@form-create/component-elm-group 2.5.17 → 2.5.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@form-create/component-elm-group",
-  "version": "2.5.17",
+  "version": "2.5.22",
   "description": "@form-create/element-ui 内置组件",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -30,7 +30,7 @@
   "author": "xaboy",
   "license": "MIT",
   "dependencies": {
-    "@form-create/utils": "^2.5.17"
+    "@form-create/utils": "^2.5.18"
   },
   "bugs": {
     "url": "https://github.com/xaboy/form-create/issues"
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b21068f23bf2b13bcf4ebb130d75fdb173f4c80a"
+  "gitHead": "43cbd7f5342d014a4e6de877304ad613b1433e0b"
 }

package/src/component.jsx

@@ -1,4 +1,6 @@
 import {hasProperty} from '@form-create/utils/lib/type';
+import deepExtend, {deepCopy} from '@form-create/utils/lib/deepextend';
+import extend from '@form-create/utils/lib/extend';
 
 const NAME = 'fcGroup';
 
@@ -30,6 +32,7 @@ export default {
             type: Array,
             default: () => []
         },
+        defaultValue: Object,
         disabled: {
             type: Boolean,
             default: false
@@ -63,16 +66,39 @@ export default {
     },
     computed: {
         formRule() {
-            if (this.rule) {
-                return Array.isArray(this.rule) ? this.rule : [this.rule];
-            }
             if (this.rules) {
                 return this.rules;
             }
+            if (this.rule) {
+                return Array.isArray(this.rule) ? this.rule : [this.rule];
+            }
             return [];
         }
     },
     watch: {
+        formRule: {
+            handler(n, o) {
+                Object.keys(this.cacheRule).forEach(v => {
+                    const item = this.cacheRule[v];
+                    if (item.$f) {
+                        const val = item.$f.formData();
+                        if (n === o) {
+                            item.$f.deferSyncValue(() => {
+                                deepExtend(item.rule, n);
+                                item.$f.setValue(val);
+                            }, true);
+                        } else {
+                            const val = item.$f.formData();
+                            item.$f.once('reloading', () => {
+                                item.$f.setValue(val);
+                            })
+                            item.rule = deepCopy(n);
+                        }
+                    }
+                })
+            },
+            deep: true
+        },
         disabled(n) {
             if (this.syncDisabled) {
                 const lst = this.cacheRule;
@@ -102,7 +128,6 @@ export default {
                     for (let i = 0; i < len; i++) {
                         this.removeRule(keys[total - i - 1]);
                     }
-                    this.subForm();
                 }
                 n.forEach((val, i) => {
                     this.setValue(keys[i], n[i]);
@@ -152,7 +177,11 @@ export default {
                 submitBtn: false,
                 resetBtn: false,
             };
-            options.formData = this.field ? ({[this.field]: this._value(this.value[i])}) : (this.value[i] || {});
+            if (this.defaultValue) {
+                if (!options.formData) options.formData = {};
+                const defVal = deepCopy(this.defaultValue);
+                extend(options.formData, this.field ? {[this.field]: defVal} : defVal);
+            }
             this.$set(this.cacheRule, ++this.len, {rule, options});
             if (emit) {
                 this.$nextTick(() => this.$emit('add', rule, Object.keys(this.cacheRule).length - 1));
@@ -160,7 +189,7 @@ export default {
         },
         add$f(i, key, $f) {
             this.cacheRule[key].$f = $f;
-            this.subForm();
+            this.formData(key, $f.formData());
             this.$nextTick(() => {
                 if (this.syncDisabled) {
                     $f.disabled(this.disabled);
@@ -168,9 +197,6 @@ export default {
                 this.$emit('itemMounted', $f, Object.keys(this.cacheRule).indexOf(key));
             });
         },
-        subForm() {
-            this.formCreateInject.subForm(Object.keys(this.cacheRule).map(k => this.cacheRule[k].$f));
-        },
         removeRule(key, emit) {
             const index = Object.keys(this.cacheRule).indexOf(key);
             this.$delete(this.cacheRule, key);
@@ -190,7 +216,6 @@ export default {
                 return;
             }
             this.removeRule(key, true);
-            this.subForm();
             this.value.splice(index, 1);
             this.input(this.value);
         },
@@ -257,12 +282,13 @@ export default {
                 return <ElRow align="middle" type="flex" key={key}
                     style="border-bottom:1px dashed #DCDFE6;margin-bottom:10px;">
                     <ElCol span={button ? 20 : 24}><ElFormItem><Type
-                        key={key}
+                        key={key} inFor={true}
                         on={{
                             'update:value': (formData) => this.formData(key, formData),
                             'emit-event': (name, ...args) => this.emitEvent(name, args, index, key),
                             input: ($f) => this.add$f(index, key, $f)
                         }}
+                        value={this.field ? {[this.field]: this._value(this.value[index])} : this.value[index]}
                         rule={rule}
                         option={options} extendOption={true}/></ElFormItem></ElCol>
                     {button ? <ElCol span={2} pull={1} push={1}>{this.makeIcon(keys.length, index, key)}</ElCol> : null}