vxe-table 4.13.11 → 4.13.13

package/es/table/src/cell.js

@@ -11,7 +11,7 @@ function renderTitlePrefixIcon(params) {
     const titlePrefix = column.titlePrefix || column.titleHelp;
     if (titlePrefix) {
         return h('i', {
-            class: ['vxe-cell-title-prefix-icon', titlePrefix.icon || getIcon().TABLE_TITLE_PREFIX],
+            class: ['vxe-cell-title-prefix-icon', titlePrefix.iconStatus ? `theme--${titlePrefix.iconStatus}` : '', titlePrefix.icon || getIcon().TABLE_TITLE_PREFIX],
             onMouseenter(evnt) {
                 $table.triggerHeaderTitleEvent(evnt, titlePrefix, params);
             },
@@ -27,7 +27,7 @@ function renderTitleSuffixIcon(params) {
     const titleSuffix = column.titleSuffix;
     if (titleSuffix) {
         return h('i', {
-            class: ['vxe-cell-title-suffix-icon', titleSuffix.icon || getIcon().TABLE_TITLE_SUFFIX],
+            class: ['vxe-cell-title-suffix-icon', titleSuffix.iconStatus ? `theme--${titleSuffix.iconStatus}` : '', titleSuffix.icon || getIcon().TABLE_TITLE_SUFFIX],
             onMouseenter(evnt) {
                 $table.triggerHeaderTitleEvent(evnt, titleSuffix, params);
             },

package/es/table/src/table.js

@@ -376,6 +376,7 @@ export default defineComponent({
             insertRowMaps: {},
             // 已删除行
             removeRowMaps: {},
+            cvCacheMaps: {},
             inited: false,
             tooltipTimeout: null,
             initStatus: false,
@@ -2796,12 +2797,12 @@ export default defineComponent({
             if (bodyWrapperElem) {
                 overflowY = scrollYHeight > bodyWrapperElem.clientHeight;
                 if (yHandleEl) {
-                    reactData.scrollbarWidth = Math.max(scrollbarOpts.width || 0, yHandleEl.offsetWidth - yHandleEl.clientWidth);
+                    reactData.scrollbarWidth = scrollbarOpts.width || (yHandleEl.offsetWidth - yHandleEl.clientWidth) || 14;
                 }
                 reactData.overflowY = overflowY;
                 overflowX = scrollXWidth > bodyWrapperElem.clientWidth;
                 if (xHandleEl) {
-                    reactData.scrollbarHeight = Math.max(scrollbarOpts.height || 0, xHandleEl.offsetHeight - xHandleEl.clientHeight);
+                    reactData.scrollbarHeight = scrollbarOpts.height || (xHandleEl.offsetHeight - xHandleEl.clientHeight) || 14;
                 }
                 const headerHeight = headerTableElem ? headerTableElem.clientHeight : 0;
                 const footerHeight = footerTableElem ? footerTableElem.clientHeight : 0;
@@ -2994,6 +2995,7 @@ export default defineComponent({
             scrollYStore.endIndex = 1;
             scrollXStore.startIndex = 0;
             scrollXStore.endIndex = 1;
+            internalData.cvCacheMaps = {};
             reactData.isRowLoading = true;
             reactData.scrollVMLoading = false;
             internalData.treeExpandedMaps = {};
@@ -3587,40 +3589,40 @@ export default defineComponent({
                 return -1;
             };
         };
-        const lazyScrollXData = () => {
-            const { lxTimeout, lxRunTime, scrollXStore } = internalData;
-            const { visibleSize } = scrollXStore;
-            const fpsTime = Math.max(5, Math.min(10, Math.floor(visibleSize / 3)));
-            if (lxTimeout) {
-                clearTimeout(lxTimeout);
-            }
-            if (!lxRunTime || lxRunTime + fpsTime < Date.now()) {
-                internalData.lxRunTime = Date.now();
-                loadScrollXData();
-            }
-            internalData.lxTimeout = setTimeout(() => {
-                internalData.lxTimeout = undefined;
-                internalData.lxRunTime = undefined;
-                loadScrollXData();
-            }, fpsTime);
-        };
-        const lazyScrollYData = () => {
-            const { lyTimeout, lyRunTime, scrollYStore } = internalData;
-            const { visibleSize } = scrollYStore;
-            const fpsTime = Math.floor(Math.max(4, Math.min(10, visibleSize / 3)));
-            if (lyTimeout) {
-                clearTimeout(lyTimeout);
-            }
-            if (!lyRunTime || lyRunTime + fpsTime < Date.now()) {
-                internalData.lyRunTime = Date.now();
-                loadScrollYData();
-            }
-            internalData.lyTimeout = setTimeout(() => {
-                internalData.lyTimeout = undefined;
-                internalData.lyRunTime = undefined;
-                loadScrollYData();
-            }, fpsTime);
-        };
+        // const lazyScrollXData = () => {
+        //   const { lxTimeout, lxRunTime, scrollXStore } = internalData
+        //   const { visibleSize } = scrollXStore
+        //   const fpsTime = Math.max(5, Math.min(10, Math.floor(visibleSize / 3)))
+        //   if (lxTimeout) {
+        //     clearTimeout(lxTimeout)
+        //   }
+        //   if (!lxRunTime || lxRunTime + fpsTime < Date.now()) {
+        //     internalData.lxRunTime = Date.now()
+        //     loadScrollXData()
+        //   }
+        //   internalData.lxTimeout = setTimeout(() => {
+        //     internalData.lxTimeout = undefined
+        //     internalData.lxRunTime = undefined
+        //     loadScrollXData()
+        //   }, fpsTime)
+        // }
+        // const lazyScrollYData = () => {
+        //   const { lyTimeout, lyRunTime, scrollYStore } = internalData
+        //   const { visibleSize } = scrollYStore
+        //   const fpsTime = Math.floor(Math.max(4, Math.min(10, visibleSize / 3)))
+        //   if (lyTimeout) {
+        //     clearTimeout(lyTimeout)
+        //   }
+        //   if (!lyRunTime || lyRunTime + fpsTime < Date.now()) {
+        //     internalData.lyRunTime = Date.now()
+        //     loadScrollYData()
+        //   }
+        //   internalData.lyTimeout = setTimeout(() => {
+        //     internalData.lyTimeout = undefined
+        //     internalData.lyRunTime = undefined
+        //     loadScrollYData()
+        //   }, fpsTime)
+        // }
         const checkLastSyncScroll = (isRollX, isRollY) => {
             const { scrollXLoad, scrollYLoad } = reactData;
             const { lcsTimeout } = internalData;
@@ -6085,12 +6087,14 @@ export default defineComponent({
                     setScrollLeft(bodyScrollElem, scrollLeft);
                     setScrollLeft(headerScrollElem, scrollLeft);
                     setScrollLeft(footerScrollElem, scrollLeft);
+                    loadScrollXData();
                 }
                 if (XEUtils.isNumber(scrollTop)) {
                     setScrollTop(yHandleEl, scrollTop);
                     setScrollTop(bodyScrollElem, scrollTop);
                     setScrollTop(leftScrollElem, scrollTop);
                     setScrollTop(rightScrollElem, scrollTop);
+                    loadScrollYData();
                 }
                 if (reactData.scrollXLoad || reactData.scrollYLoad) {
                     return new Promise(resolve => {
@@ -6114,7 +6118,7 @@ export default defineComponent({
                 const rest = [];
                 if (row) {
                     if (props.treeConfig) {
-                        rest.push(tablePrivateMethods.scrollToTreeRow(row));
+                        rest.push($xeTable.scrollToTreeRow(row));
                     }
                     else {
                         rest.push(rowToVisible($xeTable, row));
@@ -9513,25 +9517,23 @@ export default defineComponent({
              * 横向 X 可视渲染事件处理
              */
             triggerScrollXEvent() {
-                const virtualXOpts = computeVirtualXOpts.value;
-                if (virtualXOpts.immediate) {
-                    loadScrollXData();
-                }
-                else {
-                    lazyScrollXData();
-                }
+                // const virtualXOpts = computeVirtualXOpts.value
+                // if (virtualXOpts.immediate) {
+                loadScrollXData();
+                // } else {
+                //   lazyScrollXData()
+                // }
             },
             /**
              * 纵向 Y 可视渲染事件处理
              */
             triggerScrollYEvent() {
-                const virtualYOpts = computeVirtualYOpts.value;
-                if (virtualYOpts.immediate) {
-                    loadScrollYData();
-                }
-                else {
-                    lazyScrollYData();
-                }
+                // const virtualYOpts = computeVirtualYOpts.value
+                // if (virtualYOpts.immediate) {
+                loadScrollYData();
+                // } else {
+                //   lazyScrollYData()
+                // }
             },
             triggerBodyScrollEvent(evnt, fixedType) {
                 const { scrollYLoad, scrollXLoad } = reactData;
@@ -11176,6 +11178,9 @@ export default defineComponent({
             if (tableViewportEl) {
                 tableViewportEl.removeEventListener('wheel', $xeTable.triggerBodyWheelEvent);
             }
+            internalData.cvCacheMaps = {};
+            internalData.prevDragRow = null;
+            internalData.prevDragCol = null;
             if (resizeObserver) {
                 resizeObserver.disconnect();
             }

package/es/table/src/util.js

@@ -1,4 +1,4 @@
-import { watch, reactive } from 'vue';
+import { watch, reactive, nextTick } from 'vue';
 import XEUtils from 'xe-utils';
 import { ColumnInfo } from './columnInfo';
 import { isPx, isScale } from '../../ui/src/dom';
@@ -64,22 +64,18 @@ export const convertHeaderColumnToRows = (originColumns) => {
 };
 export function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
     const internalData = $xeTable.internalData;
-    return $xeTable.clearScroll().then(() => {
-        if (scrollLeft || scrollTop) {
-            // 重置最后滚动状态
-            internalData.lastScrollLeft = 0;
-            internalData.lastScrollTop = 0;
-            internalData.intoRunScroll = false;
-            internalData.inVirtualScroll = false;
-            internalData.inWheelScroll = false;
-            internalData.inHeaderScroll = false;
-            internalData.inBodyScroll = false;
-            internalData.inFooterScroll = false;
-            internalData.scrollRenderType = '';
-            // 还原滚动状态
-            return $xeTable.scrollTo(scrollLeft, scrollTop);
-        }
-    });
+    if (scrollLeft || scrollTop) {
+        internalData.intoRunScroll = false;
+        internalData.inVirtualScroll = false;
+        internalData.inWheelScroll = false;
+        internalData.inHeaderScroll = false;
+        internalData.inBodyScroll = false;
+        internalData.inFooterScroll = false;
+        internalData.scrollRenderType = '';
+        // 还原滚动状态
+        return $xeTable.scrollTo(scrollLeft, scrollTop);
+    }
+    return nextTick();
 }
 /**
  * 生成行的唯一主键

package/es/table/style.css

@@ -2327,6 +2327,30 @@
 .vxe-header--column .vxe-cell-title-suffix-icon {
   cursor: help;
 }
+.vxe-header--column .vxe-cell-title-prefix-icon.theme--primary,
+.vxe-header--column .vxe-cell-title-suffix-icon.theme--primary {
+  color: var(--vxe-ui-font-primary-color);
+}
+.vxe-header--column .vxe-cell-title-prefix-icon.theme--success,
+.vxe-header--column .vxe-cell-title-suffix-icon.theme--success {
+  color: var(--vxe-ui-status-success-color);
+}
+.vxe-header--column .vxe-cell-title-prefix-icon.theme--info,
+.vxe-header--column .vxe-cell-title-suffix-icon.theme--info {
+  color: var(--vxe-ui-status-info-color);
+}
+.vxe-header--column .vxe-cell-title-prefix-icon.theme--warning,
+.vxe-header--column .vxe-cell-title-suffix-icon.theme--warning {
+  color: var(--vxe-ui-status-warning-color);
+}
+.vxe-header--column .vxe-cell-title-prefix-icon.theme--danger,
+.vxe-header--column .vxe-cell-title-suffix-icon.theme--danger {
+  color: var(--vxe-ui-status-danger-color);
+}
+.vxe-header--column .vxe-cell-title-prefix-icon.theme--error,
+.vxe-header--column .vxe-cell-title-suffix-icon.theme--error {
+  color: var(--vxe-ui-status-error-color);
+}
 
 .vxe-cell--col-resizable {
   position: absolute;