vxe-table 3.17.10 → 3.17.12

package/es/table/src/methods.js

@@ -1214,9 +1214,6 @@ function updateStyle($xeTable) {
     if (mouseConfig && mouseOpts.selected && editStore.selected.row && editStore.selected.column) {
         $xeTable.addCellSelectedClass();
     }
-    if ($xeGanttView) {
-        $xeGanttView.handleUpdateStyle();
-    }
     return $xeTable.$nextTick();
 }
 function checkValidate($xeTable, type) {
@@ -2741,7 +2738,6 @@ function handleLazyRecalculate($xeTable, reFull, reWidth, reHeight) {
     const internalData = $xeTable;
     return new Promise(resolve => {
         const { rceTimeout, rceRunTime } = internalData;
-        const $xeGanttView = internalData.xeGanttView;
         const resizeOpts = $xeTable.computeResizeOpts;
         const refreshDelay = resizeOpts.refreshDelay || 20;
         const el = $xeTable.$refs.refElem;
@@ -2763,9 +2759,6 @@ function handleLazyRecalculate($xeTable, reFull, reWidth, reHeight) {
         else {
             resolve(handleRecalculateStyle($xeTable, reFull, reWidth, reHeight));
         }
-        if ($xeGanttView) {
-            $xeGanttView.handleLazyRecalculate();
-        }
         internalData.rceTimeout = setTimeout(() => {
             internalData.rceTimeout = undefined;
             handleRecalculateStyle($xeTable, reFull, reWidth, reHeight);
@@ -3025,6 +3018,7 @@ function loadTableData($xeTable, datas, isReset) {
     }).then(() => {
         computeScrollLoad($xeTable);
     }).then(() => {
+        const virtualYOpts = $xeTable.computeVirtualYOpts;
         // 是否启用了虚拟滚动
         if (sYLoad) {
             scrollYStore.endIndex = scrollYStore.visibleSize;
@@ -3033,6 +3027,9 @@ function loadTableData($xeTable, datas, isReset) {
             if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
                 errLog('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
             }
+            if (virtualYOpts.mode === 'scroll' && expandOpts.mode === 'fixed') {
+                warnLog('vxe.error.notConflictProp', ['virtual-y-config.mode=scroll', 'expand-config.mode=inside']);
+            }
             // if (showOverflow) {
             //   if (!rowOpts.height) {
             //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
@@ -3546,18 +3543,6 @@ const wheelScrollTopTo = (diffNum, cb) => {
     };
     requestAnimationFrame(step);
 };
-const syncGanttScrollTop = ($xeTable, scrollTop) => {
-    const internalData = $xeTable;
-    const $xeGanttView = internalData.xeGanttView;
-    if ($xeGanttView) {
-        const ganttInternalData = $xeGanttView.internalData;
-        const { elemStore: ganttElemStore } = ganttInternalData;
-        const ganttBodyScrollElem = getRefElem(ganttElemStore['main-body-scroll']);
-        if (ganttBodyScrollElem) {
-            ganttBodyScrollElem.scrollTop = scrollTop;
-        }
-    }
-};
 function updateHeight($xeTable) {
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -3864,7 +3849,6 @@ const Methods = {
         const internalData = $xeTable;
         const { scrollYLoad } = reactData;
         const { scrollYStore, fullDataRowIdData } = internalData;
-        const $xeGanttView = internalData.xeGanttView;
         let fullList = internalData.afterFullData;
         // 是否进行数据处理
         if (force) {
@@ -3885,9 +3869,6 @@ const Methods = {
         });
         reactData.tableData = tableData;
         internalData.visibleDataRowIdData = visibleDataRowIdMaps;
-        if ($xeGanttView) {
-            $xeGanttView.updateViewData();
-        }
         return $xeTable.$nextTick();
     },
     /**
@@ -4847,6 +4828,32 @@ const Methods = {
         }
         return [];
     },
+    /**
+     * 只对 tree-config 有效，用于树形结构，获取指定行的层级
+     */
+    getTreeRowLevel(rowOrRowid) {
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const { fullAllDataRowIdData } = internalData;
+        if (rowOrRowid && treeConfig) {
+            let rowid;
+            if (XEUtils.isString(rowOrRowid)) {
+                rowid = rowOrRowid;
+            }
+            else {
+                rowid = getRowid($xeTable, rowOrRowid);
+            }
+            if (rowid) {
+                const rest = fullAllDataRowIdData[rowid];
+                if (rest) {
+                    return rest.level;
+                }
+            }
+        }
+        return -1;
+    },
     /**
      * 只对 tree-config 有效，获取行的父级
      */
@@ -10017,7 +10024,6 @@ const Methods = {
             }
             setScrollTop(yHandleEl, scrollTop);
             setScrollTop(rowExpandEl, scrollTop);
-            syncGanttScrollTop($xeTable, scrollTop);
             if (scrollYLoad) {
                 $xeTable.triggerScrollYEvent(evnt);
             }
@@ -10214,7 +10220,6 @@ const Methods = {
                 setScrollTop(leftScrollElem, currTopNum);
                 setScrollTop(rightScrollElem, currTopNum);
                 setScrollTop(rowExpandEl, currTopNum);
-                syncGanttScrollTop($xeTable, currTopNum);
                 if (scrollYLoad) {
                     $xeTable.triggerScrollYEvent(evnt);
                 }
@@ -10232,7 +10237,6 @@ const Methods = {
                     setScrollTop(leftScrollElem, currTopNum);
                     setScrollTop(rightScrollElem, currTopNum);
                     setScrollTop(rowExpandEl, currTopNum);
-                    syncGanttScrollTop($xeTable, currTopNum);
                     if (scrollYLoad) {
                         $xeTable.triggerScrollYEvent(evnt);
                     }
@@ -10312,7 +10316,6 @@ const Methods = {
         setScrollTop(leftScrollElem, scrollTop);
         setScrollTop(rightScrollElem, scrollTop);
         setScrollTop(rowExpandEl, scrollTop);
-        syncGanttScrollTop($xeTable, scrollTop);
         if (scrollYLoad) {
             $xeTable.triggerScrollYEvent(evnt);
         }
@@ -10342,7 +10345,6 @@ const Methods = {
         const internalData = $xeTable;
         const { scrollXLoad, overflowX, scrollXWidth } = reactData;
         const { visibleColumn, scrollXStore, elemStore, fullColumnIdData } = internalData;
-        const $xeGanttView = internalData.xeGanttView;
         const mouseOpts = $xeTable.computeMouseOpts;
         const tableBody = $xeTable.$refs.refTableBody;
         const tableBodyElem = tableBody ? tableBody.$el : null;
@@ -10408,9 +10410,6 @@ const Methods = {
             if (isScrollXBig && mouseOpts.area) {
                 errLog('vxe.error.notProp', ['mouse-config.area']);
             }
-            if ($xeGanttView) {
-                $xeGanttView.updateScrollXSpace();
-            }
             return $xeTable.$nextTick(() => {
                 updateStyle($xeTable);
             });
@@ -10432,7 +10431,6 @@ const Methods = {
         const internalData = $xeTable;
         const { isAllOverflow, scrollYLoad, expandColumn } = reactData;
         const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData;
-        const $xeGanttView = internalData.xeGanttView;
         const { startIndex } = scrollYStore;
         const mouseOpts = $xeTable.computeMouseOpts;
         const expandOpts = $xeTable.computeExpandOpts;
@@ -10529,9 +10527,6 @@ const Methods = {
         if (isScrollYBig && mouseOpts.area) {
             errLog('vxe.error.notProp', ['mouse-config.area']);
         }
-        if ($xeGanttView) {
-            $xeGanttView.updateScrollYSpace();
-        }
         return $xeTable.$nextTick().then(() => {
             updateStyle($xeTable);
         });

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.17.10";
+export const version = "3.17.12";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

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

package/lib/index.common.js

@@ -17,6 +17,5 @@ Object.keys(VxeTableExport).forEach(function (key) {
     }
   });
 });
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 var _default = exports.default = VxeTableExport;