@form-create/element-ui 3.2.11 → 3.2.13

package/dist/form-create.esm.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.11
+ * @form-create/element-ui v3.2.13
  * (c) 2018-2024 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -1321,13 +1321,25 @@ function render$1(_ctx, _cache, $props, $setup, $data, $options) {
 script$1.render = render$1;
 
 function parseFile(file, i) {
+  if (_typeof(file) === 'object') {
+    return file;
+  }
+
   return {
     url: file,
+    is_string: true,
     name: getFileName(file),
     uid: i
   };
 }
 
+function parseUpload(file) {
+  return _objectSpread2(_objectSpread2({}, file), {}, {
+    file: file,
+    value: file
+  });
+}
+
 function getFileName(file) {
   return ('' + file).split('/').pop();
 }
@@ -1360,11 +1372,11 @@ var Upload = defineComponent({
     };
   },
   created: function created() {
-    this.fileList = toArray(this.modelValue).map(parseFile);
+    this.fileList = toArray(this.modelValue).map(parseFile).map(parseUpload);
   },
   watch: {
     modelValue: function modelValue(n) {
-      this.fileList = toArray(n).map(parseFile);
+      this.fileList = toArray(n).map(parseFile).map(parseUpload);
     }
   },
   methods: {
@@ -1381,8 +1393,8 @@ var Upload = defineComponent({
       }
     },
     update: function update(fileList) {
-      var files = fileList.map(function (file) {
-        return file.url;
+      var files = fileList.map(function (v) {
+        return v.is_string ? v.url : v.value || v.url;
       }).filter(function (url) {
         return url !== undefined;
       });
@@ -3073,14 +3085,13 @@ function Api(h) {
 
     formData: function formData(fields) {
       if (fields == null) {
-        return api.fields().reduce(function (initial, id) {
-          var ctx = (h.fieldCtx[id] || []).filter(function (ctx) {
-            return !h.isIgnore(ctx.rule);
-          })[0];
-          if (!ctx) return initial;
-          initial[ctx.field] = copy(ctx.rule.value);
-          return initial;
-        }, h.options.appendValue !== false ? copy(h.appendData) : {});
+        var data = {};
+        Object.keys(h.form).forEach(function (k) {
+          if (h.ignoreFields.indexOf(k) === -1) {
+            data[k] = copy(h.form[k]);
+          }
+        });
+        return data;
       } else {
         return tidyFields(fields).reduce(function (initial, id) {
           initial[id] = api.getValue(id);
@@ -5086,9 +5097,9 @@ function useLoader(Handler) {
               __ctrl: true,
               children: rule,
               valid: valid
-            }) : ctx.ctrlRule.splice(ctx.ctrlRule.indexOf(ctrl), 1);
+            }) : ctrl && ctx.ctrlRule.splice(ctx.ctrlRule.indexOf(ctrl) >>> 0, 1);
             hideLst[valid ? 'push' : 'unshift'](function () {
-              if (method === 'disabled') {
+              if (method === 'disabled' || method === 'enabled') {
                 _this7.api.disabled(!valid, rule);
               } else if (method === 'display') {
                 _this7.api.display(valid, rule);
@@ -5308,6 +5319,7 @@ function useInput(Handler) {
 
       var data = reactive({});
       var fields = this.fields();
+      var ignoreFields = [];
 
       if (this.options.appendValue !== false) {
         Object.keys(this.appendData).reduce(function (initial, field) {
@@ -5320,19 +5332,23 @@ function useInput(Handler) {
       }
 
       fields.reduce(function (initial, field) {
-        var ctx = _this2.getCtx(field);
+        var ctx = (_this2.fieldCtx[field] || []).filter(function (ctx) {
+          return !_this2.isIgnore(ctx.rule);
+        })[0] || _this2.fieldCtx[field][0];
 
-        if (!_this2.isIgnore(ctx.rule)) {
-          initial[field] = toRef(ctx.rule, 'value');
+        if (_this2.isIgnore(ctx.rule)) {
+          ignoreFields.push(field);
         }
 
+        initial[field] = toRef(ctx.rule, 'value');
         return initial;
       }, data);
       this.form = data;
+      this.ignoreFields = ignoreFields;
       this.syncValue();
     },
     isIgnore: function isIgnore(rule) {
-      return rule.ignore || this.options.ignoreHiddenFields && rule.hidden;
+      return rule.ignore === true || rule.ignore === 'hidden' && rule.hidden || this.options.ignoreHiddenFields && rule.hidden;
     },
     appendValue: function appendValue(rule) {
       if ((!rule.field || !hasProperty(this.appendData, rule.field)) && !this.options.forceCoverValue) {
@@ -5365,11 +5381,19 @@ function useInput(Handler) {
       }
     },
     syncValue: function syncValue() {
+      var _this3 = this;
+
       if (this.deferSyncFn) {
         return this.deferSyncFn.sync = true;
       }
 
-      this.vm.setupState.updateValue(_objectSpread2({}, this.form));
+      var data = {};
+      Object.keys(this.form).forEach(function (k) {
+        if (_this3.ignoreFields.indexOf(k) === -1) {
+          data[k] = _this3.form[k];
+        }
+      });
+      this.vm.setupState.updateValue(data);
     },
     isChange: function isChange(ctx, value) {
       return JSON.stringify(this.getFormData(ctx), strFn) !== JSON.stringify(value, strFn);
@@ -5378,11 +5402,11 @@ function useInput(Handler) {
       return (is.Object(value) || Array.isArray(value)) && value === ctx.rule.value;
     },
     refreshUpdate: function refreshUpdate(ctx, val, origin, field) {
-      var _this3 = this;
+      var _this4 = this;
 
       if (is.Function(ctx.rule.update)) {
         var state = invoke(function () {
-          return ctx.rule.update(val, ctx.origin, _this3.api, {
+          return ctx.rule.update(val, ctx.origin, _this4.api, {
             origin: origin || 'change',
             linkField: field
           });
@@ -5406,18 +5430,18 @@ function useInput(Handler) {
       this.refreshUpdate(ctx, val, origin, field);
     },
     appendLink: function appendLink(ctx) {
-      var _this4 = this;
+      var _this5 = this;
 
       var link = ctx.rule.link;
       is.trueArray(link) && link.forEach(function (field) {
         var fn = function fn() {
-          return _this4.refreshRule(ctx, ctx.rule.value, 'link', field);
+          return _this5.refreshRule(ctx, ctx.rule.value, 'link', field);
         };
 
-        _this4.bus.$on('change-' + field, fn);
+        _this5.bus.$on('change-' + field, fn);
 
         ctx.linkOn.push(function () {
-          return _this4.bus.$off('change-' + field, fn);
+          return _this5.bus.$off('change-' + field, fn);
         });
       });
     },
@@ -5575,7 +5599,7 @@ function useContext(Handler) {
             _this.$render.clearCacheAll();
           }
 
-          if (key === 'ignore' && ctx.input || key === 'hidden' && ctx.input && _this.options.ignoreHiddenFields) {
+          if (key === 'ignore' && ctx.input || key === 'hidden' && ctx.input && (ctx.rule.ignore === 'hidden' || _this.options.ignoreHiddenFields)) {
             _this.syncForm();
           } else if (key === 'link') {
             ctx.link();
@@ -6093,6 +6117,7 @@ function Handler(fc) {
     subForm: {},
     form: reactive({}),
     appendData: {},
+    ignoreFields: [],
     providers: {},
     cycleLoad: null,
     loadedId: 1,
@@ -7495,6 +7520,7 @@ function FormCreateFactory(config) {
 var DEFAULT_FORMATS = {
   date: 'YYYY-MM-DD',
   month: 'YYYY-MM',
+  week: 'YYYY-wo',
   datetime: 'YYYY-MM-DD HH:mm:ss',
   timerange: 'HH:mm:ss',
   daterange: 'YYYY-MM-DD',
@@ -7824,7 +7850,7 @@ var manager = {
       ref: ref
     });
     extend(this.rule.props, {
-      model: _objectSpread2({}, $handle.formData)
+      model: $handle.formData
     });
   },
   render: function render(children) {
@@ -8120,7 +8146,7 @@ function useFrame(maker) {
   return maker;
 }
 
-var css_248z = ".form-create .form-create .el-form-item{margin-bottom:22px}.form-create{width:100%}.form-create .fc-none,.form-create.is-preview .el-form-item.is-required>.el-form-item__label-wrap>.el-form-item__label:before,.form-create.is-preview .el-form-item.is-required>.el-form-item__label:before,.form-create.is-preview .fc-clock{display:none!important}.fc-wrap-left .el-form-item__label{justify-content:flex-start;justify-content:flex-end}.fc-wrap-top.el-form-item{display:block}.fc-wrap-top.el-form-item .el-form-item__label{display:block;height:auto;line-height:22px;margin-bottom:8px;text-align:left}.el-form--large .fc-wrap-top.el-form-item .el-form-item__label{line-height:22px;margin-bottom:12px}.el-form--default .fc-wrap-top.el-form-item .el-form-item__label{line-height:22px;margin-bottom:8px}.el-form--small .fc-wrap-top.el-form-item .el-form-item__label{line-height:20px;margin-bottom:4px}";
+var css_248z = ".form-create .form-create .el-form-item{margin-bottom:22px}.form-create{width:100%}.form-create .fc-none,.form-create.is-preview .el-form-item.is-required>.el-form-item__label-wrap>.el-form-item__label:before,.form-create.is-preview .el-form-item.is-required>.el-form-item__label:before,.form-create.is-preview .fc-clock{display:none!important}.fc-wrap-right .el-form-item__label{justify-content:flex-end}.fc-wrap-left .el-form-item__label{justify-content:flex-start}.fc-wrap-top.el-form-item{display:block}.fc-wrap-top.el-form-item .el-form-item__label{display:block;height:auto;line-height:22px;margin-bottom:8px;text-align:left}.el-form--large .fc-wrap-top.el-form-item .el-form-item__label{line-height:22px;margin-bottom:12px}.el-form--default .fc-wrap-top.el-form-item .el-form-item__label{line-height:22px;margin-bottom:8px}.el-form--small .fc-wrap-top.el-form-item .el-form-item__label{line-height:20px;margin-bottom:4px}";
 styleInject(css_248z);
 
 function tidyBtnProp(btn, def) {
@@ -8373,7 +8399,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.2.11',
+    version: '3.2.13',
     manager: manager,
     extendApi: extendApi,
     install: install,