@form-create/element-ui 3.2.22 → 3.2.24

package/dist/form-create.esm.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.22
+ * @form-create/element-ui v3.2.24
  * (c) 2018-2025 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -2353,7 +2353,7 @@ function parseFn(fn, mode) {
         v.__inject = true;
         return v;
       } else if (v.indexOf('$FNX:') === 0) {
-        v = makeFn('function($inject){' + v.substring(5) + '}');
+        v = makeFn('function($inject){\n' + v.substring(5) + '\n}');
         v.__json = fn;
         v.__inject = true;
         return v;
@@ -2648,6 +2648,68 @@ function convertFieldToConditions(field) {
   });
   return conditions.join(' && ');
 }
+function parseTemplateToTree(template) {
+  var tokens = [];
+  var current = '';
+  var depth = 0;
+
+  for (var i = 0; i < template.length; i++) {
+    var _char = template[i];
+
+    if (_char === '[') {
+      if (depth === 0 && current) {
+        tokens.push({
+          type: 'key',
+          value: current
+        });
+        current = '';
+      }
+
+      depth++;
+      current += _char;
+    } else if (_char === ']') {
+      depth--;
+      current += _char;
+
+      if (depth === 0) {
+        tokens.push({
+          type: 'bracket',
+          value: parseTemplateToTree(current.slice(1, -1))
+        });
+        current = '';
+      }
+    } else if (_char === '.' && depth === 0) {
+      if (current) {
+        tokens.push({
+          type: 'key',
+          value: current
+        });
+        current = '';
+      }
+    } else {
+      current += _char;
+    }
+  }
+
+  if (current) {
+    tokens.push({
+      type: 'key',
+      value: current
+    });
+  }
+
+  return tokens.map(function (token) {
+    if (token.type === 'key') {
+      return {
+        key: token.value
+      };
+    } else {
+      return {
+        children: token.value
+      };
+    }
+  });
+}
 
 var _getGroupInject = function getGroupInject(vm, parent) {
   if (!vm || vm === parent) {
@@ -2844,10 +2906,10 @@ function $FormCreate(FormCreate, components, directives) {
           fapi.scope.bus.$off('$loadData.$scopeForm', emit$scopeForm);
         }
 
-        styleEl && document.head.removeChild(styleEl);
         rmSubForm();
         data.destroyed = true;
         fc.unmount();
+        styleEl && (styleEl.parentNode || styleEl.parentElement) && document.head.removeChild(styleEl);
       });
       onUpdated(function () {
         fc.updated();
@@ -3740,9 +3802,7 @@ function Api(h) {
 
         if (!config) {
           resolve(h.fc.loadData[name]);
-        }
-
-        if (config.type === 'fetch') {
+        } else if (config.type === 'fetch') {
           api.fetch(config).then(function (res) {
             resolve(res);
           })["catch"](inject);
@@ -4611,6 +4671,58 @@ function useInject(Handler) {
       if (str && typeof str === 'string' && str.indexOf('{{') > -1 && str.indexOf('}}') > -1) {
         var tmp = str;
         var vars = extractVar(str);
+
+        var getValue = function getValue(field) {
+          var flag = false;
+          var val;
+
+          if (group && field.indexOf('$form.') === 0) {
+            var _split = field.split('.');
+
+            _split.shift();
+
+            if (hasProperty(group.value, _split[0])) {
+              flag = true;
+              val = get ? get({
+                id: '$form.' + _split[0] + '_' + group.rule.__fc__.id,
+                getValue: function getValue() {
+                  return deepGet(group.value, _split);
+                }
+              }) : deepGet(group.value, _split);
+            }
+          }
+
+          if (!flag) {
+            val = get ? get(field) : _this3.fc.getLoadData(field);
+          }
+
+          return val;
+        };
+
+        var treeToVal = function treeToVal(tree) {
+          var fields = [];
+          tree.forEach(function (item) {
+            if (item.key) {
+              fields.push(item.key);
+            } else if (item.children) {
+              fields.push(treeToVal(item.children));
+            }
+          });
+          var flag = false;
+          fields.forEach(function (field, idx) {
+            if (field != null && (field.indexOf('\'') === 0 || field.indexOf('"') === 0)) {
+              fields[idx] = field.slice(1, -1);
+              flag = true;
+            }
+          });
+
+          if (fields.length === 1 && (flag || !isNaN(Number(fields[0])))) {
+            return fields[0];
+          }
+
+          return getValue(fields.join('.'));
+        };
+
         var lastVal;
         vars.forEach(function (v) {
           var split = v.split('||');
@@ -4618,27 +4730,13 @@ function useInject(Handler) {
 
           if (field) {
             var def = (split[1] || '').trim();
-            var val;
-            var flag = false;
-
-            if (group && field.indexOf('$form.') === 0) {
-              var _split = field.split('.');
-
-              _split.shift();
-
-              if (hasProperty(group.value, _split[0])) {
-                flag = true;
-                val = get ? get({
-                  id: '$form.' + _split[0] + '_' + group.rule.__fc__.id,
-                  getValue: function getValue() {
-                    return deepGet(group.value, _split);
-                  }
-                }) : deepGet(group.value, _split);
-              }
-            }
+            var tree = parseTemplateToTree(field);
+            var val = invoke(function () {
+              return treeToVal(tree);
+            });
 
-            if (!flag) {
-              val = get ? get(field, def) : _this3.fc.getLoadData(field, def);
+            if ((val == null || val === '') && split.length > 1) {
+              val = def;
             }
 
             lastVal = val;
@@ -4963,6 +5061,9 @@ extend(RuleContext.prototype, {
   initNone: function initNone() {
     this.none = !(is.Undef(this.prop.display) || !!this.prop.display);
   },
+  hasHidden: function hasHidden() {
+    return !!this.rule.hidden || (this.parent ? this.parent.hasHidden() : false);
+  },
   injectValidate: function injectValidate() {
     return this.prop.validate;
   },
@@ -5638,10 +5739,11 @@ function useInput(Handler) {
 
       fields.reduce(function (initial, field) {
         var ctx = (_this3.fieldCtx[field] || []).filter(function (ctx) {
-          return !_this3.isIgnore(ctx.rule);
-        })[0] || _this3.fieldCtx[field][0];
+          return !_this3.isIgnore(ctx);
+        })[0];
 
-        if (_this3.isIgnore(ctx.rule)) {
+        if (!ctx) {
+          ctx = _this3.fieldCtx[field][0];
           ignoreFields.push(field);
         }
 
@@ -5652,8 +5754,8 @@ function useInput(Handler) {
       this.ignoreFields = ignoreFields;
       this.syncValue();
     },
-    isIgnore: function isIgnore(rule) {
-      return rule.ignore === true || rule.ignore === 'hidden' && rule.hidden || this.options.ignoreHiddenFields && rule.hidden;
+    isIgnore: function isIgnore(ctx) {
+      return ctx.rule.ignore === true || (ctx.rule.ignore === 'hidden' || this.options.ignoreHiddenFields) && ctx.hasHidden();
     },
     appendValue: function appendValue(rule) {
       if ((!rule.field || !hasProperty(this.appendData, rule.field)) && !this.options.forceCoverValue) {
@@ -6069,7 +6171,6 @@ function useContext(Handler) {
         }
 
         Object.keys(computedRule).forEach(function (k) {
-          var oldValue = undefined;
           var computedValue = computed(function () {
             var item = computedRule[k];
             if (!item) return undefined;
@@ -6077,7 +6178,7 @@ function useContext(Handler) {
             var value = _this.compute(ctx, item);
 
             if (item.linkage && value === oldValueTag) {
-              return oldValue;
+              return oldValueTag;
             }
 
             return value;
@@ -6098,10 +6199,15 @@ function useContext(Handler) {
           }
 
           ctx.watch.push(watch(computedValue, function (n) {
-            oldValue = n;
+            if (n === oldValueTag) {
+              return;
+            }
+
             setTimeout(function () {
               callback(n);
             });
+          }, {
+            deep: true
           }));
         });
       });
@@ -6123,7 +6229,7 @@ function useContext(Handler) {
         if (before === false) {
           callback();
         } else {
-          var key = _this2.validator(value, validate);
+          var key = _this2.validator(ctx, value, validate);
 
           if (!key) {
             if (validate.validator) {
@@ -6176,7 +6282,9 @@ function useContext(Handler) {
       var formatRule = Array.isArray(invalid.rule) ? invalid.rule.join(',') : '' + invalid.rule;
       return this.api.t(invalid.key === 'required' ? invalid.key : 'validate.' + invalid.key, (_this$api$t = {}, _defineProperty(_this$api$t, invalid.key, formatRule), _defineProperty(_this$api$t, "title", (_ctx$refRule2 = ctx.refRule) === null || _ctx$refRule2 === void 0 ? void 0 : (_ctx$refRule2$__$titl = _ctx$refRule2.__$title) === null || _ctx$refRule2$__$titl === void 0 ? void 0 : _ctx$refRule2$__$titl.value), _this$api$t));
     },
-    validator: function validator(value, validate) {
+    validator: function validator(ctx, value, validate) {
+      var _this3 = this;
+
       var isEmpty = is.empty(value);
 
       if (isEmpty) {
@@ -6370,6 +6478,15 @@ function useContext(Handler) {
               };
             }
 
+            break;
+
+          case 'computed':
+            if (!_this3.compute(ctx, rule)) {
+              return {
+                v: key
+              };
+            }
+
             break;
         }
       };
@@ -6381,7 +6498,7 @@ function useContext(Handler) {
       }
     },
     compute: function compute(ctx, item) {
-      var _this3 = this;
+      var _this4 = this;
 
       var fn;
 
@@ -6407,7 +6524,7 @@ function useContext(Handler) {
             var field = null;
 
             if (one.variable) {
-              field = JSON.stringify(_this3.fc.getLoadData(one.variable) || '');
+              field = JSON.stringify(_this4.fc.getLoadData(one.variable) || '');
             } else if (one.field) {
               field = convertFieldToConditions(one.field || '');
             } else if (!one.mode) {
@@ -6428,11 +6545,11 @@ function useContext(Handler) {
               flag = false;
             } else if (is.Function(one.handler)) {
               flag = invoke(function () {
-                return one.handler(_this3.api, ctx.rule);
+                return one.handler(_this4.api, ctx.rule);
               });
             } else {
               flag = invoke(function () {
-                return new Function('$condition', '$val', '$form', '$scope', '$group', '$rule', "with($form){with($scope){with(this){with($group){ return $condition['".concat(one.condition, "'](").concat(field, ", ").concat(compare ? compare : '$val', "); }}}}")).call(_this3.api.form, condition, one.value, _this3.api.top.form, _this3.api.top === _this3.api.scope ? {} : _this3.api.scope.form, group ? _this3.subRuleData[group.id] || {} : {}, ctx.rule);
+                return new Function('$condition', '$val', '$form', '$scope', '$group', '$rule', "with($form){with($scope){with(this){with($group){ return $condition['".concat(one.condition, "'](").concat(field, ", ").concat(compare ? compare : '$val', "); }}}}")).call(_this4.api.form, condition, one.value, _this4.api.top.form, _this4.api.top === _this4.api.scope ? {} : _this4.api.scope.form, group ? _this4.subRuleData[group.id] || {} : {}, ctx.rule);
               });
             }
 
@@ -6461,27 +6578,27 @@ function useContext(Handler) {
 
         if (item.linkage) {
           return val ? invoke(function () {
-            return _this3.computeValue(item.linkage, ctx, group);
+            return _this4.computeValue(item.linkage, ctx, group);
           }, undefined) : oldValueTag;
         }
 
         return val;
       } else if (is.Function(item)) {
         fn = function fn() {
-          return item(_this3.api.form, _this3.api);
+          return item(_this4.api.form, _this4.api);
         };
       } else {
         var _group = ctx.getParentGroup();
 
         fn = function fn() {
-          return _this3.computeValue(item, ctx, _group);
+          return _this4.computeValue(item, ctx, _group);
         };
       }
 
       return invoke(fn, undefined);
     },
     computeValue: function computeValue(str, ctx, group) {
-      var _this4 = this;
+      var _this5 = this;
 
       var that = this;
       var formulas = Object.keys(this.fc.formulas).reduce(function (obj, k) {
@@ -6503,35 +6620,35 @@ function useContext(Handler) {
         return obj;
       }, {});
       return invoke(function () {
-        return new Function('$formulas', '$form', '$scope', '$group', '$rule', '$api', "with($form){with($scope){with(this){with($group){with($formulas){ return ".concat(str, " }}}}}")).call(_this4.api.form, formulas, _this4.api.top.form, _this4.api.top === _this4.api.scope ? {} : _this4.api.scope.form, group ? _this4.subRuleData[group.id] || {} : {}, ctx.rule, _this4.api);
+        return new Function('$formulas', '$form', '$scope', '$group', '$rule', '$api', "with($form){with($scope){with(this){with($group){with($formulas){ return ".concat(str, " }}}}}")).call(_this5.api.form, formulas, _this5.api.top.form, _this5.api.top === _this5.api.scope ? {} : _this5.api.scope.form, group ? _this5.subRuleData[group.id] || {} : {}, ctx.rule, _this5.api);
       }, undefined);
     },
     updateChildren: function updateChildren(ctx, n, o) {
-      var _this5 = this;
+      var _this6 = this;
 
       this.deferSyncValue(function () {
         o && o.forEach(function (child) {
           if ((n || []).indexOf(child) === -1 && child && !is.String(child) && child.__fc__ && child.__fc__.parent === ctx) {
-            _this5.rmCtx(child.__fc__);
+            _this6.rmCtx(child.__fc__);
           }
         });
 
         if (is.trueArray(n)) {
-          _this5.loadChildren(n, ctx);
+          _this6.loadChildren(n, ctx);
 
-          _this5.bus.$emit('update', _this5.api);
+          _this6.bus.$emit('update', _this6.api);
         }
       });
     },
     rmSub: function rmSub(sub) {
-      var _this6 = this;
+      var _this7 = this;
 
       is.trueArray(sub) && sub.forEach(function (r) {
-        r && r.__fc__ && _this6.rmCtx(r.__fc__);
+        r && r.__fc__ && _this7.rmCtx(r.__fc__);
       });
     },
     rmCtx: function rmCtx(ctx) {
-      var _this7 = this;
+      var _this8 = this;
 
       if (ctx.deleted) return;
       var id = ctx.id,
@@ -6560,19 +6677,19 @@ function useContext(Handler) {
       }
 
       this.deferSyncValue(function () {
-        if (!_this7.reloading) {
+        if (!_this8.reloading) {
           if (ctx.parser.loadChildren !== false) {
             var children = ctx.getPending('children', ctx.rule.children);
 
             if (is.trueArray(children)) {
               children.forEach(function (h) {
-                return h.__fc__ && _this7.rmCtx(h.__fc__);
+                return h && h.__fc__ && _this8.rmCtx(h.__fc__);
               });
             }
           }
 
-          if (ctx.root === _this7.rules) {
-            _this7.vm.setupState.renderRule();
+          if (ctx.root === _this8.rules) {
+            _this8.vm.setupState.renderRule();
           }
         }
       }, input);
@@ -7013,7 +7130,9 @@ function makeDirective(data, vn) {
 function CreateNodeFactory() {
   var aliasMap = {};
 
-  function CreateNode() {}
+  function CreateNode(vm) {
+    this.vm = vm;
+  }
 
   extend(CreateNode.prototype, {
     make: function make(tag, data, children) {
@@ -7028,7 +7147,7 @@ function CreateNodeFactory() {
       }
     },
     h: function h(tag, data, children) {
-      var isNativeTag = getCurrentInstance().appContext.config.isNativeTag(tag);
+      var isNativeTag = this.vm.appContext.config.isNativeTag(tag);
 
       if (isNativeTag) {
         delete data.formCreateInject;
@@ -7183,14 +7302,30 @@ var loadData = function loadData(fc) {
         attrs.forEach(function (attr) {
           if (attr && (attr.attr || attr.template)) {
             var fn = function fn(get) {
+              var group;
+
+              if (rule && rule.__fc__) {
+                group = rule.__fc__.getParentGroup();
+              }
+
               var value;
 
               if (attr.template) {
-                value = fc.$handle.loadStrVar(attr.template, get);
+                value = fc.$handle.loadStrVar(attr.template, get, group ? {
+                  rule: rule,
+                  value: fc.$handle.subRuleData[group.id] || {}
+                } : null);
               } else if (attr.handler && is.Function(attr.handler)) {
                 value = attr.handler(get, rule, api);
               } else {
-                value = get(attr.attr, attr["default"]);
+                value = fc.$handle.loadStrVar("{{".concat(attr.attr, "}}"), get, group ? {
+                  rule: rule,
+                  value: fc.$handle.subRuleData[group.id] || {}
+                } : null);
+              }
+
+              if ((value == null || value === '') && attr["default"] != null) {
+                value = attr["default"];
               }
 
               if (attr.copy !== false) {
@@ -8326,7 +8461,7 @@ function FormCreateFactory(config) {
 
           if (!unwatch[id]) {
             return;
-          } else if (JSON.stringify(temp) !== JSON.stringify(unwatch[id].val)) {
+          } else if ((temp instanceof Function || is.Object(temp) || Array.isArray(temp)) && temp === unwatch[id].val || JSON.stringify(temp) !== JSON.stringify(unwatch[id].val)) {
             unwatch[id].val = temp;
             run(true);
           }
@@ -9468,7 +9603,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.2.22',
+    version: '3.2.24',
     manager: manager,
     extendApi: extendApi,
     install: install,