@form-create/element-ui 2.5.13 → 2.5.17

package/dist/form-create.js

@@ -1,6 +1,6 @@
 /*!
- * @form-create/element-ui v2.5.13
- * (c) 2018-2021 xaboy
+ * @form-create/element-ui v2.5.17
+ * (c) 2018-2022 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
  */
@@ -268,6 +268,12 @@
       type: String
     },
     watch: {
+      'formCreateInject.options': {
+        handler: function handler() {
+          this.update();
+        },
+        deep: true
+      },
       value: function value() {
         this.update();
       }
@@ -859,6 +865,12 @@
       type: String
     },
     watch: {
+      'formCreateInject.options': {
+        handler: function handler() {
+          this.update();
+        },
+        deep: true
+      },
       value: function value() {
         this.update();
       }
@@ -1101,7 +1113,8 @@
       return {
         uploadList: [],
         previewVisible: false,
-        previewImage: ''
+        previewImage: '',
+        cacheFiles: []
       };
     },
     created: function created() {
@@ -1252,7 +1265,11 @@
         }).filter(function (url) {
           return url !== undefined;
         });
-        this.$emit('input', this.limit === 1 ? files[0] || '' : files);
+
+        if (this.cacheFiles.length !== files.length) {
+          this.cacheFiles = _toConsumableArray(files);
+          this.$emit('input', this.limit === 1 ? files[0] || '' : files);
+        }
       },
       handleCancel: function handleCancel() {
         this.previewVisible = false;
@@ -1998,6 +2015,20 @@
     return [].concat(keyAttrs, _toConsumableArray(normalMerge$1), _toConsumableArray(toArrayMerge$1), _toConsumableArray(functionalMerge$1), arrayAttrs, normalAttrs);
   }
 
+  function format(type, msg, rule) {
+    return "[form-create ".concat(type, "]: ").concat(msg) + (rule ? '\n\nrule: ' + JSON.stringify(rule.getRule ? rule.getRule() : rule) : '');
+  }
+  function tip(msg, rule) {
+    console.warn(format('tip', msg, rule));
+  }
+  function err(msg, rule) {
+    console.error(format('err', msg, rule));
+  }
+  function logError(e) {
+    err(e.toString());
+    console.error(e);
+  }
+
   function deepExtend(origin) {
     var target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var mode = arguments.length > 2 ? arguments[2] : undefined;
@@ -2026,14 +2057,18 @@
           }
 
           origin[key] = deepExtend(origin[key], clone, mode);
-        } else if (is.Undef(clone)) {
-          $set(origin, key, clone);
-        } else if (clone.__json !== undefined) {
-          $set(origin, key, clone.__json);
-        } else if (clone.__origin !== undefined) {
-          $set(origin, key, clone.__origin);
         } else {
           $set(origin, key, clone);
+
+          if (!is.Undef(clone)) {
+            if (!is.Undef(clone.__json)) {
+              origin[key].__json = clone.__json;
+            }
+
+            if (!is.Undef(clone.__origin)) {
+              origin[key].__origin = clone.__origin;
+            }
+          }
         }
       }
     }
@@ -2048,20 +2083,6 @@
     }).value;
   }
 
-  function format(type, msg, rule) {
-    return "[form-create ".concat(type, "]: ").concat(msg) + (rule ? '\n\nrule: ' + JSON.stringify(rule.getRule ? rule.getRule() : rule) : '');
-  }
-  function tip(msg, rule) {
-    console.warn(format('tip', msg, rule));
-  }
-  function err(msg, rule) {
-    console.error(format('err', msg, rule));
-  }
-  function logError(e) {
-    err(e.toString());
-    console.error(e);
-  }
-
   var PREFIX = '[[FORM-CREATE-PREFIX-';
   var SUFFIX = '-FORM-CREATE-SUFFIX]]';
   var $T = '$FN:';
@@ -2075,7 +2096,7 @@
         return val;
       }
 
-      if (hasProperty(val, '__json')) {
+      if (val.__json) {
         return val.__json;
       }
 
@@ -2138,8 +2159,8 @@
     };
   } //todo 优化位置
 
