From 1ca9cd8256f676ca10dff6601e79818d9a43a2c8 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 23 Apr 2024 11:10:12 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=A1=A8=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 515cad92c..4b8b07820 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1859,7 +1859,8 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => {
         //let rootid_ = data.value.label
         associatedFormsCurrentFormFieldTree.value = [{
             id: 'rootid_'+data.label,
-            label: '当前表单',
+            //label: '当前表单',
+            label: '当前表单-'+data.treeAttrs.show,
             children: [...resData.value],
             treeAttrs: data.treeAttrs,
         }]
@@ -3459,6 +3460,7 @@ const loadNextPage = () => {
                     <el-tree
 						ref="fieldTreeRef"
                         node-key="id"
+                        empty-text="选择关联的表单后展示"
 						:data="asfasfFieldTree"
 						:props="treeDefaultProps"
 						:filter-node-method="filterNode"
@@ -3477,7 +3479,7 @@ const loadNextPage = () => {
 					<el-tree
 						ref="fieldTreeRef"
                         node-key="id"
-                        empty-text="请先保存当前表单,若需要展示本次编辑表单添加的字段,也需先保存"
+                        empty-text="请先保存当前表单"
 						:data="associatedFormsCurrentFormFieldTree"
 						:props="treeDefaultProps"
 						:filter-node-method="filterNode"
@@ -3573,7 +3575,7 @@ const loadNextPage = () => {
             <div style="height:300px;border:1px solid white;overflow-y:auto">
                 
                     <template v-for="(item, index) in controlData.control.fillRoles"  :key="controlData.control.fillRoles[index].id">
-                        <AssociatedFormsFillRole v-model:left-value="controlData.control.fillRoles[index].leftValue"  v-model:right-value="controlData.control.fillRoles[index].rightValue" :left-tree-source = "asfasfFieldTree[0].children" :right-tree-source = "associatedFormsCurrentFormFieldTree[0].children"  :current-key="controlData.control.fillRoles[index].id"  @del-Role = "delRole"  ></AssociatedFormsFillRole>
+                        <AssociatedFormsFillRole v-model:left-value="controlData.control.fillRoles[index].leftValue"  v-model:right-value="controlData.control.fillRoles[index].rightValue" :left-tree-source = "asfasfFieldTree" :right-tree-source = "associatedFormsCurrentFormFieldTree"  :current-key="controlData.control.fillRoles[index].id"  @del-Role = "delRole"  ></AssociatedFormsFillRole>
                     </template>
                 
                 

From c37de4e81ddb790933400bcf5b8622e6c3914b46 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 23 Apr 2024 13:22:23 +0800
Subject: [PATCH 02/18] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue | 2 +-
 src/types/components.d.ts                     | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 4b8b07820..ff9c43e81 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -3366,7 +3366,7 @@ const loadNextPage = () => {
 					<el-tree
 						ref="fieldTreeRef"
                         node-key="id"
-                        empty-text="请先保存当前表单,若需要展示本次编辑表单添加的字段,也需先保存"
+                        empty-text="请先保存当前表单"
 						:data="associatedFormsCurrentFormFieldTree"
 						:props="treeDefaultProps"
 						:filter-node-method="filterNode"
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 19f29ef9c..02ee073ba 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -66,10 +66,12 @@ declare module '@vue/runtime-core' {
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+    ElResult: typeof import('element-plus/es')['ElResult']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSlider: typeof import('element-plus/es')['ElSlider']
+    ElSpace: typeof import('element-plus/es')['ElSpace']
     ElStep: typeof import('element-plus/es')['ElStep']
     ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
@@ -108,15 +110,18 @@ declare module '@vue/runtime-core' {
     HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
+    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IEpClose: typeof import('~icons/ep/close')['default']
     IEpDelete: typeof import('~icons/ep/delete')['default']
     IEpEdit: typeof import('~icons/ep/edit')['default']
     IEpMessageBox: typeof import('~icons/ep/message-box')['default']
+    IEpMinus: typeof import('~icons/ep/minus')['default']
     IEpOperation: typeof import('~icons/ep/operation')['default']
     IEpPlus: typeof import('~icons/ep/plus')['default']
     IEpRefresh: typeof import('~icons/ep/refresh')['default']
     IEpSearch: typeof import('~icons/ep/search')['default']
     IEpSetting: typeof import('~icons/ep/setting')['default']
+    IEpUser: typeof import('~icons/ep/user')['default']
     LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
     LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default']
     List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default']

From e834f352781dc53a50b40971effe7c00af154bba Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 7 May 2024 14:45:36 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=85=8D=E7=BD=AE-=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/assembly/index.ts   |   9 +-
 src/components/DesignForm/formControlAttr.vue | 181 +++++++++++++++++-
 2 files changed, 186 insertions(+), 4 deletions(-)

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 76d13c258..dd32b14a2 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -80,7 +80,8 @@ const selectOption: any = [
 			icon: 'radio',
 			iconFont: 'fa-dot-circle-o',
 			control: {
-				modelValue: ''
+				modelValue: '',
+				glxxsz:[],
 			},
 			options: selectOption, // 下拉选项数据集合
 			config: config,
@@ -96,7 +97,8 @@ const selectOption: any = [
 			icon: 'checkbox',
 			iconFont: 'fa-check-square-o',
 			control: {
-				modelValue: []
+				modelValue: [],
+				glxxsz:[],
 			},
 			options: selectOption,
 			config: config,
@@ -113,7 +115,8 @@ const selectOption: any = [
 			iconFont: 'fa-toggle-down',
 			control: {
 				modelValue: '',
-				appendToBody: true
+				appendToBody: true,
+				glxxsz:[],
 			},
 			options: selectOption,
 			config: config,
diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index ff9c43e81..7376339b6 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1850,6 +1850,7 @@ function formidChanged(){
 }
 
 const associatedFormsCurrentFormFieldTree = ref<Tree[]>()
+const associatedFormsCurrentFormFieldTreeForGlxxsz = ref<Tree[]>()
 getAssociatedFormsCurrentFieldTree().then(({ data }) => {
     
     if(data.id==="cfid为空"){
@@ -1864,6 +1865,17 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => {
             children: [...resData.value],
             treeAttrs: data.treeAttrs,
         }]
+
+        let resDataForGlxxsz = ref(data.children.slice(8))
+        
+        
+        associatedFormsCurrentFormFieldTreeForGlxxsz.value = [{
+            id: 'rootid_'+data.label,
+            //label: '当前表单',
+            label: '当前表单-'+data.treeAttrs.show,
+            children: [...resDataForGlxxsz.value],
+            treeAttrs: data.treeAttrs,
+        }]
     }
 });
 
@@ -2153,6 +2165,69 @@ function delRole(id:String){
 //liwenxuan20240403 associatedForms end 
 
 
+//liwenxuan20240426 单选多选下拉 关联选项设置  start
+
+const glxxszDialogFlag = ref(false)
+const glxxszDialogFlagCheckBox = ref(false)
+function handelGlxxszDialog(){
+    if(controlData.value.options.length===0){
+        alert("无可配置选项，请先添加。")
+    }else{
+        glxxszDialogFlag.value = true
+    }
+}
+
+function handelGlxxszDialogCheckbox(){
+    glxxszDialogFlagCheckBox.value = true
+}
+
+function handleDetermineGlxxszDialog(){
+    glxxszDialogFlag.value = false
+}
+function handleDetermineGlxxszDialogCheckBox(){
+    glxxszDialogFlagCheckBox.value = false
+}
+/* function addShowField(val:string){
+    alert('addShowField:'+val)
+} */
+
+
+
+//radio,select添加选项时同步配置选项
+watch(()=>controlData.value.options, (changedOptions:any) => {
+    if(controlData.value.type === "radio" || controlData.value.type === "select"){
+        if(changedOptions.length===0){
+            //删没了option
+            controlData.value.control.glxxsz = []
+        }else{
+            if(changedOptions.length < controlData.value.control.glxxsz.length){
+                //删除了某个option
+                controlData.value.control.glxxsz = controlData.value.control.glxxsz.filter((item: { optionValue: any }) => changedOptions.find((bItem: { value: any }) => item.optionValue == bItem.value))
+            }else{
+                for(var i = 0; i < changedOptions.length; i++){
+                    if(controlData.value.control.glxxsz[i]===undefined){
+                        //新增了某个option
+                        controlData.value.control.glxxsz.push(
+                            {
+                                optionLabel: changedOptions[i].label,
+                                optionValue: changedOptions[i].value,
+                                tableIndex: i,
+                                id: uuidv4().replaceAll('-','').toString(),
+                            }
+                        )
+                    }else{
+                        //修改了某个option
+                        controlData.value.control.glxxsz[i].optionLabel = changedOptions[i].label
+                        controlData.value.control.glxxsz[i].optionValue = changedOptions[i].value
+                    }
+                }
+            }
+        }
+    }
+},{ deep: true })
+
+
+//liwenxuan20240426 单选多选下拉 关联选项设置  end
 
 
 
@@ -2774,6 +2849,12 @@ const loadNextPage = () => {
                                 </el-form-item>
                             </div>
                         </div>
+                        <div v-if="showHide(['radio','select',],true)">
+                            <el-button @click="handelGlxxszDialog">关联选项设置</el-button>
+                        </div>
+                        <div v-if="showHide(['checkbox',],true)">
+                            <el-button @click="handelGlxxszDialogCheckbox">关联选项设置</el-button>
+                        </div>
                         <div
                             v-if="
                             showHide(
@@ -3595,10 +3676,107 @@ const loadNextPage = () => {
 
 
 	<!-- 关联表单设置弹窗 liwenxuan 20240402 end -->
+
+
+<!-- 关联选项设置弹窗 liwenxuan 20240426 start -->
+        <el-dialog  v-model="glxxszDialogFlag" class="glxxsztc" top="150px" :close-on-click-modal="false" title="关联选项设置" :show-close="false" style="margin-top:70px;" width="50%" >
+
+            
+            
+            <template v-if="controlData.type=='radio'||controlData.type=='select'">
+                
+                <el-table  
+                :data="controlData.options" stripe  border style="width: 100%;min-height:50px;max-height:500px;overflow-y:auto" 
+                            :cell-style="{height: '55px',paddingLeft: '15px'}" :header-cell-style="{background:'#F3F4F7',color:'#555',}" 
+                            >
+                
+                    <el-table-column prop="link" label="当选项为" width="220">
+                        <template #default="optionScope">
+                            <span style="background-color: #E8EAEE;border-radius: 8px;padding-top: 5px;padding-bottom: 5px;padding-left: 15px;padding-right: 15px;">{{ optionScope.row.label }}</span>
+                            
+                        </template>
+                    </el-table-column>
+                    <el-table-column fixed="right" label="显示以下组件" >
+                        
+                        <!-- <template #default="fieldScope">
+                            <div style="display:flex;align-items: center;flex-wrap: wrap;">
+                                <el-tag v-for="tag in tags" :key="tag.name" closable style="font-weight: 500; margin-right: 5px;margin-top: 5px;" effect="dark" >
+                                    {{ tag.name }}
+                                </el-tag>
+                                
+                                    <el-icon style="display:inline-block; width:20px;margin-top: 5px;height:20px;border: 1.5px #9C9DA0 solid; border-radius: 3px; font-size: large; cursor: pointer; position:relative" @click="addShowField(fieldScope.row.value)">
+                                        <Plus />
+                                        <div :class="`treeSelectDiv`+fieldScope.row.value" style="position: absolute;z-index: 999999; display:inline-block;">
+                                        <el-tree-select 
+                                            size=""
+                                            v-model="trseChVal" style="width: 290px;" :data="associatedFormsCurrentFormFieldTree"
+                                            check-strictly :render-after-expand="false"    />
+                                    </div>
+                                    </el-icon>
+                            </div> 
+                            </template> -->
+                            
+                            <template #default="fieldScope">
+                                
+                                <el-tree-select v-model="controlData.control.glxxsz[fieldScope.$index].showFields" style="width: 100%" :data="associatedFormsCurrentFormFieldTreeForGlxxsz[0].children" multiple   />
+                            </template>
+                    </el-table-column>
+                </el-table>
+            </template>
+            <template #footer>
+            <div class="dialog-footer">
+                <!-- <el-button @click="asfhTextCancelFillRoles">取消</el-button> -->
+                <el-button type="primary" @click="handleDetermineGlxxszDialog">
+                确定
+                </el-button>
+            </div>
+        </template>
+        </el-dialog>
+        <!-- 
+            
+            
+        -->
+
+        <el-dialog v-model="glxxszDialogFlagCheckBox"  class="glxxsztc" top="150px" :close-on-click-modal="false" title="关联选项设置" :show-close="false" style="margin-top:70px;" width="50%" >
+
+            
+            
+            <template v-if="controlData.type=='checkbox'">
+                
+                <el-table  
+                :data="controlData.control.glxxsz" stripe  border style="width: 100%;min-height:50px;max-height:500px;overflow-y:auto" 
+                            :cell-style="{height: '55px',paddingLeft: '15px'}" :header-cell-style="{background:'#F3F4F7',color:'#555',}" 
+                            >
+                
+                    <el-table-column prop="link" label="当选项为" width="220">
+                        <template #default="optionScope">
+                            
+                            <el-tree-select v-model="controlData.control.glxxsz[optionScope.$index].showFields" style="width: 100%" :data="associatedFormsCurrentFormFieldTreeForGlxxsz[0].children" multiple   />
+                        </template>
+                    </el-table-column>
+                    <el-table-column fixed="right" label="显示以下组件" >
+                            <template #default="fieldScope">
+                                
+                                <el-tree-select v-model="controlData.control.glxxsz[fieldScope.$index].showFields" style="width: 100%" :data="associatedFormsCurrentFormFieldTreeForGlxxsz[0].children" multiple   />
+                            </template>
+                    </el-table-column>
+                </el-table>
+            </template>
+            <template #footer>
+            <div class="dialog-footer">
+                <!-- <el-button @click="asfhTextCancelFillRoles">取消</el-button> -->
+                <el-button type="primary" @click="handleDetermineGlxxszDialogCheckBox">
+                确定
+                </el-button>
+            </div>
+            </template>
+            </el-dialog>
+
+        <!-- 关联选项设置弹窗 liwenxuan 20240426 end -->
     </template>
 
 <style   lang='scss' scoped>   
-
+    
     li::before {
         content: "";
         display: inline-block;
@@ -3659,5 +3837,6 @@ const loadNextPage = () => {
 .el-main{
 	--el-main-padding: 5px
 }
+
 </style>
 

From 7f6bd37fc8c692a0a60cd1481ea71045850dade2 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 8 May 2024 16:31:02 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=85=8D=E7=BD=AE-=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/assembly/index.ts   |  3 +-
 src/components/DesignForm/formControlAttr.vue | 98 ++++++++++++++++---
 .../DesignForm/public/form/form.vue           |  2 +-
 3 files changed, 86 insertions(+), 17 deletions(-)

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index dd32b14a2..7d739262f 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -1,3 +1,4 @@
+import { v4 as uuidv4 } from "uuid";
 const selectOption: any = [
 	/*{
 	  label: '标签1',
@@ -98,7 +99,7 @@ const selectOption: any = [
 			iconFont: 'fa-check-square-o',
 			control: {
 				modelValue: [],
-				glxxsz:[],
+				glxxszForCheckBox:[],
 			},
 			options: selectOption,
 			config: config,
diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 7376339b6..5b5634bda 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1134,11 +1134,52 @@
     // 属性设置相关结束
     // 多选固定选项删除
     const delSelectOption = (index: number, type?: string) => {
-        if (type === 'tabs') {
-              controlData.value.columns.splice(index, 1)
-        } else {
-              controlData.value.options.splice(index, 1)
+        //liwenxuan 20240508 checkbox 删除选项时提醒  start
+        let delflag = true
+        let breakFlag = 0
+        if(controlData.value.type === 'checkbox'){
+            for(var i = 0;i < controlData.value.control.glxxszForCheckBox.length;i ++){
+                if(breakFlag>0){
+                    break
+                }
+                for(var j = 0; j < controlData.value.control.glxxszForCheckBox[i].selectedOptions.length; j++){
+                    if(controlData.value.control.glxxszForCheckBox[i].selectedOptions[j] === controlData.value.options[index].value){
+                        let del =confirm("您本次删除的选项已在关联选项设置中有所配置，相关关联选项设置将被删除，是否确定删除？");
+                        if (del==true){
+                            breakFlag++
+                            break
+                        }else{
+                            delflag = false
+                            breakFlag++
+                            break
+                        }
+                    }
+                }
+
+                
+            }
+        }
+        if(delflag === true){
+            //删除相关关联选项设置
+            const todelArr:any = []     
+            for(var i = 0;i < controlData.value.control.glxxszForCheckBox.length;i ++){
+                for(var j = 0; j < controlData.value.control.glxxszForCheckBox[i].selectedOptions.length; j++){
+                    if(controlData.value.control.glxxszForCheckBox[i].selectedOptions[j] === controlData.value.options[index].value){
+                        todelArr.push(controlData.value.control.glxxszForCheckBox[i].id)
+                    }
+                }
+            }
+            for(var i = 0;i < todelArr.length;i++){
+                controlData.value.control.glxxszForCheckBox = controlData.value.control.glxxszForCheckBox.filter((item: { id: any }) => item.id != todelArr[i])
+            }
+            //liwenxuan 20240508 checkbox 删除选项时提醒  end
+            if (type === 'tabs' ) {
+                    controlData.value.columns.splice(index, 1)
+            } else {
+                    controlData.value.options.splice(index, 1)
+            }
         }
+        
     }
     // 多选固定选项增加
     const addSelectOption = (type: any) => {
@@ -2223,10 +2264,26 @@ watch(()=>controlData.value.options, (changedOptions:any) => {
                 }
             }
         }
+    }else if(controlData.value.type === "checkbox"){
+        
     }
 },{ deep: true })
 
 
+function createRowForGlxxsz(){
+    controlData.value.control.glxxszForCheckBox.push(
+        {
+            selectedOptions:[],
+            showFields:[],
+            id: uuidv4().replaceAll('-','').toString(),
+        }
+    )
+}
+
+function deleteRowForGlxxsz(row: { id: any }){
+    controlData.value.control.glxxszForCheckBox = controlData.value.control.glxxszForCheckBox.filter((item: { id: any }) => item.id!=row.id)
+}
+
 //liwenxuan20240426 单选多选下拉 关联选项设置  end
 
 
@@ -3744,23 +3801,34 @@ const loadNextPage = () => {
             <template v-if="controlData.type=='checkbox'">
                 
                 <el-table  
-                :data="controlData.control.glxxsz" stripe  border style="width: 100%;min-height:50px;max-height:500px;overflow-y:auto" 
-                            :cell-style="{height: '55px',paddingLeft: '15px'}" :header-cell-style="{background:'#F3F4F7',color:'#555',}" 
-                            >
-                
-                    <el-table-column prop="link" label="当选项为" width="220">
+                    :data="controlData.control.glxxszForCheckBox" stripe  border style="width: 100%;min-height:50px;max-height:500px;overflow-y:auto" 
+                    :cell-style="{height: '55px',paddingLeft: '15px'}" :header-cell-style="{background:'#F3F4F7',color:'#555',}">
+
+                    <el-table-column prop="link" label="当选项为" width="300">
                         <template #default="optionScope">
-                            
-                            <el-tree-select v-model="controlData.control.glxxsz[optionScope.$index].showFields" style="width: 100%" :data="associatedFormsCurrentFormFieldTreeForGlxxsz[0].children" multiple   />
+                            <el-tree-select v-model="controlData.control.glxxszForCheckBox[optionScope.$index].selectedOptions" style="width: 100%" :data="controlData.options" multiple />
                         </template>
                     </el-table-column>
+
                     <el-table-column fixed="right" label="显示以下组件" >
-                            <template #default="fieldScope">
-                                
-                                <el-tree-select v-model="controlData.control.glxxsz[fieldScope.$index].showFields" style="width: 100%" :data="associatedFormsCurrentFormFieldTreeForGlxxsz[0].children" multiple   />
-                            </template>
+                        <template #default="fieldScope">
+                            <el-tree-select v-model="controlData.control.glxxszForCheckBox[fieldScope.$index].showFields" style="width: 100%" :data="associatedFormsCurrentFormFieldTreeForGlxxsz[0].children" multiple   />
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column fixed="right" label="操作" width="130">
+                        <!-- <el-button v-if="controlData.control.carsuselConfigArr.length>1" type="danger" :icon="Delete" circle @click="deleteRow(scope.row)"/>
+                        
+                        <el-button v-if="controlData.control.carsuselConfigArr[controlData.control.carsuselConfigArr.length-1].imgId == scope.row.imgId" type="success" :icon="Plus" circle @click="createRow(scope.row)" /> -->
+                        <template #default="operateScope">
+                            <!-- <el-button v-if="controlData.control.glxxsz[controlData.control.glxxsz.length-1].id == operateScope.row.id" type="success" :icon="Plus" circle @click="createRowForGlxxsz(operateScope.row)" /> -->
+                            <el-button  type="danger" :icon="Delete" circle @click="deleteRowForGlxxsz(operateScope.row)"/>
+                        </template>
+                        
                     </el-table-column>
+
                 </el-table>
+                <el-button plain type="success" style="margin-top: 10px;" @click="createRowForGlxxsz">新增</el-button>
             </template>
             <template #footer>
             <div class="dialog-footer">
diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index 6536dde2a..efd1bfce4 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -248,7 +248,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 	// console.log("监听表单-6-constControlChange-->",attribute)
 
 
-	console.log("监听表单--constControlChange-->",key, value, data, tProp,type,attribute)
+	console.log("监听表单--constControlChange-->",key, value, data, tProp,type,attribute)//liwenxuan
 
 	if (typeof props.changeKeyVal === 'function') {
 		props.changeKeyVal(key, value,type,attribute)

From b9a46e08faf10aae8020d22b390e70a55e15411e Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 9 May 2024 16:06:49 +0800
Subject: [PATCH 05/18] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=85=8D=E7=BD=AE=E6=B5=8B=E8=AF=95bug?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 5b5634bda..838d32ff8 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1161,16 +1161,18 @@
         }
         if(delflag === true){
             //删除相关关联选项设置
-            const todelArr:any = []     
-            for(var i = 0;i < controlData.value.control.glxxszForCheckBox.length;i ++){
-                for(var j = 0; j < controlData.value.control.glxxszForCheckBox[i].selectedOptions.length; j++){
-                    if(controlData.value.control.glxxszForCheckBox[i].selectedOptions[j] === controlData.value.options[index].value){
-                        todelArr.push(controlData.value.control.glxxszForCheckBox[i].id)
+            if(controlData.value.type === 'checkbox'){
+                const todelArr:any = []     
+                for(var i = 0;i < controlData.value.control.glxxszForCheckBox.length;i ++){
+                    for(var j = 0; j < controlData.value.control.glxxszForCheckBox[i].selectedOptions.length; j++){
+                        if(controlData.value.control.glxxszForCheckBox[i].selectedOptions[j] === controlData.value.options[index].value){
+                            todelArr.push(controlData.value.control.glxxszForCheckBox[i].id)
+                        }
                     }
                 }
-            }
-            for(var i = 0;i < todelArr.length;i++){
-                controlData.value.control.glxxszForCheckBox = controlData.value.control.glxxszForCheckBox.filter((item: { id: any }) => item.id != todelArr[i])
+                for(var i = 0;i < todelArr.length;i++){
+                    controlData.value.control.glxxszForCheckBox = controlData.value.control.glxxszForCheckBox.filter((item: { id: any }) => item.id != todelArr[i])
+                }
             }
             //liwenxuan 20240508 checkbox 删除选项时提醒  end
             if (type === 'tabs' ) {

From 4401405741152119b3e2c583c71dddf8a401b04d Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 20 May 2024 11:46:32 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=8B=E6=8B=89=E5=8D=95=E9=80=89=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue |  51 ++---
 .../DesignForm/public/form/form.vue           | 181 +++++++++++++++++-
 .../DesignForm/public/form/formGroup.vue      |   9 +
 .../sysworkflow/lowcodepage/pageDesignes.vue  |  35 +++-
 4 files changed, 235 insertions(+), 41 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 838d32ff8..25964f9fa 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -56,6 +56,7 @@
         (e: 'openDialog', data: any): void
         (e: 'update:formOtherData', data: any): void
         (e: 'videoMsgChange', data: VideoMsg): void
+        (e: 'formNameChange', data: any): void
         //(e: 'update:formData', data: any): void
         //(e: 'update:formConfig', data: any): void
     }>()
@@ -993,6 +994,7 @@
     
     const fileSignAry = reactive<any>([])
     const controlChange = (obj: any, val: any) => {
+        
         // console.log("字段编辑--1--》",obj)
         // console.log("字段编辑--2--》",obj.eventName)
         // console.log("字段编辑--3--》",val)
@@ -1088,7 +1090,15 @@
             const newVal = obj.isNum ? formatNumber(val) : val // 类型为数字时转整数
             obj.path && getPropByPath(controlData.value, obj.path, newVal)
         }
+
+
+        //liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  start
+
+        emits('formNameChange',val);
+        //liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  end
+
     }
+
     /** 
     * 获取非负整数随机数 
     * @param Min 最小整数  
@@ -2230,9 +2240,7 @@ function handleDetermineGlxxszDialog(){
 function handleDetermineGlxxszDialogCheckBox(){
     glxxszDialogFlagCheckBox.value = false
 }
-/* function addShowField(val:string){
-    alert('addShowField:'+val)
-} */
+
 
 
 
@@ -2252,6 +2260,7 @@ watch(()=>controlData.value.options, (changedOptions:any) => {
                         //新增了某个option
                         controlData.value.control.glxxsz.push(
                             {
+                                conditionField: controlData.value.name,
                                 optionLabel: changedOptions[i].label,
                                 optionValue: changedOptions[i].value,
                                 tableIndex: i,
@@ -2275,6 +2284,7 @@ watch(()=>controlData.value.options, (changedOptions:any) => {
 function createRowForGlxxsz(){
     controlData.value.control.glxxszForCheckBox.push(
         {
+            
             selectedOptions:[],
             showFields:[],
             id: uuidv4().replaceAll('-','').toString(),
@@ -2286,6 +2296,8 @@ function deleteRowForGlxxsz(row: { id: any }){
     controlData.value.control.glxxszForCheckBox = controlData.value.control.glxxszForCheckBox.filter((item: { id: any }) => item.id!=row.id)
 }
 
+//修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改
+
 //liwenxuan20240426 单选多选下拉 关联选项设置  end
 
 
@@ -3756,25 +3768,6 @@ const loadNextPage = () => {
                         </template>
                     </el-table-column>
                     <el-table-column fixed="right" label="显示以下组件" >
-                        
-                        <!-- <template #default="fieldScope">
-                            <div style="display:flex;align-items: center;flex-wrap: wrap;">
-                                <el-tag v-for="tag in tags" :key="tag.name" closable style="font-weight: 500; margin-right: 5px;margin-top: 5px;" effect="dark" >
-                                    {{ tag.name }}
-                                </el-tag>
-                                
-                                    <el-icon style="display:inline-block; width:20px;margin-top: 5px;height:20px;border: 1.5px #9C9DA0 solid; border-radius: 3px; font-size: large; cursor: pointer; position:relative" @click="addShowField(fieldScope.row.value)">
-                                        <Plus />
-                                        <div :class="`treeSelectDiv`+fieldScope.row.value" style="position: absolute;z-index: 999999; display:inline-block;">
-                                        <el-tree-select 
-                                            size=""
-                                            v-model="trseChVal" style="width: 290px;" :data="associatedFormsCurrentFormFieldTree"
-                                            check-strictly :render-after-expand="false"    />
-                                    </div>
-                                    </el-icon>
-                            </div> 
-                            </template> -->
-                            
                             <template #default="fieldScope">
                                 
                                 <el-tree-select v-model="controlData.control.glxxsz[fieldScope.$index].showFields" style="width: 100%" :data="associatedFormsCurrentFormFieldTreeForGlxxsz[0].children" multiple   />
@@ -3784,17 +3777,13 @@ const loadNextPage = () => {
             </template>
             <template #footer>
             <div class="dialog-footer">
-                <!-- <el-button @click="asfhTextCancelFillRoles">取消</el-button> -->
+                
                 <el-button type="primary" @click="handleDetermineGlxxszDialog">
                 确定
                 </el-button>
             </div>
         </template>
         </el-dialog>
-        <!-- 
-            
-            
-        -->
 
         <el-dialog v-model="glxxszDialogFlagCheckBox"  class="glxxsztc" top="150px" :close-on-click-modal="false" title="关联选项设置" :show-close="false" style="margin-top:70px;" width="50%" >
 
@@ -3819,11 +3808,11 @@ const loadNextPage = () => {
                     </el-table-column>
 
                     <el-table-column fixed="right" label="操作" width="130">
-                        <!-- <el-button v-if="controlData.control.carsuselConfigArr.length>1" type="danger" :icon="Delete" circle @click="deleteRow(scope.row)"/>
                         
-                        <el-button v-if="controlData.control.carsuselConfigArr[controlData.control.carsuselConfigArr.length-1].imgId == scope.row.imgId" type="success" :icon="Plus" circle @click="createRow(scope.row)" /> -->
+                        
+                        
                         <template #default="operateScope">
-                            <!-- <el-button v-if="controlData.control.glxxsz[controlData.control.glxxsz.length-1].id == operateScope.row.id" type="success" :icon="Plus" circle @click="createRowForGlxxsz(operateScope.row)" /> -->
+                            
                             <el-button  type="danger" :icon="Delete" circle @click="deleteRowForGlxxsz(operateScope.row)"/>
                         </template>
                         
@@ -3834,7 +3823,7 @@ const loadNextPage = () => {
             </template>
             <template #footer>
             <div class="dialog-footer">
-                <!-- <el-button @click="asfhTextCancelFillRoles">取消</el-button> -->
+                
                 <el-button type="primary" @click="handleDetermineGlxxszDialogCheckBox">
                 确定
                 </el-button>
diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index efd1bfce4..a3e59464a 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -115,7 +115,7 @@ const setWindowEvent = (bool?: boolean) => {
 }
 watch(
 	() => props.formData,
-    () => {
+    () => { 
 		emits('update:issave', false)
     },
     { deep: true }
@@ -239,16 +239,170 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 		}
 	// })
 	
+	//liwenxuan 关联选项设置效果实现 start
+	 console.log("监听表单-1-constControlChange-->",props.formData)
+	 console.log("监听表单-2-constControlChange-->",key)
+	 console.log("监听表单-3-constControlChange-->", value)
+	 console.log("监听表单-4-constControlChange-->",data)
+	 console.log("监听表单-5-constControlChange-->",type)
+	 console.log("监听表单-6-constControlChange-->",attribute)
+	
+
+
+
+	//得到当前表单各选项的值
+	//props.formData.config.hideField.push("nin2yuan4yi4wei4wo3menda3fen1ma101939")
+	
+	
+	
 	
-	// console.log("监听表单-1-constControlChange-->",props.formData)
-	// console.log("监听表单-2-constControlChange-->",key)
-	// console.log("监听表单-3-constControlChange-->", value)
-	// console.log("监听表单-4-constControlChange-->",data)
-	// console.log("监听表单-5-constControlChange-->",type)
-	// console.log("监听表单-6-constControlChange-->",attribute)
 
 
-	console.log("监听表单--constControlChange-->",key, value, data, tProp,type,attribute)//liwenxuan
+	//得到所有配置对象，包括radio,checkbox,select
+	const radioSelectShowConfigArr = []
+	const checkboxShowConfigArr = []
+	//以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建一个数组radioselectArr2。----用于获取所有出现在配置中的字段。
+	const radioSelectArr2:any[] = []
+	for(let i = 0;i<props.formData.list.length;i++){
+		if(props.formData.list[i].type=="radio"||props.formData.list[i].type=="select"||props.formData.list[i].type=="checkbox"){
+			props.formData.config.hideField = [];
+		}
+		//console.log(props.formData.list[i].type)
+		if(props.formData.list[i].type=="radio"||props.formData.list[i].type=="select"){
+			radioSelectShowConfigArr.push(props.formData.list[i].control.glxxsz)
+			
+		}else if(props.formData.list[i].type=="checkbox"){
+			
+			checkboxShowConfigArr.push(props.formData.list[i].control.glxxszForCheckBox)
+		}
+	}
+	//数组深拷贝
+	const radioSelectShowConfigArr2 = JSON.parse(JSON.stringify(radioSelectShowConfigArr));
+	const checkboxShowConfigArr2 = JSON.parse(JSON.stringify(checkboxShowConfigArr));
+	console.log(radioSelectShowConfigArr2)
+	console.log(checkboxShowConfigArr2)
+
+
+
+	if(radioSelectShowConfigArr2.length>0){
+		for(let i = 0;i<radioSelectShowConfigArr2.length;i++){
+			if( radioSelectShowConfigArr2[i].length>0){
+				for(let j = 0;j<radioSelectShowConfigArr2[i].length;j++){
+					//数组深拷贝
+					const jArr = JSON.parse(JSON.stringify(radioSelectShowConfigArr2[i][j]));
+					const optionValueJArr = jArr.optionValue
+					if(jArr.showFields!=undefined&&jArr.showFields.length>0){
+						for(let n = 0;n<jArr.showFields.length;n++){
+							let fieldKeyArr = jArr.showFields[n].split(":")
+							let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
+							radioSelectArr2.push({
+								//conditionFieldKey:jArr.conditionField,
+								//conditionFieldValue:optionValueJArr,
+								toShowFieldKey:fieldKeyStr,
+							})
+						}
+					}
+				}
+			}
+		}
+	}
+
+	//以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建一个数组radioselectArr3  ---用于组装完整显示隐藏条件、
+	const radioSelectArr3:any[] = []
+	if(radioSelectShowConfigArr2.length>0){
+		for(let i = 0;i<radioSelectShowConfigArr2.length;i++){
+			if( radioSelectShowConfigArr2[i].length>0){
+				for(let j = 0;j<radioSelectShowConfigArr2[i].length;j++){
+					//数组深拷贝
+					const jArr = JSON.parse(JSON.stringify(radioSelectShowConfigArr2[i][j]));
+					const optionValueJArr = jArr.optionValue
+					if(jArr.showFields!=undefined&&jArr.showFields.length>0){
+						if(jArr.showFields.length>1){
+							let arr1 = []
+							for(let n = 0;n<jArr.showFields.length;n++){
+								let fieldKeyArr = jArr.showFields[n].split(":")
+								let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
+								arr1.push(fieldKeyStr)
+							}
+							radioSelectArr3.push({
+								conditionFieldKey:jArr.conditionField,
+								conditionFieldValue:optionValueJArr,
+								toShowFieldKey:arr1,
+							})
+						}else{//等于1
+							for(let n = 0;n<jArr.showFields.length;n++){
+								let fieldKeyArr = jArr.showFields[n].split(":")
+								let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
+								radioSelectArr3.push({
+									conditionFieldKey:jArr.conditionField,
+									conditionFieldValue:optionValueJArr,
+									toShowFieldKey:[fieldKeyStr],
+								})
+							}
+						}
+						
+					}
+				}
+			}
+		}
+	}
+
+
+
+	//暂时使用的隐藏数组，数据敲定后赋给props.formData.config.hideField
+	let hideFieldArr: any[] = [];
+	//但凡配置条件的字段先放入隐藏数组中
+	for(let i = 0;i< radioSelectArr2.length;i++){
+		hideFieldArr.push(radioSelectArr2[i].toShowFieldKey)
+	} 
+	hideFieldArr = Array.from(new Set(hideFieldArr))
+
+	nextTick(() => {
+		console.log(radioSelectArr3)
+		console.log(model.value)
+		let modelKeyArr = [];
+		for(let i= 0;i<props.formData.list.length;i++){
+			modelKeyArr.push(props.formData.list[i].name+"")
+		}
+		console.log("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"+modelKeyArr)
+
+
+		//根据条件的生效情况从隐藏数组中过滤字段
+		for(let i = 0;i< radioSelectArr3.length;i++){
+			for(let j = 0; j< modelKeyArr.length;j++){
+				
+				if(modelKeyArr[j]==radioSelectArr3[i].conditionFieldKey){
+					//console.log("当前：字段标识modelKeyArr[j]========="+modelKeyArr[j]+"字段标识modelKeyArr[j]的值===="+model.value[modelKeyArr[j]])
+					//console.log("规则：字段标识radioSelectArr3[i].conditionFieldKey========="+radioSelectArr3[i].conditionFieldKey+"conditionFieldValue的值======"+radioSelectArr3[i].conditionFieldValue)
+					
+					
+					//作为条件的字段的设定条件值等于其当前的值
+					if(radioSelectArr3[i].conditionFieldValue == model.value[modelKeyArr[j]]){
+						console.log("当前的值==="+model.value[modelKeyArr[j]])
+						console.log("modelKeyArr[j]==="+modelKeyArr[j])
+						console.log("作为条件的字段的设定条件值radioSelectArr3[i]==="+radioSelectArr3[i].conditionFieldValue)
+						console.log(radioSelectArr3[i].toShowFieldKey)
+						//hideFieldArr = hideFieldArr.filter( item => radioSelectArr3[i].toShowFieldKey.find((bItem: any) => item != bItem))
+						for(let n = 0; n < hideFieldArr.length; n++){
+							for(let m = 0; m < radioSelectArr3[i].toShowFieldKey.length; m++){
+								if(hideFieldArr[n] == radioSelectArr3[i].toShowFieldKey[m]){
+									hideFieldArr.splice(n,1);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		console.log(hideFieldArr)
+		props.formData.config.hideField?.push(...hideFieldArr)
+	});
+
+	
+	
+	
+	 //props.formData.config?.hideField?.push("nin2yuan4yi4wei4wo3menda3fen1ma101939")
+	//console.log("监听表单--constControlChange-->",key, value, data, tProp,type,attribute)//liwenxuan
 
 	if (typeof props.changeKeyVal === 'function') {
 		props.changeKeyVal(key, value,type,attribute)
@@ -274,7 +428,10 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 		emits('change', { key, value, model: model.value, data, tProp })
     }
 
-	
+		
+	/* 
+		
+	*/
 })
 const dictForm = computed(() => {
     const storage = window.localStorage.getItem('akFormDict')
@@ -295,6 +452,7 @@ const formProps = computed(() => {
 		dict: dictForm.value
     }
 })
+
 provide(constFormProps, formProps)
 
 // 提供一个方法，用于根据name从formData.list里查找数据
@@ -709,6 +867,11 @@ watch(
     }
 )
 // ------------------------数据处理结束------------------------
+
+
+
+
+
 // 重置表单方法
 const resetFields = () => {
     ruleForm.value.resetFields()
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index 04f37fd10..eba74e198 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -209,15 +209,24 @@ const getFormItemStyle = (ele: FormList) => {
 }
 // 根据关联条件显示隐藏当前项
 const linksShow = (el: FormList, index: number) => {
+
+	/* 
+		
+	*/
     // 当前项设置了关联条件，当关联主体的值等于当前组件设定的值时
     if (!el.config) {
       	return true
     }
     const key = el.config.linkKey
+	//liwenxuan 关联选项设置效果实现  
+	//console.log("linksShow--------"+index+"--------"+JSON.stringify(el))
+	//仅第一次加载会触发，须将出现在配置条件中的表单项隐藏。
+	
     const value = el.config.linkValue
     const linkResult = el.config.linkResult
     if (key && value && type.value !== 5) {
 		const Fn = new Function('$', `return (${value})`)
+		console.log(Fn)
 		const pass = Fn(formProps.value.model)
 		if (linkResult === 'disabled') {
 			// 设置为disabled后返回显示状态
diff --git a/src/views/sysworkflow/lowcodepage/pageDesignes.vue b/src/views/sysworkflow/lowcodepage/pageDesignes.vue
index 77d27c647..f24521c4e 100644
--- a/src/views/sysworkflow/lowcodepage/pageDesignes.vue
+++ b/src/views/sysworkflow/lowcodepage/pageDesignes.vue
@@ -75,6 +75,11 @@ const formKeyVal =  computed({
 	}
 });
 
+
+
+
+
+
 // 当前表单设计类型，供各子组件调用以展示不同页面，统一方式不需要每个组件都从路由中取
 provide('formDesignType', state.value.designType)
 const vueFileEl = ref()
@@ -564,7 +569,34 @@ onMounted(() => {
 //监听版本变化
 // watch(() =>versionId.value ,(val:string)=>{
 // 	emits('update:formVersion', val)
-// })	
+// })
+
+//liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  start
+const formNameChanged = (param1: any)=>{
+	for(let i = 0; i < state.value.formData.list.length; i++){
+		if(state.value.formData.list[i].type=="radio"||state.value.formData.list[i].type=="select"||state.value.formData.list[i].type=="checkbox"){
+			if(state.value.formData.list[i].control.glxxsz!=undefined&&state.value.formData.list[i].control.glxxsz.length>0){
+				state.value.formData.list[i].control.glxxsz = []
+				state.value.formData.list[i].options.push({
+					label: '',
+					value: ''
+                })
+				state.value.formData.list[i].options.pop();
+			}
+			if(state.value.formData.list[i].control.glxxszForCheckBox!=undefined&&state.value.formData.list[i].control.glxxszForCheckBox.length>0){
+				state.value.formData.list[i].control.glxxszForCheckBox = []
+			}
+		}
+	}
+	ElMessage({
+		message: '因字段标识改变，本表单的所有单选、多选、下拉的关联选项设置已重置，请重新设置。',
+		type: 'warning',
+	})
+}
+//liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  end
+
+
+
 </script>
 <template>
 	<div class="design_container">
@@ -598,6 +630,7 @@ onMounted(() => {
 			:form-list="state.formData.list"
 			:form-info="state.formData"
 			@open-dialog="openAceEditDrawer"
+			@form-name-change="formNameChanged"
 		/>
 		<ace-drawer
 			v-model="drawer.visible"

From ab72a46cf59eaac4710473b73da0d97a6082c5cc Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 20 May 2024 13:33:09 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug:=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=8F=97=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E9=80=89=E9=A1=B9=E6=8E=A7=E5=88=B6=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/public/form/form.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index a3e59464a..50a9289a4 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -395,7 +395,10 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 			}
 		}
 		console.log(hideFieldArr)
-		props.formData.config.hideField?.push(...hideFieldArr)
+		if(formProps.value.type!=5){
+			props.formData.config.hideField?.push(...hideFieldArr)
+		}
+		
 	});
 
 	

From 880fffd651939dca903774979fea52c313090ccc Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 20 May 2024 14:36:04 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E8=AE=BE=E7=BD=AE=E9=9A=90=E8=97=8F=E6=97=B6?=
 =?UTF-8?q?options=E9=94=99=E4=B9=B1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/public/form/formItem.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 1f5991f6b..d56b9dd8e 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -69,6 +69,7 @@ const control = computed(() => {
 	// return props.data
 })
 const options = ref(props.data.options)
+//console.log("FormItem*********************************************************"+JSON.stringify(props.data))
 const changeEvent = inject(constControlChange, '') as any
 const updateModel = (val: any) => {
 	let controlAttribute = ""
@@ -552,7 +553,7 @@ const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown"
 				<el-radio
 					:key="index"
 					:label="transformOption(item.value)"
-					v-for="(item, index) in options"
+					v-for="(item, index) in props.data.options"
 					
 				>
 					<span :style="getFormItemInputStyle(configStyle,5)">{{ item.label }}</span>
@@ -566,7 +567,7 @@ const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown"
 				:style="getFormItemInputStyle(configStyle,4)"
 			>
 				<el-checkbox
-					v-for="(item, index) in options"
+					v-for="(item, index) in props.data.options"
 					:key="index"
 					:label="transformOption(item.value)"
 				>
@@ -580,7 +581,7 @@ const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown"
 				:data="data"
 				:disabled="editDisabled"
 				v-model="value"
-				:options="options"
+				:options="props.data.options"
 				:remote-method="getAxiosOptions"
 				:transformOption="transformOption"
 			/>

From fabdb03369207be4328676e466f5b75bf00986b4 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 20 May 2024 15:33:31 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE-=E5=8D=95=E9=80=89=EF=BC=8C=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E4=BE=9D=E8=B5=96=E8=81=94=E5=8A=A8=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/public/form/form.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index 50a9289a4..e6e186b12 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -390,10 +390,17 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 								}
 							}
 						}
+						
 					}
 				}
 			}
 		}
+		for(let i = 0; i< hideFieldArr.length;i++){
+			console.log(i+"dsfafdasdfasfsda===="+hideFieldArr[i]+"=====jiuopfdsahokjuhuiofadshuiofadsjbknfdjisahuifhjken wij================"+model.value[hideFieldArr[i]])
+			if(typeof model.value[hideFieldArr[i]] === "string" || typeof model.value[hideFieldArr[i]] === "number"){
+				model.value[hideFieldArr[i]] = ""
+			}
+		}
 		console.log(hideFieldArr)
 		if(formProps.value.type!=5){
 			props.formData.config.hideField?.push(...hideFieldArr)

From 17531a8f39179db8ee881b0200569d2571e5f447 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 21 May 2024 11:13:26 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BC=98=E5=8C=96:=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9D=A1=E4=BB=B6=E6=BB=A1=E8=B6=B3=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=9D=A5=E5=AE=9E=E7=8E=B0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/public/form/form.vue           | 115 +++++++++++++++++-
 1 file changed, 110 insertions(+), 5 deletions(-)

diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index e6e186b12..07f048d30 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -358,16 +358,90 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 	hideFieldArr = Array.from(new Set(hideFieldArr))
 
 	nextTick(() => {
+		console.log("以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建的数组radioselectArr3  --- 内容为完整显示隐藏条件")
 		console.log(radioSelectArr3)
+		console.log("当前表单的值-------------------")
 		console.log(model.value)
-		let modelKeyArr = [];
+		console.log("默认隐藏的字段-----------------")
+		console.log(hideFieldArr)
+		let modelKeyArr = [];//所有字段
 		for(let i= 0;i<props.formData.list.length;i++){
 			modelKeyArr.push(props.formData.list[i].name+"")
 		}
-		console.log("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"+modelKeyArr)
+		console.log("所有字段modelKeyArr^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")
+		console.log(modelKeyArr)
+		//以被默认隐藏的每个字段为key,显示该字段的所有条件的数组作为value作为该数组的每一项。
+		const hideFieldConditionArr:hideFieldConditionArritem[] = []
+
+		interface hideFieldConditionArritem {
+			toShow:string
+			conditions: any[]
+		}
+		for(let i = 0;i < hideFieldArr.length;i++){
+			hideFieldConditionArr.push({
+				toShow:hideFieldArr[i],
+				conditions:[],
+			})
+		}
+		console.log(hideFieldConditionArr)
+		//遍历所有配置条件数组radioSelectArr3，当radioSelectArr3 [ i ] . toshowFieldKey 【i】==hideFieldArr【i】时
+
+		for(let i = 0;i < radioSelectArr3.length;i++){
+			for(let j = 0;j < radioSelectArr3[i].toShowFieldKey.length;j++){
+				for(let n = 0;n < hideFieldConditionArr.length;n++){
+					/* console.log(i)
+					console.log(j)
+					console.log(n) */
+					if(radioSelectArr3[i].toShowFieldKey[j]==hideFieldConditionArr[n].toShow){
+						hideFieldConditionArr[n].conditions.push({
+							conditionFrom:"radioOrSelect",//本条件来自于单选或者下拉
+							condition:[{//条件详细信息//当表单字段conditionField的值为conditionFieldValue时,显示hideFieldConditionArr[n]
+								conditionField:radioSelectArr3[i].conditionFieldKey,
+								conditionFieldValue:radioSelectArr3[i].conditionFieldValue//
+							}]
+						})
+					}
+				}
+				
+			}
+		}
+		console.log(hideFieldConditionArr);
+		for(let i = 0;i<hideFieldConditionArr.length;i++){
+			let x = 0//满足显示条件的次数
+			let toshow = hideFieldConditionArr[i].toShow
+			let conditions = hideFieldConditionArr[i].conditions
+			//console.log(conditions)
+			for(let j = 0;j<conditions.length;j++){
+				if(conditions[j].conditionFrom == "radioOrSelect"){//本条件来自于单选或者下拉,其只有一项
+					let conditionField = conditions[j].condition[0].conditionField
+					let conditionFieldValue = conditions[j].condition[0].conditionFieldValue
+					console.log(conditionField)
+					console.log(conditionFieldValue)
+					for(let n = 0; n< modelKeyArr.length;n++){
+						if(modelKeyArr[n]==conditionField){
+							let trueValue = model.value[modelKeyArr[n]]
+							//console.log(modelKeyArr[n])
+							//console.log(trueValue)
+							if(trueValue==conditionFieldValue){
+								x++
+							}
+						}
+					}
+				}else{//本条件来自于多选,其可能有多项
+
+				}
+			}
+			
+			if(x>0){
+				alert(x)
+				hideFieldArr = hideFieldArr.filter(item => item!=toshow)
+			}
+		}
+		
+		
 
 
-		//根据条件的生效情况从隐藏数组中过滤字段
+		/* //根据条件的生效情况从隐藏数组中过滤字段
 		for(let i = 0;i< radioSelectArr3.length;i++){
 			for(let j = 0; j< modelKeyArr.length;j++){
 				
@@ -394,14 +468,45 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 					}
 				}
 			}
+		} */
+		
+		
+		
+		/* const radioSelectArr4:any[] = []
+		//联动隐藏效果实现
+		for(let i = 0;i < radioSelectArr3.length;i++){
+			//console.log(radioSelectArr3[i].conditionFieldKey)
+			for(let j = 0;j < hideFieldArr.length;j++){
+				//目前隐藏掉的字段中，找出涉及到隐藏条件conditionFieldKey的,放入radioSelectArr4
+				if(radioSelectArr3[i].conditionFieldKey == hideFieldArr[j]){
+					
+					console.log("radioSelectArr3[i].conditionFieldKey============="+radioSelectArr3[i].conditionFieldKey)
+					console.log("hideFieldArr[j]=================================="+hideFieldArr[j]) 
+					radioSelectArr4.push(radioSelectArr3[i])
+					console.log("radioSelectArr3[i]============="+JSON.stringify(radioSelectArr3[i]))
+				}
+			}
 		}
+		console.log(radioSelectArr4)
+		for(let i = 0;i < radioSelectArr4.length;i++){
+			//本次隐藏掉的字段中，涉及到隐藏条件conditionFieldKey的
+			//
+			console.log("radioSelectArr4[i]============="+JSON.stringify(radioSelectArr4[i]))
+		} */
+		
+		
+		console.log("条件筛选过后最终要隐藏的字段-----"+hideFieldArr)
+
+		//将隐藏的字段值重置
 		for(let i = 0; i< hideFieldArr.length;i++){
-			console.log(i+"dsfafdasdfasfsda===="+hideFieldArr[i]+"=====jiuopfdsahokjuhuiofadshuiofadsjbknfdjisahuifhjken wij================"+model.value[hideFieldArr[i]])
+			//console.log(i+"dsfafdasdfasfsda===="+hideFieldArr[i]+"=====jiuopfdsahokjuhuiofadshuiofadsjbknfdjisahuifhjken wij================"+model.value[hideFieldArr[i]])
 			if(typeof model.value[hideFieldArr[i]] === "string" || typeof model.value[hideFieldArr[i]] === "number"){
 				model.value[hideFieldArr[i]] = ""
+			}else if( model.value[hideFieldArr[i]] instanceof Array){
+				model.value[hideFieldArr[i]] = []
 			}
 		}
-		console.log(hideFieldArr)
+		//编辑表单页不隐藏任何字段。
 		if(formProps.value.type!=5){
 			props.formData.config.hideField?.push(...hideFieldArr)
 		}

From 90e4f87940714c95d9a9163b60bacceef5d7fb30 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 21 May 2024 13:05:16 +0800
Subject: [PATCH 11/18] v0.5

---
 .../DesignForm/public/form/form.vue           | 99 +++++++------------
 1 file changed, 37 insertions(+), 62 deletions(-)

diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index 07f048d30..e5a253122 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -351,11 +351,13 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 
 	//暂时使用的隐藏数组，数据敲定后赋给props.formData.config.hideField
 	let hideFieldArr: any[] = [];
+	
 	//但凡配置条件的字段先放入隐藏数组中
 	for(let i = 0;i< radioSelectArr2.length;i++){
 		hideFieldArr.push(radioSelectArr2[i].toShowFieldKey)
 	} 
 	hideFieldArr = Array.from(new Set(hideFieldArr))
+	const defaultHideFields: any[] = JSON.parse(JSON.stringify(hideFieldArr))
 
 	nextTick(() => {
 		console.log("以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建的数组radioselectArr3  --- 内容为完整显示隐藏条件")
@@ -370,7 +372,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 		}
 		console.log("所有字段modelKeyArr^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")
 		console.log(modelKeyArr)
-		//以被默认隐藏的每个字段为key,显示该字段的所有条件的数组作为value作为该数组的每一项。
+		//以被默认隐藏的每个字段为key,显示该字段的所有条件的数组作为value,来作为该数组的每一项。
 		const hideFieldConditionArr:hideFieldConditionArritem[] = []
 
 		interface hideFieldConditionArritem {
@@ -384,8 +386,8 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 			})
 		}
 		console.log(hideFieldConditionArr)
-		//遍历所有配置条件数组radioSelectArr3，当radioSelectArr3 [ i ] . toshowFieldKey 【i】==hideFieldArr【i】时
 
+		//遍历所有配置条件数组radioSelectArr3，当radioSelectArr3 [ i ] . toshowFieldKey 【i】==hideFieldArr【i】时
 		for(let i = 0;i < radioSelectArr3.length;i++){
 			for(let j = 0;j < radioSelectArr3[i].toShowFieldKey.length;j++){
 				for(let n = 0;n < hideFieldConditionArr.length;n++){
@@ -406,8 +408,11 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 			}
 		}
 		console.log(hideFieldConditionArr);
+		//要显示的和其满足显示条件的个数.
+		//let showfieldsCountX = [];
 		for(let i = 0;i<hideFieldConditionArr.length;i++){
 			let x = 0//满足显示条件的次数
+			
 			let toshow = hideFieldConditionArr[i].toShow
 			let conditions = hideFieldConditionArr[i].conditions
 			//console.log(conditions)
@@ -423,7 +428,10 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 							//console.log(modelKeyArr[n])
 							//console.log(trueValue)
 							if(trueValue==conditionFieldValue){
+								//此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
+								//let flag = false//其依赖的选项的字段是否被隐藏.默认没被隐藏,其依赖的选项的字段一定是有可能被隐藏的.也就是在遍历defaultHideFields时有可能找到他:条件-
 								x++
+								
 							}
 						}
 					}
@@ -433,69 +441,15 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 			}
 			
 			if(x>0){
-				alert(x)
+				/* showfieldsCountX.push({
+					count:x,
+					field:toshow,
+					conditionField:
+				}) */
+				//alert(x)
 				hideFieldArr = hideFieldArr.filter(item => item!=toshow)
 			}
 		}
-		
-		
-
-
-		/* //根据条件的生效情况从隐藏数组中过滤字段
-		for(let i = 0;i< radioSelectArr3.length;i++){
-			for(let j = 0; j< modelKeyArr.length;j++){
-				
-				if(modelKeyArr[j]==radioSelectArr3[i].conditionFieldKey){
-					//console.log("当前：字段标识modelKeyArr[j]========="+modelKeyArr[j]+"字段标识modelKeyArr[j]的值===="+model.value[modelKeyArr[j]])
-					//console.log("规则：字段标识radioSelectArr3[i].conditionFieldKey========="+radioSelectArr3[i].conditionFieldKey+"conditionFieldValue的值======"+radioSelectArr3[i].conditionFieldValue)
-					
-					
-					//作为条件的字段的设定条件值等于其当前的值
-					if(radioSelectArr3[i].conditionFieldValue == model.value[modelKeyArr[j]]){
-						console.log("当前的值==="+model.value[modelKeyArr[j]])
-						console.log("modelKeyArr[j]==="+modelKeyArr[j])
-						console.log("作为条件的字段的设定条件值radioSelectArr3[i]==="+radioSelectArr3[i].conditionFieldValue)
-						console.log(radioSelectArr3[i].toShowFieldKey)
-						//hideFieldArr = hideFieldArr.filter( item => radioSelectArr3[i].toShowFieldKey.find((bItem: any) => item != bItem))
-						for(let n = 0; n < hideFieldArr.length; n++){
-							for(let m = 0; m < radioSelectArr3[i].toShowFieldKey.length; m++){
-								if(hideFieldArr[n] == radioSelectArr3[i].toShowFieldKey[m]){
-									hideFieldArr.splice(n,1);
-								}
-							}
-						}
-						
-					}
-				}
-			}
-		} */
-		
-		
-		
-		/* const radioSelectArr4:any[] = []
-		//联动隐藏效果实现
-		for(let i = 0;i < radioSelectArr3.length;i++){
-			//console.log(radioSelectArr3[i].conditionFieldKey)
-			for(let j = 0;j < hideFieldArr.length;j++){
-				//目前隐藏掉的字段中，找出涉及到隐藏条件conditionFieldKey的,放入radioSelectArr4
-				if(radioSelectArr3[i].conditionFieldKey == hideFieldArr[j]){
-					
-					console.log("radioSelectArr3[i].conditionFieldKey============="+radioSelectArr3[i].conditionFieldKey)
-					console.log("hideFieldArr[j]=================================="+hideFieldArr[j]) 
-					radioSelectArr4.push(radioSelectArr3[i])
-					console.log("radioSelectArr3[i]============="+JSON.stringify(radioSelectArr3[i]))
-				}
-			}
-		}
-		console.log(radioSelectArr4)
-		for(let i = 0;i < radioSelectArr4.length;i++){
-			//本次隐藏掉的字段中，涉及到隐藏条件conditionFieldKey的
-			//
-			console.log("radioSelectArr4[i]============="+JSON.stringify(radioSelectArr4[i]))
-		} */
-		
-		
-		console.log("条件筛选过后最终要隐藏的字段-----"+hideFieldArr)
 
 		//将隐藏的字段值重置
 		for(let i = 0; i< hideFieldArr.length;i++){
@@ -506,6 +460,27 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 				model.value[hideFieldArr[i]] = []
 			}
 		}
+
+
+		//默认隐藏的字段中目前被显示出来的
+		let nowShowingDefaultHideFieldArr = defaultHideFields.filter(a => !hideFieldArr.includes(a))
+		console.log("(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((())))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))")
+		console.log(nowShowingDefaultHideFieldArr)
+		//for(let i = 0;i< nowShowingDefaultHideFieldArr.length; i++){
+			//当被显示出来的字段涉及到的conditionfield已经被隐藏了时,其x应-1,如果x-1后造成该field被隐藏,应递归重新敲定hideFieldArr
+			//if()
+		//}
+
+		
+		
+
+
+		
+		
+		
+		console.log("条件筛选过后最终要隐藏的字段-----"+hideFieldArr)
+
+		
 		//编辑表单页不隐藏任何字段。
 		if(formProps.value.type!=5){
 			props.formData.config.hideField?.push(...hideFieldArr)

From db04c60ae89a378fde45fa42160a29b205888bc0 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 22 May 2024 11:07:17 +0800
Subject: [PATCH 12/18] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86v0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue |   2 +-
 .../DesignForm/public/form/form.vue           | 232 ++++++++++--------
 2 files changed, 137 insertions(+), 97 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 25964f9fa..fe4489a9f 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -2284,7 +2284,7 @@ watch(()=>controlData.value.options, (changedOptions:any) => {
 function createRowForGlxxsz(){
     controlData.value.control.glxxszForCheckBox.push(
         {
-            
+            conditionField: controlData.value.name,
             selectedOptions:[],
             showFields:[],
             id: uuidv4().replaceAll('-','').toString(),
diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index e5a253122..30421cd06 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -170,6 +170,128 @@ const forEachGetFormModel = (list: FormList[], obj: any) => {
     })
 }
 
+interface hideFieldConditionArritem {
+	toShow:string
+	conditions: any[]
+}
+
+const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: string | any[],modelKeyArr: string | any[],defaultHideFields: any[],nowShowingDefaultHideFieldArr: any[],nowShowingFieldArr: string[]) => {
+	
+	//以被默认隐藏的每个字段为key,显示该字段的所有条件的数组作为value,来作为该数组的每一项。
+	const hideFieldConditionArr:hideFieldConditionArritem[] = []
+
+
+	for(let i = 0;i < hideFieldArr.length;i++){
+		hideFieldConditionArr.push({
+			toShow:hideFieldArr[i],
+			conditions:[],
+		})
+	}
+	console.log(hideFieldConditionArr)
+
+	//遍历所有配置条件数组radioSelectArr3，当radioSelectArr3 [ i ] . toshowFieldKey 【i】==hideFieldArr【i】时
+	for(let i = 0;i < radioSelectArr3.length;i++){
+		for(let j = 0;j < radioSelectArr3[i].toShowFieldKey.length;j++){
+			for(let n = 0;n < hideFieldConditionArr.length;n++){
+				/* console.log(i)
+				console.log(j)
+				console.log(n) */
+				if(radioSelectArr3[i].toShowFieldKey[j]==hideFieldConditionArr[n].toShow){
+					hideFieldConditionArr[n].conditions.push({
+						conditionFrom:"radioOrSelect",//本条件来自于单选或者下拉
+						condition:[{//条件详细信息//当表单字段conditionField的值为conditionFieldValue时,显示hideFieldConditionArr[n]
+							conditionField:radioSelectArr3[i].conditionFieldKey,
+							conditionFieldValue:radioSelectArr3[i].conditionFieldValue//
+						}]
+					})
+				}
+			}
+			
+		}
+	}
+	console.log(hideFieldConditionArr);
+	//要显示的和其满足显示条件的个数.
+	//let showfieldsCountX = [];
+	for(let i = 0;i<hideFieldConditionArr.length;i++){
+		let x = 0//满足显示条件的次数
+		
+		let toshow = hideFieldConditionArr[i].toShow
+		let conditions = hideFieldConditionArr[i].conditions
+		//console.log(conditions)
+		for(let j = 0;j<conditions.length;j++){
+			if(conditions[j].conditionFrom == "radioOrSelect"){//本条件来自于单选或者下拉,其只有一项
+				let conditionField = conditions[j].condition[0].conditionField
+				let conditionFieldValue = conditions[j].condition[0].conditionFieldValue
+				console.log(conditionField)
+				console.log(conditionFieldValue)
+				for(let n = 0; n< modelKeyArr.length;n++){
+					if(modelKeyArr[n]==conditionField){
+						let count_1 = 0;
+						let trueValue = model.value[modelKeyArr[n]]
+						//console.log(modelKeyArr[n])
+						//console.log(trueValue)
+						if(trueValue==conditionFieldValue){
+							//此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
+							
+							let flag = false//其依赖的选项的父字段是否被隐藏.默认没被隐藏,
+							//如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
+							for(let a = 0;a<hideFieldConditionArr.length;a++){
+								if(hideFieldConditionArr[a].toShow==conditionField){//当conditions.length>1说明时多选,=1说明是单选.
+									for(let b = 0;b<hideFieldConditionArr[a].conditions.length;b++){
+										for(let c = 0;c<hideFieldConditionArr[a].conditions[b].condition.length;c++){
+											if(hideFieldConditionArr[a].conditions[b].condition[c]==conditionField){
+												//暂时写到这里,先去组装多选条件数组.
+												console.log(1)
+											}
+										}
+									}
+								}
+							}
+							if(flag==false){
+								x++
+							}
+							
+							
+						}
+					}
+				}
+			}else{//本条件来自于多选,其可能有多项
+
+			}
+		}
+		
+		
+		if(x>0){
+			
+			hideFieldArr = hideFieldArr.filter((item: string) => item!=toshow)
+		}
+	}
+
+	//将隐藏的字段值重置
+	for(let i = 0; i< hideFieldArr.length;i++){
+		//console.log(i+"dsfafdasdfasfsda===="+hideFieldArr[i]+"=====jiuopfdsahokjuhuiofadshuiofadsjbknfdjisahuifhjken wij================"+model.value[hideFieldArr[i]])
+		if(typeof model.value[hideFieldArr[i]] === "string" || typeof model.value[hideFieldArr[i]] === "number"){
+			model.value[hideFieldArr[i]] = ""
+		}else if( model.value[hideFieldArr[i]] instanceof Array){
+			model.value[hideFieldArr[i]] = []
+		}
+	}
+
+
+	//默认隐藏的字段中目前被显示出来的
+	nowShowingDefaultHideFieldArr = defaultHideFields.filter(a => !hideFieldArr.includes(a))
+	console.log("(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((())))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))")
+	console.log(nowShowingDefaultHideFieldArr)
+	/* for(let i = 0;i< nowShowingDefaultHideFieldArr.length; i++){
+		//当被显示出来的字段涉及到的conditionfield已经被隐藏了时,其x应-1,如果x-1后造成该field被隐藏,应递归重新敲定hideFieldArr
+		if()
+	} */
+
+	return hideFieldArr
+
+}
+
+
 // 表单组件值改变事件 tProp为子表格相关
 provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) => {
 
@@ -309,6 +431,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 
 	//以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建一个数组radioselectArr3  ---用于组装完整显示隐藏条件、
 	const radioSelectArr3:any[] = []
+	
 	if(radioSelectShowConfigArr2.length>0){
 		for(let i = 0;i<radioSelectShowConfigArr2.length;i++){
 			if( radioSelectShowConfigArr2[i].length>0){
@@ -346,6 +469,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 			}
 		}
 	}
+	//console.log(radioSelectShowConfigArr2)
 
 
 
@@ -359,6 +483,8 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 	hideFieldArr = Array.from(new Set(hideFieldArr))
 	const defaultHideFields: any[] = JSON.parse(JSON.stringify(hideFieldArr))
 
+	
+
 	nextTick(() => {
 		console.log("以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建的数组radioselectArr3  --- 内容为完整显示隐藏条件")
 		console.log(radioSelectArr3)
@@ -372,105 +498,16 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 		}
 		console.log("所有字段modelKeyArr^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")
 		console.log(modelKeyArr)
-		//以被默认隐藏的每个字段为key,显示该字段的所有条件的数组作为value,来作为该数组的每一项。
-		const hideFieldConditionArr:hideFieldConditionArritem[] = []
-
-		interface hideFieldConditionArritem {
-			toShow:string
-			conditions: any[]
-		}
-		for(let i = 0;i < hideFieldArr.length;i++){
-			hideFieldConditionArr.push({
-				toShow:hideFieldArr[i],
-				conditions:[],
-			})
-		}
-		console.log(hideFieldConditionArr)
-
-		//遍历所有配置条件数组radioSelectArr3，当radioSelectArr3 [ i ] . toshowFieldKey 【i】==hideFieldArr【i】时
-		for(let i = 0;i < radioSelectArr3.length;i++){
-			for(let j = 0;j < radioSelectArr3[i].toShowFieldKey.length;j++){
-				for(let n = 0;n < hideFieldConditionArr.length;n++){
-					/* console.log(i)
-					console.log(j)
-					console.log(n) */
-					if(radioSelectArr3[i].toShowFieldKey[j]==hideFieldConditionArr[n].toShow){
-						hideFieldConditionArr[n].conditions.push({
-							conditionFrom:"radioOrSelect",//本条件来自于单选或者下拉
-							condition:[{//条件详细信息//当表单字段conditionField的值为conditionFieldValue时,显示hideFieldConditionArr[n]
-								conditionField:radioSelectArr3[i].conditionFieldKey,
-								conditionFieldValue:radioSelectArr3[i].conditionFieldValue//
-							}]
-						})
-					}
-				}
-				
-			}
-		}
-		console.log(hideFieldConditionArr);
-		//要显示的和其满足显示条件的个数.
-		//let showfieldsCountX = [];
-		for(let i = 0;i<hideFieldConditionArr.length;i++){
-			let x = 0//满足显示条件的次数
-			
-			let toshow = hideFieldConditionArr[i].toShow
-			let conditions = hideFieldConditionArr[i].conditions
-			//console.log(conditions)
-			for(let j = 0;j<conditions.length;j++){
-				if(conditions[j].conditionFrom == "radioOrSelect"){//本条件来自于单选或者下拉,其只有一项
-					let conditionField = conditions[j].condition[0].conditionField
-					let conditionFieldValue = conditions[j].condition[0].conditionFieldValue
-					console.log(conditionField)
-					console.log(conditionFieldValue)
-					for(let n = 0; n< modelKeyArr.length;n++){
-						if(modelKeyArr[n]==conditionField){
-							let trueValue = model.value[modelKeyArr[n]]
-							//console.log(modelKeyArr[n])
-							//console.log(trueValue)
-							if(trueValue==conditionFieldValue){
-								//此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
-								//let flag = false//其依赖的选项的字段是否被隐藏.默认没被隐藏,其依赖的选项的字段一定是有可能被隐藏的.也就是在遍历defaultHideFields时有可能找到他:条件-
-								x++
-								
-							}
-						}
-					}
-				}else{//本条件来自于多选,其可能有多项
-
-				}
-			}
-			
-			if(x>0){
-				/* showfieldsCountX.push({
-					count:x,
-					field:toshow,
-					conditionField:
-				}) */
-				//alert(x)
-				hideFieldArr = hideFieldArr.filter(item => item!=toshow)
-			}
-		}
-
-		//将隐藏的字段值重置
-		for(let i = 0; i< hideFieldArr.length;i++){
-			//console.log(i+"dsfafdasdfasfsda===="+hideFieldArr[i]+"=====jiuopfdsahokjuhuiofadshuiofadsjbknfdjisahuifhjken wij================"+model.value[hideFieldArr[i]])
-			if(typeof model.value[hideFieldArr[i]] === "string" || typeof model.value[hideFieldArr[i]] === "number"){
-				model.value[hideFieldArr[i]] = ""
-			}else if( model.value[hideFieldArr[i]] instanceof Array){
-				model.value[hideFieldArr[i]] = []
-			}
-		}
 
+		
 
-		//默认隐藏的字段中目前被显示出来的
+		//当前处于显示状态的默认隐藏的字段
 		let nowShowingDefaultHideFieldArr = defaultHideFields.filter(a => !hideFieldArr.includes(a))
-		console.log("(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((())))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))")
-		console.log(nowShowingDefaultHideFieldArr)
-		//for(let i = 0;i< nowShowingDefaultHideFieldArr.length; i++){
-			//当被显示出来的字段涉及到的conditionfield已经被隐藏了时,其x应-1,如果x-1后造成该field被隐藏,应递归重新敲定hideFieldArr
-			//if()
-		//}
-
+		//当前所有处于显示状态的字段
+		let nowShowingFieldArr = modelKeyArr.filter(a => !hideFieldArr.includes(a))
+		
+		hideFieldArr = recursionToGetFinallyHideFields(hideFieldArr,radioSelectArr3,modelKeyArr,defaultHideFields,nowShowingDefaultHideFieldArr,nowShowingFieldArr)
+		
 		
 		
 
@@ -543,6 +580,9 @@ const formProps = computed(() => {
     }
 })
 
+
+
+
 provide(constFormProps, formProps)
 
 // 提供一个方法，用于根据name从formData.list里查找数据

From 5d6ead2c20a04d8469008a582da90f3fb3638548 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 22 May 2024 11:26:28 +0800
Subject: [PATCH 13/18] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86v0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/public/form/form.vue           | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index 30421cd06..51f0119de 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -429,6 +429,27 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 		}
 	}
 
+	//将出现在多选配置中的字段放入radioSelectArr2,radioSelectArr2是未去重的所有可能被隐藏的字段
+	if(checkboxShowConfigArr2.length>0){
+		for(let i = 0;i<checkboxShowConfigArr2.length;i++){
+			if(checkboxShowConfigArr2[i].length>0){
+				for(let j = 0;j<checkboxShowConfigArr2[i].length;j++){
+					if(checkboxShowConfigArr2[i][j].showFields.length>0){
+						for(let n = 0; n<checkboxShowConfigArr2[i][j].showFields.length;n++){
+							let fieldKeyArr = checkboxShowConfigArr2[i][j].showFields[n].split(":")
+							let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
+							//alert(fieldKeyStr)
+							radioSelectArr2.push({
+								toShowFieldKey:fieldKeyStr,
+							})
+						}
+					}
+					
+				}
+			}
+		}
+	}
+
 	//以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建一个数组radioselectArr3  ---用于组装完整显示隐藏条件、
 	const radioSelectArr3:any[] = []
 	

From 2e79ce20ca10a3854200f9a8119d80c1bda493e4 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 22 May 2024 16:20:13 +0800
Subject: [PATCH 14/18] =?UTF-8?q?=E5=A4=9A=E9=80=89=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0v0.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/public/form/form.vue           | 223 +++++++++++++++---
 .../sysworkflow/lowcodepage/pageDesignes.vue  |   7 +
 2 files changed, 191 insertions(+), 39 deletions(-)

diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index 51f0119de..378be8697 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -7,6 +7,7 @@
 import '@/assets/scss/element-var.scss'
 import '@/assets/scss/index.scss'
 import FormGroup from './formGroup.vue'
+
 import { FormData,FormList,FormDataStyle } from '@/api/DesignForm/types'
 import { getRequest } from '@/api/DesignForm'
 import { useRoute, useRouter } from 'vue-router'
@@ -75,12 +76,14 @@ const props = withDefaults(
 			type:Boolean,
 			default:true
 		},
+		key:1
     }
 )
 const emits = defineEmits<{
 	(e: 'btnClick', type: string): void
 	(e: 'change', val: any): void // 表单组件值发生变化时
 	(e: 'update:issave', type: boolean): void
+	(e: 'refresh'): void
 }>()
 const route = useRoute()
 const router = useRouter()
@@ -170,6 +173,30 @@ const forEachGetFormModel = (list: FormList[], obj: any) => {
     })
 }
 
+function arrayEqual(a: string[], b: any[]) {
+	//alert("开始比较")
+    //先将数组排序
+	let a_ = JSON.parse(JSON.stringify(a));
+	for(let i = 0;i<a_.length;i++){
+		a_[i] = a_[i]+""
+	}
+	//console.log(a_)
+	//console.log(b)
+    a_ = a_.sort();
+    b = b.sort();
+    //判断数组长度是否相等，若不相等返回false
+    if (a_.length != b.length) 
+    return false;
+    //逐个比较数组元素
+    for (var i = 0; i < a_.length; ++i) {
+        if (a_[i] !== b[i]) 
+        return false;
+    }
+    return true;
+}
+
+
+
 interface hideFieldConditionArritem {
 	toShow:string
 	conditions: any[]
@@ -180,6 +207,9 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 	//以被默认隐藏的每个字段为key,显示该字段的所有条件的数组作为value,来作为该数组的每一项。
 	const hideFieldConditionArr:hideFieldConditionArritem[] = []
 
+	//保存应多选条件造成的应隐藏的字段
+	let hideFieldsFromCheckbox: string[] = []
+
 
 	for(let i = 0;i < hideFieldArr.length;i++){
 		hideFieldConditionArr.push({
@@ -197,13 +227,30 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 				console.log(j)
 				console.log(n) */
 				if(radioSelectArr3[i].toShowFieldKey[j]==hideFieldConditionArr[n].toShow){
-					hideFieldConditionArr[n].conditions.push({
-						conditionFrom:"radioOrSelect",//本条件来自于单选或者下拉
-						condition:[{//条件详细信息//当表单字段conditionField的值为conditionFieldValue时,显示hideFieldConditionArr[n]
-							conditionField:radioSelectArr3[i].conditionFieldKey,
-							conditionFieldValue:radioSelectArr3[i].conditionFieldValue//
-						}]
-					})
+
+
+					if(Array.isArray(radioSelectArr3[i].conditionFieldValue)){
+						let valStr = "";
+						for(let x = 0;x<radioSelectArr3[i].conditionFieldValue.length;x++){
+							valStr = valStr+radioSelectArr3[i].conditionFieldValue[x]+","
+						}
+						hideFieldConditionArr[n].conditions.push({
+							conditionFrom:"radioOrSelect",//本条件来自于单选或者下拉
+							condition:[{//条件详细信息//当表单字段conditionField的值为conditionFieldValue时,显示hideFieldConditionArr[n]
+								conditionField:radioSelectArr3[i].conditionFieldKey,
+								conditionFieldValue:valStr
+							}]
+						})
+						
+					}else{
+						hideFieldConditionArr[n].conditions.push({
+							conditionFrom:"radioOrSelect",//本条件来自于单选或者下拉
+							condition:[{//条件详细信息//当表单字段conditionField的值为conditionFieldValue时,显示hideFieldConditionArr[n]
+								conditionField:radioSelectArr3[i].conditionFieldKey,
+								conditionFieldValue:radioSelectArr3[i].conditionFieldValue//
+							}]
+						})
+					}
 				}
 			}
 			
@@ -216,56 +263,112 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 		let x = 0//满足显示条件的次数
 		
 		let toshow = hideFieldConditionArr[i].toShow
+		
 		let conditions = hideFieldConditionArr[i].conditions
 		//console.log(conditions)
 		for(let j = 0;j<conditions.length;j++){
-			if(conditions[j].conditionFrom == "radioOrSelect"){//本条件来自于单选或者下拉,其只有一项
 				let conditionField = conditions[j].condition[0].conditionField
 				let conditionFieldValue = conditions[j].condition[0].conditionFieldValue
 				console.log(conditionField)
-				console.log(conditionFieldValue)
-				for(let n = 0; n< modelKeyArr.length;n++){
-					if(modelKeyArr[n]==conditionField){
-						let count_1 = 0;
-						let trueValue = model.value[modelKeyArr[n]]
-						//console.log(modelKeyArr[n])
-						//console.log(trueValue)
-						if(trueValue==conditionFieldValue){
-							//此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
-							
-							let flag = false//其依赖的选项的父字段是否被隐藏.默认没被隐藏,
-							//如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
-							for(let a = 0;a<hideFieldConditionArr.length;a++){
-								if(hideFieldConditionArr[a].toShow==conditionField){//当conditions.length>1说明时多选,=1说明是单选.
-									for(let b = 0;b<hideFieldConditionArr[a].conditions.length;b++){
-										for(let c = 0;c<hideFieldConditionArr[a].conditions[b].condition.length;c++){
-											if(hideFieldConditionArr[a].conditions[b].condition[c]==conditionField){
-												//暂时写到这里,先去组装多选条件数组.
-												console.log(1)
+				if(conditionFieldValue.includes(",")){//来自多选
+					//alert(conditionFieldValue)
+
+					let conditionFieldValueArr = conditionFieldValue.split(",")
+					conditionFieldValueArr = conditionFieldValueArr.slice(0, -1);
+					console.log(conditionFieldValueArr)
+					console.log(conditionFieldValue)
+					nextTick(()=>{
+						for(let n = 0; n< modelKeyArr.length;n++){
+							if(modelKeyArr[n]==conditionField){
+								let count_1 = 0;
+								let trueValue = model.value[modelKeyArr[n]]
+								//alert(trueValue)
+								console.log(trueValue.length)
+								//console.log(modelKeyArr[n])
+								//console.log(trueValue)
+								if(trueValue.length>0&&arrayEqual(trueValue,conditionFieldValueArr)){
+									//此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
+									//alert("多选条件成功触发")
+									console.log(conditionField)
+									console.log(toshow)
+									let flag = false//其依赖的选项的父字段是否被隐藏.默认没被隐藏,
+									//如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
+									for(let a = 0;a<hideFieldConditionArr.length;a++){
+										if(hideFieldConditionArr[a].toShow==conditionField){//当conditions.length>1说明时多选,=1说明是单选.
+											for(let b = 0;b<hideFieldConditionArr[a].conditions.length;b++){
+												for(let c = 0;c<hideFieldConditionArr[a].conditions[b].condition.length;c++){
+													if(hideFieldConditionArr[a].conditions[b].condition[c]==conditionField){
+														//暂时写到这里,先去组装多选条件数组.
+														console.log(1)
+													}
+												}
 											}
 										}
 									}
+									
+									if(flag==false){
+										
+										x++
+										
+										//alert(x)
+
+										hideFieldsFromCheckbox.push(toshow)
+										console.log(hideFieldArr)
+										for(let i = 0;i<hideFieldsFromCheckbox.length;i++){
+
+											alert(hideFieldsFromCheckbox[i])
+											hideFieldArr = hideFieldArr.filter((item: string) => item!=hideFieldsFromCheckbox[i])
+											//emits('refresh')
+										}
+									}
 								}
 							}
-							if(flag==false){
-								x++
+						}
+					})
+					
+
+
+
+				}else{
+					console.log(conditionFieldValue)
+					for(let n = 0; n< modelKeyArr.length;n++){
+						if(modelKeyArr[n]==conditionField){
+							let count_1 = 0;
+							let trueValue = model.value[modelKeyArr[n]]
+							//console.log(modelKeyArr[n])
+							//console.log(trueValue)
+							if(trueValue==conditionFieldValue){
+								//此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
+								
+								let flag = false//其依赖的选项的父字段是否被隐藏.默认没被隐藏,
+								//如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
+								for(let a = 0;a<hideFieldConditionArr.length;a++){
+									if(hideFieldConditionArr[a].toShow==conditionField){//当conditions.length>1说明时多选,=1说明是单选.
+										for(let b = 0;b<hideFieldConditionArr[a].conditions.length;b++){
+											for(let c = 0;c<hideFieldConditionArr[a].conditions[b].condition.length;c++){
+												if(hideFieldConditionArr[a].conditions[b].condition[c]==conditionField){
+													//暂时写到这里,先去组装多选条件数组.
+													console.log(1)
+												}
+											}
+										}
+									}
+								}
+								if(flag==false){
+									x++
+								}
 							}
-							
-							
 						}
 					}
 				}
-			}else{//本条件来自于多选,其可能有多项
-
-			}
 		}
 		
 		
 		if(x>0){
-			
 			hideFieldArr = hideFieldArr.filter((item: string) => item!=toshow)
 		}
 	}
+	
 
 	//将隐藏的字段值重置
 	for(let i = 0; i< hideFieldArr.length;i++){
@@ -432,13 +535,16 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 	//将出现在多选配置中的字段放入radioSelectArr2,radioSelectArr2是未去重的所有可能被隐藏的字段
 	if(checkboxShowConfigArr2.length>0){
 		for(let i = 0;i<checkboxShowConfigArr2.length;i++){
+			//console.log(i)
 			if(checkboxShowConfigArr2[i].length>0){
 				for(let j = 0;j<checkboxShowConfigArr2[i].length;j++){
+					//console.log(j)
+					//console.log(checkboxShowConfigArr2[i][j].showFields)
 					if(checkboxShowConfigArr2[i][j].showFields.length>0){
 						for(let n = 0; n<checkboxShowConfigArr2[i][j].showFields.length;n++){
 							let fieldKeyArr = checkboxShowConfigArr2[i][j].showFields[n].split(":")
 							let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
-							//alert(fieldKeyStr)
+							//console.log(fieldKeyStr)
 							radioSelectArr2.push({
 								toShowFieldKey:fieldKeyStr,
 							})
@@ -448,7 +554,8 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 				}
 			}
 		}
-	}
+	} 
+
 
 	//以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建一个数组radioselectArr3  ---用于组装完整显示隐藏条件、
 	const radioSelectArr3:any[] = []
@@ -490,8 +597,46 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 			}
 		}
 	}
-	//console.log(radioSelectShowConfigArr2)
-
+	console.log(radioSelectArr3)
+	//将多选配置也放入radioSelectArr3
+	if(checkboxShowConfigArr2.length>0){
+		for(let i = 0;i<checkboxShowConfigArr2.length;i++){
+			if( checkboxShowConfigArr2[i].length>0){
+				for(let j = 0;j<checkboxShowConfigArr2[i].length;j++){
+					//数组深拷贝
+					const jArr = JSON.parse(JSON.stringify(checkboxShowConfigArr2[i][j]));
+					const optionValueJArr = jArr.selectedOptions
+					if(jArr.showFields!=undefined&&jArr.showFields.length>0){
+						if(jArr.showFields.length>1){
+							let arr1 = []
+							for(let n = 0;n<jArr.showFields.length;n++){
+								let fieldKeyArr = jArr.showFields[n].split(":")
+								let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
+								arr1.push(fieldKeyStr)
+							}
+							radioSelectArr3.push({
+								conditionFieldKey:jArr.conditionField,
+								conditionFieldValue:optionValueJArr,
+								toShowFieldKey:arr1,
+							})
+						}else{//等于1
+							for(let n = 0;n<jArr.showFields.length;n++){
+								let fieldKeyArr = jArr.showFields[n].split(":")
+								let fieldKeyStr = fieldKeyArr[fieldKeyArr.length-1]
+								radioSelectArr3.push({
+									conditionFieldKey:jArr.conditionField,
+									conditionFieldValue:optionValueJArr,
+									toShowFieldKey:[fieldKeyStr],
+								})
+							}
+						}
+						
+					}
+				}
+			}
+		}
+	}
+	console.log(radioSelectArr3)
 
 
 	//暂时使用的隐藏数组，数据敲定后赋给props.formData.config.hideField
diff --git a/src/views/sysworkflow/lowcodepage/pageDesignes.vue b/src/views/sysworkflow/lowcodepage/pageDesignes.vue
index f24521c4e..ac739a9cd 100644
--- a/src/views/sysworkflow/lowcodepage/pageDesignes.vue
+++ b/src/views/sysworkflow/lowcodepage/pageDesignes.vue
@@ -595,7 +595,11 @@ const formNameChanged = (param1: any)=>{
 }
 //liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  end
 
+let index = ref(0)
 
+function refreshFunc(){
+	index.value = index.value+1
+}
 
 </script>
 <template>
@@ -651,9 +655,12 @@ const formNameChanged = (param1: any)=>{
 			<form-design
 				v-if="state.previewVisible"
 				ref="previewForm"
+				:key="index"
 				:form-data="state.formDataPreview"
 				:dict="state.formDict"
 				:type="1"
+				@refresh="refreshFunc"
+				
 			/>
 			<template #footer>
 				<div class="dialog-footer">

From 5502301e7ab54c657a494cfa04748dad4c151de6 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 22 May 2024 16:43:53 +0800
Subject: [PATCH 15/18] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=A4=9A=E9=80=89=E6=95=88=E6=9E=9Cv0.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/public/form/form.vue | 18 ++++--------------
 .../DesignForm/public/form/formGroup.vue       |  2 ++
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index 378be8697..d86c8067c 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -277,15 +277,11 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 					conditionFieldValueArr = conditionFieldValueArr.slice(0, -1);
 					console.log(conditionFieldValueArr)
 					console.log(conditionFieldValue)
-					nextTick(()=>{
+					//nextTick(()=>{
 						for(let n = 0; n< modelKeyArr.length;n++){
 							if(modelKeyArr[n]==conditionField){
 								let count_1 = 0;
 								let trueValue = model.value[modelKeyArr[n]]
-								//alert(trueValue)
-								console.log(trueValue.length)
-								//console.log(modelKeyArr[n])
-								//console.log(trueValue)
 								if(trueValue.length>0&&arrayEqual(trueValue,conditionFieldValueArr)){
 									//此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
 									//alert("多选条件成功触发")
@@ -307,24 +303,18 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 									}
 									
 									if(flag==false){
-										
 										x++
-										
-										//alert(x)
-
 										hideFieldsFromCheckbox.push(toshow)
 										console.log(hideFieldArr)
-										for(let i = 0;i<hideFieldsFromCheckbox.length;i++){
-
-											alert(hideFieldsFromCheckbox[i])
+										/* for(let i = 0;i<hideFieldsFromCheckbox.length;i++){
 											hideFieldArr = hideFieldArr.filter((item: string) => item!=hideFieldsFromCheckbox[i])
 											//emits('refresh')
-										}
+										} */
 									}
 								}
 							}
 						}
-					})
+					//})
 					
 
 
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index eba74e198..88ec858e4 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -26,6 +26,7 @@ const props = withDefaults(
       	data: FormList[]
 		tableinfo:formTableInfo
 		numrun?:number
+		
     }>(),
     {
 		data: () => {
@@ -34,6 +35,7 @@ const props = withDefaults(
     }
 )
 
+
 const store = useDesignFormStore() as any //自定义表单存储器
 const formProps = inject(constFormProps, {}) as any
 const type = computed(() => {				//动态计算属性

From 02afadbb7993048d04c3d455385525c0c57e2832 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Fri, 24 May 2024 08:17:19 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE-=E5=A4=9A=E9=80=89=E7=BB=93=E5=90=88?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E6=95=88=E6=9E=9C=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/public/form/form.vue           | 86 +++++++------------
 1 file changed, 29 insertions(+), 57 deletions(-)

diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index d86c8067c..9d62527b0 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -206,11 +206,8 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 	
 	//以被默认隐藏的每个字段为key,显示该字段的所有条件的数组作为value,来作为该数组的每一项。
 	const hideFieldConditionArr:hideFieldConditionArritem[] = []
-
 	//保存应多选条件造成的应隐藏的字段
 	let hideFieldsFromCheckbox: string[] = []
-
-
 	for(let i = 0;i < hideFieldArr.length;i++){
 		hideFieldConditionArr.push({
 			toShow:hideFieldArr[i],
@@ -218,7 +215,6 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 		})
 	}
 	console.log(hideFieldConditionArr)
-
 	//遍历所有配置条件数组radioSelectArr3，当radioSelectArr3 [ i ] . toshowFieldKey 【i】==hideFieldArr【i】时
 	for(let i = 0;i < radioSelectArr3.length;i++){
 		for(let j = 0;j < radioSelectArr3[i].toShowFieldKey.length;j++){
@@ -227,8 +223,6 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 				console.log(j)
 				console.log(n) */
 				if(radioSelectArr3[i].toShowFieldKey[j]==hideFieldConditionArr[n].toShow){
-
-
 					if(Array.isArray(radioSelectArr3[i].conditionFieldValue)){
 						let valStr = "";
 						for(let x = 0;x<radioSelectArr3[i].conditionFieldValue.length;x++){
@@ -241,7 +235,6 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 								conditionFieldValue:valStr
 							}]
 						})
-						
 					}else{
 						hideFieldConditionArr[n].conditions.push({
 							conditionFrom:"radioOrSelect",//本条件来自于单选或者下拉
@@ -253,7 +246,6 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 					}
 				}
 			}
-			
 		}
 	}
 	console.log(hideFieldConditionArr);
@@ -261,9 +253,7 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 	//let showfieldsCountX = [];
 	for(let i = 0;i<hideFieldConditionArr.length;i++){
 		let x = 0//满足显示条件的次数
-		
 		let toshow = hideFieldConditionArr[i].toShow
-		
 		let conditions = hideFieldConditionArr[i].conditions
 		//console.log(conditions)
 		for(let j = 0;j<conditions.length;j++){
@@ -271,55 +261,46 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 				let conditionFieldValue = conditions[j].condition[0].conditionFieldValue
 				console.log(conditionField)
 				if(conditionFieldValue.includes(",")){//来自多选
-					//alert(conditionFieldValue)
-
 					let conditionFieldValueArr = conditionFieldValue.split(",")
 					conditionFieldValueArr = conditionFieldValueArr.slice(0, -1);
 					console.log(conditionFieldValueArr)
 					console.log(conditionFieldValue)
-					//nextTick(()=>{
-						for(let n = 0; n< modelKeyArr.length;n++){
-							if(modelKeyArr[n]==conditionField){
-								let count_1 = 0;
-								let trueValue = model.value[modelKeyArr[n]]
-								if(trueValue.length>0&&arrayEqual(trueValue,conditionFieldValueArr)){
-									//此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
-									//alert("多选条件成功触发")
-									console.log(conditionField)
-									console.log(toshow)
-									let flag = false//其依赖的选项的父字段是否被隐藏.默认没被隐藏,
-									//如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
-									for(let a = 0;a<hideFieldConditionArr.length;a++){
-										if(hideFieldConditionArr[a].toShow==conditionField){//当conditions.length>1说明时多选,=1说明是单选.
-											for(let b = 0;b<hideFieldConditionArr[a].conditions.length;b++){
-												for(let c = 0;c<hideFieldConditionArr[a].conditions[b].condition.length;c++){
-													if(hideFieldConditionArr[a].conditions[b].condition[c]==conditionField){
-														//暂时写到这里,先去组装多选条件数组.
-														console.log(1)
-													}
+					for(let n = 0; n< modelKeyArr.length;n++){
+						if(modelKeyArr[n]==conditionField){
+							let count_1 = 0;
+							let trueValue = model.value[modelKeyArr[n]]
+							if(trueValue.length>0&&arrayEqual(trueValue,conditionFieldValueArr)){
+								//此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
+								//alert("多选条件成功触发")
+								console.log(conditionField)
+								console.log(toshow)
+								let flag = false//其依赖的选项的父字段是否被隐藏.默认没被隐藏,
+								//如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
+								for(let a = 0;a<hideFieldConditionArr.length;a++){
+									if(hideFieldConditionArr[a].toShow==conditionField){//当conditions.length>1说明时多选,=1说明是单选.
+										for(let b = 0;b<hideFieldConditionArr[a].conditions.length;b++){
+											for(let c = 0;c<hideFieldConditionArr[a].conditions[b].condition.length;c++){
+												if(hideFieldConditionArr[a].conditions[b].condition[c]==conditionField){
+													//暂时写到这里,先去组装多选条件数组.
+													console.log(1)
 												}
 											}
 										}
 									}
-									
-									if(flag==false){
-										x++
-										hideFieldsFromCheckbox.push(toshow)
-										console.log(hideFieldArr)
-										/* for(let i = 0;i<hideFieldsFromCheckbox.length;i++){
-											hideFieldArr = hideFieldArr.filter((item: string) => item!=hideFieldsFromCheckbox[i])
-											//emits('refresh')
-										} */
-									}
+								}
+								if(flag==false){
+									x++
+									hideFieldsFromCheckbox.push(toshow)
+									console.log(hideFieldArr)
+									/* for(let i = 0;i<hideFieldsFromCheckbox.length;i++){
+										hideFieldArr = hideFieldArr.filter((item: string) => item!=hideFieldsFromCheckbox[i])
+										//emits('refresh')
+									} */
 								}
 							}
 						}
-					//})
-					
-
-
-
-				}else{
+					}
+				}else{//来自单选下拉
 					console.log(conditionFieldValue)
 					for(let n = 0; n< modelKeyArr.length;n++){
 						if(modelKeyArr[n]==conditionField){
@@ -329,7 +310,6 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 							//console.log(trueValue)
 							if(trueValue==conditionFieldValue){
 								//此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
-								
 								let flag = false//其依赖的选项的父字段是否被隐藏.默认没被隐藏,
 								//如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
 								for(let a = 0;a<hideFieldConditionArr.length;a++){
@@ -352,14 +332,10 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 					}
 				}
 		}
-		
-		
 		if(x>0){
 			hideFieldArr = hideFieldArr.filter((item: string) => item!=toshow)
 		}
 	}
-	
-
 	//将隐藏的字段值重置
 	for(let i = 0; i< hideFieldArr.length;i++){
 		//console.log(i+"dsfafdasdfasfsda===="+hideFieldArr[i]+"=====jiuopfdsahokjuhuiofadshuiofadsjbknfdjisahuifhjken wij================"+model.value[hideFieldArr[i]])
@@ -369,8 +345,6 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 			model.value[hideFieldArr[i]] = []
 		}
 	}
-
-
 	//默认隐藏的字段中目前被显示出来的
 	nowShowingDefaultHideFieldArr = defaultHideFields.filter(a => !hideFieldArr.includes(a))
 	console.log("(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((())))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))")
@@ -379,9 +353,7 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 		//当被显示出来的字段涉及到的conditionfield已经被隐藏了时,其x应-1,如果x-1后造成该field被隐藏,应递归重新敲定hideFieldArr
 		if()
 	} */
-
 	return hideFieldArr
-
 }
 
 

From 133952f6df3bdee551517f735d8ae31c1af78db3 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Fri, 24 May 2024 15:39:05 +0800
Subject: [PATCH 17/18] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=95=88=E6=9E=9C=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/public/form/form.vue           | 85 ++++++++++++-------
 1 file changed, 53 insertions(+), 32 deletions(-)

diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index 9d62527b0..8d8d9f92c 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -202,8 +202,36 @@ interface hideFieldConditionArritem {
 	conditions: any[]
 }
 
-const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: string | any[],modelKeyArr: string | any[],defaultHideFields: any[],nowShowingDefaultHideFieldArr: any[],nowShowingFieldArr: string[]) => {
+const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: string | any[],defaultHideFields: any[]) => {
 	
+
+	nextTick(() => {
+		console.log("以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建的数组radioselectArr3  --- 内容为完整显示隐藏条件")
+		console.log(radioSelectArr3)
+		console.log("当前表单的值-------------------")
+		console.log(model.value)
+		console.log("默认隐藏的字段-----------------")
+		console.log(defaultHideFields)
+		let modelKeyArr = [];//所有字段
+		for(let i= 0;i<props.formData.list.length;i++){
+			modelKeyArr.push(props.formData.list[i].name+"")
+		}
+		console.log("所有字段modelKeyArr^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")
+		console.log(modelKeyArr)
+
+		
+
+		//当前处于显示状态的默认隐藏的字段
+		let nowShowingDefaultHideFieldArr = defaultHideFields.filter(a => !hideFieldArr.includes(a))
+		//当前所有处于显示状态的字段
+		let nowShowingFieldArr = modelKeyArr.filter(a => !hideFieldArr.includes(a))
+
+
+
+
+
+
+
 	//以被默认隐藏的每个字段为key,显示该字段的所有条件的数组作为value,来作为该数组的每一项。
 	const hideFieldConditionArr:hideFieldConditionArritem[] = []
 	//保存应多选条件造成的应隐藏的字段
@@ -353,6 +381,25 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 		//当被显示出来的字段涉及到的conditionfield已经被隐藏了时,其x应-1,如果x-1后造成该field被隐藏,应递归重新敲定hideFieldArr
 		if()
 	} */
+
+
+
+
+
+	
+	console.log("条件筛选过后最终要隐藏的字段-----"+hideFieldArr)
+
+		
+//编辑表单页不隐藏任何字段。
+if(formProps.value.type!=5){
+	props.formData.config.hideField?.push(...hideFieldArr)
+}
+
+});
+
+
+
+
 	return hideFieldArr
 }
 
@@ -611,30 +658,13 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 	hideFieldArr = Array.from(new Set(hideFieldArr))
 	const defaultHideFields: any[] = JSON.parse(JSON.stringify(hideFieldArr))
 
+	for(let i = 0;i<defaultHideFields.length;i++){
+		hideFieldArr = recursionToGetFinallyHideFields(hideFieldArr,radioSelectArr3,defaultHideFields)
+	}
+	hideFieldArr = recursionToGetFinallyHideFields(hideFieldArr,radioSelectArr3,defaultHideFields)
 	
-
-	nextTick(() => {
-		console.log("以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建的数组radioselectArr3  --- 内容为完整显示隐藏条件")
-		console.log(radioSelectArr3)
-		console.log("当前表单的值-------------------")
-		console.log(model.value)
-		console.log("默认隐藏的字段-----------------")
-		console.log(hideFieldArr)
-		let modelKeyArr = [];//所有字段
-		for(let i= 0;i<props.formData.list.length;i++){
-			modelKeyArr.push(props.formData.list[i].name+"")
-		}
-		console.log("所有字段modelKeyArr^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")
-		console.log(modelKeyArr)
-
 		
-
-		//当前处于显示状态的默认隐藏的字段
-		let nowShowingDefaultHideFieldArr = defaultHideFields.filter(a => !hideFieldArr.includes(a))
-		//当前所有处于显示状态的字段
-		let nowShowingFieldArr = modelKeyArr.filter(a => !hideFieldArr.includes(a))
 		
-		hideFieldArr = recursionToGetFinallyHideFields(hideFieldArr,radioSelectArr3,modelKeyArr,defaultHideFields,nowShowingDefaultHideFieldArr,nowShowingFieldArr)
 		
 		
 		
@@ -642,16 +672,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 
 		
 		
-		
-		console.log("条件筛选过后最终要隐藏的字段-----"+hideFieldArr)
-
-		
-		//编辑表单页不隐藏任何字段。
-		if(formProps.value.type!=5){
-			props.formData.config.hideField?.push(...hideFieldArr)
-		}
-		
-	});
+	
 
 	
 	

From beb973446319fd7efdd2274324de629a91f02195 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Fri, 24 May 2024 15:50:31 +0800
Subject: [PATCH 18/18] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=95=88=E6=9E=9C=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/public/form/form.vue           | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index 8d8d9f92c..8774d306e 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -206,18 +206,18 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 	
 
 	nextTick(() => {
-		console.log("以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建的数组radioselectArr3  --- 内容为完整显示隐藏条件")
+		/* console.log("以showFields的处理过冒号的每个元素为key,其对应的optionValue为value,新建的数组radioselectArr3  --- 内容为完整显示隐藏条件")
 		console.log(radioSelectArr3)
 		console.log("当前表单的值-------------------")
 		console.log(model.value)
 		console.log("默认隐藏的字段-----------------")
-		console.log(defaultHideFields)
+		console.log(defaultHideFields) */
 		let modelKeyArr = [];//所有字段
 		for(let i= 0;i<props.formData.list.length;i++){
 			modelKeyArr.push(props.formData.list[i].name+"")
 		}
-		console.log("所有字段modelKeyArr^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")
-		console.log(modelKeyArr)
+		/* console.log("所有字段modelKeyArr^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")
+		console.log(modelKeyArr) */
 
 		
 
@@ -242,7 +242,7 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 			conditions:[],
 		})
 	}
-	console.log(hideFieldConditionArr)
+	//console.log(hideFieldConditionArr)
 	//遍历所有配置条件数组radioSelectArr3，当radioSelectArr3 [ i ] . toshowFieldKey 【i】==hideFieldArr【i】时
 	for(let i = 0;i < radioSelectArr3.length;i++){
 		for(let j = 0;j < radioSelectArr3[i].toShowFieldKey.length;j++){
@@ -276,7 +276,7 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 			}
 		}
 	}
-	console.log(hideFieldConditionArr);
+	//console.log(hideFieldConditionArr);
 	//要显示的和其满足显示条件的个数.
 	//let showfieldsCountX = [];
 	for(let i = 0;i<hideFieldConditionArr.length;i++){
@@ -287,12 +287,12 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 		for(let j = 0;j<conditions.length;j++){
 				let conditionField = conditions[j].condition[0].conditionField
 				let conditionFieldValue = conditions[j].condition[0].conditionFieldValue
-				console.log(conditionField)
+				//console.log(conditionField)
 				if(conditionFieldValue.includes(",")){//来自多选
 					let conditionFieldValueArr = conditionFieldValue.split(",")
 					conditionFieldValueArr = conditionFieldValueArr.slice(0, -1);
-					console.log(conditionFieldValueArr)
-					console.log(conditionFieldValue)
+					/* console.log(conditionFieldValueArr)
+					console.log(conditionFieldValue) */
 					for(let n = 0; n< modelKeyArr.length;n++){
 						if(modelKeyArr[n]==conditionField){
 							let count_1 = 0;
@@ -300,8 +300,8 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 							if(trueValue.length>0&&arrayEqual(trueValue,conditionFieldValueArr)){
 								//此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
 								//alert("多选条件成功触发")
-								console.log(conditionField)
-								console.log(toshow)
+								/* console.log(conditionField)
+								console.log(toshow) */
 								let flag = false//其依赖的选项的父字段是否被隐藏.默认没被隐藏,
 								//如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
 								for(let a = 0;a<hideFieldConditionArr.length;a++){
@@ -310,7 +310,7 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 											for(let c = 0;c<hideFieldConditionArr[a].conditions[b].condition.length;c++){
 												if(hideFieldConditionArr[a].conditions[b].condition[c]==conditionField){
 													//暂时写到这里,先去组装多选条件数组.
-													console.log(1)
+													//console.log(1)
 												}
 											}
 										}
@@ -319,7 +319,7 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 								if(flag==false){
 									x++
 									hideFieldsFromCheckbox.push(toshow)
-									console.log(hideFieldArr)
+									//console.log(hideFieldArr)
 									/* for(let i = 0;i<hideFieldsFromCheckbox.length;i++){
 										hideFieldArr = hideFieldArr.filter((item: string) => item!=hideFieldsFromCheckbox[i])
 										//emits('refresh')
@@ -329,7 +329,7 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 						}
 					}
 				}else{//来自单选下拉
-					console.log(conditionFieldValue)
+					//console.log(conditionFieldValue)
 					for(let n = 0; n< modelKeyArr.length;n++){
 						if(modelKeyArr[n]==conditionField){
 							let count_1 = 0;
@@ -340,7 +340,7 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 								//此时满足了条件,但是必须看一下conditionField有没有被隐藏.如果被隐藏了,则x不能增加.
 								let flag = false//其依赖的选项的父字段是否被隐藏.默认没被隐藏,
 								//如果此时的conditionField有可能被隐藏且已被隐藏,x不能++
-								for(let a = 0;a<hideFieldConditionArr.length;a++){
+								/* for(let a = 0;a<hideFieldConditionArr.length;a++){
 									if(hideFieldConditionArr[a].toShow==conditionField){//当conditions.length>1说明时多选,=1说明是单选.
 										for(let b = 0;b<hideFieldConditionArr[a].conditions.length;b++){
 											for(let c = 0;c<hideFieldConditionArr[a].conditions[b].condition.length;c++){
@@ -351,7 +351,7 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 											}
 										}
 									}
-								}
+								} */
 								if(flag==false){
 									x++
 								}
@@ -375,8 +375,8 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 	}
 	//默认隐藏的字段中目前被显示出来的
 	nowShowingDefaultHideFieldArr = defaultHideFields.filter(a => !hideFieldArr.includes(a))
-	console.log("(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((())))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))")
-	console.log(nowShowingDefaultHideFieldArr)
+	/* console.log("(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((())))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))")
+	console.log(nowShowingDefaultHideFieldArr) */
 	/* for(let i = 0;i< nowShowingDefaultHideFieldArr.length; i++){
 		//当被显示出来的字段涉及到的conditionfield已经被隐藏了时,其x应-1,如果x-1后造成该field被隐藏,应递归重新敲定hideFieldArr
 		if()
@@ -387,7 +387,7 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
 
 
 	
-	console.log("条件筛选过后最终要隐藏的字段-----"+hideFieldArr)
+	//console.log("条件筛选过后最终要隐藏的字段-----"+hideFieldArr)
 
 		
 //编辑表单页不隐藏任何字段。
@@ -474,12 +474,12 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 	// })
 	
 	//liwenxuan 关联选项设置效果实现 start
-	 console.log("监听表单-1-constControlChange-->",props.formData)
+	 /* console.log("监听表单-1-constControlChange-->",props.formData)
 	 console.log("监听表单-2-constControlChange-->",key)
 	 console.log("监听表单-3-constControlChange-->", value)
 	 console.log("监听表单-4-constControlChange-->",data)
 	 console.log("监听表单-5-constControlChange-->",type)
-	 console.log("监听表单-6-constControlChange-->",attribute)
+	 console.log("监听表单-6-constControlChange-->",attribute) */
 	
 
 
@@ -513,8 +513,8 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 	//数组深拷贝
 	const radioSelectShowConfigArr2 = JSON.parse(JSON.stringify(radioSelectShowConfigArr));
 	const checkboxShowConfigArr2 = JSON.parse(JSON.stringify(checkboxShowConfigArr));
-	console.log(radioSelectShowConfigArr2)
-	console.log(checkboxShowConfigArr2)
+	/* console.log(radioSelectShowConfigArr2)
+	console.log(checkboxShowConfigArr2) */
 
 
 
@@ -606,7 +606,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 			}
 		}
 	}
-	console.log(radioSelectArr3)
+	//console.log(radioSelectArr3)
 	//将多选配置也放入radioSelectArr3
 	if(checkboxShowConfigArr2.length>0){
 		for(let i = 0;i<checkboxShowConfigArr2.length;i++){
@@ -645,7 +645,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 			}
 		}
 	}
-	console.log(radioSelectArr3)
+	//console.log(radioSelectArr3)
 
 
 	//暂时使用的隐藏数组，数据敲定后赋给props.formData.config.hideField