@form-create/element-ui 3.2.22 → 3.2.23

package/dist/form-create.esm.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.22
+ * @form-create/element-ui v3.2.23
  * (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;
@@ -6069,7 +6069,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 +6076,7 @@ function useContext(Handler) {
             var value = _this.compute(ctx, item);
 
             if (item.linkage && value === oldValueTag) {
-              return oldValue;
+              return oldValueTag;
             }
 
             return value;
@@ -6098,10 +6097,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 +6127,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 +6180,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 +6376,15 @@ function useContext(Handler) {
               };
             }
 
+            break;
+
+          case 'computed':
+            if (!_this3.compute(ctx, rule)) {
+              return {
+                v: key
+              };
+            }
+
             break;
         }
       };
@@ -6381,7 +6396,7 @@ function useContext(Handler) {
       }
     },
     compute: function compute(ctx, item) {
-      var _this3 = this;
+      var _this4 = this;
 
       var fn;
 
@@ -6407,7 +6422,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 +6443,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 +6476,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 +6518,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 +6575,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.__fc__ && _this8.rmCtx(h.__fc__);
               });
             }
           }
 
-          if (ctx.root === _this7.rules) {
-            _this7.vm.setupState.renderRule();
+          if (ctx.root === _this8.rules) {
+            _this8.vm.setupState.renderRule();
           }
         }
       }, input);
@@ -7183,14 +7198,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) {
@@ -9468,7 +9499,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.2.22',
+    version: '3.2.23',
     manager: manager,
     extendApi: extendApi,
     install: install,