vxe-table 3.18.6 → 3.18.8

package/lib/table/src/methods.js

@@ -3238,7 +3238,7 @@ function clearRowDragData($xeTable) {
  * @param {Event} evnt 事件
  * @param {Row} row 行对象
  */
-function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
+function handleTooltip($xeTable, evnt, type, tdEl, overflowElem, tipElem, params) {
   const reactData = $xeTable;
   const tipOverEl = overflowElem || tdEl;
   if (!tipOverEl) {
@@ -3262,16 +3262,19 @@ function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
   const content = useCustom ? customContent : _xeUtils.default.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim();
   const isOver = tipOverEl.scrollWidth > tipOverEl.clientWidth;
   if (content && (showAll || useCustom || isOver)) {
+    const tipContent = (0, _utils.formatText)(content);
     Object.assign(tooltipStore, {
       row,
       column,
       visible: true,
+      content: tipContent,
+      type,
       currOpts: {}
     });
     $xeTable.$nextTick(() => {
       const $tooltip = $xeTable.$refs.refTooltip;
       if ($tooltip && $tooltip.open) {
-        $tooltip.open(isOver ? tipOverEl : tipElem, (0, _utils.formatText)(content));
+        $tooltip.open(isOver ? tipOverEl : tipElem, tipContent);
       }
     });
   }
@@ -8021,7 +8024,7 @@ const Methods = {
     }
     if (tooltipStore.column !== column || !tooltipStore.visible) {
       const ctEl = thEl.querySelector('.vxe-cell--title');
-      handleTooltip($xeTable, evnt, thEl, ((0, _dom.hasClass)(thEl, 'col--ellipsis') ? ctEl : cWrapperEl) || cWrapperEl, ctEl || cellEl, params);
+      handleTooltip($xeTable, evnt, 'header', thEl, ((0, _dom.hasClass)(thEl, 'col--ellipsis') ? ctEl : cWrapperEl) || cWrapperEl, ctEl || cellEl, params);
     }
   },
   /**
@@ -8071,7 +8074,7 @@ const Methods = {
       if (!tipEl) {
         tipEl = ctEl;
       }
-      handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tipEl, params);
+      handleTooltip($xeTable, evnt, 'body', tdEl, ovEl || ctEl, tipEl, params);
     }
   },
   /**
@@ -8098,7 +8101,7 @@ const Methods = {
       if (!tipEl) {
         tipEl = ctEl;
       }
-      handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tipEl, params);
+      handleTooltip($xeTable, evnt, 'footer', tdEl, ovEl || ctEl, tipEl, params);
     }
   },
   openTooltip(target, content) {
@@ -8128,6 +8131,7 @@ const Methods = {
         column: null,
         content: null,
         visible: false,
+        type: null,
         currOpts: {}
       });
       if (tooltip) {
@@ -11671,6 +11675,40 @@ const Methods = {
     }
     return $xeTable.$nextTick();
   },
+  getRowGroups() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      aggregateConfig,
+      rowGroupConfig
+    } = props;
+    const {
+      fullColumnFieldData
+    } = internalData;
+    if (aggregateConfig || rowGroupConfig) {
+      const {
+        rowGroupList
+      } = reactData;
+      return rowGroupList.map(({
+        field
+      }) => {
+        const colRet = fullColumnFieldData[field];
+        if (colRet) {
+          return colRet.column;
+        }
+        return {
+          field
+        };
+      });
+    }
+    return [];
+  },
+  getRowGroupFields() {
+    const $xeTable = this;
+    return $xeTable.getRowGroups().map(item => item.field);
+  },
   clearRowGroups() {
     const $xeTable = this;
     const props = $xeTable;