vxe-table 3.18.10 → 3.18.12

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.18.10";
+const version = "3.18.12";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2065,6 +2065,12 @@ core_.VxeUI.setConfig({
     tooltipConfig: {
       enterable: true
     },
+    headerTooltipConfig: {
+      enterable: true
+    },
+    footerTooltipConfig: {
+      enterable: true
+    },
     validConfig: {
       showMessage: true,
       autoClear: true,
@@ -2074,6 +2080,11 @@ core_.VxeUI.setConfig({
       theme: 'beautify'
     },
     columnConfig: {
+      autoOptions: {
+        isCalcHeader: true,
+        isCalcBody: true,
+        isCalcFooter: true
+      },
       maxFixedSize: 4
     },
     cellConfig: {
@@ -2675,7 +2686,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.18.10"}`;
+const log_version = `table v${"3.18.12"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3940,8 +3951,8 @@ function renderTitleContent(h, params, content) {
   const {
     showHeaderOverflow
   } = column;
-  const tooltipOpts = $table.computeTooltipOpts;
-  const showAllTip = tooltipOpts.showAll;
+  const headerTooltipOpts = $table.computeHeaderTooltipOpts;
+  const showAllTip = headerTooltipOpts.showAll;
   const headOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
   const showTitle = headOverflow === 'title';
   const showTooltip = headOverflow === true || headOverflow === 'tooltip';
@@ -4658,6 +4669,10 @@ const Cell = {
       selectCheckboxMaps,
       treeIndeterminateRowMaps
     } = tableInternalData;
+    const aggregateOpts = $table.computeAggregateOpts;
+    const {
+      mapChildrenField
+    } = aggregateOpts;
     const checkboxOpts = $table.computeCheckboxOpts;
     const {
       labelField,
@@ -4671,29 +4686,38 @@ 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.click = 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({
+      } else {
+        isVisible = !visibleMethod || visibleMethod({
           $table,
           row
         });
+        isDisabled = checkMethod ? !checkMethod({
+          $table,
+          row
+        }) : !!checkMethod;
       }
       if (treeConfig || isRowGroupStatus) {
         indeterminate = !!treeIndeterminateRowMaps[rowid];
       }
+      ons.click = evnt => {
+        if (!isDisabled && isVisible) {
+          $table.triggerCheckRowEvent(evnt, params, !isChecked);
+        }
+      };
     }
     const checkboxParams = {
       ...params,
@@ -4749,6 +4773,10 @@ const Cell = {
     const {
       treeIndeterminateRowMaps
     } = tableInternalData;
+    const aggregateOpts = $table.computeAggregateOpts;
+    const {
+      mapChildrenField
+    } = aggregateOpts;
     const checkboxOpts = $table.computeCheckboxOpts;
     const {
       labelField,
@@ -4762,38 +4790,47 @@ const Cell = {
     } = 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 && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
-      ons.click = 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({
+      } else {
+        isVisible = !visibleMethod || visibleMethod({
           $table,
           row
         });
+        isDisabled = checkMethod ? !checkMethod({
+          $table,
+          row
+        }) : !!checkMethod;
       }
       if (treeConfig || isRowGroupStatus) {
-        isIndeterminate = !!treeIndeterminateRowMaps[rowid];
+        indeterminate = !!treeIndeterminateRowMaps[rowid];
       }
+      ons.click = evnt => {
+        if (!isDisabled && isVisible) {
+          $table.triggerCheckRowEvent(evnt, params, !isChecked);
+        }
+      };
     }
     const checkboxParams = {
       ...params,
       checked: isChecked,
       disabled: isDisabled,
       visible: isVisible,
-      indeterminate: isIndeterminate
+      indeterminate
     };
     if (checkboxSlot) {
       return renderCellBaseVNs(h, params, $table.callSlot(checkboxSlot, checkboxParams, h));
@@ -4801,7 +4838,7 @@ const Cell = {
     const checkVNs = [];
     if (isVisible) {
       checkVNs.push(h('span', {
-        class: ['vxe-checkbox--icon', isIndeterminate ? cell_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? cell_getIcon().TABLE_CHECKBOX_CHECKED : isDisabled ? cell_getIcon().TABLE_CHECKBOX_DISABLED_UNCHECKED : cell_getIcon().TABLE_CHECKBOX_UNCHECKED]
+        class: ['vxe-checkbox--icon', indeterminate ? cell_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? cell_getIcon().TABLE_CHECKBOX_CHECKED : isDisabled ? cell_getIcon().TABLE_CHECKBOX_DISABLED_UNCHECKED : cell_getIcon().TABLE_CHECKBOX_UNCHECKED]
       }));
     }
     if (defaultSlot || labelField) {
@@ -4813,7 +4850,7 @@ const Cell = {
       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
       }],
       on: ons
@@ -5705,6 +5742,10 @@ const tableProps = {
   checkboxConfig: Object,
   // tooltip 配置项
   tooltipConfig: Object,
+  // 表头 tooltip 配置项
+  headerTooltipConfig: Object,
+  // 表尾 tooltip 配置项
+  footerTooltipConfig: Object,
   // 导出配置项
   exportConfig: [Boolean, Object],
   // 导入配置项
@@ -9076,7 +9117,7 @@ function clearRowDragData($xeTable) {
  * @param {Event} evnt 事件
  * @param {Row} row 行对象
  */
-function handleTooltip($xeTable, evnt, type, tdEl, overflowElem, tipElem, params) {
+function handleTooltip($xeTable, evnt, tipOpts, type, tdEl, overflowElem, tipElem, params) {
   const reactData = $xeTable;
   const tipOverEl = overflowElem || tdEl;
   if (!tipOverEl) {
@@ -9086,7 +9127,6 @@ function handleTooltip($xeTable, evnt, type, tdEl, overflowElem, tipElem, params
   const {
     tooltipStore
   } = reactData;
-  const tooltipOpts = $xeTable.computeTooltipOpts;
   const {
     column,
     row
@@ -9094,7 +9134,7 @@ function handleTooltip($xeTable, evnt, type, tdEl, overflowElem, tipElem, params
   const {
     showAll,
     contentMethod
-  } = tooltipOpts;
+  } = tipOpts;
   const customContent = contentMethod ? contentMethod(params) : null;
   const useCustom = contentMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(customContent);
   const content = useCustom ? customContent : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim();
@@ -9107,7 +9147,7 @@ function handleTooltip($xeTable, evnt, type, tdEl, overflowElem, tipElem, params
       visible: true,
       content: tipContent,
       type,
-      currOpts: {}
+      currOpts: tipOpts
     });
     $xeTable.$nextTick(() => {
       const $tooltip = $xeTable.$refs.refTooltip;
@@ -13848,6 +13888,7 @@ const Methods = {
     const {
       tooltipStore
     } = reactData;
+    const headerTooltipOpts = $xeTable.computeHeaderTooltipOpts;
     const {
       column
     } = params;
@@ -13870,7 +13911,7 @@ const Methods = {
     }
     if (tooltipStore.column !== column || !tooltipStore.visible) {
       const ctEl = thEl.querySelector('.vxe-cell--title');
-      handleTooltip($xeTable, evnt, 'header', thEl, (hasClass(thEl, 'col--ellipsis') ? ctEl : cWrapperEl) || cWrapperEl, ctEl || cellEl, params);
+      handleTooltip($xeTable, evnt, headerTooltipOpts, 'header', thEl, (hasClass(thEl, 'col--ellipsis') ? ctEl : cWrapperEl) || cWrapperEl, ctEl || cellEl, params);
     }
   },
   /**
@@ -13889,6 +13930,7 @@ const Methods = {
     const {
       tooltipStore
     } = reactData;
+    const tooltipOpts = $xeTable.computeTooltipOpts;
     const editOpts = $xeTable.computeEditOpts;
     const {
       actived
@@ -13920,7 +13962,7 @@ const Methods = {
       if (!tipEl) {
         tipEl = ctEl;
       }
-      handleTooltip($xeTable, evnt, 'body', tdEl, ovEl || ctEl, tipEl, params);
+      handleTooltip($xeTable, evnt, tooltipOpts, 'body', tdEl, ovEl || ctEl, tipEl, params);
     }
   },
   /**
@@ -13935,6 +13977,7 @@ const Methods = {
     const {
       tooltipStore
     } = reactData;
+    const footerTooltipOpts = $xeTable.computeFooterTooltipOpts;
     const tdEl = evnt.currentTarget;
     handleTargetEnterEvent($xeTable, tooltipStore.column !== column || !!tooltipStore.row);
     if (tooltipStore.column !== column || !tooltipStore.visible) {
@@ -13947,7 +13990,7 @@ const Methods = {
       if (!tipEl) {
         tipEl = ctEl;
       }
-      handleTooltip($xeTable, evnt, 'footer', tdEl, ovEl || ctEl, tipEl, params);
+      handleTooltip($xeTable, evnt, footerTooltipOpts, 'footer', tdEl, ovEl || ctEl, tipEl, params);
     }
   },
   openTooltip(target, content) {
@@ -14354,7 +14397,7 @@ const Methods = {
         }
       }
     }
-    if (!checkMethod || checkMethod({
+    if (isRowGroupStatus || !checkMethod || checkMethod({
       $table: $xeTable,
       row
     })) {
@@ -14573,6 +14616,10 @@ const Methods = {
       selectCheckboxMaps,
       treeIndeterminateRowMaps
     } = internalData;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
+    const {
+      mapChildrenField
+    } = aggregateOpts;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField,
@@ -14591,7 +14638,21 @@ const Methods = {
     rootList.forEach(checkMethod ? row => {
       const childRowid = handleGetRowId(row);
       const selected = checkField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : selectCheckboxMaps[childRowid];
-      if (checkMethod({
+      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
       })) {
@@ -19628,7 +19689,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   }
   // hover 进入事件
   if (showTitle || showTooltip || showAllTip || tooltipConfig) {
-    tdOns.mouseenter = evnt => {
+    tdOns.mouseover = evnt => {
       if (!isVMScrollProcess($xeTable)) {
         if (showTitle) {
           updateCellTitle(evnt.currentTarget, column);
@@ -19940,7 +20001,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     const hasRowGroupAggregate = isRowGroupStatus && row.isAggregate;
     // 当前行事件
     if (rowOpts.isHover || highlightHoverRow) {
-      trOn.mouseenter = evnt => {
+      trOn.mouseover = evnt => {
         if (isVMScrollProcess($xeTable)) {
           return;
         }
@@ -20970,7 +21031,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
     scrollXStore
   } = tableInternalData;
   const virtualXOpts = $xeTable.computeVirtualXOpts;
-  const tooltipOpts = $xeTable.computeTooltipOpts;
+  const footerTooltipOpts = $xeTable.computeFooterTooltipOpts;
   const resizableOpts = $xeTable.resizableOpts;
   const {
     isAllColumnDrag
@@ -20994,7 +21055,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
     const colRest = fullColumnIdData[colid] || {};
     const renderOpts = editRender || cellRender;
     const compConf = renderOpts ? footer_renderer.get(renderOpts.name) : null;
-    const showAllTip = tooltipOpts.showAll;
+    const showAllTip = footerTooltipOpts.showAll;
     const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
     const isPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(footerCellOpts.padding) ? footerCellOpts.padding : cellOpts.padding;
     const footOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
@@ -30577,6 +30638,16 @@ function renderBody(h, $xeTable) {
         ...this.tooltipOpts
       };
     },
+    computeHeaderTooltipOpts() {
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().tooltip, table_getConfig().table.headerTooltipConfig, props.headerTooltipConfig);
+    },
+    computeFooterTooltipOpts() {
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().tooltip, table_getConfig().table.footerTooltipConfig, props.footerTooltipConfig);
+    },
     computeTableTipConfig() {
       const $xeTable = this;
       const reactData = $xeTable;