@form-create/element-ui 3.1.20 → 3.1.22

package/dist/form-create.esm.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.1.20
+ * @form-create/element-ui v3.1.22
  * (c) 2018-2023 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -1961,9 +1961,11 @@ var getRuleInject = function getRuleInject(vm, parent) {
   }
 };
 
-function $FormCreate(FormCreate) {
+function $FormCreate(FormCreate, components, directives) {
   return defineComponent({
     name: NAME$1,
+    components: components,
+    directives: directives,
     props: {
       rule: {
         type: Array,
@@ -1988,7 +1990,7 @@ function $FormCreate(FormCreate) {
       },
       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();
     },
@@ -2957,7 +2959,6 @@ function useCache(Render) {
       }
 
       if (!this.cache[ctx.id]) {
-        ctx.parent && this.clearCache(ctx.parent);
         return;
       }
 
@@ -2965,9 +2966,7 @@ function useCache(Render) {
         this.$handle.refresh();
       }
 
-      var parent = this.cache[ctx.id].parent;
       this.cache[ctx.id] = null;
-      parent && this.clearCache(parent);
     },
     clearCacheAll: function clearCacheAll() {
       this.cache = {};
@@ -3035,12 +3034,18 @@ function useRender$1(Render) {
     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;
@@ -3118,12 +3123,16 @@ function useRender$1(Render) {
         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;
@@ -3190,7 +3199,7 @@ function useRender$1(Render) {
               children = _this4.renderChildren(_load, ctx);
             }
 
-            var slot = _this4.getTypeSlot(ctx.type);
+            var slot = _this4.getTypeSlot(ctx);
 
             var _vn;
 
@@ -3225,6 +3234,8 @@ function useRender$1(Render) {
 
           if (cache) {
             return cache.apply(void 0, arguments);
+          } else if (_this4.cache[ctx.id]) {
+            return;
           }
 
           var _vn = _this4.renderCtx(ctx, ctx.parent);
@@ -4235,7 +4246,7 @@ function useLoader(Handler) {
 
           if (is.Function(r.update)) {
             _this6.bus.$once('load-end', function () {
-              _this6.refreshUpdate(ctx, r.value);
+              _this6.refreshUpdate(ctx, r.value, 'init');
             });
           }
 
@@ -4508,12 +4519,14 @@ function useInput(Handler) {
     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;
@@ -4523,7 +4536,7 @@ function useInput(Handler) {
       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();
@@ -4531,7 +4544,7 @@ function useInput(Handler) {
         this.refresh();
       }
 
-      this.refreshUpdate(ctx, val);
+      this.refreshUpdate(ctx, val, origin);
     },
     appendLink: function appendLink(ctx) {
       var _this3 = this;
@@ -4539,7 +4552,7 @@ function useInput(Handler) {
       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);
@@ -5358,6 +5371,39 @@ extend(Manager.prototype, {
   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)) {
@@ -5454,7 +5500,8 @@ var fetch = function fetch(fc) {
 };
 
 var $provider = {
-  fetch: fetch
+  fetch: fetch,
+  componentValidate: componentValidate
 };
 
 var name$6 = 'html';
@@ -5585,7 +5632,7 @@ function FormCreateFactory(config) {
   }
 
   function $form() {
-    return $FormCreate(FormCreate);
+    return $FormCreate(FormCreate, components, directives);
   }
 
   function createFormApp(rule, option) {
@@ -6485,7 +6532,7 @@ function useFrame(maker) {
   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) {
@@ -6512,6 +6559,9 @@ function extendApi(api, h) {
         })["catch"](function (e) {
           reject(e);
           callback && callback(e);
+          h.vm.emit('validate-fail', e, {
+            api: api
+          });
         });
       });
     },
@@ -6530,6 +6580,10 @@ function extendApi(api, h) {
         })["catch"](function (e) {
           reject(e);
           callback && callback(e);
+          h.vm.emit('validate-field-fail', e, {
+            field: field,
+            api: api
+          });
         });
       });
     },
@@ -6723,7 +6777,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.1.20',
+    version: '3.1.22',
     manager: manager,
     extendApi: extendApi,
     install: install,