vxe-table 3.5.9-beta.10 → 3.5.9-beta.13

package/lib/index.umd.js

@@ -8808,7 +8808,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.9-beta.9", "] ").concat(src_conf.i18n(message, params));
+  return "[vxe-table v".concat("3.5.9-beta.13", "] ").concat(src_conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10089,7 +10089,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.5.9-beta.9",
+  version: "3.5.9-beta.13",
   reg: reg,
   use: use,
   setup: setup,
@@ -11906,6 +11906,7 @@ var convertToRows = function convertToRows(originColumns) {
 
 
 
+
 var cellType = 'header';
 /* harmony default export */ var header = ({
   name: 'VxeTableHeader',
@@ -12239,7 +12240,8 @@ var cellType = 'header';
       document.onmouseup = function (evnt) {
         document.onmousemove = domMousemove;
         document.onmouseup = domMouseup;
-        column.resizeWidth = column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
+        var resizeWidth = column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
+        column.resizeWidth = resizeWidth;
         resizeBarElem.style.display = 'none';
         $xetable._isResize = false;
         $xetable._lastResizeTime = Date.now();
@@ -12247,7 +12249,9 @@ var cellType = 'header';
         $xetable.recalculate(true).then(function () {
           $xetable.saveCustomResizable();
           $xetable.updateCellAreas();
-          $xetable.emitEvent('resizable-change', params, evnt);
+          $xetable.emitEvent('resizable-change', _objectSpread2(_objectSpread2({}, params), {}, {
+            resizeWidth: resizeWidth
+          }), evnt);
         });
         dom.removeClass($xetable.$el, 'drag--resize');
       };
@@ -36024,6 +36028,10 @@ var Textarea = Object.assign(src_textarea, {
         contents.push(h('i', {
           class: ['vxe-button--loading-icon', src_conf.icon.BUTTON_LOADING]
         }));
+      } else if ($scopedSlots.icon) {
+        contents.push(h('span', {
+          class: 'vxe-button--custom-icon'
+        }, $scopedSlots.icon.call(this, {})));
       } else if (icon) {
         contents.push(h('i', {
           class: ['vxe-button--icon', icon]
@@ -36033,7 +36041,7 @@ var Textarea = Object.assign(src_textarea, {
       if ($scopedSlots.default) {
         contents.push(h('span', {
           class: 'vxe-button--content'
-        }, $scopedSlots.default.call(this)));
+        }, $scopedSlots.default.call(this, {})));
       } else if (content) {
         contents.push(h('span', {
           class: 'vxe-button--content'
@@ -36813,6 +36821,7 @@ var Tooltip = Object.assign(tooltip, {
 
 
 
+
 var util_ItemConfig = /*#__PURE__*/function () {
   function ItemConfig($xeform, item) {
     _classCallCheck(this, ItemConfig);
@@ -36870,6 +36879,41 @@ var util_handleFieldOrItem = function handleFieldOrItem($xeform, fieldOrItem) {
 
   return null;
 };
+function isHiddenItem($xeform, formItem) {
+  var collapseAll = $xeform.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) ? v_x_e_table.renderer.get(itemRender.name) : null;
+
+  if (!visibleMethod && compConf && compConf.itemVisibleMethod) {
+    visibleMethod = compConf.itemVisibleMethod;
+  }
+
+  if (!visibleMethod) {
+    return true;
+  }
+
+  var data = $xeform.data;
+  return visibleMethod({
+    data: data,
+    field: field,
+    property: field,
+    item: formItem,
+    $form: $xeform
+  });
+}
 function createItem($xeform, _vm) {
   return getItemConfig($xeform, _vm);
 }
@@ -36982,6 +37026,7 @@ function renderTitle(h, _vm, item) {
 
 
 
+
 /**
  * 配置式项
  */
@@ -36999,9 +37044,7 @@ var VxeFormConfigItem = {
   provide: function provide() {
     return {
       $xeformgather: null,
-      $xeformiteminfo: {
-        itemConfig: this.itemConfig
-      }
+      $xeformiteminfo: this
     };
   },
   render: function render(h) {
@@ -37021,7 +37064,6 @@ var VxeFormConfigItem = {
         title = item.title,
         folding = item.folding,
         visible = item.visible,
-        visibleMethod = item.visibleMethod,
         field = item.field,
         collapseNode = item.collapseNode,
         itemRender = item.itemRender,
@@ -37038,7 +37080,6 @@ var VxeFormConfigItem = {
     var titleWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
     var titleColon = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleColon) ? allTitleColon : item.titleColon;
     var titleAsterisk = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
-    var itemVisibleMethod = visibleMethod;
     var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isUndefined(titleOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
     var showEllipsis = itemOverflow === 'ellipsis';
     var showTitle = itemOverflow === 'title';
@@ -37074,10 +37115,6 @@ var VxeFormConfigItem = {
       }, childVNs) : _e();
     }
 
-    if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
-      itemVisibleMethod = compConf.itemVisibleMethod;
-    }
-
     if (rules) {
       var itemRules = rules[field];
 
@@ -37107,13 +37144,13 @@ var VxeFormConfigItem = {
       mouseleave: $xeform.handleTitleTipLeaveEvent
     } : {};
     return h('div', {
-      class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : null, 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) : className : '', {
+      class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : null, 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--colon': titleColon,
         'is--asterisk': titleAsterisk,
         'is--required': isRequired,
         'is--hidden': folding && collapseAll,
-        'is--active': !itemVisibleMethod || itemVisibleMethod(params),
+        'is--active': isActivetem(this, item),
         'is--error': showError
       }],
       props: {
@@ -37181,6 +37218,7 @@ var VxeFormConfigItem = {
 
 
 
+
 
 
 var form_Rule = /*#__PURE__*/function () {
@@ -37667,7 +37705,7 @@ function getResetValue(value, resetValue) {
         itemList.forEach(function (item) {
           var field = item.field;
 
-          if (field) {
+          if (field && !isHiddenItem(_this6, item) && isActivetem(_this6, item)) {
             itemValids.push(_this6.validItemRules(type || 'all', field).then(function () {
               item.errRule = null;
             }).catch(function (_ref2) {
@@ -37861,7 +37899,7 @@ function getResetValue(value, resetValue) {
       var _this9 = this;
 
       if (field) {
-        return this.validItemRules(evnt ? evnt.type : 'all', field, itemValue).then(function () {
+        return this.validItemRules(evnt ? ['blur'].includes(evnt.type) ? 'blur' : 'change' : 'all', field, itemValue).then(function () {
           _this9.clearValidate(field);
         }).catch(function (_ref3) {
           var rule = _ref3.rule;
@@ -37954,7 +37992,8 @@ Object.keys(form_item_props).forEach(function (name) {
 });
 
 var form_item_renderItem = function renderItem(h, _vm, item, slots) {
-  var rules = _vm.rules,
+  var _e = _vm._e,
+      rules = _vm.rules,
       data = _vm.data,
       collapseAll = _vm.collapseAll,
       validOpts = _vm.validOpts,
@@ -37962,7 +38001,6 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
   var title = item.title,
       folding = item.folding,
       visible = item.visible,
-      visibleMethod = item.visibleMethod,
       field = item.field,
       collapseNode = item.collapseNode,
       itemRender = item.itemRender,
@@ -37976,7 +38014,6 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
   var align = item.align || _vm.align;
   var titleAlign = item.titleAlign || _vm.titleAlign;
   var titleWidth = item.titleWidth || _vm.titleWidth;
-  var itemVisibleMethod = visibleMethod;
   var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isUndefined(titleOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
   var showEllipsis = itemOverflow === 'ellipsis';
   var showTitle = itemOverflow === 'title';
@@ -37991,8 +38028,8 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
   };
   var isRequired;
 
-  if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
-    itemVisibleMethod = compConf.itemVisibleMethod;
+  if (visible === false) {
+    return _e();
   }
 
   if (rules) {
@@ -38027,8 +38064,8 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
     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(_vm, item),
       'is--error': showError
     }]
   }, [h('div', {
@@ -38077,9 +38114,7 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
   provide: function provide() {
     return {
       $xeformitem: this,
-      $xeformiteminfo: {
-        itemConfig: this.itemConfig
-      }
+      $xeformiteminfo: this
     };
   },
   data: function data() {
@@ -38122,9 +38157,7 @@ var FormItem = Object.assign(form_item, {
     return {
       $xeformgather: this,
       xeformitem: null,
-      $xeformiteminfo: {
-        itemConfig: this.itemConfig
-      }
+      $xeformiteminfo: this
     };
   },
   created: function created() {