vxe-table 3.18.7 → 3.18.9

package/lib/table/src/methods.js

@@ -326,6 +326,10 @@ function cacheColumnMap($xeTable) {
   const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
+  const {
+    treeConfig,
+    showOverflow
+  } = props;
   const {
     tableFullColumn,
     collectColumn
@@ -336,17 +340,19 @@ function cacheColumnMap($xeTable) {
   const expandOpts = $xeTable.computeExpandOpts;
   const columnOpts = $xeTable.computeColumnOpts;
   const columnDragOpts = $xeTable.computeColumnDragOpts;
+  const virtualYOpts = $xeTable.computeVirtualYOpts;
   const {
     isCrossDrag,
     isSelfToChildDrag
   } = columnDragOpts;
   const customOpts = $xeTable.computeCustomOpts;
+  const treeOpts = $xeTable.computeTreeOpts;
   const {
     storage
   } = customOpts;
   const rowOpts = $xeTable.computeRowOpts;
   const isGroup = collectColumn.some(_utils.hasChildrenList);
-  let isAllOverflow = !!props.showOverflow;
+  let isAllOverflow = !!showOverflow;
   let rowGroupColumn;
   let expandColumn;
   let treeNodeColumn;
@@ -448,9 +454,15 @@ function cacheColumnMap($xeTable) {
   } else {
     tableFullColumn.forEach(handleFunc);
   }
+  if (expandColumn && expandOpts.mode !== 'fixed' && virtualYOpts.enabled) {
+    (0, _log.warnLog)('vxe.error.notConflictProp', ['column.type="expand', 'virtual-y-config.enabled=false']);
+  }
   if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
     (0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
   }
+  if (expandColumn && expandOpts.mode !== 'inside' && treeConfig && !treeOpts.transform) {
+    (0, _log.errLog)('vxe.error.notConflictProp', ['tree-config.transform=false', 'expand-config.mode=fixed']);
+  }
   if (htmlColumn) {
     if (!columnOpts.useKey) {
       (0, _log.errLog)('vxe.error.notSupportProp', ['column.type=html', 'column-config.useKey=false', 'column-config.useKey=true']);
@@ -3238,7 +3250,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 +3274,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 +8036,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 +8086,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 +8113,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 +8143,7 @@ const Methods = {
         column: null,
         content: null,
         visible: false,
+        type: null,
         currOpts: {}
       });
       if (tooltip) {