@zscreate/zhxy-app-component 1.0.267 → 1.0.269

package/components/evan-form/evan-form.vue

@@ -40,28 +40,7 @@
 		computed: {
 			// 整个form是否有*号，为了保证label对齐，而不是和*号对齐
 			hasRequiredAsterisk() {
-				if (this.hideRequiredAsterisk) {
-					return false
-				}
-				if (this.mRules) {
-					const values = Object.values(this.mRules)
-					if (values && values.length > 0) {
-						for (let i = 0; i < values.length; i++) {
-							const value = values[i]
-							if (Array.isArray(value) && value.length > 0) {
-								const requiredItem = value.find((v) => v.required === true)
-								if (requiredItem) {
-									return true
-								}
-							} else {
-								if (value && value.required) {
-									return true
-								}
-							}
-						}
-					}
-				}
-				return false
+        return true
 			}
 		},
 		watch: {
@@ -92,7 +71,24 @@
 				utils.validateField(this.model, this.mRules, props, callback, {
 					showMessage: this.showMessage
 				})
-			}
+			},
+      clearValidation (component, model) {
+        if (typeof component.clearValidate === 'function' && (model ? model === component.widget.model : true)) {
+          console.log('clearValidate: ', component)
+          component.clearValidate();
+        }
+        if (component.$children && component.$children.length > 0) {
+          component.$children.forEach((child) => {
+            this.clearValidation(child, model);
+          });
+        }
+      },
+      clearValidate (props) {
+        this.$children.forEach((child) => {
+          this.clearValidation(child, props);
+        });
+        // this.clearValidation(this.$children, props);
+      }
 		}
 	}
 </script>

package/components/evan-form/utils.js

@@ -121,7 +121,7 @@ const utils = {
 			title: message,
 			icon: 'none'
 		})
-	}
+	},
 }
 
 export default utils

package/components/evan-form-item/evan-form-item.vue

@@ -415,7 +415,10 @@
         {{ widget.name }}
       </view>
       <view class="evan-form-item-container__main" :style="mContentStyle" @click="handleSeclet(widget.options.multiple)">
-        <div class="option-font-size">{{ dataModelShow ? dataModelShow : widget.options.placeholder }}</div>
+        <view class="form-input" style="display: flex">
+          <view class="option-font-size">{{ dataModelShow ? dataModelShow : widget.options.placeholder }}</view>
+          <uni-icons style="margin-left: auto; margin-right: 20rpx; height: 60rpx; line-height: 60rpx" @click.native.stop="handleClear" v-if="!widget.options.disabled && dataModelShow" type="clear" color="#e1e1e1" size="14"></uni-icons>
+        </view>
       </view>
       <!--			<icon type="clear" size="14" v-if="widget.options.canView" />-->
     </view>
