vxe-table 3.15.11 → 3.15.13

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.11";
+const version = "3.15.13";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2422,7 +2422,7 @@ core_.VxeUI.setConfig({
     },
     virtualXConfig: {
       enabled: true,
-      gt: 28,
+      gt: 24,
       preSize: 0,
       oSize: 1
     },
@@ -2433,8 +2433,8 @@ core_.VxeUI.setConfig({
       oSize: 2
     },
     scrollbarConfig: {
-      width: 14,
-      height: 14
+      // width: 14,
+      // height: 14
     }
   },
   // export: {
@@ -2858,7 +2858,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.11"}`;
+const log_version = `table v${"3.15.13"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3101,22 +3101,18 @@ const convertHeaderColumnToRows = originColumns => {
 };
 function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
   const internalData = $xeTable;
-  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 $xeTable.$nextTick();
 }
 function toTreePathSeq(path) {
   return path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
@@ -3672,7 +3668,7 @@ function renderTitlePrefixIcon(h, params) {
   const titlePrefix = column.titlePrefix || column.titleHelp;
   if (titlePrefix) {
     return h('i', {
-      class: ['vxe-cell-title-prefix-icon', titlePrefix.icon || cell_getIcon().TABLE_TITLE_PREFIX],
+      class: ['vxe-cell-title-prefix-icon', titlePrefix.iconStatus ? `theme--${titlePrefix.iconStatus}` : '', titlePrefix.icon || cell_getIcon().TABLE_TITLE_PREFIX],
       on: {
         mouseenter(evnt) {
           $table.triggerHeaderTitleEvent(evnt, titlePrefix, params);
@@ -3693,7 +3689,7 @@ function renderTitleSuffixIcon(h, params) {
   const titleSuffix = column.titleSuffix;
   if (titleSuffix) {
     return h('i', {
-      class: ['vxe-cell-title-suffix-icon', titleSuffix.icon || cell_getIcon().TABLE_TITLE_SUFFIX],
+      class: ['vxe-cell-title-suffix-icon', titleSuffix.iconStatus ? `theme--${titleSuffix.iconStatus}` : '', titleSuffix.icon || cell_getIcon().TABLE_TITLE_SUFFIX],
       on: {
         mouseenter(evnt) {
           $table.triggerHeaderTitleEvent(evnt, titleSuffix, params);
@@ -8191,12 +8187,12 @@ function calcScrollbar($xeTable) {
   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;
     }
     reactData.overflowX = overflowX;
     const headerHeight = headerTableElem ? headerTableElem.clientHeight : 0;
@@ -8414,6 +8410,7 @@ function loadTableData($xeTable, datas, isReset) {
   scrollYStore.endIndex = 1;
   scrollXStore.startIndex = 0;
   scrollXStore.endIndex = 1;
+  internalData.cvCacheMaps = {};
   reactData.isRowLoading = true;
   reactData.scrollVMLoading = false;
   internalData.treeExpandedMaps = {};
@@ -8891,54 +8888,42 @@ const createGetColumnCacheProp = prop => {
     return -1;
   };
 };
-function lazyScrollXData($xeTable) {
-  const internalData = $xeTable;
-  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($xeTable);
-  }
-  internalData.lxTimeout = setTimeout(() => {
-    internalData.lxTimeout = undefined;
-    internalData.lxRunTime = undefined;
-    loadScrollXData($xeTable);
-  }, fpsTime);
-}
-function lazyScrollYData($xeTable) {
-  const internalData = $xeTable;
-  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($xeTable);
-  }
-  internalData.lyTimeout = setTimeout(() => {
-    internalData.lyTimeout = undefined;
-    internalData.lyRunTime = undefined;
-    loadScrollYData($xeTable);
-  }, fpsTime);
-}
+// function lazyScrollXData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
+//   const internalData = $xeTable as unknown as TableInternalData
+//   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($xeTable)
+//   }
+//   internalData.lxTimeout = setTimeout(() => {
+//     internalData.lxTimeout = undefined
+//     internalData.lxRunTime = undefined
+//     loadScrollXData($xeTable)
+//   }, fpsTime)
+// }
+// function lazyScrollYData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
+//   const internalData = $xeTable as unknown as TableInternalData
+//   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($xeTable)
+//   }
+//   internalData.lyTimeout = setTimeout(() => {
+//     internalData.lyTimeout = undefined
+//     internalData.lyRunTime = undefined
+//     loadScrollYData($xeTable)
+//   }, fpsTime)
+// }
 function checkLastSyncScroll($xeTable, isRollX, isRollY) {
   const reactData = $xeTable;
   const internalData = $xeTable;
@@ -15846,24 +15831,24 @@ const Methods = {
    */
   triggerScrollXEvent() {
     const $xeTable = this;
-    const virtualXOpts = $xeTable.computeVirtualXOpts;
-    if (virtualXOpts.immediate) {
-      loadScrollXData($xeTable);
-    } else {
-      lazyScrollXData($xeTable);
-    }
+    // const virtualXOpts = $xeTable.computeVirtualXOpts
+    // if (virtualXOpts.immediate) {
+    loadScrollXData($xeTable);
+    // } else {
+    //   lazyScrollXData($xeTable)
+    // }
   },
   /**
    * 纵向 Y 可视渲染事件处理
    */
   triggerScrollYEvent() {
     const $xeTable = this;
-    const virtualYOpts = $xeTable.computeVirtualYOpts;
-    if (virtualYOpts.immediate) {
-      loadScrollYData($xeTable);
-    } else {
-      lazyScrollYData($xeTable);
-    }
+    // const virtualYOpts = $xeTable.computeVirtualYOpts
+    // if (virtualYOpts.immediate) {
+    loadScrollYData($xeTable);
+    // } else {
+    //   lazyScrollYData($xeTable)
+    // }
   },
   triggerBodyScrollEvent(evnt, fixedType) {
     const $xeTable = this;
@@ -16492,54 +16477,44 @@ const Methods = {
    */
   scrollTo(scrollLeft, scrollTop) {
     const $xeTable = this;
+    const reactData = $xeTable;
     const internalData = $xeTable;
     const {
-      $refs
-    } = this;
-    const {
-      refTableBody,
-      refTableHeader,
-      leftBody,
-      rightBody,
-      refTableFooter
-    } = $refs;
-    const tableBodyElem = refTableBody ? refTableBody.$el : null;
-    const leftBodyElem = leftBody ? leftBody.$el : null;
-    const rightBodyElem = rightBody ? rightBody.$el : null;
-    const tableHeaderElem = refTableHeader ? refTableHeader.$el : null;
-    const tableFooterElem = refTableFooter ? refTableFooter.$el : null;
+      elemStore
+    } = internalData;
+    const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
+    const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+    const footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
+    const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
+    const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
+    const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
+    const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
     internalData.intoRunScroll = true;
     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollLeft)) {
-      const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
-      if (xHandleEl) {
-        setScrollLeft(xHandleEl, scrollLeft);
-      } else {
-        setScrollLeft(tableBodyElem, scrollLeft);
-        setScrollLeft(tableHeaderElem, scrollLeft);
-        setScrollLeft(tableFooterElem, scrollLeft);
-      }
+      setScrollLeft(xHandleEl, scrollLeft);
+      setScrollLeft(bodyScrollElem, scrollLeft);
+      setScrollLeft(headerScrollElem, scrollLeft);
+      setScrollLeft(footerScrollElem, scrollLeft);
+      loadScrollXData($xeTable);
     }
     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollTop)) {
-      const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
-      if (yHandleEl) {
-        setScrollTop(yHandleEl, scrollTop);
-      } else {
-        setScrollTop(tableBodyElem, scrollTop);
-        setScrollTop(leftBodyElem, scrollTop);
-        setScrollTop(rightBodyElem, scrollTop);
-      }
+      setScrollTop(yHandleEl, scrollTop);
+      setScrollTop(bodyScrollElem, scrollTop);
+      setScrollTop(leftScrollElem, scrollTop);
+      setScrollTop(rightScrollElem, scrollTop);
+      loadScrollYData($xeTable);
     }
-    if (this.scrollXLoad || this.scrollYLoad) {
+    if (reactData.scrollXLoad || reactData.scrollYLoad) {
       return new Promise(resolve => {
         setTimeout(() => {
           $xeTable.$nextTick(() => {
             internalData.intoRunScroll = false;
             resolve();
           });
-        });
+        }, 30);
       });
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   /**
    * 如果有滚动条，则滚动到对应的行
@@ -16548,6 +16523,7 @@ const Methods = {
    */
   scrollToRow(row, fieldOrColumn) {
     const $xeTable = this;
+    const props = $xeTable;
     const reactData = $xeTable;
     const {
       isAllOverflow,
@@ -16556,10 +16532,10 @@ const Methods = {
     } = reactData;
     const rest = [];
     if (row) {
-      if (this.treeConfig) {
-        rest.push(this.scrollToTreeRow(row));
+      if (props.treeConfig) {
+        rest.push($xeTable.scrollToTreeRow(row));
       } else {
-        rest.push(rowToVisible(this, row));
+        rest.push(rowToVisible($xeTable, row));
       }
     }
     if (fieldOrColumn) {
@@ -21340,6 +21316,7 @@ const {
         const hasChildMenus = item.children && item.children.some(child => child.visible !== false);
         const prefixOpts = Object.assign({}, item.prefixConfig);
         const suffixOpts = Object.assign({}, item.suffixConfig);
+        const menuContent = getFuncText(item.name);
         return item.visible === false ? null : h('li', {
           class: [item.className, {
             'link--disabled': item.disabled,
@@ -21364,8 +21341,11 @@ const {
         }, [h('i', {
           class: prefixOpts.icon || item.prefixIcon
         }), prefixOpts.content ? h('span', {}, `${prefixOpts.content}`) : _e()]), h('span', {
-          class: 'vxe-context-menu--link-content'
-        }, getFuncText(item.name)), h('div', {
+          class: 'vxe-context-menu--link-content',
+          attrs: {
+            title: menuContent
+          }
+        }, menuContent), h('div', {
           class: ['vxe-context-menu--link-suffix', suffixOpts.className || '']
         }, [h('i', {
           class: suffixOpts.icon || item.suffixIcon || (hasChildMenus ? menu_panel_getIcon().TABLE_MENU_OPTIONS : '')
@@ -21376,6 +21356,7 @@ const {
         }, item.children.map((child, cIndex) => {
           const childPrefixOpts = Object.assign({}, child.prefixConfig);
           const childSuffixOpts = Object.assign({}, child.suffixConfig);
+          const childMenuContent = getFuncText(child.name);
           return child.visible === false ? null : h('li', {
             class: [child.className, {
               'link--disabled': child.disabled,
@@ -21400,8 +21381,11 @@ const {
           }, [h('i', {
             class: childPrefixOpts.icon || child.prefixIcon
           }), childPrefixOpts.content ? h('span', `${childPrefixOpts.content}`) : _e()]), h('span', {
-            class: 'vxe-context-menu--link-content'
-          }, getFuncText(child.name)), h('div', {
+            class: 'vxe-context-menu--link-content',
+            attrs: {
+              title: childMenuContent
+            }
+          }, childMenuContent), h('div', {
             class: ['vxe-context-menu--link-suffix', childSuffixOpts.className || '']
           }, [h('i', {
             class: childSuffixOpts.icon
@@ -28390,6 +28374,7 @@ function renderBody(h, $xeTable) {
       insertRowMaps: {},
       // 已删除行
       removeRowMaps: {},
+      cvCacheMaps: {},
       swYSize: 0,
       swYInterval: 0,
       swYTotal: 0
@@ -28699,10 +28684,14 @@ function renderBody(h, $xeTable) {
   },
   beforeDestroy() {
     const $xeTable = this;
+    const internalData = $xeTable;
     const tableViewportEl = $xeTable.$refs.refTableViewportElem;
     if (tableViewportEl) {
       tableViewportEl.removeEventListener('wheel', $xeTable.triggerBodyWheelEvent);
     }
+    internalData.cvCacheMaps = {};
+    internalData.prevDragRow = null;
+    internalData.prevDragCol = null;
     if (this.$resize) {
       this.$resize.disconnect();
     }