@form-create/element-ui 3.2.39 → 3.2.41

package/dist/form-create.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.
@@ -2913,7 +2913,7 @@
         },
         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();
       },
@@ -4049,9 +4049,10 @@
 
         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) {
@@ -4077,7 +4078,7 @@
       },
       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);
 
@@ -4341,6 +4342,8 @@
             }
 
             vn = function vn() {
+              var _prop$col;
+
               for (var _len = arguments.length, slotValue = new Array(_len), _key = 0; _key < _len; _key++) {
                 slotValue[_key] = arguments[_key];
               }
@@ -4403,7 +4406,7 @@
 
               _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);
@@ -4960,6 +4963,10 @@
           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,
@@ -5246,6 +5253,7 @@
     },
     initProp: function initProp() {
       var _this3 = this,
+          _rule$col,
           _this$refRule,
           _this$refRule$__$vali;
 
@@ -5256,6 +5264,11 @@
       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() {
@@ -8781,7 +8794,7 @@
       },
       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];
         });
 
@@ -8810,6 +8823,10 @@
       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);
@@ -9435,7 +9452,9 @@
       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',
@@ -9906,7 +9925,7 @@
   function elmFormCreate() {
     return FormCreateFactory({
       ui: 'element-ui',
-      version: '3.2.39',
+      version: '3.2.41',
       manager: manager,
       extendApi: extendApi,
       install: install,