vxe-table 4.15.8 → 4.15.10

package/es/table/src/table.js

@@ -2436,9 +2436,6 @@ export default defineVxeComponent({
             if (mouseConfig && mouseOpts.selected && editStore.selected.row && editStore.selected.column) {
                 $xeTable.addCellSelectedClass();
             }
-            if ($xeGanttView) {
-                $xeGanttView.handleUpdateStyle();
-            }
             return nextTick();
         };
         const checkValidate = (type) => {
@@ -3073,7 +3070,6 @@ export default defineVxeComponent({
         };
         const handleLazyRecalculate = (reFull, reWidth, reHeight) => {
             return new Promise(resolve => {
-                const $xeGanttView = internalData.xeGanttView;
                 const { rceTimeout, rceRunTime } = internalData;
                 const resizeOpts = computeResizeOpts.value;
                 const refreshDelay = resizeOpts.refreshDelay || 20;
@@ -3096,9 +3092,6 @@ export default defineVxeComponent({
                 else {
                     resolve(handleRecalculateStyle(reFull, reWidth, reHeight));
                 }
-                if ($xeGanttView) {
-                    $xeGanttView.handleLazyRecalculate();
-                }
                 internalData.rceTimeout = setTimeout(() => {
                     internalData.rceTimeout = undefined;
                     handleRecalculateStyle(reFull, reWidth, reHeight);
@@ -3349,6 +3342,7 @@ export default defineVxeComponent({
             }).then(() => {
                 computeScrollLoad();
             }).then(() => {
+                const virtualYOpts = computeVirtualYOpts.value;
                 // 是否启用了虚拟滚动
                 if (sYLoad) {
                     scrollYStore.endIndex = scrollYStore.visibleSize;
@@ -3357,6 +3351,9 @@ export default defineVxeComponent({
                     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)
@@ -4058,17 +4055,6 @@ export default defineVxeComponent({
             };
             requestAnimationFrame(step);
         };
-        const syncGanttScrollTop = (scrollTop) => {
-            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;
-                }
-            }
-        };
         const dispatchEvent = (type, params, evnt) => {
             emit(type, createEvent(evnt, { $table: $xeTable, $grid: $xeGrid }, params));
         };
@@ -4959,6 +4945,29 @@ export default defineVxeComponent({
                 }
                 return [];
             },
+            /**
+             * 只对 tree-config 有效，用于树形结构，获取指定行的层级
+             */
+            getTreeRowLevel(rowOrRowid) {
+                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 有效，获取行的父级
              */
@@ -7904,7 +7913,6 @@ export default defineVxeComponent({
             handleTableData(force) {
                 const { scrollYLoad } = reactData;
                 const { scrollYStore, fullDataRowIdData } = internalData;
-                const $xeGanttView = internalData.xeGanttView;
                 let fullList = internalData.afterFullData;
                 // 是否进行数据处理
                 if (force) {
@@ -7925,9 +7933,6 @@ export default defineVxeComponent({
                 });
                 reactData.tableData = tableData;
                 internalData.visibleDataRowIdData = visibleDataRowIdMaps;
-                if ($xeGanttView) {
-                    $xeGanttView.updateViewData();
-                }
                 return nextTick();
             },
             /**
@@ -10444,7 +10449,6 @@ export default defineVxeComponent({
                     }
                     setScrollTop(yHandleEl, scrollTop);
                     setScrollTop(rowExpandEl, scrollTop);
-                    syncGanttScrollTop(scrollTop);
                     if (scrollYLoad) {
                         $xeTable.triggerScrollYEvent(evnt);
                     }
@@ -10633,7 +10637,6 @@ export default defineVxeComponent({
                         setScrollTop(leftScrollElem, currTopNum);
                         setScrollTop(rightScrollElem, currTopNum);
                         setScrollTop(rowExpandEl, currTopNum);
-                        syncGanttScrollTop(currTopNum);
                         if (scrollYLoad) {
                             $xeTable.triggerScrollYEvent(evnt);
                         }
@@ -10651,7 +10654,6 @@ export default defineVxeComponent({
                             setScrollTop(leftScrollElem, currTopNum);
                             setScrollTop(rightScrollElem, currTopNum);
                             setScrollTop(rowExpandEl, currTopNum);
-                            syncGanttScrollTop(currTopNum);
                             if (scrollYLoad) {
                                 $xeTable.triggerScrollYEvent(evnt);
                             }
@@ -10725,7 +10727,6 @@ export default defineVxeComponent({
                 setScrollTop(leftScrollElem, scrollTop);
                 setScrollTop(rightScrollElem, scrollTop);
                 setScrollTop(rowExpandEl, scrollTop);
-                syncGanttScrollTop(scrollTop);
                 if (scrollYLoad) {
                     $xeTable.triggerScrollYEvent(evnt);
                 }
@@ -10765,7 +10766,6 @@ export default defineVxeComponent({
             updateScrollXSpace() {
                 const { scrollXLoad, overflowX, scrollXWidth } = reactData;
                 const { visibleColumn, scrollXStore, elemStore, fullColumnIdData } = internalData;
-                const $xeGanttView = internalData.xeGanttView;
                 const mouseOpts = computeMouseOpts.value;
                 const tableBody = refTableBody.value;
                 const tableBodyElem = tableBody ? tableBody.$el : null;
@@ -10831,9 +10831,6 @@ export default defineVxeComponent({
                     if (isScrollXBig && mouseOpts.area) {
                         errLog('vxe.error.notProp', ['mouse-config.area']);
                     }
-                    if ($xeGanttView) {
-                        $xeGanttView.updateScrollXSpace();
-                    }
                     return nextTick().then(() => {
                         updateStyle();
                     });
@@ -10843,7 +10840,6 @@ export default defineVxeComponent({
             updateScrollYSpace() {
                 const { isAllOverflow, overflowY, scrollYLoad, expandColumn } = reactData;
                 const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData;
-                const $xeGanttView = internalData.xeGanttView;
                 const { startIndex } = scrollYStore;
                 const mouseOpts = computeMouseOpts.value;
                 const expandOpts = computeExpandOpts.value;
@@ -10943,9 +10939,6 @@ export default defineVxeComponent({
                 if (isScrollYBig && mouseOpts.area) {
                     errLog('vxe.error.notProp', ['mouse-config.area']);
                 }
-                if ($xeGanttView) {
-                    $xeGanttView.updateScrollYSpace();
-                }
                 return nextTick().then(() => {
                     updateStyle();
                 });

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.15.8";
+export const version = "4.15.10";
 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${"4.15.8"}`;
+const version = `table v${"4.15.10"}`;
 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(VxeUITableExport).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 = VxeUITableExport;