@form-create/element-ui 3.2.23 → 3.2.24

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.23
+ * @form-create/element-ui v3.2.24
  * (c) 2018-2025 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -2652,6 +2652,68 @@
     });
     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) {
@@ -2848,10 +2910,10 @@
             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);
         });
         vue.onUpdated(function () {
           fc.updated();
@@ -3744,9 +3806,7 @@
 
           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);
@@ -4615,6 +4675,58 @@
         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('||');
@@ -4622,27 +4734,13 @@
 
             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;
@@ -4967,6 +5065,9 @@
     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;
     },
@@ -5642,10 +5743,11 @@
 
         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);
           }
 
@@ -5656,8 +5758,8 @@
         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) {
@@ -6585,7 +6687,7 @@
 
               if (is.trueArray(children)) {
                 children.forEach(function (h) {
-                  return h.__fc__ && _this8.rmCtx(h.__fc__);
+                  return h && h.__fc__ && _this8.rmCtx(h.__fc__);
                 });
               }
             }
@@ -7032,7 +7134,9 @@
   function CreateNodeFactory() {
     var aliasMap = {};
 
-    function CreateNode() {}
+    function CreateNode(vm) {
+      this.vm = vm;
+    }
 
     extend(CreateNode.prototype, {
       make: function make(tag, data, children) {
@@ -7047,7 +7151,7 @@
         }
       },
       h: function h(tag, data, children) {
-        var isNativeTag = vue.getCurrentInstance().appContext.config.isNativeTag(tag);
+        var isNativeTag = this.vm.appContext.config.isNativeTag(tag);
 
         if (isNativeTag) {
           delete data.formCreateInject;
@@ -8361,7 +8465,7 @@
 
             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);
             }
@@ -9503,7 +9607,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.2.23',
+      version: '3.2.24',
       manager: manager,
       extendApi: extendApi,
       install: install,