vxe-table 3.9.14 → 3.9.16

package/lib/index.umd.js

@@ -2220,9 +2220,9 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.9.14";
+const version = "3.9.16";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "3.9.14";
+core_.VxeUI.tableVersion = "3.9.16";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2764,7 +2764,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.9.14"}`;
+const log_version = `table v${"3.9.16"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3392,7 +3392,7 @@ function colToVisible($xeTable, column) {
 ;// CONCATENATED MODULE: ./packages/ui/src/vn.ts
 
 function getOnName(type) {
-  return type;
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().kebabCase(type);
 }
 function getModelEvent(renderOpts) {
   switch (renderOpts.name) {
@@ -13645,7 +13645,7 @@ const renderSimplePanel = (h, _vm) => {
           colid: column.id
         },
         class: ['vxe-table-custom--option', `level--${column.level}`, {
-          'is--hidden': isHidden,
+          'is--hidden': isDisabled || isHidden,
           'is--group': isColGroup
         }],
         on: {
@@ -13675,12 +13675,12 @@ const renderSimplePanel = (h, _vm) => {
         class: 'vxe-table-custom--sort-option'
       }, [h('span', {
         class: ['vxe-table-custom--sort-btn', {
-          'is--disabled': isHidden
+          'is--disabled': isDisabled || isHidden
         }],
         attrs: {
           title: panel_getI18n('vxe.custom.setting.sortHelpTip')
         },
-        on: isHidden ? {} : {
+        on: isDisabled || isHidden ? {} : {
           mousedown: _vm.sortMousedownEvent,
           mouseup: _vm.sortMouseupEvent
         }
@@ -13705,7 +13705,7 @@ const renderSimplePanel = (h, _vm) => {
           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')
         },
         on: {
@@ -13718,7 +13718,7 @@ const renderSimplePanel = (h, _vm) => {
           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')
         },
         on: {
@@ -13891,12 +13891,12 @@ const renderPopupPanel = (h, _vm) => {
         class: 'vxe-table-custom-popup--column-item col--sort'
       }, [column.level === 1 ? h('span', {
         class: ['vxe-table-custom-popup--column-sort-btn', {
-          'is--disabled': isHidden
+          'is--disabled': isDisabled || isHidden
         }],
         attrs: {
           title: panel_getI18n('vxe.custom.setting.sortHelpTip')
         },
-        on: isHidden ? {} : {
+        on: isDisabled || isHidden ? {} : {
           mousedown: _vm.sortMousedownEvent,
           mouseup: _vm.sortMouseupEvent
         }
@@ -13921,7 +13921,7 @@ const renderPopupPanel = (h, _vm) => {
       }, [column.children && column.children.length ? h('span', '-') : VxeUIInputComponent ? h(VxeUIInputComponent, {
         props: {
           type: 'integer',
-          disabled: isHidden,
+          disabled: isDisabled || isHidden,
           value: column.renderResizeWidth
         },
         on: {
@@ -13936,19 +13936,19 @@ const renderPopupPanel = (h, _vm) => {
           value: 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
           }]
         },
         on: {
@@ -14402,30 +14402,43 @@ const renderPopupPanel = (h, _vm) => {
         customOpts
       } = $xetable;
       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
+          })) {
+            return;
+          }
+          if (checkMethod && !checkMethod({
             column
           })) {
-            column.visible = isAll;
-            column.renderVisible = isAll;
-            column.halfVisible = false;
+            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;
       }