@zscreate/zhxy-app-component 1.0.186 → 1.0.187

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

@@ -840,7 +840,26 @@ export default {
         }
       })
     },
-
+    /**
+     * @param date Moment
+     * @returns {boolean}
+     */
+    disabledDate(val) {
+      const { min, max, format, type } = this.widget.options
+      let flag = false
+      const date = moment(new Date())
+      if (min) {
+        const ago = moment(val, format).subtract(min + (type === 'month' ? 1 : 0), 'months')
+        flag = date.diff(ago) < 0
+        if (flag) return true
+      }
+      if (max) {
+        const after = moment(val, format).add(max, 'months')
+        flag = date.diff(after) > 0
+        if (flag) return true
+      }
+      return flag
+    },
     //切换时间
     dateChange(val) {
       if (this.tableKey) {
@@ -1640,7 +1659,6 @@ export default {
       if (this.tableKey) {
         this.tableValueSet(v);
       } else {
-        this.models[this.widget.model] = v
         if (this.widget.type === 'userSelector') {
           if (v === "") {
             this.dataModel = []
@@ -1677,7 +1695,22 @@ export default {
           // }
           this.widget.key = v
           this.$emit('upDateWidget', this.widget)
+        } else if( this.widget.type === 'date') {
+          if (this.widget.options.type === 'range' && !Array.isArray(v)) {
+            this.dataModel = v =[]
+          }
+          const concatData = [].concat(v)
+          if (v && concatData.length > 0 && !concatData.every(item => !this.disabledDate(item))) {
+            this.$refs.uToast.show({
+              title: "超出允许选择范围",
+              duration: 2000,
+            });
+            this.dataModel = undefined
+            v = undefined
+          }
+
         }
+        this.models[this.widget.model] = v
 
         this.$emit("update:models", {
           ...this.models,

package/package.json

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