vxe-table 3.9.13 → 3.9.15

package/es/table/src/header.js

@@ -1,7 +1,9 @@
 import XEUtils from 'xe-utils';
+import { VxeUI } from '../../ui';
 import { getClass } from '../../ui/src/utils';
 import { getOffsetPos, hasClass, addClass, removeClass } from '../../ui/src/dom';
 import { convertHeaderColumnToRows, getColReMinWidth } from './util';
+const { renderer } = VxeUI;
 const cellType = 'header';
 export default {
     name: 'VxeTableHeader',
@@ -118,13 +120,15 @@ export default {
                         class: ['vxe-header--row', headerRowClassName ? XEUtils.isFunction(headerRowClassName) ? headerRowClassName({ $table: $xetable, $rowIndex, fixed: fixedType, type: cellType }) : headerRowClassName : ''],
                         style: headerRowStyle ? (XEUtils.isFunction(headerRowStyle) ? headerRowStyle({ $table: $xetable, $rowIndex, fixed: fixedType, type: cellType }) : headerRowStyle) : null
                     }, cols.map((column, $columnIndex) => {
-                        const { type, showHeaderOverflow, headerAlign, align, headerClassName } = column;
+                        const { type, showHeaderOverflow, headerAlign, align, headerClassName, editRender, cellRender } = column;
                         // const { enabled } = tooltipOpts
                         const colid = column.id;
+                        const renderOpts = editRender || cellRender;
+                        const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
                         const isColGroup = column.children && column.children.length;
                         const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
                         const headOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
-                        const headAlign = headerAlign || align || allHeaderAlign || allAlign;
+                        const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
                         let showEllipsis = headOverflow === 'ellipsis';
                         const showTitle = headOverflow === 'title';
                         const showTooltip = headOverflow === true || headOverflow === 'tooltip';

package/es/ui/index.js

@@ -1,8 +1,8 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.9.13";
+export const version = "3.9.15";
 VxeUI.version = version;
-VxeUI.tableVersion = "3.9.13";
+VxeUI.tableVersion = "3.9.15";
 VxeUI.setConfig({
     emptyCell: '　',
     table: {

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.9.13"}`;
+const version = `table v${"3.9.15"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,9 +2220,9 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.9.13";
+const version = "3.9.15";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "3.9.13";
+core_.VxeUI.tableVersion = "3.9.15";
 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.13"}`;
+const log_version = `table v${"3.9.15"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -11754,7 +11754,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   let hasEllipsis = showTitle || showTooltip || showEllipsis;
   let isDirty;
   const tdOns = {};
-  const cellAlign = align || allAlign;
+  const cellAlign = align || (compConf ? compConf.tableCellAlign : '') || allAlign;
   const errorValidItem = validErrorMaps[`${rowid}:${column.id}`];
   const showValidTip = editRules && validOpts.showMessage && (validOpts.message === 'default' ? height || tableData.length > 1 : validOpts.message === 'inline');
   const attrs = {
@@ -12578,6 +12578,10 @@ function syncBodyScroll(_vm, fixedType, scrollTop, elem1, elem2) {
 
 
 
+
+const {
+  renderer: header_renderer
+} = core_.VxeUI;
 const cellType = 'header';
 /* harmony default export */ var header = ({
   name: 'VxeTableHeader',
@@ -12742,14 +12746,18 @@ const cellType = 'header';
           showHeaderOverflow,
           headerAlign,
           align,
-          headerClassName
+          headerClassName,
+          editRender,
+          cellRender
         } = column;
         // const { enabled } = tooltipOpts
         const colid = column.id;
+        const renderOpts = editRender || cellRender;
+        const compConf = renderOpts ? header_renderer.get(renderOpts.name) : null;
         const isColGroup = column.children && column.children.length;
         const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
         const headOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showHeaderOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
-        const headAlign = headerAlign || align || allHeaderAlign || allAlign;
+        const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
         let showEllipsis = headOverflow === 'ellipsis';
         const showTitle = headOverflow === 'title';
         const showTooltip = headOverflow === true || headOverflow === 'tooltip';
@@ -12947,7 +12955,11 @@ const cellType = 'header';
 
 
 
+
 const footer_cellType = 'footer';
+const {
+  renderer: footer_renderer
+} = core_.VxeUI;
 function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
   for (let mIndex = 0; mIndex < mergeFooterList.length; mIndex++) {
     const {
@@ -13119,13 +13131,17 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
           showFooterOverflow,
           footerAlign,
           align,
-          footerClassName
+          footerClassName,
+          editRender,
+          cellRender
         } = column;
+        const renderOpts = editRender || cellRender;
+        const compConf = renderOpts ? footer_renderer.get(renderOpts.name) : null;
         const showAllTip = tooltipOpts.showAll || tooltipOpts.enabled;
         const isColGroup = column.children && column.children.length;
         const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
         const footOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showFooterOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
-        const footAlign = footerAlign || align || allFooterAlign || allAlign;
+        const footAlign = footerAlign || (compConf ? compConf.tableFooterCellAlign : '') || allFooterAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
         let showEllipsis = footOverflow === 'ellipsis';
         const showTitle = footOverflow === 'title';
         const showTooltip = footOverflow === true || footOverflow === 'tooltip';
@@ -13629,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: {
@@ -13659,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
         }
@@ -13689,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: {
@@ -13702,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: {
@@ -13875,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
         }
@@ -13905,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: {
@@ -13920,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: {
@@ -14386,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
           })) {
-            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
+          })) {
+            return;
+          }
+          if (checkMethod && !checkMethod({
             column
           })) {
-            column.renderVisible = isAll;
-            column.halfVisible = false;
+            return;
           }
+          column.renderVisible = isAll;
+          column.halfVisible = false;
         });
         customStore.isAll = isAll;
       }