@form-create/element-ui 3.2.39 → 3.2.41

package/dist/form-create.esm.js

@@ -1,5 +1,5 @@
 /*!
- * @form-create/element-ui v3.2.39
+ * @form-create/element-ui v3.2.41
  * (c) 2018-2026 xaboy
  * Github https://github.com/xaboy/form-create
  * Released under the MIT License.
@@ -2909,7 +2909,7 @@ function $FormCreate(FormCreate, components, directives) {
       },
       inFor: Boolean
     },
-    emits: ['update:api', 'update:modelValue', 'mounted', 'submit', 'reset', 'change', 'emit-event', 'control', 'remove-rule', 'remove-field', 'sync', 'reload', 'repeat-field', 'update', 'validate-field-fail', 'validate-fail', 'created'],
+    emits: ['update:api', 'update:modelValue', 'mounted', 'beforeUnmount', 'submit', 'reset', 'change', 'emit-event', 'control', 'remove-rule', 'remove-field', 'sync', 'reload', 'repeat-field', 'update', 'validate-field-fail', 'validate-fail', 'created'],
     render: function render() {
       return this.fc.render();
     },
@@ -4045,9 +4045,10 @@ function Api(h) {
 
       return (_h$vm$setupState$getG = h.vm.setupState.getGroupInject()) === null || _h$vm$setupState$getG === void 0 ? void 0 : _h$vm$setupState$getG.rule;
     },
-    fetch: function fetch(opt) {
+    fetch: function fetch(_opt) {
       return new Promise(function (resolve, reject) {
-        opt = deepCopy(opt);
+        var opt = _objectSpread2({}, _opt);
+
         opt = h.loadFetchVar(opt);
 
         var fail = function fail(e) {
@@ -4073,7 +4074,7 @@ function Api(h) {
     },
     watchFetch: function watchFetch(opt, callback, error, beforeFetch) {
       return h.fc.watchLoadData(function (get, change) {
-        var _opt = deepCopy(opt);
+        var _opt = _objectSpread2({}, opt);
 
         _opt = h.loadFetchVar(_opt, get);
 
@@ -4337,6 +4338,8 @@ function useRender$1(Render) {
           }
 
           vn = function vn() {
+            var _prop$col;
+
             for (var _len = arguments.length, slotValue = new Array(_len), _key = 0; _key < _len; _key++) {
               slotValue[_key] = arguments[_key];
             }
@@ -4399,7 +4402,7 @@ function useRender$1(Render) {
 
             _vn = _this4.renderSides(_vn, ctx);
 
-            if ((ctx.input || !is.Undef(prop["native"]) || prop.col.show !== false) && prop["native"] !== true) {
+            if ((!(!ctx.input && is.Undef(prop["native"])) || ((_prop$col = prop.col) === null || _prop$col === void 0 ? void 0 : _prop$col.show) === true) && prop["native"] !== true) {
               _this4.fc.targetFormDriver('updateWrap', ctx);
 
               _vn = _this4.$manager.makeWrap(ctx, _vn);
@@ -4956,6 +4959,10 @@ function useInject(Handler) {
         group = rule.__fc__.getParentGroup();
       }
 
+      if (!group && options.targetRule && options.targetRule.__fc__) {
+        group = options.targetRule.__fc__.getParentGroup();
+      }
+
       var loadVal = function loadVal(str) {
         return _this4.loadStrVar(str, get, group ? {
           rule: rule,
@@ -5242,6 +5249,7 @@ extend(RuleContext.prototype, {
   },
   initProp: function initProp() {
     var _this3 = this,
+        _rule$col,
         _this$refRule,
         _this$refRule$__$vali;
 
@@ -5252,6 +5260,11 @@ extend(RuleContext.prototype, {
     this.prop = mergeRule({}, [rule].concat(_toConsumableArray(Object.keys(this.payload).map(function (k) {
       return _this3.payload[k];
     })), [this.computed]));
+
+    if (rule.col && ((_rule$col = rule.col) === null || _rule$col === void 0 ? void 0 : _rule$col.show) !== false) {
+      this.prop.col.show = true;
+    }
+
     this.prop.validate = [].concat(_toConsumableArray(((_this$refRule = this.refRule) === null || _this$refRule === void 0 ? void 0 : (_this$refRule$__$vali = _this$refRule.__$validate) === null || _this$refRule$__$vali === void 0 ? void 0 : _this$refRule$__$vali.value) || []), _toConsumableArray(this.prop.validate || []));
   },
   initNone: function initNone() {
@@ -8777,7 +8790,7 @@ function FormCreateFactory(config) {
     },
     mergeOptions: function mergeOptions(target, opt, parent) {
       opt = _objectSpread2({}, opt || {});
-      parent && ['page', 'onSubmit', 'onReset', 'onCreated', 'onChange', 'onMounted', 'mounted', 'onReload', 'reload', 'formData', 'el', 'globalClass', 'style'].forEach(function (n) {
+      parent && ['page', 'onSubmit', 'onReset', 'onCreated', 'onChange', 'onMounted', 'mounted', 'beforeUnmount', 'onBeforeUnmount', 'onReload', 'reload', 'formData', 'el', 'globalClass', 'style'].forEach(function (n) {
         delete opt[n];
       });
 
@@ -8806,6 +8819,10 @@ function FormCreateFactory(config) {
     unmount: function unmount() {
       var _this7 = this;
 
+      invoke(function () {
+        return _this7.$handle.lifecycle('beforeUnmount');
+      });
+
       if (this.name) {
         if (this.inFor) {
           var idx = instance[this.name].indexOf(this);
@@ -9431,7 +9448,9 @@ var manager = {
     return this.$r(_prop, children);
   },
   makeCol: function makeCol(rule, uni, children) {
-    var col = rule.col;
+    var col = _objectSpread2({}, rule.col);
+
+    delete col.show;
     return this.$r({
       "class": this.$render.mergeClass(col["class"], 'fc-form-col'),
       type: 'col',
@@ -9902,7 +9921,7 @@ function install(FormCreate) {
 function elmFormCreate() {
   return FormCreateFactory({
     ui: 'element-ui',
-    version: '3.2.39',
+    version: '3.2.41',
     manager: manager,
     extendApi: extendApi,
     install: install,