-  function copyRule(rule, mode) {
-    return copyRules([rule], mode || false)[0];
+  function copyRule(rule) {
+    return copyRules([rule])[0];
   }
   function copyRules(rules, mode) {
     return deepExtend([], _toConsumableArray(rules), mode || false);
@@ -2186,39 +2207,6 @@
     return def;
   }
 
-  function toString(val) {
-    return val == null ? '' : _typeof(val) === 'object' ? JSON.stringify(val, null, 2) : String(val);
-  }
-
-  function toLine(name) {
-    var line = name.replace(/([A-Z])/g, '-$1').toLocaleLowerCase();
-    if (line.indexOf('-') === 0) line = line.substr(1);
-    return line;
-  }
-
-  var id = 0;
-  function uniqueId() {
-    return Math.random().toString(36).substr(3, 3) + Number("".concat(Date.now()).concat(++id)).toString(36);
-  }
-
-  function deepSet(data, idx, val) {
-    var _data = data,
-        to;
-    (idx || '').split('.').forEach(function (v) {
-      if (to) {
-        if (!_data[to] || _typeof(_data[to]) != 'object') {
-          _data[to] = {};
-        }
-
-        _data = _data[to];
-      }
-
-      to = v;
-    });
-    _data[to] = val;
-    return _data;
-  }
-
   function baseRule() {
     return {
       props: {},
@@ -2740,6 +2728,39 @@
     return str.replace(str[0], str[0].toLowerCase());
   }
 
+  function toString(val) {
+    return val == null ? '' : _typeof(val) === 'object' ? JSON.stringify(val, null, 2) : String(val);
+  }
+
+  function toLine(name) {
+    var line = name.replace(/([A-Z])/g, '-$1').toLocaleLowerCase();
+    if (line.indexOf('-') === 0) line = line.substr(1);
+    return line;
+  }
+
+  var id = 0;
+  function uniqueId() {
+    return Math.random().toString(36).substr(3, 3) + Number("".concat(Date.now()).concat(++id)).toString(36);
+  }
+
+  function deepSet(data, idx, val) {
+    var _data = data,
+        to;
+    (idx || '').split('.').forEach(function (v) {
+      if (to) {
+        if (!_data[to] || _typeof(_data[to]) != 'object') {
+          _data[to] = {};
+        }
+
+        _data = _data[to];
+      }
+
+      to = v;
+    });
+    _data[to] = val;
+    return _data;
+  }
+
   function useRender(Render) {
     extend(Render.prototype, {
       initRender: function initRender() {
@@ -2760,6 +2781,23 @@
       clearOrgChildren: function clearOrgChildren() {
         this.orgChildren = {};
       },
+      getTypeSlot: function getTypeSlot(type) {
+        var name = 'type-' + toLine(type);
+
+        var _fn = function _fn(vm) {
+          if (vm) {
+            var slot = vm.$scopedSlots[name] || vm.$scopedSlots['type-' + type];
+
+            if (slot) {
+              return slot;
+            }
+
+            return _fn(vm.$pfc);
+          }
+        };
+
+        return _fn(this.vm);
+      },
       render: function render() {
         var _this = this;
 
@@ -2955,10 +2993,10 @@
                 children = this.renderChildren(ctx);
               }
 
-              var slot = 'type-' + toLine(ctx.type);
+              var slot = this.getTypeSlot(ctx.type);
 
-              if (this.vm.$scopedSlots[slot]) {
-                vn = this.vm.$scopedSlots[slot]({
+              if (slot) {
+                vn = slot({
                   rule: rule,
                   prop: prop,
                   preview: preview,
@@ -3038,6 +3076,10 @@
             subForm: function subForm(_subForm) {
               _this7.$handle.addSubForm(ctx, _subForm);
             },
+            options: [],
+            children: [],
+            prop: {},
+            preview: false,
             field: ctx.field,
             rule: ctx.rule
           });
@@ -4114,7 +4156,7 @@
         this.vm._updateValue(_objectSpread2({}, this.form));
       },
       isChange: function isChange(ctx, value) {
-        return JSON.stringify(ctx.rule.value) !== JSON.stringify(value);
+        return JSON.stringify(ctx.rule.value, strFn) !== JSON.stringify(value, strFn);
       },
       isQuote: function isQuote(ctx, value) {
         return (is.Object(value) || Array.isArray(value)) && value === ctx.rule.value;
@@ -4166,6 +4208,10 @@
     });
   }
 
+  function strFn(key, val) {
+    return typeof val === 'function' ? '' + val : val;
+  }
+
   function toEmpty(obj) {
     Object.keys(obj).forEach(function (k) {
       return delete obj[k];
@@ -4269,7 +4315,7 @@
         var vm = this.vm;
         var none = ['field', 'value', 'vm', 'template', 'name', 'config', 'control', 'inject', 'sync', 'payload', 'optionsTo', 'update'];
         Object.keys(ctx.rule).filter(function (k) {
-          return none.indexOf(k) === -1;
+          return k[0] !== '_' && none.indexOf(k) === -1;
         }).forEach(function (key) {
           var flag = key === 'children';
           ctx.watch.push(vm.$watch(function () {
@@ -4850,6 +4896,11 @@
 
   function run(inject, rule, api) {
     var option = inject.value;
+
+    if (is.Function(option)) {
+      option = option(rule, api);
+    }
+
     option = parseOpt(option);
 
     if (!option || !option.action) {
@@ -5181,6 +5232,7 @@
         copyRules: copyRules,
         fetch: fetch,
         $form: $form,
+        parseFn: parseFn,
         parseJson: parseJson,
         toJson: toJson,
         init: function init(rules) {
@@ -6037,7 +6089,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: "".concat("element-ui"),
-      version: "".concat("2.5.13"),
+      version: "".concat("2.5.17"),
       manager: manager,
       extendApi: extendApi,
       install: install,