@form-create/component-elm-group 2.5.20 → 2.5.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@form-create/component-elm-group",
-  "version": "2.5.20",
+  "version": "2.5.26",
   "description": "@form-create/element-ui 内置组件",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "196b3c5b14af477d3d86fa37418a60e47ac4bc1f"
+  "gitHead": "a98b4876f74f56f070980b81834c7fa10e23b2e9"
 }

package/src/component.jsx

@@ -80,14 +80,20 @@ export default {
             handler(n, o) {
                 Object.keys(this.cacheRule).forEach(v => {
                     const item = this.cacheRule[v];
-                    if (n === o) {
-                        deepExtend(item.rule, n)
-                    } else {
+                    if (item.$f) {
                         const val = item.$f.formData();
-                        item.$f.once('reload', () => {
-                            item.$f.setValue(val);
-                        })
-                        item.rule = deepCopy(n);
+                        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);
+                        }
                     }
                 })
             },
@@ -275,17 +281,22 @@ export default {
                 const {rule, options} = this.cacheRule[key];
                 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} inFor={true}
+                    <ElCol span={button ? 20 : 24}><Type
+                        key={key}
                         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}
+                        props={{
+                            value: this.field ? {[this.field]: this._value(this.value[index])} : this.value[index],
+                            rule,
+                            option: options,
+                            extendOption: true,
+                            inFor: true
+                        }}/></ElCol>
+                    {button ? <ElCol
+                        props={{span: 2, pull: 1, push: 1}}>{this.makeIcon(keys.length, index, key)}</ElCol> : null}
                 </ElRow>
             })}</div>
     }