fix: 修复组件联动取消联动bug @0.8.8-1

BoBoooooo · Feb 22, 2021 · e8f35ac · e8f35ac
1 parent 873ea47
commit e8f35ac
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-pro-crud",
-  "version": "0.8.8",
+  "version": "0.8.8-1",
   "author": "BoBo<[email protected]>",
   "main": "lib/ProCrud.umd.min.js",
   "files": [

diff --git a/src/component/form-designer/src/GenerateForm.vue b/src/component/form-designer/src/GenerateForm.vue
@@ -187,17 +187,10 @@ export default class GenerateForm extends Vue {
                   case 'show': field.hidden = false; this.models[_.field] = _.value; break;
                   case 'hidden': field.hidden = true; break;
                   case 'required':
-                    field.options.required = true;
-                    field.rules.push({
-                      message: `${field.name}必须填写`,
-                      required: true,
-                      trigger: 'blur',
-                    });
+                    this.setRequired(field);
                     break;
                   case 'unrequired':
-                    field.options.required = false;
-                    // eslint-disable-next-line no-shadow
-                    field.rules.shift(field.rules.findIndex(_ => _.required));
+                    this.setUnRequired(field);
                     break;
                   default: break;
                 }
@@ -209,6 +202,22 @@ export default class GenerateForm extends Vue {
     });
   }
 
+  setRequired(field:any) {
+    if (!field.options.required) {
+      field.options.required = true;
+      field.rules.push({
+        message: `${field.name}必须填写`,
+        required: true,
+        trigger: 'blur',
+      });
+    }
+  }
+
+  setUnRequired(field: any) {
+    field.options.required = false;
+    field.rules = field.rules.filter(_ => !_.required);
+  }
+
   getTableSelection($event, item) {
     const tableSelections = {};
     tableSelections[item.model] = $event;