@form-create/iview 2.5.36 → 2.5.37

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/iview v2.5.36
+ * @form-create/iview v2.5.37
  * (c) 2018-2024 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -1473,14 +1473,6 @@
         },
         deep: true
       },
-      disabled: function disabled(n) {
-        if (this.syncDisabled) {
-          var lst = this.cacheRule;
-          Object.keys(lst).forEach(function (k) {
-            lst[k].$f.disabled(n);
-          });
-        }
-      },
       expand: function expand(n) {
         var d = n - this.value.length;
         if (d > 0) {
@@ -1585,9 +1577,6 @@
         var _this5 = this;
         this.cacheRule[key].$f = $f;
         this.$nextTick(function () {
-          if (_this5.syncDisabled) {
-            $f.disabled(_this5.disabled);
-          }
           _this5.$emit('itemMounted', $f, Object.keys(_this5.cacheRule).indexOf(key));
         });
       },
@@ -1759,6 +1748,7 @@
           }
         }, {}, {
           "props": {
+            disabled: disabled,
             inFor: true,
             value: _this11.field ? _defineProperty({}, _this11.field, _this11._value(_this11.value[index])) : _this11.value[index],
             rule: rule,
@@ -1811,9 +1801,6 @@
       };
     },
     watch: {
-      disabled: function disabled(n) {
-        this.syncDisabled && this.cacheRule.$f.disabled(n);
-      },
       value: function value(n) {
         this.setValue(n);
       }
@@ -1847,7 +1834,6 @@
         var _this = this;
         this.cacheRule.$f = $f;
         this.$nextTick(function () {
-          _this.syncDisabled && $f.disabled(_this.disabled);
           _this.$emit('itemMounted', $f);
         });
       },
@@ -1878,6 +1864,7 @@
         "props": {
           rule: rule,
           option: options,
+          disabled: this.disabled,
           extendOption: true
         }
       }]));
@@ -2528,7 +2515,7 @@
           if (!ctx) return initial;
           initial[ctx.field] = copy(ctx.rule.value);
           return initial;
