@form-create/element-ui 3.1.6 → 3.1.9

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.1.6
+ * @form-create/element-ui v3.1.9
  * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -1506,14 +1506,22 @@
           Object.keys(this.cacheRule).forEach(function (v) {
             var item = _this.cacheRule[v];
 
-            if (n === o) {
-              deepExtend(item.rule, n);
-            } else {
+            if (item.$f) {
               var val = item.$f.formData();
-              item.$f.once('reloading', function () {
-                item.$f.setValue(val);
-              });
-              item.rule = deepCopy(n);
+
+              if (n === o) {
+                item.$f.deferSyncValue(function () {
+                  deepExtend(item.rule, n);
+                  item.$f.setValue(val);
+                }, true);
+              } else {
+                var _val = item.$f.formData();
+
+                item.$f.once('reloading', function () {
+                  item.$f.setValue(_val);
+                });
+                item.rule = deepCopy(n);
+              }
             }
           });
         },
@@ -2886,6 +2894,9 @@
         h.nextRefresh();
         fn && invoke(fn);
       },
+      deferSyncValue: function deferSyncValue(fn, sync) {
+        h.deferSyncValue(fn, sync);
+      },
       emit: function emit(name) {
         var _h$vm;
 
@@ -3177,7 +3188,9 @@
           }
 
           return function () {
-            return _this4.getCache(ctx).apply(void 0, arguments);
+            var cache = _this4.getCache(ctx);
+
+            return cache && cache.apply(void 0, arguments);
           };
         } catch (e) {
           console.error(e);
@@ -3185,7 +3198,7 @@
         }
       },
       getModelField: function getModelField(ctx) {
-        return ctx.rule.modelField || ctx.parser.modelField || this.fc.modelFields[this.vNode.aliasMap[ctx.field]] || this.fc.modelFields[ctx.field] || this.fc.modelFields[ctx.originType] || 'modelValue';
+        return ctx.rule.modelField || ctx.parser.modelField || this.fc.modelFields[this.vNode.aliasMap[ctx.type]] || this.fc.modelFields[ctx.type] || this.fc.modelFields[ctx.originType] || 'modelValue';
       },
       display: function display(vn) {
         var _this5 = this;
@@ -5542,7 +5555,7 @@
           });
         }
 
-        this.initOptions(this.options || {});
+        this.initOptions(this.options.value);
         this.$handle.init();
       },
       isSub: function isSub() {
@@ -6070,8 +6083,10 @@
     makeInfo: function makeInfo(rule, uni) {
       var _this4 = this;
 
-      var titleProp = rule.title;
-      var infoProp = rule.info;
+      var titleProp = _objectSpread2({}, rule.title);
+
+      var infoProp = _objectSpread2({}, rule.info);
+
       var isTip = isTooltip(infoProp);
       var form = this.options.form;
       var children = [(titleProp.title || '') + (form.labelSuffix || form['label-suffix'] || '')];
@@ -6085,6 +6100,8 @@
         delete prop.props.icon;
         delete prop.props.show;
         delete prop.props.info;
+        delete prop.props.align;
+        delete prop.props["native"];
         var field = 'content';
 
         if (infoProp.info && !hasProperty(prop.props, field)) {
@@ -6106,11 +6123,16 @@
         })));
       }
 
-      return this.$r(mergeProps([titleProp, {
+      var _prop = mergeProps([titleProp, {
         props: titleProp,
         key: "".concat(uni, "tit"),
         type: titleProp.type || 'span'
-      }]), children);
+      }]);
+
+      delete _prop.props.show;
+      delete _prop.props.title;
+      delete _prop.props["native"];
+      return this.$r(_prop, children);
     },
     makeCol: function makeCol(rule, uni, children) {
       var col = rule.col;
@@ -6166,6 +6188,9 @@
 
       var innerText = resetBtn.innerText;
       delete resetBtn.innerText;
+      delete resetBtn.click;
+      delete resetBtn.col;
+      delete resetBtn.show;
       return this.$r({
         type: 'button',
         props: resetBtn,
@@ -6175,7 +6200,7 @@
         on: {
           click: function click() {
             var fApi = _this5.$handle.api;
-            resetBtn.click ? resetBtn.click(fApi) : fApi.resetFields();
+            _this5.options.resetBtn.click ? _this5.options.resetBtn.click(fApi) : fApi.resetFields();
           }
         },
         key: "".concat(this.key, "b2")
@@ -6188,6 +6213,9 @@
 
       var innerText = submitBtn.innerText;
       delete submitBtn.innerText;
+      delete submitBtn.click;
+      delete submitBtn.col;
+      delete submitBtn.show;
       return this.$r({
         type: 'button',
         props: submitBtn,
@@ -6197,7 +6225,7 @@
         on: {
           click: function click() {
             var fApi = _this6.$handle.api;
-            submitBtn.click ? submitBtn.click(fApi) : fApi.submit();
+            _this6.options.submitBtn.click ? _this6.options.submitBtn.click(fApi) : fApi.submit();
           }
         },
         key: "".concat(this.key, "b1")
@@ -6520,7 +6548,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.1.6',
+      version: '3.1.9',
       manager: manager,
       extendApi: extendApi,
       install: install,