fix: 修复this.value初始值bug ,版本更新至0.5.4

BoBoooooo · Dec 18, 2020 · 5b32d30 · 5b32d30
1 parent c95fe9f
commit 5b32d30
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-pro-crud",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "main": "lib/ProCrud.umd.min.js",
   "files": [
     "lib",

diff --git a/packages/form-designer/src/GenerateForm.vue b/packages/form-designer/src/GenerateForm.vue
@@ -407,6 +407,7 @@ export default class GenerateForm extends Vue {
 
   @Watch('value', {
     deep: true,
+    immediate: true,
   })
   valueOnChange(val) {
     this.$nextTick(() => {
@@ -419,7 +420,7 @@ export default class GenerateForm extends Vue {
 
   @Watch('models', {
     deep: true,
-    immediate: true,
+    // immediate: true,
   })
   modelsOnChange(val) {
     this.$emit('update:entity', val);

diff --git a/packages/form-designer/src/GenerateFormItem.vue b/packages/form-designer/src/GenerateFormItem.vue
@@ -351,7 +351,7 @@ export default class GenerateFormItem extends Vue {
   readOnly: any;
 
   // 当前组件对象
-  dataModel: any = this.models[this.widget.model];
+  dataModel: string | number | null | object = this.models[this.widget.model] || null;
 
   copyOption: any = []; // 备份一份初始选项
 
@@ -375,21 +375,7 @@ export default class GenerateFormItem extends Vue {
         };
       };
     }
-    let model = this.models[this.widget.model];
-
-    if (this.widget.type === 'date') {
-      // 此处防止传入的值为非正常时间格式导致日历控件报错
-      // new Date校验以下四种情况yyyy-MM-dd yyyy-M-d yyyy/MM/dd yyyy/M/d yyyy-MM yyyy-M yyyy/MM yyyy/M
-      // 正则表达式校验  yyyy年MM月dd日  yyyy年M月d日情况 yyyy年MM月 yyyy年M月
-      const reg = /^([1-9]\d{3})年(\d{1,2})月(\d{1,2})日$/;
-      const regForYYYYMM = /^([1-9]\d{3})年(\d{1,2})月$/;
-      const regForYYYYMMDD = /^([1-9]\d{3})(\d{1,2})(\d{1,2})$/;
-      const isValid = !this.dayjs(model).isValid() || reg.test(model) || regForYYYYMM.test(model) || regForYYYYMMDD.test(model);
-      if (!isValid) {
-        model = '';
-      }
-    }
-
+    const model = this.models[this.widget.model];
     this.normalizer = normalizer;
     this.dataModel = model;
   }