-        }, h.options.appendValue ? copy(h.appendData) : {});
+        }, h.options.appendValue !== false ? copy(h.appendData) : {});
       },
       getValue: function getValue(field) {
         var ctx = h.getFieldCtx(field);
@@ -2875,15 +2862,17 @@
         h.deferSyncValue(fn, sync);
       },
       fetch: function fetch(opt) {
-        h.options.beforeFetch && invoke(function () {
-          return h.options.beforeFetch(opt, {
-            api: api
+        return new Promise(function (resolve, reject) {
+          h.beforeFetch(opt).then(function () {
+            return asyncFetch(opt).then(resolve)["catch"](reject);
           });
         });
-        return asyncFetch(opt);
       },
       getData: function getData(id, def) {
-        return hasProperty(h.fc.loadData, id) ? h.fc.loadData[id] : def;
+        return h.fc.getData(id, def);
+      },
+      setData: function setData(id, data) {
+        return h.fc.setData(id, data);
       },
       helper: {
         tidyFields: tidyFields,
@@ -3323,8 +3312,8 @@
           }
         }];
         if (ctx.input) {
-          if (this.vm.$props.disabled !== undefined) {
-            ctx.prop.props.disabled = !!this.vm.$props.disabled;
+          if (this.vm.$props.disabled === true) {
+            ctx.prop.props.disabled = true;
           }
           ctx.prop.model = {
             value: this.$handle.getFormData(ctx),
@@ -4205,7 +4194,7 @@
           handle.configurable = true;
           initial[field] = handle;
           return initial;
-        }, this.options.appendValue ? Object.keys(this.appendData).reduce(function (initial, field) {
+        }, this.options.appendValue !== false ? Object.keys(this.appendData).reduce(function (initial, field) {
           initial[field] = {
             enumerable: true,
             configurable: true,
@@ -4261,7 +4250,7 @@
         if (this.deferSyncFn) {
           return this.deferSyncFn.sync = true;
         }
-        this.vm._updateValue(_objectSpread2(_objectSpread2({}, this.options.appendValue ? this.appendData : {}), this.form));
+        this.vm._updateValue(_objectSpread2(_objectSpread2({}, this.options.appendValue !== false ? this.appendData : {}), this.form));
       },
       isChange: function isChange(ctx, value) {
         return JSON.stringify(ctx.rule.value, strFn) !== JSON.stringify(value === null ? undefined : value, strFn);
@@ -4750,6 +4739,21 @@
       this.$manager.__init();
       this.lifecycle('created');
       this.vm.$set(this.vm, 'formData', this.formData);
+    },
+    beforeFetch: function beforeFetch(opt) {
+      var _this2 = this;
+      return new Promise(function (resolve) {
+        var source = _this2.options.beforeFetch && invoke(function () {
+          return _this2.options.beforeFetch(opt, {
+            api: _this2.api
+          });
+        });
+        if (source && is.Function(source.then)) {
+          source.then(resolve);
+        } else {
+          resolve();
+        }
+      });
     }
   });
   useInject(Handler);
@@ -4918,7 +4922,7 @@
               var value = undefined;
               if (attr.attr) {
                 value = fc.loadData[attr.attr] || attr["default"];
-                if (attr.copy) {
+                if (attr.copy !== false) {
                   value = deepCopy(value);
                 }
               }
@@ -5021,7 +5025,7 @@
         onSuccess: function onSuccess(body, flag) {
           if (check()) return;
           var fn = function fn(v) {
-            return flag ? v : v.data;
+            return flag ? v : hasProperty(v, 'data') ? v.data : v;
           };
           if (is.Function(option.parse)) {
             fn = option.parse;
@@ -5046,25 +5050,24 @@
           })(e, rule, api);
         }
       });
-      fc.options.beforeFetch && invoke(function () {
-        return fc.options.beforeFetch(config, {
-          rule: rule,
-          api: api
-        });
-      });
-      if (is.Function(option.action)) {
-        option.action(rule, api).then(function (val) {
-          config.onSuccess(val, true);
-        })["catch"](function (e) {
-          config.onError(e);
-        });
-        return;
-      }
-      invoke(function () {
-        return fc.create.fetch(config, {
-          inject: inject,
-          rule: rule,
-          api: api
+      fc.$handle.beforeFetch(config, {
+        rule: rule,
+        api: api
+      }).then(function () {
+        if (is.Function(option.action)) {
+          option.action(rule, api).then(function (val) {
+            config.onSuccess(val, true);
+          })["catch"](function (e) {
+            config.onError(e);
+          });
+          return;
+        }
+        invoke(function () {
+          return fc.create.fetch(config, {
+            inject: inject,
+            rule: rule,
+            api: api
+          });
         });
       });
     }
@@ -5284,6 +5287,9 @@
       loadData[id] = data;
       _emitData(id);
     }
+    function getData(id, def) {
+      return hasProperty(loadData, id) ? loadData[id] : def;
+    }
     function removeData(id) {
       delete loadData[id];
       _emitData(id);
@@ -5337,6 +5343,8 @@
           components: components,
           directives: directives
         },
+        setData: setData,
+        getData: getData,
         loadData: loadData,
         CreateNode: CreateNode,
         bus: new _vue(),
@@ -5455,6 +5463,7 @@
         version: config.version,
         ui: config.ui,
         setData: setData,
+        getData: getData,
         removeData: removeData,
         maker: maker,
         component: component,
@@ -6307,7 +6316,7 @@
   function ivuFormCreate() {
     return FormCreateFactory({
       ui: "".concat("iview"),
-      version: "".concat("2.5.36"),
+      version: "".concat("2.5.37"),
       manager: manager,
       install: install,
       extendApi: extendApi,