vxe-table 4.2.7-beta.5 → 4.2.8

package/lib/index.umd.js

@@ -8805,7 +8805,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.2.7-beta.4", "] ").concat(src_conf.i18n(message, params));
+  return "[vxe-table v".concat("4.2.8", "] ").concat(src_conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10831,7 +10831,7 @@ var v_x_e_table_config = new v_x_e_table_VXETableConfig();
 var v = 'v4';
 var VXETable = {
   v: v,
-  version: "4.2.7-beta.4",
+  version: "4.2.8",
   setup: setup_setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -28721,19 +28721,58 @@ var itemInfo_ItemInfo = /*#__PURE__*/function () {
 
 
 
+
+
+
 function isFormItem(item) {
   return item instanceof itemInfo_ItemInfo;
 }
 function createItem($xeform, _vm) {
   return isFormItem(_vm) ? _vm : new itemInfo_ItemInfo($xeform, _vm);
 }
-var util_handleFieldOrItem = function handleFieldOrItem($xeform, fieldOrItem) {
+function handleFieldOrItem($xeform, fieldOrItem) {
   if (fieldOrItem) {
     return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(fieldOrItem) ? $xeform.getItemByField(fieldOrItem) : fieldOrItem;
   }
 
   return null;
-};
+}
+function isHiddenItem($xeform, formItem) {
+  var reactData = $xeform.reactData;
+  var collapseAll = reactData.collapseAll;
+  var folding = formItem.folding,
+      visible = formItem.visible;
+  return visible === false || folding && collapseAll;
+}
+function isActivetem($xeform, formItem) {
+  var visibleMethod = formItem.visibleMethod,
+      itemRender = formItem.itemRender,
+      visible = formItem.visible,
+      field = formItem.field;
+
+  if (visible === false) {
+    return visible;
+  }
+
+  var compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null;
+
+  if (!visibleMethod && compConf && compConf.itemVisibleMethod) {
+    visibleMethod = compConf.itemVisibleMethod;
+  }
+
+  if (!visibleMethod) {
+    return true;
+  }
+
+  var data = $xeform.props.data;
+  return visibleMethod({
+    data: data,
+    field: field,
+    property: field,
+    item: formItem,
+    $form: $xeform
+  });
+}
 function watchItem(props, formItem) {
   Object.keys(props).forEach(function (name) {
     Object(external_commonjs_vue_commonjs2_vue_root_Vue_["watch"])(function () {
@@ -28859,6 +28898,7 @@ function renderTitle($xeform, item) {
 
 
 
+
 var VxeFormConfigItem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeFormConfigItem',
   props: {
@@ -28896,7 +28936,6 @@ var VxeFormConfigItem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["de
           title = item.title,
           visible = item.visible,
           folding = item.folding,
-          visibleMethod = item.visibleMethod,
           field = item.field,
           collapseNode = item.collapseNode,
           itemRender = item.itemRender,
@@ -28920,7 +28959,6 @@ var VxeFormConfigItem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["de
       var showTitle = itemOverflow === 'title';
       var showTooltip = itemOverflow === true || itemOverflow === 'tooltip';
       var hasEllipsis = showTitle || showTooltip || showEllipsis;
-      var itemVisibleMethod = visibleMethod;
       var params = {
         data: data,
         field: field,
@@ -28960,10 +28998,6 @@ var VxeFormConfigItem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["de
         }, childVNs) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])();
       }
 
-      if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
-        itemVisibleMethod = compConf.itemVisibleMethod;
-      }
-
       var contentVNs = [];
 
       if (defaultSlot) {
@@ -29007,7 +29041,7 @@ var VxeFormConfigItem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["de
           'is--asterisk': titleAsterisk,
           'is--required': isRequired,
           'is--hidden': folding && collapseAll,
-          'is--active': !itemVisibleMethod || itemVisibleMethod(params),
+          'is--active': isActivetem($xeform, item),
           'is--error': showError
         }],
         itemConfig: item,
@@ -29067,6 +29101,7 @@ var VxeFormConfigItem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["de
 
 
 
+
 
 
 var form_Rule = /*#__PURE__*/function () {
@@ -29348,7 +29383,7 @@ function getResetValue(value, resetValue) {
 
     var clearValidate = function clearValidate(fieldOrItem) {
       if (fieldOrItem) {
-        var item = util_handleFieldOrItem($xeform, fieldOrItem);
+        var item = handleFieldOrItem($xeform, fieldOrItem);
 
         if (item) {
           item.showError = false;
@@ -29535,7 +29570,7 @@ function getResetValue(value, resetValue) {
         itemList.forEach(function (item) {
           var field = item.field;
 
-          if (field) {
+          if (field && !isHiddenItem($xeform, item) && isActivetem($xeform, item)) {
             itemValids.push(validItemRules(type || 'all', field).then(function () {
               item.errRule = null;
             }).catch(function (_ref) {
@@ -29604,7 +29639,7 @@ function getResetValue(value, resetValue) {
     };
 
     var validateField = function validateField(fieldOrItem, callback) {
-      var item = util_handleFieldOrItem($xeform, fieldOrItem);
+      var item = handleFieldOrItem($xeform, fieldOrItem);
       return beginValidate(item ? [item] : [], '', callback);
     };
 
@@ -29694,7 +29729,7 @@ function getResetValue(value, resetValue) {
 
     var triggerItemEvent = function triggerItemEvent(evnt, field, itemValue) {
       if (field) {
-        return validItemRules(evnt ? evnt.type : 'all', field, itemValue).then(function () {
+        return validItemRules(evnt ? ['blur'].includes(evnt.type) ? 'blur' : 'change' : 'all', field, itemValue).then(function () {
           clearValidate(field);
         }).catch(function (_ref2) {
           var rule = _ref2.rule;
@@ -29897,7 +29932,7 @@ var formItemProps = {
     var refElem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
     var $xeform = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["inject"])('$xeform', {});
     var formGather = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["inject"])('$xeformgather', null);
-    var formItem = createItem($xeform, props);
+    var formItem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["reactive"])(createItem($xeform, props));
     var xeformitem = {
       formItem: formItem
     };
@@ -29932,7 +29967,6 @@ var formItemProps = {
           title = item.title,
           visible = item.visible,
           folding = item.folding,
-          visibleMethod = item.visibleMethod,
           field = item.field,
           collapseNode = item.collapseNode,
           itemRender = item.itemRender,
@@ -29953,7 +29987,6 @@ var formItemProps = {
       var showTitle = itemOverflow === 'title';
       var showTooltip = itemOverflow === true || itemOverflow === 'tooltip';
       var hasEllipsis = showTitle || showTooltip || showEllipsis;
-      var itemVisibleMethod = visibleMethod;
       var params = {
         data: data,
         field: field,
@@ -29963,6 +29996,10 @@ var formItemProps = {
       };
       var isRequired = false;
 
+      if (visible === false) {
+        return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])();
+      }
+
       if (rules) {
         var itemRules = rules[field];
 
@@ -29973,10 +30010,6 @@ var formItemProps = {
         }
       }
 
-      if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
-        itemVisibleMethod = compConf.itemVisibleMethod;
-      }
-
       var contentVNs = [];
 
       if (defaultSlot) {
@@ -30018,8 +30051,8 @@ var formItemProps = {
         class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
           'is--title': title,
           'is--required': isRequired,
-          'is--hidden': visible === false || folding && collapseAll,
-          'is--active': !itemVisibleMethod || itemVisibleMethod(params),
+          'is--hidden': folding && collapseAll,
+          'is--active': isActivetem($xeform, item),
           'is--error': showError
         }]
       }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {