@form-create/element-ui 3.1.21 → 3.1.23

package/dist/form-create.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.1.21
+ * @form-create/element-ui v3.1.23
  * (c) 2018-2023 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -1965,9 +1965,11 @@
     }
   };
 
-  function $FormCreate(FormCreate) {
+  function $FormCreate(FormCreate, components, directives) {
     return vue.defineComponent({
       name: NAME$1,
+      components: components,
+      directives: directives,
       props: {
         rule: {
           type: Array,
@@ -1992,7 +1994,7 @@
         },
         inFor: Boolean
       },
-      emits: ['update:api', 'update:modelValue', 'mounted', 'submit', 'change', 'emit-event', 'control', 'remove-rule', 'remove-field', 'sync', 'reload', 'repeat-field', 'update'],
+      emits: ['update:api', 'update:modelValue', 'mounted', 'submit', 'change', 'emit-event', 'control', 'remove-rule', 'remove-field', 'sync', 'reload', 'repeat-field', 'update', 'validate-field-fail', 'validate-fail'],
       render: function render() {
         return this.fc.render();
       },
@@ -2240,7 +2242,7 @@
   }
 
   function makeFn(fn) {
-    return eval('(' + FUNCTION + '(){return ' + fn + ' })()');
+    return new Function('return ' + fn)();
   }
 
   function parseFn(fn, mode) {
@@ -2961,7 +2963,6 @@
         }
 
         if (!this.cache[ctx.id]) {
-          ctx.parent && this.clearCache(ctx.parent);
           return;
         }
 
@@ -2969,9 +2970,7 @@
           this.$handle.refresh();
         }
 
-        var parent = this.cache[ctx.id].parent;
         this.cache[ctx.id] = null;
-        parent && this.clearCache(parent);
       },
       clearCacheAll: function clearCacheAll() {
         this.cache = {};
@@ -3039,12 +3038,18 @@
       initRender: function initRender() {
         this.cacheConfig = {};
       },
-      getTypeSlot: function getTypeSlot(type) {
-        var name = 'type-' + toLine(type);
-
+      getTypeSlot: function getTypeSlot(ctx) {
         var _fn = function _fn(vm) {
           if (vm) {
-            var slot = vm.slots[name] || vm.slots['type-' + type];
+            var slot = undefined;
+
+            if (ctx.rule.field) {
+              slot = vm.slots['field-' + toLine(ctx.rule.field)] || vm.slots['field-' + ctx.rule.field];
+            }
+
+            if (!slot) {
+              slot = vm.slots['type-' + toLine(ctx.type)] || vm.slots['type-' + ctx.type];
+            }
 
             if (slot) {
               return slot;
@@ -3122,12 +3127,16 @@
           deepSet(ctx.prop, str, deep[str]);
         });
       },
-      parseSide: function parseSide(side) {
-        return is.Object(side) ? mergeRule({}, side) : side;
+      parseSide: function parseSide(side, ctx) {
+        return is.Object(side) ? mergeRule({
+          props: {
+            formCreateInject: ctx.prop.props.formCreateInject
+          }
+        }, side) : side;
       },
       renderSides: function renderSides(vn, ctx, temp) {
         var prop = ctx[temp ? 'rule' : 'prop'];
-        return [this.renderRule(this.parseSide(prop.prefix)), vn, this.renderRule(this.parseSide(prop.suffix))];
+        return [this.renderRule(this.parseSide(prop.prefix, ctx)), vn, this.renderRule(this.parseSide(prop.suffix, ctx))];
       },
       renderId: function renderId(name, type) {
         var _this3 = this;
@@ -3194,7 +3203,7 @@
                 children = _this4.renderChildren(_load, ctx);
               }
 
-              var slot = _this4.getTypeSlot(ctx.type);
+              var slot = _this4.getTypeSlot(ctx);
 
               var _vn;
 
@@ -3539,9 +3548,9 @@
         return event;
       },
       getInjectData: function getInjectData(self, inject) {
-        var _this$vm = this.vm,
-            option = _this$vm.option,
-            rule = _this$vm.rule;
+        var _this$vm$props = this.vm.props,
+            option = _this$vm$props.option,
+            rule = _this$vm$props.rule;
         return {
           $f: this.api,
           api: this.api,
@@ -4241,7 +4250,7 @@
 
             if (is.Function(r.update)) {
               _this6.bus.$once('load-end', function () {
-                _this6.refreshUpdate(ctx, r.value);
+                _this6.refreshUpdate(ctx, r.value, 'init');
               });
             }
 
@@ -4514,12 +4523,14 @@
       isQuote: function isQuote(ctx, value) {
         return (is.Object(value) || Array.isArray(value)) && value === ctx.rule.value;
       },
-      refreshUpdate: function refreshUpdate(ctx, val) {
+      refreshUpdate: function refreshUpdate(ctx, val, origin) {
         var _this2 = this;
 
         if (is.Function(ctx.rule.update)) {
           var state = invoke(function () {
-            return ctx.rule.update(val, ctx.origin, _this2.api);
+            return ctx.rule.update(val, ctx.origin, _this2.api, {
+              origin: origin || 'change'
+            });
           });
           if (state === undefined) return;
           ctx.rule.hidden = state === true;
@@ -4529,7 +4540,7 @@
         this.refreshRule(ctx, val);
         this.bus.$emit('change-' + ctx.field, val);
       },
-      refreshRule: function refreshRule(ctx, val) {
+      refreshRule: function refreshRule(ctx, val, origin) {
         if (this.refreshControl(ctx)) {
           this.$render.clearCacheAll();
           this.loadRule();
@@ -4537,7 +4548,7 @@
           this.refresh();
         }
 
-        this.refreshUpdate(ctx, val);
+        this.refreshUpdate(ctx, val, origin);
       },
       appendLink: function appendLink(ctx) {
         var _this3 = this;
@@ -4545,7 +4556,7 @@
         var link = ctx.rule.link;
         is.trueArray(link) && link.forEach(function (field) {
           var fn = function fn() {
-            return _this3.refreshRule(ctx, ctx.rule.value);
+            return _this3.refreshRule(ctx, ctx.rule.value, 'link');
           };
 
           _this3.bus.$on('change-' + field, fn);
@@ -5364,6 +5375,39 @@
     render: function render(children) {}
   });
 
+  var componentValidate = {
+    name: 'componentValidate',
+    load: function load(attr, rule, api) {
+      var method = attr.getValue();
+
+      if (!method) {
+        attr.clearProp();
+        api.clearValidateState([rule.field]);
+      } else {
+        attr.getProp().validate = [{
+          validator: function validator() {
+            var ctx = byCtx(rule);
+
+            if (ctx) {
+              for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+                args[_key] = arguments[_key];
+              }
+
+              return api.exec.apply(api, [ctx.id, method === true ? 'formCreateValidate' : method].concat(args, [{
+                attr: attr,
+                rule: rule,
+                api: api
+              }]));
+            }
+          }
+        }];
+      }
+    },
+    watch: function watch() {
+      componentValidate.load.apply(componentValidate, arguments);
+    }
+  };
+
   var fetch = function fetch(fc) {
     function parseOpt(option) {
       if (is.String(option)) {
@@ -5460,7 +5504,8 @@
   };
 
   var $provider = {
-    fetch: fetch
+    fetch: fetch,
+    componentValidate: componentValidate
   };
 
   var name$6 = 'html';
@@ -5591,7 +5636,7 @@
     }
 
     function $form() {
-      return $FormCreate(FormCreate);
+      return $FormCreate(FormCreate, components, directives);
     }
 
     function createFormApp(rule, option) {
@@ -5728,7 +5773,7 @@
         this.$handle.init();
       },
       isSub: function isSub() {
-        return this.vm.setupState.parent && this.vm.setupState.extendOption;
+        return this.vm.setupState.parent && this.vm.props.extendOption;
       },
       initOptions: function initOptions(options) {
         this.options.value = _objectSpread2({
@@ -6491,7 +6536,7 @@
     return maker;
   }
 
-  var css_248z = ".form-create .form-create .el-form-item{margin-bottom:22px}.form-create .form-create .el-form-item .el-form-item{margin-bottom:0}.form-create{width:100%}";
+  var css_248z = ".form-create .form-create .el-form-item{margin-bottom:22px}.form-create{width:100%}";
   styleInject(css_248z);
 
   function tidyBtnProp(btn, def) {
@@ -6518,6 +6563,9 @@
           })["catch"](function (e) {
             reject(e);
             callback && callback(e);
+            h.vm.emit('validate-fail', e, {
+              api: api
+            });
           });
         });
       },
@@ -6536,6 +6584,10 @@
           })["catch"](function (e) {
             reject(e);
             callback && callback(e);
+            h.vm.emit('validate-field-fail', e, {
+              field: field,
+              api: api
+            });
           });
         });
       },
@@ -6729,7 +6781,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.1.21',
+      version: '3.1.23',
       manager: manager,
       extendApi: extendApi,
       install: install,