vxe-table 4.7.93 → 4.7.94

package/lib/index.umd.js

@@ -1998,9 +1998,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.93";
+const version = "4.7.94";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.93";
+core_.VxeUI.tableVersion = "4.7.94";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2384,7 +2384,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.93"}`;
+const log_version = `table v${"4.7.94"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6924,30 +6924,43 @@ const {
       } = reactData;
       const customOpts = computeCustomOpts.value;
       const {
-        checkMethod
+        checkMethod,
+        visibleMethod
       } = customOpts;
       const isAll = !customStore.isAll;
       if (customOpts.immediate) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
-          if (!checkMethod || checkMethod({
+          if (visibleMethod && !visibleMethod({
             column
           })) {
-            column.visible = isAll;
-            column.renderVisible = isAll;
-            column.halfVisible = false;
+            return;
           }
+          if (checkMethod && !checkMethod({
+            column
+          })) {
+            return;
+          }
+          column.visible = isAll;
+          column.renderVisible = isAll;
+          column.halfVisible = false;
         });
         customStore.isAll = isAll;
         $xeTable.handleCustom();
         $xeTable.saveCustomStore('update:visible');
       } else {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
-          if (!checkMethod || checkMethod({
+          if (visibleMethod && !visibleMethod({
             column
           })) {
-            column.renderVisible = isAll;
-            column.halfVisible = false;
+            return;
+          }
+          if (checkMethod && !checkMethod({
+            column
+          })) {
+            return;
           }
+          column.renderVisible = isAll;
+          column.halfVisible = false;
         });
         customStore.isAll = isAll;
       }
@@ -7109,6 +7122,7 @@ const {
             key: column.id,
             colid: column.id,
             class: ['vxe-table-custom--option', `level--${column.level}`, {
+              'is--hidden': isDisabled || isHidden,
               'is--group': isColGroup
             }],
             onDragstart: sortDragstartEvent,
@@ -7132,10 +7146,10 @@ const {
             class: 'vxe-table-custom--sort-option'
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: ['vxe-table-custom--sort-btn', {
-              'is--disabled': isHidden
+              'is--disabled': isDisabled || isHidden
             }],
             title: panel_getI18n('vxe.custom.setting.sortHelpTip'),
-            ...(isHidden ? {} : {
+            ...(isDisabled || isHidden ? {} : {
               onMousedown: sortMousedownEvent,
               onMouseup: sortMouseupEvent
             })
@@ -7154,7 +7168,7 @@ const {
             mode: 'text',
             icon: column.renderFixed === 'left' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT,
             status: column.renderFixed === 'left' ? 'primary' : '',
-            disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
+            disabled: isDisabled || isHidden || isMaxFixedColumn && !column.renderFixed,
             title: panel_getI18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft'),
             onClick: () => {
               changeFixedOption(column, 'left');
@@ -7163,7 +7177,7 @@ const {
             mode: 'text',
             icon: column.renderFixed === 'right' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,
             status: column.renderFixed === 'right' ? 'primary' : '',
-            disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
+            disabled: isDisabled || isHidden || isMaxFixedColumn && !column.renderFixed,
             title: panel_getI18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight'),
             onClick: () => {
               changeFixedOption(column, 'right');
@@ -7305,10 +7319,10 @@ const {
             class: 'vxe-table-custom-popup--column-item col--sort'
           }, [column.level === 1 ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: ['vxe-table-custom-popup--column-sort-btn', {
-              'is--disabled': isHidden
+              'is--disabled': isDisabled || isHidden
             }],
             title: panel_getI18n('vxe.custom.setting.sortHelpTip'),
-            ...(isHidden ? {} : {
+            ...(isDisabled || isHidden ? {} : {
               onMousedown: sortMousedownEvent,
               onMouseup: sortMouseupEvent
             })
@@ -7328,7 +7342,7 @@ const {
             class: 'vxe-table-custom-popup--column-item col--resizable'
           }, [column.children && column.children.length ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', '-') : VxeUIInputComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIInputComponent, {
             type: 'integer',
-            disabled: isHidden,
+            disabled: isDisabled || isHidden,
             modelValue: column.renderResizeWidth,
             'onUpdate:modelValue'(value) {
               column.renderResizeWidth = Math.max(0, Number(value));
@@ -7339,19 +7353,19 @@ const {
             modelValue: column.renderFixed || '',
             type: 'button',
             size: 'mini',
-            disabled: isHidden,
+            disabled: isDisabled || isHidden,
             options: [{
               label: panel_getI18n('vxe.custom.setting.fixedLeft'),
               value: 'left',
-              disabled: isHidden || isMaxFixedColumn
+              disabled: isDisabled || isHidden || isMaxFixedColumn
             }, {
               label: panel_getI18n('vxe.custom.setting.fixedUnset'),
               value: '',
-              disabled: isHidden
+              disabled: isDisabled || isHidden
             }, {
               label: panel_getI18n('vxe.custom.setting.fixedRight'),
               value: 'right',
-              disabled: isHidden || isMaxFixedColumn
+              disabled: isDisabled || isHidden || isMaxFixedColumn
             }],
             'onUpdate:modelValue'(value) {
               column.renderFixed = value;