@@ -672,7 +675,12 @@ export default {
     isCorrect: [Number, String, null],
     widget: Object,
     labelStyle: Object,
-    rules: [Object, Array],
+    rules: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
     label: String,
     contentStyle: {
       type: Object,
@@ -750,6 +758,7 @@ export default {
   },
   data() {
     return {
+      showRequiredAsterisk: false,
       hiddenLineTypes: ['hidden'],
       nameSign: '',
       isClickByUser: false, //是否用户点击
@@ -776,6 +785,8 @@ export default {
   created() {
     this.updateDataModel();
     this.pubsubScribe();
+    this.initFormLinkage(); //初始化联动
+
     this.showFormData(); //非 v-model值回显
     //下拉框联动的时候重新选择清空联动的数据
     if (this.widget.type == 'select') {
@@ -828,9 +839,22 @@ export default {
     uni.$off(this.widget.model);
   },
   methods: {
+    clearValidate() {
+      this.showFalse = false
+    },
     handleClear() {
       this.dataModel = []
       this.dataModelShow = ''
+      if (this.widget.type === 'select') {
+        this.clearAllLinkageSelect(this.widget.options?.linkage)
+      }
+    },
+    clearAllLinkageSelect(linkage) {
+      linkage?.forEach(link_model => {
+        uni.$emit(link_model)
+        const link_widget = this.dataObj().list.find(item => item.model === link_model)
+        if (link_widget) this.clearAllLinkageSelect(link_widget.options?.linkage)
+      })
     },
     correctOldValue(oldValue) {
       const type = this.widget.type
@@ -1108,7 +1132,8 @@ export default {
     },
 
     updateRadioOrCheckboxModel(arr) {
-      if (!arr) return;
+
+      if (!arr) return global.dictData[this.widget.model] = [];
       this.checkboxAndRadioOptions = JSON.parse(JSON.stringify(arr));
       if (!this.dataModel) return false;
       this.checkboxAndRadioOptions.forEach(item => {
@@ -1281,14 +1306,20 @@ export default {
       })
       this.dataModelShow = str.substr(1);
     },
-    updatedSelectModal() {
+    async updatedSelectModal() {
+
+      if (!global.dictData) global.dictData = {
+        [this.widget.model]: null
+      }
       let options = this.widget.options
       if (this.widget.options.dictCode || this.widget.options.dictName) {
         //根据字典Code, 初始化字典数组
-        this.$u.get(
+        await this.$u.get(
           `/sys/dict/getDictItems/${this.widget.options.dictCode ? this.widget.options.dictCode : this.widget.options.dictName}`,
         ).then(res => {
           if (res.success) {
+            const dictData = this.arrFindDictOrTable(res.result, 'dictCode')
+            global.dictData[this.widget.model] = dictData
             if (this.widget.type == 'select') {
               this.arrFindOptionLabel(res.result)
             } else if (this.widget.type == 'radio' || this.widget.type == 'checkbox') {
@@ -1300,12 +1331,14 @@ export default {
         let params = {
           tableName: this.widget.options.dictTable
         };
-        this.$u.get(`/form/formdesiger/getDataCenterDict`, params).then(res => {
+        await this.$u.get(`/form/formdesiger/getDataCenterDict`, params).then(res => {
           if (res.success) {
+            const dictData = this.arrFindDictOrTable(res.result, 'dictTable')
+            global.dictData[this.widget.model] = dictData
             if (this.widget.type == 'select') {
               this.arrFindOptionLabel(res.result)
             } else if (this.widget.type == 'radio' || this.widget.type == 'checkbox') {
-              this.updateRadioOrCheckboxModel(this.arrFindDictOrTable(res.result, 'dictTable'))
+              this.updateRadioOrCheckboxModel(dictData)
             }
           }
         })
@@ -1317,7 +1350,7 @@ export default {
             id: this.linkage[this.widget.model],
             applyId: this.applyId
           }
-          this.getSelectUrl(options.dictUrl, params)
+          await this.getSelectUrl(options.dictUrl, params)
         } else if (options.dictUrl.indexOf("?") != -1) {
           let list = options.dictUrl.split("?");
           let url = list[0];
@@ -1325,11 +1358,12 @@ export default {
           if (this.applyId) {
             params.applyId = this.applyId;
           }
-          this.getSelectUrl(url, params)
+          await this.getSelectUrl(url, params)
         } else {
-          this.getSelectUrl(options.dictUrl, this.applyId ? { applyId: this.applyId } : {});
+          await this.getSelectUrl(options.dictUrl, this.applyId ? { applyId: this.applyId } : {});
         }
       } else {
+        global.dictData[this.widget.model] = this.widget.options.options
         if (this.widget.type == 'select') {
           this.arrFindOptionLabel(this.widget.options.options)
         } else if (this.widget.type == 'radio' || this.widget.type == 'checkbox') {
@@ -1340,12 +1374,21 @@ export default {
     },
     //处理下拉框接口地址数据
     getSelectUrl(url, params) {
-      this.$u.get(url, params).then(res => {
+      return this.$u.get(url, params).then(res => {
         if (res.success) {
+          let arr = res.result
+          global.dictData[this.widget.model] =  arr.map(item => {
+            return {
+              value: item.dataValue || item.id,
+              label: item.dataKey || item.departName,
+              text: item.dataKey || item.departName
+            }
+          })
           if (this.widget.type == 'select') {
-            let arr = res.result
+
             if (!Array.isArray(arr)) return;
             let showLabel = ''
+
             for (let i = 0; i < arr.length; i++) {
               const Code = arr[i].dataKey || arr[i].departName;
               const Value = arr[i].dataValue || arr[i].id;
@@ -1382,14 +1425,16 @@ export default {
         newArr = arr.map(item => {
           return {
             value: item.dictValue,
-            label: item.dictLabel
+            label: item.dictLabel,
+            text: item.dictLabel,
           }
         })
       } else {
         newArr = arr.map(item => {
           return {
             value: item.value,
-            label: item.text
+            label: item.text,
+            text: item.text
           }
         })
       }
@@ -1421,9 +1466,9 @@ export default {
     /**点击表单后 代表确认已知晓验证不通过**/
     resetShowFalse() {
       this.showFalse = false;
-      this.$emit("update:models", {
-        ...this.models
-      })
+      // this.$emit("update:models", {
+      //   ...this.models
+      // })
     },
     updateDataModel() {
       if (this.tableKey) {
@@ -1494,18 +1539,6 @@ export default {
     // 		// this.dataModel = data[this.widget.model];//dataModel
     // 	})
     // },
-    // 当前formItem是否显示*号
-    showRequiredAsteriskFun() {
-      // console.log(this.rules, '----')
-      const rules = this.rules[this.widget.model];
-      // console.log('rules', rules)
-      if (rules && rules.length > 0) {
-        if (rules.find((rule) => rule.required === true)) {
-          return true
-        }
-      }
-      return false
-    },
     // 选择人员
     selectUser(flag) {
       if (this.widget.options.disabled) return
@@ -1629,15 +1662,7 @@ export default {
         var PubsubSign = String(Math.random()).split('.')[1];
         Pubsub.subscribe(PubsubSign, (msg, data) => {
           console.log(data)
-          this.widget.options?.linkage?.forEach(link_model => {
-            uni.$emit(link_model)
-            const link_widget = this.dataObj().list.find(item => item.model === link_model)
-            if (link_widget) {
-              link_widget.options?.linkage?.forEach(link_model => {
-                uni.$emit(link_model)
-              })
-            }
-          })
+          this.clearAllLinkageSelect(this.widget.options?.linkage)
           this.isClickByUser = true
           // this.dataModel = data.map(item => item.value)
           const value = data.map(item => item.value) || []
@@ -1712,12 +1737,12 @@ export default {
       formRules = formRules ? formRules[this.prop] : [];
       return [].concat(formRules || []);
     },
-    validateField(props, callback) {
-      // console.log('---p', props)
-      utils.validateField(this.model, this.mRules, props, callback, {
-        showMessage: this.showMessage
-      })
-    },
+    // validateField(props, callback) {
+    //   // console.log('---p', props)
+    //   utils.validateField(this.model, this.mRules, props, callback, {
+    //     showMessage: this.showMessage
+    //   })
+    // },
     //打开级联选择器
     openCascdar() {
       this.$refs.picker.show()
@@ -1864,6 +1889,13 @@ export default {
     },
   },
   watch: {
+    currRules: {
+      deep: true,
+      immediate: true,
+      handler(v) {
+          this.showRequiredAsterisk = [].concat(this.currRules || []).some(item => item.required)
+      }
+    },
     models: {
       deep: true,
       handler(v) {
@@ -1946,7 +1978,7 @@ export default {
             }
 
           }
-          this.models[this.widget.model] = v
+          // this.models[this.widget.model] = v
 
           this.$emit("update:models", {
             ...this.models,

package/components/evan-form-item/mixins/computedMixin.js

@@ -29,16 +29,10 @@ export const computedMixin = {
 			}
 			return false
 		},
-		showRequiredAsterisk() {
-			/**子表单必选要深入下一层rules**/
-			const rules = this.tableKey ? this.rules[this.tableKey][this.widget.model] : this.rules[this.widget
-				.model];
-			if (rules && rules.length > 0) {
-				if (rules.find((rule) => rule.required === true)) {
-					return true
-				}
-			}
-			return false
-		}
+
+		currRules() {
+			return this.tableKey ? this.rules[this.tableKey][this.widget.model] : this.rules[this.widget
+				.model]
+		},
 	}
 }

package/components/evan-form-item/mixins/pubSubMixin.js

@@ -172,7 +172,17 @@ export const pubSubMixin = {
 				});
 			}
 		},
-
+		initFormLinkage() {
+			this.publish_linkage = Pubsub.subscribe('formLinkage_' + this.widget.model, (key, data) => {
+				// console.log(key, data)
+				if (data.type === 'update') {
+					this.dataModel = data.updateValue
+				}
+				if (data.type === 'show') {
+					this.widget.options.canView =  data.updateValue
+				}
+			})
+		},
 		resetByflag(flag) {
 			if (flag) {
 				this.resetDataModel();
@@ -194,5 +204,13 @@ export const pubSubMixin = {
 			this.dataModel = value
 		},
 
+	},
+	destroyed() {
+		if (this.pubsubSign) {
+			Pubsub.unsubscribe(this.pubsubSign)
+		}
+		if (this.publish_linkage) {
+			Pubsub.unsubscribe(this.publish_linkage);
+		}
 	}
 }

package/components/evan-form-item/mixins/validateFormMixin.js

@@ -66,16 +66,6 @@ export const validateFormMixin = {
 			}
 			utils.validateItem(rules, props, tempModel[this.widget.model], callback)
 		},
-		// 当前formItem是否显示*号
-		showRequiredAsteriskFun() {
-			const rules = this.rules[this.widget.model];
-			// console.log('rules', rules)
-			if (rules && rules.length > 0) {
-				if (rules.find((rule) => rule.required === true)) {
-					return true
-				}
-			}
-			return false
-		},
+
 	}
 }

package/components/form-container/form-container.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="evan-form-show" >
-        <evan-form :hide-required-asterisk="hideRequiredAsterisk" ref="form">
-            <template v-for="(item, index) in dataObj.list">
+        <evan-form :hide-required-asterisk="hideRequiredAsterisk" ref="Form" >
+            <template v-for="(item, index) in data.list">
                 <template v-if="item.type === 'table' && item.options.canView">
                     <view class="table-wrapper" :key="index">
                         <view class="table-header">
@@ -28,7 +28,7 @@
                                                         @upDateWidget="data => upDateTableWidget(data, tableItemIndex, item.model, tableCIndex)" :itemkey="tableItemIndex"
                                                         :tableKey="item.model" :tableIndex="tableCIndex" :prop="tableItem.model"
                                                         :ref="String(Math.random()).split('.')[1]" :models.sync="models"
-                                                        :rules="rules" :widget="tableItem" :isDraft="isDraft" :formId="formId"
+                                                        :rules="rules" :widget.sync="tableItem" :isDraft="isDraft" :formId="formId"
                                                         :linkage="linkage" :isApply="isApply" :applyId="applyId">
                                         </evan-form-item>
                                     </view>
@@ -43,10 +43,10 @@
 
                 <view v-else-if="item.type === 'all-lay-out'" v-show="item.options.canView" class="form_layout">
                     <view v-for="(colItem, colIndex) in item.columns" :key="colIndex" class="form-item-container">
-                        <view v-for="(col, itemIndex) in colItem.list" :key="itemIndex">
+                        <view v-for="(col, itemIndex) in colItem.list" :key="itemIndex" v-show="col.options.canView">
                             <evan-form-item :isCorrect="isCorrect" :labelPosition="labelPosition" :prop="col.model"
                                             :ref="String(Math.random()).split('.')[1]" :models.sync="models" :rules="rules"
-                                            :widget="col" :isDraft="isDraft" :formId="formId" :linkage="linkage" :isApply="isApply" :applyId="applyId">
+                                            :widget.sync="col" :isDraft="isDraft" :formId="formId" :linkage="linkage" :isApply="isApply" :applyId="applyId">
                             </evan-form-item>
                         </view>
                     </view>
@@ -54,7 +54,7 @@
 
                 <view v-else-if="item.type === 'grid-lay-out'" v-show="item.options.canView" class="form_layout">
                     <view v-for="(colItem, colIndex) in item.columns" :key="colIndex" class="form-item-container ">
-                        <view v-for="(col, itemIndex) in colItem.list" :key="itemIndex">
+                        <view v-for="(col, itemIndex) in colItem.list" :key="itemIndex" v-show="col.options.canView">
                             <template v-if="col.type == 'hnkj-verify' && item.options.canView">
                                 <view class="verify">
                                     <view class="verify-step">
@@ -102,7 +102,7 @@
                                 <evan-form-item :isCorrect="isCorrect" :prop="col.model"
                                                 :labelPosition="labelPosition"
                                                 :ref="String(Math.random()).split('.')[1]" :models.sync="models" :rules="rules"
-                                                :widget="col" :isDraft="isDraft" :formId="formId" :linkage="linkage" :isApply="isApply" :applyId="applyId">
+                                                :widget.sync="col" :isDraft="isDraft" :formId="formId" :linkage="linkage" :isApply="isApply" :applyId="applyId">
                                 </evan-form-item>
                             </template>
                         </view>
@@ -111,10 +111,10 @@
 
                 <view v-else-if="item.type === 'grid'" v-show="item.options.canView" class="form_layout">
                     <view class="form-item-container" v-for="(colItem, colIndex) in item.columns" :key="colIndex">
-                        <view  v-for="(col, itemIndex) in colItem.list" :key="itemIndex">
+                        <view  v-for="(col, itemIndex) in colItem.list" :key="itemIndex" v-show="col.options.canView">
                             <evan-form-item :isCorrect="isCorrect" :labelPosition="labelPosition" :prop="col.model"
                                             :ref="String(Math.random()).split('.')[1]" :models.sync="models" :rules="rules"
-                                            :widget="col" :isDraft="isDraft" :formId="formId" :linkage="linkage" :isApply="isApply" :applyId="applyId">
+                                            :widget.sync="col" :isDraft="isDraft" :formId="formId" :linkage="linkage" :isApply="isApply" :applyId="applyId">
                             </evan-form-item>
                         </view>
                     </view>
@@ -196,13 +196,15 @@
 
                 <template v-else>
                     <view :key="index" class="form-item-container" v-show="item.options.canView" >
+
                         <evan-form-item @upDateWidget="data => upDateWidget(data, index)" :labelPosition="labelPosition" :isCorrect="isCorrect" :prop="item.model"
                                         :ref="String(Math.random()).split('.')[1]" :models.sync="models" :rules="rules"
-                                        :widget="item" :itemkey="index" :isDraft="isDraft" :formId="formId" :linkage="linkage" :formData="value"
+                                        :widget.sync="item" :itemkey="index" :isDraft="isDraft" :formId="formId" :linkage="linkage" :formData="value"
                                         :isApply="isApply" :applyId="applyId">
                         </evan-form-item>
                     </view>
                 </template>
+<!--              {{ item.options.canView? 1 : 0 }}-->
             </template>
 
         </evan-form>
@@ -220,7 +222,17 @@ import evanForm from "../evan-form/evan-form";
 import mTextarea from "../m-textarea/m-textarea";
 import packageJson from '../../package.json'
 import { run } from "../../utils/formula_run"
+import {intersection, isEqual, isEqualWith, reduce, cloneDeep} from "lodash";
+import {getRecursionWidget} from "../../utils/util";
 console.log('zhxy-app-component: ', packageJson.version)
+
+function timeout(ms) {
+    return new Promise(resolve => {
+        setTimeout(() => {
+            resolve()
+        }, ms)
+    })
+}
 export default {
   options: { styleIsolation: 'shared' },
     name: 'formContainer',
@@ -253,6 +265,7 @@ export default {
             tableFlag: {
 
             },
+            data: {},
             userSignature: undefined,
             // dataObj:dataObj,
             isScroll: true,
@@ -295,6 +308,12 @@ export default {
         // 	// console.log(this.models)
         // 	this.isScroll = true;
         // },
+      "dataObj.config"(val) {
+        if (val?.linkage_config) {
+          this.data.config = val
+          this.handleLinkAge()
+        }
+      },
       verifyNode: {
         handler(val) {
           if (val) {
@@ -311,25 +330,30 @@ export default {
         },
         dataObj: {
             handler(v) {
+                if (this._currObjId && this._currObjId !== this.dataObj._currObjId) return
+                this.data = v
                 if (this.dataObj && this.dataObj.list) {
+                    this.data = v
+                    this.dataObj._currObjId = this._currObjId = Math.random()
                     this.rules = {};
-                    this.generateModle(this.dataObj.list);
+                    this.generateModle(this.data.list);
                     this.updateFormDataToModels()
                     console.log(JSON.stringify(this.models))
                 }
             },
-            immediate: true
+          immediate: true
+        },
+        data: {
+          handler(val) {
+            this.dataObj = val
+          },
+          deep: true
         },
         value: {
             handler(v) {
-                if (this.dataObj && this.dataObj.list) {
-                    this.rules = {};
-                    this.generateModle(this.dataObj.list);
-
-                    this.updateFormDataToModels()
-                    console.log(this.models)
-                    console.log(JSON.stringify(this.models))
-                }
+              if (v) {
+                this.updateFormDataToModels()
+              }
             },
             immediate: true
         },
@@ -638,9 +662,253 @@ export default {
             // console.log('tableData',this.tableData)
             // console.log(this.models)
         },
+      async or(...args) {
+        for (const argsKey in args) {
+          if (await args[argsKey]) return true
+        }
+        return false
+      },
+      async and(...args) {
+        for (const argsKey in args) {
+          if (!await args[argsKey]) return false
+        }
+        return  true
+      },
+      async handleLinkAge() {
+        // console.log(this.data.config.linkage_config)
+        const that = this
+        if (!this.data?.config?.linkage_config) return
+        if (this.formFunctions) return
+        this.formFunctions = {
+          async call_func(list, models) {
+            const widgetList = getRecursionWidget(that.data.list)
+            const linkageWidget = widgetList.filter(item => list.map(item => item.model).includes(item.model))
+            return list.map(item => this[item.type](models[item.model] ,item.value, linkageWidget.find(widget => widget.model === item.model)))
+          },
+          all_same(currVal, targetVal, widget) {
+            if (Array.isArray(currVal) && Array.isArray(targetVal)) {
+              return intersection(targetVal, currVal).length === targetVal.length
+            }
+            return false
+          },
+          same(currVal, targetVal, widget) {
+            console.log(widget)
+            const { format } = widget.options
+
+            if (widget.type === 'date') {
+              return moment(currVal).format(format) === moment(targetVal).format(format)
+            }
+            if (Array.isArray(currVal)) {
+              if (Array.isArray(targetVal)) {
+                if (currVal.length !== targetVal.length) return false
+                return isEqual(currVal.sort(), targetVal.sort()) || isEqualWith(currVal.sort(), targetVal.sort(), (a, b) =>  { if (!a.id) return false; return a.id === b.id})
+              }
+            }
+            return currVal == targetVal
+          },
+          not_same(currVal, targetVal, widget) {
+            const { format } = widget.options
+            if (widget.type === 'date') {
+              return moment(currVal).format(format) === moment(targetVal).format(format)
+            }
+            if (Array.isArray(currVal)) {
+              return currVal.every(item => {
+                return targetVal == item?.id || targetVal == item
+              })
+            }
+            return currVal != targetVal
+          },
+          gt(currVal, targetVal, widget) {
+            const { format } = widget.options
+            if (widget.type === 'date') {
+              return moment(currVal).isAfter(moment(targetVal))
+            }
+            return currVal > targetVal
+          },
+          gte(currVal, targetVal, widget) {
+            const { format } = widget.options
+            if (widget.type === 'date') {
+              return moment(currVal).isSameOrAfter(moment(targetVal))
+            }
+            return currVal >= targetVal
+          },
+          lt(currVal, targetVal, widget) {
+            if (widget.type === 'date') {
+              return moment(currVal).isBefore(moment(targetVal))
+            }
+            return currVal < targetVal
+          },
+          lte(currVal, targetVal, widget) {
+            const { format } = widget.options
+            if (widget.type === 'date') {
+              return moment(currVal).isSameOrBefore(moment(targetVal))
+            }
+            return currVal <= targetVal
+          },
+          same_some(currVal, targetVal, widget) {
+            if (Array.isArray(targetVal) && targetVal.includes('[未填写]')) {
+              targetVal = targetVal.concat(undefined, null, '')
+            }
+            if (Array.isArray(currVal) && !currVal.length) currVal = undefined
+
+            return [].concat(currVal).some(item => targetVal.includes(item))
+            // return targetVal.includes(currVal)
+          },
+          not_same_some(currVal, targetVal, widget) {
+            if (Array.isArray(targetVal) && targetVal.includes('[未填写]')) {
+              targetVal = targetVal.concat(undefined, null, '')
+            }
+            if (Array.isArray(currVal) && !currVal.length) currVal = undefined
+            return [].concat(currVal).some(item => !targetVal.includes(item))
+            // return !targetVal.includes(currVal)
+          },
+          EMPTY(currVal, targetVal, widget) {
+            if (Array.isArray(currVal)) return !currVal.length
+            return !currVal
+          },
+          NOT_EMPTY(currVal, targetVal, widget) {
+            if (Array.isArray(currVal)) return !!currVal.length
+            return !!currVal
+          },
+          async include(currVal, targetVal, widget) {
+            if ([undefined, null, ''].includes(currVal)) return false
+            if (['checkbox', 'select', 'radio'].includes(widget.type) && global.dictData[widget.model] == null || Array.isArray(global.dictData[widget.model])) {
+              for (let i = 0; i < 10; i++) {
+                if (Array.isArray(global.dictData[widget.model])) {
+                  return global.dictData[widget.model].filter(item => item.value == currVal)?.some( item => item.text.includes(targetVal || undefined) || item.value.includes(targetVal || undefined))
+                }
+                await timeout(300)
+              }
+            }
+            return currVal.includes(targetVal || undefined)
+          },
+          async not_include(currVal, targetVal, widget) {
+            return !(await this.include(currVal, targetVal, widget))
+          },
+        }
+        this.formFunctions._init = true
+        await this.$nextTick()
+        this.$watch('models', async (newVal, oldVal) => {
+              await timeout(0)
+              let diffModels = reduce(newVal, function(result, value, key) {
+                return isEqual(value, oldVal?.[key]) ?
+                    result : result.concat(key);
+              }, []);
+              if (!diffModels?.length && (this.formFunctions._init && newVal && oldVal)) {
+                diffModels = Object.keys(newVal)
+                this.formFunctions._init = false
+              }
+              // const differenceObj = difference(cloneDeep(newVal), cloneDeep(oldVal))
+              console.log('diffModels', diffModels)
+              const widgetList = getRecursionWidget(this.data?.list)
+              this.data?.config?.linkage_config?.forEach(item => {
+                let { toTypeSelect, toWidgetList, typeSelect, list, updateValue, hideClearValue, forceClearValue } = item
+                // 表单详情会导致可编辑
+                if (['update', 'disabled'].includes(toTypeSelect) && this.$route?.query?.type === 'detail') return
+                toWidgetList.forEach(async toWidgetModel => {
+                  const widget = widgetList.find(item => item.model === toWidgetModel)
+                  const changeModelList = list.some(item => diffModels.includes(item.model)) ? list : []
+                  if (changeModelList.length === 0) return
+
+                  const flag = await this[typeSelect].apply(this, await this.formFunctions.call_func(changeModelList, newVal))
+                  switch (toTypeSelect) {
+                    case 'show':
+                      if (widget.parentType === 'table') {
+                        this.$set(widget.options, 'canView', flag)
+                      }
+                      Pubsub.publish('formLinkage_' + widget.model, {
+                        type: 'show',
+                        updateValue: flag,
+                      })
+                      if (!flag && hideClearValue) {
+                        Pubsub.publish('formLinkage_' + widget.model, {
+                          type: 'update',
+                          updateValue: '',
+                        })
+                        setTimeout(() => {
+                          const isAllFlag = widgetList.filter(item => item.parentModel === widget.parentModel).every( item => item.options.canView === flag)
+                          if (!flag && isAllFlag) {
+                            // 删除所有行
+                            that.tableData = []
+                          }
+                        },  100)
+                      }
+                      // this.$set(widget.options, 'canView', flag)
+                      // this.data.list = cloneDeep(this.data.list)
+                      break
+                    case 'required':
+                      let rules = this.rules
+                      if (widget.parentType === 'table') {
+                        if (!rules[widget.parentModel]) rules[widget.parentModel] = {}
+                        rules = rules[widget.parentModel]
+                      }
+                      if (!rules[widget.model]) rules[widget.model] = []
+                      const hasRequiredConfig = rules[widget.model].some(item => {
+                        if (item?.required !== undefined) {
+                          item.required = flag
+                          return true
+                        }
+                        return false
+                      })
+                      if (!hasRequiredConfig) {
+                        rules[widget.model].push( {
+                          required: flag,
+                          trigger: 'change',
+                          message: `${(widget.name || "").replaceAll(' ', '')}必须填写`,
+                        })
+                      }
+                      this.$set(widget.options, 'required', flag)
+
+                      !flag && this.$refs.Form.clearValidate(widget.model)
+
+                      this.$set(widget, 'rules', rules[widget.model])
+                      this.generateRules(widget, this.data?.list?.find(item => item.model === widget.parentModel))
+                      break
+                    case 'update':
+                      updateValue = String(updateValue)
+                      if (isNaN(updateValue)) {
+                        try {
+                          updateValue = JSON.parse(updateValue)
+                        } catch (e) {
+
+                        }
+                      }
+                      if (widget.type === 'rate') updateValue = !isNaN(updateValue) ? Number(updateValue) : updateValue
+                      // if (['responsibility', 'switch'].includes(widget.type)) updateValue = Boolean(updateValue) || updateValue === 'true'
+                      if (widget.parentType === 'table') {
+                        if (!Array.isArray(this.models[widget.parentModel])) this.models[widget.parentModel] = []
+                        return this.models[widget.parentModel]?.forEach((item,idx) => {
+                          this.models[widget.parentModel][idx][widget.model] = flag ? updateValue : ''
+                        })
+                      }
+                      // 不符合时， 如果  未勾选 “不符合时清除值”， 就不用清理
+                      if (!flag && !forceClearValue) break
+                      Pubsub.publish('formLinkage_' + widget.model, {
+                        type: 'update',
+                        updateValue: flag ? updateValue : '',
+                      })
+                      // setTimeout(() => {
+                      //   this.$set(this.models, widget.model, flag ? updateValue : undefined)
+                      //   // this.models[widget.model] = flag ? updateValue : ''
+                      // }, 1000)
+                      break
+                    case 'disabled':
+                      this.$set(widget.options, 'disabled', flag)
+                      break
+                  }
+                })
+
+              })
+            },
+            {
+              immediate: true,
+              deep: true
+            })
+      },
         /***初始化models***/
         generateModle(genList) {
-            if (!genList || genList.length === 0) return;
+          if (!genList || genList.length === 0) return;
+            this.handleLinkAge()
             for (let i = 0; i < genList.length; i++) {
               if (["grid", 'grid-lay-out', 'all-lay-out', 'table'].includes(genList[i].type)) {
                 let subscribeKey = genList[i].options.subscribeOptions ?
@@ -749,14 +1017,22 @@ export default {
                     } else {
                         if (this.rules[genList[i].model]) {
                             if (genList[i].rules) {
-                                this.rules[genList[i].model] = [
+                                this.$set(this.rules, genList[i].model, [
                                     ...this.rules[genList[i].model],
                                     ...genList[i].rules.map(item => {
                                         return {
                                             ...item
                                         };
                                     })
-                                ];
+                                ]);
+                                // this.rules[genList[i].model] = [
+                                //     ...this.rules[genList[i].model],
+                                //     ...genList[i].rules.map(item => {
+                                //         return {
+                                //             ...item
+                                //         };
+                                //     })
+                                // ];
                             }
                         } else {
                             if (genList[i].rules) {
@@ -776,6 +1052,15 @@ export default {
                 this.$emit('formUpdated')
             })
         },
+        generateRules(widget, parentWidget) {
+          if (parentWidget && parentWidget.columns) {
+            if (!this.rules[parentWidget.model]) this.rules[parentWidget.model] = {}
+            this.rules[parentWidget.model][widget.model] = widget.rules;
+            return
+          }
+          this.$set(this.rules, widget.model, widget.rules)
+          this.rules = cloneDeep(this.rules)
+        },
         validateTable() {
 
             // 查找所有的table 子表单的配置组件
@@ -912,13 +1197,7 @@ export default {
             // })
         },
         saveForm2() {
-            this.$refs.form.validateField(['sub', 'phone'], (res) => {
-                if (res) {
-                    uni.showToast({
-                        title: '验证通过'
-                    })
-                }
-            })
+
             // this.$refs.form2.validate((res) => {
             // 	if (res) {
             // 		uni.showToast({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.267",
+	"version": "1.0.269",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",

package/utils/util.js

@@ -17,6 +17,43 @@ function formatTime(time) {
 	}).join(':')
 }
 
+/**
+ * 遍历所有组件（包括布局组件中）
+ * @param widgetList
+ * @returns {*[]}
+ */
+function getRecursionWidget(widgetList) {
+	const res_list = []
+
+	let func = (res_list ,val) => {
+		if (val instanceof Array && val.length > 0) {
+			val.forEach((item) => {
+				if (["grid", "grid-lay-out", "all-lay-out"].includes(item.type)) {
+					// columns.list
+					item.columns.forEach((columnsItem) => {
+						columnsItem.list.type = item.type
+						columnsItem.list.p_type = item.type
+						columnsItem.list.p_model = item.model
+						func(res_list, columnsItem.list);
+					});
+				} else if (["table"].includes(item.type)) {
+					// columns
+					item.columns.p_type = item.type
+					item.columns.p_model = item.model
+					func(res_list, item.columns);
+				} else {
+					item.parentType = val.p_type
+					item.parentModel = val.p_model
+					res_list.push(item);
+				}
+			});
+		}
+	}
+	func(res_list, widgetList)
+	func = null
+	return res_list
+}
+
 function formatLocation(longitude, latitude) {
 	if (typeof longitude === 'string' && typeof latitude === 'string') {
 		longitude = parseFloat(longitude)
@@ -251,6 +288,7 @@ module.exports = {
 	downloadFile,
 	getParentData,
 	getParentFunc,
+	getRecursionWidget,
 	getDictInfo,
 	h5PreviewFile,
 	getOpenId