@zscreate/zhxy-app-component 1.0.336 → 1.0.337-test.2

package/README.md

@@ -8,4 +8,5 @@
 
 浙江安防会议室      zjaf_meeting_20241203
 
-浙江安防文件上传预览 zjaf_file_20241216
+浙江安防文件上传预览 zjaf_file_20241216
+滁州学院默认图片以及最少选做多选 czxy_20250423_mobile

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

@@ -891,6 +891,7 @@ export default {
     let widget = this.widget;
     let model = widget.model;
     if (!widget.options) return
+    this.setRules()
     // 时间比较增加校验规则
     if (widget.options.condition && widget.options.conditionValue) {
       let model = widget.model;
@@ -929,6 +930,58 @@ export default {
     uni.$off(this.widget.model);
   },
   methods: {
+    //复选框改变
+    checkboxChange(e) {
+      if (this.tableKey) {
+        this.models[this.tableKey][this.tableIndex][this.widget.model] = e.target.value;
+      } else {
+        this.models[this.widget.model] =  e.target.value;
+      }
+        this.validateInit()
+    },
+    setRules() {
+      let widget = this.widget;
+      // 最多选最少选
+      if (widget.options.maxValue || widget.options.minValue) {
+        if (this.tableKey) {
+          if(this.rules[this.tableKey][this.widget.model]) this.rules[this.tableKey][this.widget.model] = []
+          this.rules[this.tableKey][this.widget.model].push({
+            validator: this.validateNumRange,
+            trigger: "change",
+          });
+        } else {
+          if(!this.rules[this.widget.model]) this.rules[this.widget.model] = []
+          this.rules[this.widget.model].push({
+            validator: this.validateNumRange,
+            trigger: "change",
+          });
+        }
+      } else {
+        // 清空最多最少选
+        if (this.tableKey) {
+          if(this.rules[this.tableKey][this.widget.model].filter(item=> item.validator)) this.rules[this.tableKey][this.widget.model] = this.rules[this.tableKey][this.widget.model].filter(item=> !item.validator)
+        } else {
+          if(this.rules[this.widget.model].filter(item=> item.validator)) this.rules[this.widget.model] = this.rules[this.widget.model].filter(item=> !item.validator)
+        }
+      }
+    },
+
+    validateNumRange(rule, value, callback) {
+      debugger;
+      let options = this.widget.options;
+      if (!options.maxValue && !options.minValue) {
+          callback();
+      }
+      if (Array.isArray(value) && options.maxValue && options.minValue && options.minValue == options.maxValue && (!value || (Array.isArray(value) && value.length != options.maxValue))) {
+        callback(this.widget.name + "只能选择" + options.maxValue + "项");
+      } else if (Array.isArray(value) && options.maxValue &&  value.length > options.maxValue) {
+        callback(this.widget.name + "最多选择" + options.maxValue + "项");
+      } else if (options.minValue && (!value || (Array.isArray(value) && value.length < options.minValue))) {
+        callback(this.widget.name + "最少选择" + options.minValue + "项");
+      } else {
+        callback();
+      }
+    },
     // 会议室点击
     openConferenceRoom() {
       if (!this.widget.dataKey) {
@@ -1697,6 +1750,7 @@ export default {
             }
           })
           this.dataModelShow = str.substring(1)
+          if (this.widget.type == 'radio' || this.widget.type == 'checkbox')this.updateRadioOrCheckboxModel(global.dictData[this.widget.model])
       } else {
         if (this.widget.options.dictCode || this.widget.options.dictName) {
         //根据字典Code, 初始化字典数组
@@ -2428,6 +2482,13 @@ export default {
             }
             this.updateUserSelectorModal()
           }
+          if(this.widget.type === 'imgupload') {
+            // applyId代表已提交过的（不包含暂存）
+            if((!v || !v.length) &&  !this.applyId && !this.$Route.query.applyId && this.widget.options.defaultFiles) {
+              this.dataModel = this.widget.options.defaultFiles
+              this.models[this.widget.model] = this.widget.options.defaultFiles
+            }
+          }
           if (this.widget.type === 'deptSelector') {
             this.updatedeptSelectorModal()
           }

package/components/evan-form-item/utils.js

@@ -20,7 +20,6 @@ const utils = {
 				if (typeof pattern === 'string' && String(pattern).startsWith('/') && (String(pattern).endsWith('/') || String(pattern).slice(-2)[0] === '/' )) {
 					pattern = String(pattern).substring(1, pattern.length - (String(pattern).slice(-2)[0] === '/' ? 2 : 1))
 				}
-				debugger
 				console.log('isRegExp:', isRegExp(pattern))
 				rule.pattern = new RegExp(pattern, flag)
 				console.log("rule.pattern: ",pattern, rule.pattern, flag)
@@ -30,19 +29,7 @@ const utils = {
 			[prop]: propRules
 		};
 		
-		/**
-		 * 拓展 数组类的value 校验；只需满足非空数组即可
-		 * **/
-		 if(typeof value == "object"  && value.constructor == Array  ){
-			 console.log('===',descriptor)
-		 }
-		 if(typeof value == "object" && value.constructor == Array && value.length > 0){
-			 callback(null);
-			 return false;
-		 }else if(typeof value == 'boolean'){
-			 callback(null);
-			 return false;
-		 }
+		
 		 
 		 /**
 		  * 拓展 数组类的value 校验；
@@ -51,13 +38,28 @@ const utils = {
 		const model = {
 			[prop]: value
 		};
-		
+		let flag = false
 		validator.validate(model, {
 			firstFields: true,
 			first:true,
 		}, (errors) => {
-			callback(errors);
+			flag = true
+			return callback(errors);
 		});
+		if(flag) return
+		/**
+		 * 拓展 数组类的value 校验；只需满足非空数组即可
+		 * **/
+		if(typeof value == "object"  && value.constructor == Array  ){
+			console.log('===',descriptor)
+		}
+		if(typeof value == "object" && value.constructor == Array && value.length > 0){
+			callback(null);
+			return false;
+		}else if(typeof value == 'boolean'){
+			callback(null);
+			return false;
+		}
 	},
 }
 export default utils

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.336",
+	"version": "1.0.337-test.2",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",