@form-create/element-ui 3.1.33 → 3.1.34

package/dist/form-create.esm.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.1.33
+ * @form-create/element-ui v3.1.34
  * (c) 2018-2024 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -1612,14 +1612,6 @@ var Group = defineComponent({
       },
       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.modelValue.length;
 
@@ -1741,10 +1733,6 @@ var Group = defineComponent({
 
       this.cacheRule[key].$f = $f;
       nextTick(function () {
-        if (_this5.syncDisabled) {
-          $f.disabled(_this5.disabled);
-        }
-
         _this5.$emit('itemMounted', $f, Object.keys(_this5.cacheRule).indexOf(key));
       });
     },
@@ -1915,6 +1903,7 @@ var Group = defineComponent({
       }, [createVNode(Type, mergeProps$1({
         "key": key
       }, {
+        disabled: disabled,
         'onUpdate:modelValue': function onUpdateModelValue(formData) {
           return _this12.formData(key, formData);
         },
@@ -1985,9 +1974,6 @@ var Sub = defineComponent({
   },
   emits: ['fc:subform', 'update:modelValue', 'change', 'itemMounted'],
   watch: {
-    disabled: function disabled(n) {
-      this.syncDisabled && this.subApi.disabled(n);
-    },
     modelValue: function modelValue(n) {
       this.setValue(n);
     }
@@ -2013,8 +1999,6 @@ var Sub = defineComponent({
 
       this.subApi = api;
       nextTick(function () {
-        _this.syncDisabled && api.disabled(_this.disabled);
-
         _this.$emit('itemMounted', api);
       });
     }
@@ -2022,6 +2006,7 @@ var Sub = defineComponent({
   render: function render() {
     var Type = this.form;
     return createVNode(Type, {
+      "disabled": this.disabled,
       "onUpdate:modelValue": this.formData,
       "modelValue": this.modelValue,
       "onEmit-event": this.$emit,
@@ -2963,7 +2948,7 @@ function Api(h) {
         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);
@@ -3408,12 +3393,17 @@ function Api(h) {
     },
     bus: h.bus,
     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 h.fc.getData(id, def);
+    },
+    setData: function setData(id, data) {
+      return h.fc.setData(id, data);
     },
     helper: {
       tidyFields: tidyFields,
@@ -3815,8 +3805,8 @@ function useRender$1(Render) {
       }];
 
       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;
         }
 
         var field = this.getModelField(ctx);
@@ -5027,7 +5017,7 @@ function useInput(Handler) {
         return this.deferSyncFn.sync = true;
       }
 
-      this.vm.setupState.updateValue(_objectSpread2(_objectSpread2({}, this.options.appendValue ? this.appendData : {}), this.form));
+      this.vm.setupState.updateValue(_objectSpread2(_objectSpread2({}, this.options.appendValue !== false ? this.appendData : {}), this.form));
     },
     isChange: function isChange(ctx, value) {
       return JSON.stringify(this.getFormData(ctx), strFn) !== JSON.stringify(value, strFn);
@@ -5683,7 +5673,11 @@ function Handler(fc) {
   this.initData(fc.rules);
   this.$manager = new fc.manager(this);
   this.$render = new Render(this);
-  this.api = fc.extendApi(Api(this), this);
+  this.api = fc.extendApiFn.reduce(function (api, fn) {
+    return _objectSpread2(_objectSpread2({}, api), invoke(function () {
+      return fn(_objectSpread2({}, api), _this);
+    }, {}));
+  }, Api(this));
 }
 extend(Handler.prototype, {
   initData: function initData(rules) {
@@ -5707,6 +5701,23 @@ extend(Handler.prototype, {
   },
   isBreakWatch: function isBreakWatch() {
     return this.loading || this.noWatchFn || this.reloading;
+  },
+  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);
@@ -5921,7 +5932,7 @@ var loadData = function loadData(fc) {
             if (attr.attr) {
               value = fc.loadData[attr.attr] || attr["default"];
 
-              if (attr.copy) {
+              if (attr.copy !== false) {
                 value = deepCopy(value);
               }
             }
@@ -6060,7 +6071,7 @@ var fetch = function fetch(fc) {
         if (check()) return;
 
         var fn = function fn(v) {
-          return flag ? v : v.data;
+          return flag ? v : hasProperty(v, 'data') ? v.data : v;
         };
 
         var parse = parseFn(option.parse);
@@ -6091,27 +6102,25 @@ var fetch = function fetch(fc) {
       }
     });
 
-    fc.$handle.options.beforeFetch && invoke(function () {
-      return fc.$handle.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;
-    }
+    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
+      invoke(function () {
+        return fc.create.fetch(config, {
+          inject: inject,
+          rule: rule,
+          api: api
+        });
       });
     });
   }
@@ -6192,6 +6201,7 @@ function FormCreateFactory(config) {
   var directives = {};
   var modelFields = {};
   var useApps = [];
+  var extendApiFn = [config.extendApi];
 
   var providers = _objectSpread2({}, $provider);
 
@@ -6199,7 +6209,7 @@ function FormCreateFactory(config) {
   var globalConfig = {
     global: {}
   };
-  var loadData = {};
+  var loadData = reactive({});
   var CreateNode = CreateNodeFactory();
   var formulas = {};
   exportAttrs(config.attrs || {});
@@ -6361,6 +6371,14 @@ function FormCreateFactory(config) {
     _emitData(id);
   }
 
+  function getData(id, def) {
+    return hasProperty(loadData, id) ? loadData[id] : def;
+  }
+
+  function extendApi(fn) {
+    extendApiFn.push(fn);
+  }
+
   function removeData(id) {
     delete loadData[id];
 
@@ -6386,14 +6404,14 @@ function FormCreateFactory(config) {
         components: components,
         directives: directives
       },
+      setData: setData,
+      getData: getData,
       loadData: loadData,
       CreateNode: CreateNode,
       bus: new Mitt(),
       unwatch: null,
       options: ref({}),
-      extendApi: config.extendApi || function (api) {
-        return api;
-      }
+      extendApiFn: extendApiFn
     });
     nextTick(function () {
       watch(_this.options, function () {
@@ -6511,6 +6529,8 @@ function FormCreateFactory(config) {
     extend(formCreate, {
       version: config.version,
       ui: config.ui,
+      extendApi: extendApi,
+      getData: getData,
       setData: setData,
       removeData: removeData,
       maker: maker,
@@ -7228,7 +7248,7 @@ function tidyBtnProp(btn, def) {
 }
 
 function extendApi(api, h) {
-  extend(api, {
+  return {
     formEl: function formEl() {
       return h.$manager.form();
     },
@@ -7387,8 +7407,7 @@ function extendApi(api, h) {
         });
       });
     }
-  });
-  return api;
+  };
 }
 
 var required = {
@@ -7469,7 +7488,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.1.33',
+    version: '3.1.34',
     manager: manager,
     extendApi: extendApi,
     install: install,