vxe-table 4.16.10 → 4.16.11

package/es/table/src/cell.js

@@ -161,12 +161,12 @@ function renderTitleContent(params, content) {
     const { $table, column } = params;
     const tableProps = $table.props;
     const tableReactData = $table.reactData;
-    const { computeTooltipOpts } = $table.getComputeMaps();
+    const { computeHeaderTooltipOpts } = $table.getComputeMaps();
     const { showHeaderOverflow: allColumnHeaderOverflow } = tableProps;
     const { isRowGroupStatus } = tableReactData;
     const { showHeaderOverflow } = column;
-    const tooltipOpts = computeTooltipOpts.value;
-    const showAllTip = tooltipOpts.showAll;
+    const headerTooltipOpts = computeHeaderTooltipOpts.value;
+    const showAllTip = headerTooltipOpts.showAll;
     const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
     const showTitle = headOverflow === 'title';
     const showTooltip = headOverflow === true || headOverflow === 'tooltip';
@@ -759,7 +759,9 @@ export const Cell = {
         const { treeConfig } = tableProps;
         const { updateCheckboxFlag, isRowGroupStatus } = tableReactData;
         const { selectCheckboxMaps, treeIndeterminateRowMaps } = tableInternalData;
-        const { computeCheckboxOpts } = $table.getComputeMaps();
+        const { computeCheckboxOpts, computeAggregateOpts } = $table.getComputeMaps();
+        const aggregateOpts = computeAggregateOpts.value;
+        const { mapChildrenField } = aggregateOpts;
         const checkboxOpts = computeCheckboxOpts.value;
         const { labelField, checkMethod, visibleMethod } = checkboxOpts;
         const { slots } = column;
@@ -767,23 +769,30 @@ export const Cell = {
         const checkboxSlot = slots ? slots.checkbox : null;
         let indeterminate = false;
         let isChecked = false;
-        const isVisible = !visibleMethod || visibleMethod({ $table, row });
-        let isDisabled = !!checkMethod;
+        let isVisible = true;
+        let isDisabled = false;
         const ons = {};
         if (!isHidden) {
             const rowid = getRowid($table, row);
             isChecked = !!updateCheckboxFlag && !!selectCheckboxMaps[rowid];
-            ons.onClick = (evnt) => {
-                if (!isDisabled && isVisible) {
-                    $table.triggerCheckRowEvent(evnt, params, !isChecked);
+            if (checkMethod && isRowGroupStatus && $table.isAggregateRecord(row)) {
+                const childList = row[mapChildrenField || ''];
+                if (!childList || !childList.length || childList.every(item => !checkMethod({ $table, row: item }))) {
+                    isDisabled = true;
                 }
-            };
-            if (checkMethod) {
-                isDisabled = !checkMethod({ $table, row });
+            }
+            else {
+                isVisible = !visibleMethod || visibleMethod({ $table, row });
+                isDisabled = checkMethod ? !checkMethod({ $table, row }) : !!checkMethod;
             }
             if (treeConfig || isRowGroupStatus) {
                 indeterminate = !!treeIndeterminateRowMaps[rowid];
             }
+            ons.onClick = (evnt) => {
+                if (!isDisabled && isVisible) {
+                    $table.triggerCheckRowEvent(evnt, params, !isChecked);
+                }
+            };
         }
         const checkboxParams = Object.assign(Object.assign({}, params), { checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate });
         if (checkboxSlot) {
@@ -820,41 +829,50 @@ export const Cell = {
         const { treeConfig } = tableProps;
         const { updateCheckboxFlag, isRowGroupStatus } = tableReactData;
         const { treeIndeterminateRowMaps } = tableInternalData;
-        const { computeCheckboxOpts } = $table.getComputeMaps();
+        const { computeCheckboxOpts, computeAggregateOpts } = $table.getComputeMaps();
+        const aggregateOpts = computeAggregateOpts.value;
+        const { mapChildrenField } = aggregateOpts;
         const checkboxOpts = computeCheckboxOpts.value;
         const { labelField, checkField, checkMethod, visibleMethod } = checkboxOpts;
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
         const { slots } = column;
         const defaultSlot = slots ? slots.default : null;
         const checkboxSlot = slots ? slots.checkbox : null;
-        let isIndeterminate = false;
+        let indeterminate = false;
         let isChecked = false;
-        const isVisible = !visibleMethod || visibleMethod({ $table, row });
-        let isDisabled = !!checkMethod;
+        let isVisible = true;
+        let isDisabled = false;
         const ons = {};
         if (!isHidden) {
             const rowid = getRowid($table, row);
             isChecked = !!updateCheckboxFlag && XEUtils.get(row, checkField);
+            if (checkMethod && isRowGroupStatus && $table.isAggregateRecord(row)) {
+                const childList = row[mapChildrenField || ''];
+                if (!childList || !childList.length || childList.every(item => !checkMethod({ $table, row: item }))) {
+                    isDisabled = true;
+                }
+            }
+            else {
+                isVisible = !visibleMethod || visibleMethod({ $table, row });
+                isDisabled = checkMethod ? !checkMethod({ $table, row }) : !!checkMethod;
+            }
+            if (treeConfig || isRowGroupStatus) {
+                indeterminate = !!treeIndeterminateRowMaps[rowid];
+            }
             ons.onClick = (evnt) => {
                 if (!isDisabled && isVisible) {
                     $table.triggerCheckRowEvent(evnt, params, !isChecked);
                 }
             };
-            if (checkMethod) {
-                isDisabled = !checkMethod({ $table, row });
-            }
-            if (treeConfig || isRowGroupStatus) {
-                isIndeterminate = !!treeIndeterminateRowMaps[rowid];
-            }
         }
-        const checkboxParams = Object.assign(Object.assign({}, params), { checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate: isIndeterminate });
+        const checkboxParams = Object.assign(Object.assign({}, params), { checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate });
         if (checkboxSlot) {
             return renderCellBaseVNs(params, $table.callSlot(checkboxSlot, checkboxParams));
         }
         const checkVNs = [];
         if (isVisible) {
             checkVNs.push(h('span', {
-                class: ['vxe-checkbox--icon', isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : (isDisabled ? getIcon().TABLE_CHECKBOX_DISABLED_UNCHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED))]
+                class: ['vxe-checkbox--icon', indeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : (isDisabled ? getIcon().TABLE_CHECKBOX_DISABLED_UNCHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED))]
             }));
             if (defaultSlot || labelField) {
                 checkVNs.push(h('span', {
@@ -866,7 +884,7 @@ export const Cell = {
             h('span', Object.assign({ class: ['vxe-cell--checkbox', {
                         'is--checked': isChecked,
                         'is--disabled': isDisabled,
-                        'is--indeterminate': indeterminateField && !isChecked ? row[indeterminateField] : isIndeterminate,
+                        'is--indeterminate': indeterminateField && !isChecked ? row[indeterminateField] : indeterminate,
                         'is--hidden': !isVisible
                     }] }, ons), checkVNs)
         ]);

package/es/table/src/footer.js

@@ -29,7 +29,7 @@ export default defineVxeComponent({
     setup(props) {
         const $xeTable = inject('$xeTable', {});
         const { xID, props: tableProps, reactData: tableReactData, internalData: tableInternalData } = $xeTable;
-        const { computeTooltipOpts, computeColumnOpts, computeCellOpts, computeFooterCellOpts, computeDefaultRowHeight, computeResizableOpts, computeVirtualXOpts } = $xeTable.getComputeMaps();
+        const { computeFooterTooltipOpts, computeColumnOpts, computeCellOpts, computeFooterCellOpts, computeDefaultRowHeight, computeResizableOpts, computeVirtualXOpts } = $xeTable.getComputeMaps();
         const refElem = ref();
         const refFooterScroll = ref();
         const refFooterTable = ref();
@@ -44,7 +44,7 @@ export default defineVxeComponent({
             const { scrollXLoad, scrollYLoad, overflowX, currentColumn, mergeFootFlag } = tableReactData;
             const { fullColumnIdData, mergeFooterList, mergeFooterCellMaps, scrollXStore } = tableInternalData;
             const virtualXOpts = computeVirtualXOpts.value;
-            const tooltipOpts = computeTooltipOpts.value;
+            const footerTooltipOpts = computeFooterTooltipOpts.value;
             const resizableOpts = computeResizableOpts.value;
             const { isAllColumnDrag } = resizableOpts;
             const columnOpts = computeColumnOpts.value;
@@ -58,7 +58,7 @@ export default defineVxeComponent({
                 const colRest = fullColumnIdData[colid] || {};
                 const renderOpts = editRender || cellRender;
                 const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
-                const showAllTip = tooltipOpts.showAll;
+                const showAllTip = footerTooltipOpts.showAll;
                 const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
                 const isPadding = XEUtils.isBoolean(footerCellOpts.padding) ? footerCellOpts.padding : cellOpts.padding;
                 const footOverflow = XEUtils.eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;

package/es/table/src/props.js

@@ -241,6 +241,10 @@ export const tableProps = {
     checkboxConfig: Object,
     // tooltip 配置项
     tooltipConfig: Object,
+    // 表头 tooltip 配置项
+    headerTooltipConfig: Object,
+    // 表尾 tooltip 配置项
+    footerTooltipConfig: Object,
     // 导出配置项
     exportConfig: Object,
     // 导入配置项

package/es/table/src/table.js

@@ -509,6 +509,12 @@ export default defineVxeComponent({
         const computeTooltipOpts = computed(() => {
             return Object.assign({}, getConfig().tooltip, getConfig().table.tooltipConfig, props.tooltipConfig);
         });
+        const computeHeaderTooltipOpts = computed(() => {
+            return Object.assign({}, getConfig().tooltip, getConfig().table.headerTooltipConfig, props.headerTooltipConfig);
+        });
+        const computeFooterTooltipOpts = computed(() => {
+            return Object.assign({}, getConfig().tooltip, getConfig().table.footerTooltipConfig, props.footerTooltipConfig);
+        });
         const computeTableTipConfig = computed(() => {
             const { tooltipStore } = reactData;
             const tooltipOpts = computeTooltipOpts.value;
@@ -785,6 +791,8 @@ export default defineVxeComponent({
             computeRadioOpts,
             computeCheckboxOpts,
             computeTooltipOpts,
+            computeHeaderTooltipOpts,
+            computeFooterTooltipOpts,
             computeEditOpts,
             computeSortOpts,
             computeFilterOpts,
@@ -8068,16 +8076,15 @@ export default defineVxeComponent({
          * @param {Event} evnt 事件
          * @param {Row} row 行对象
          */
-        const handleTooltip = (evnt, type, tdEl, overflowElem, tipElem, params) => {
+        const handleTooltip = (evnt, tipOpts, type, tdEl, overflowElem, tipElem, params) => {
             const tipOverEl = overflowElem || tdEl;
             if (!tipOverEl) {
                 return nextTick();
             }
             params.cell = tdEl;
             const { tooltipStore } = reactData;
-            const tooltipOpts = computeTooltipOpts.value;
             const { column, row } = params;
-            const { showAll, contentMethod } = tooltipOpts;
+            const { showAll, contentMethod } = tipOpts;
             const customContent = contentMethod ? contentMethod(params) : null;
             const useCustom = contentMethod && !XEUtils.eqNull(customContent);
             const content = useCustom ? customContent : XEUtils.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim();
@@ -8090,7 +8097,7 @@ export default defineVxeComponent({
                     visible: true,
                     content: tipContent,
                     type,
-                    currOpts: {}
+                    currOpts: tipOpts
                 });
                 nextTick(() => {
                     const $tooltip = refTooltip.value;
@@ -8997,6 +9004,8 @@ export default defineVxeComponent({
                 const { treeConfig } = props;
                 const { isRowGroupStatus } = reactData;
                 const { afterFullData, afterTreeFullData, afterGroupFullData, checkboxReserveRowMap, selectCheckboxMaps, treeIndeterminateRowMaps } = internalData;
+                const aggregateOpts = computeAggregateOpts.value;
+                const { mapChildrenField } = aggregateOpts;
                 const checkboxOpts = computeCheckboxOpts.value;
                 const { checkField, checkMethod, showReserveStatus } = checkboxOpts;
                 const { handleGetRowId } = createHandleGetRowId($xeTable);
@@ -9010,7 +9019,21 @@ export default defineVxeComponent({
                     ? row => {
                         const childRowid = handleGetRowId(row);
                         const selected = checkField ? XEUtils.get(row, checkField) : selectCheckboxMaps[childRowid];
-                        if (checkMethod({ $table: $xeTable, row })) {
+                        if (isRowGroupStatus && $xeTable.isAggregateRecord(row)) {
+                            const childList = row[mapChildrenField || ''];
+                            if (selected) {
+                                vLen++;
+                                sLen++;
+                            }
+                            else if (treeIndeterminateRowMaps[childRowid]) {
+                                vLen++;
+                                hLen++;
+                            }
+                            else if (childList && childList.length && childList.some(item => checkMethod({ $table: $xeTable, row: item }))) {
+                                vLen++;
+                            }
+                        }
+                        else if (checkMethod({ $table: $xeTable, row })) {
                             if (selected) {
                                 sLen++;
                             }
@@ -9207,6 +9230,7 @@ export default defineVxeComponent({
              */
             triggerHeaderTooltipEvent(evnt, params) {
                 const { tooltipStore } = reactData;
+                const headerTooltipOpts = computeHeaderTooltipOpts.value;
                 const { column } = params;
                 handleTargetEnterEvent(true);
                 const titleElem = evnt.currentTarget;
@@ -9227,7 +9251,7 @@ export default defineVxeComponent({
                 }
                 if (tooltipStore.column !== column || !tooltipStore.visible) {
                     const ctEl = thEl.querySelector('.vxe-cell--title');
-                    handleTooltip(evnt, 'header', thEl, (hasClass(thEl, 'col--ellipsis') ? ctEl : cWrapperEl) || cWrapperEl, ctEl || cellEl, params);
+                    handleTooltip(evnt, headerTooltipOpts, 'header', thEl, (hasClass(thEl, 'col--ellipsis') ? ctEl : cWrapperEl) || cWrapperEl, ctEl || cellEl, params);
                 }
             },
             /**
@@ -9237,6 +9261,7 @@ export default defineVxeComponent({
                 const { editConfig } = props;
                 const { editStore } = reactData;
                 const { tooltipStore } = reactData;
+                const tooltipOpts = computeTooltipOpts.value;
                 const editOpts = computeEditOpts.value;
                 const { actived } = editStore;
                 const { row, column } = params;
@@ -9263,7 +9288,7 @@ export default defineVxeComponent({
                     if (!tipEl) {
                         tipEl = ctEl;
                     }
-                    handleTooltip(evnt, 'body', tdEl, ovEl || ctEl, tipEl, params);
+                    handleTooltip(evnt, tooltipOpts, 'body', tdEl, ovEl || ctEl, tipEl, params);
                 }
             },
             /**
@@ -9272,6 +9297,7 @@ export default defineVxeComponent({
             triggerFooterTooltipEvent(evnt, params) {
                 const { column } = params;
                 const { tooltipStore } = reactData;
+                const footerTooltipOpts = computeFooterTooltipOpts.value;
                 const tdEl = evnt.currentTarget;
                 handleTargetEnterEvent(tooltipStore.column !== column || !!tooltipStore.row);
                 if (tooltipStore.column !== column || !tooltipStore.visible) {
@@ -9284,7 +9310,7 @@ export default defineVxeComponent({
                     if (!tipEl) {
                         tipEl = ctEl;
                     }
-                    handleTooltip(evnt, 'footer', tdEl, ovEl || ctEl, tipEl, params);
+                    handleTooltip(evnt, footerTooltipOpts, 'footer', tdEl, ovEl || ctEl, tipEl, params);
                 }
             },
             handleTargetLeaveEvent() {
@@ -9524,7 +9550,7 @@ export default defineVxeComponent({
                         }
                     }
                 }
-                if (!checkMethod || checkMethod({ $table: $xeTable, row })) {
+                if (isRowGroupStatus || !checkMethod || checkMethod({ $table: $xeTable, row })) {
                     $xeTable.handleBatchSelectRows([row], checked);
                     $xeTable.checkSelectionStatus();
                     dispatchEvent('checkbox-change', Object.assign({

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.16.10";
+export const version = "4.16.11";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -62,6 +62,12 @@ VxeUI.setConfig({
         tooltipConfig: {
             enterable: true
         },
+        headerTooltipConfig: {
+            enterable: true
+        },
+        footerTooltipConfig: {
+            enterable: true
+        },
         validConfig: {
             showMessage: true,
             autoClear: true,

package/es/ui/src/log.js

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