vxe-table 3.15.12 → 3.15.14

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.12";
+const version = "3.15.14";
 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.12"}`;
+const log_version = `table v${"3.15.14"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3668,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);
@@ -3689,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);
@@ -8187,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;
@@ -8410,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 = {};
@@ -8897,7 +8898,7 @@ function lazyScrollXData($xeTable) {
   const {
     visibleSize
   } = scrollXStore;
-  const fpsTime = Math.max(5, Math.min(10, Math.floor(visibleSize / 3)));
+  const fpsTime = visibleSize > 26 ? 26 : visibleSize > 16 ? 14 : 6;
   if (lxTimeout) {
     clearTimeout(lxTimeout);
   }
@@ -8921,7 +8922,7 @@ function lazyScrollYData($xeTable) {
   const {
     visibleSize
   } = scrollYStore;
-  const fpsTime = Math.floor(Math.max(4, Math.min(10, visibleSize / 3)));
+  const fpsTime = visibleSize > 30 ? 32 : visibleSize > 20 ? 18 : 8;
   if (lyTimeout) {
     clearTimeout(lyTimeout);
   }
@@ -16125,8 +16126,8 @@ const Methods = {
     if (isRollX) {
       evnt.preventDefault();
       internalData.inWheelScroll = true;
-      wheelScrollLeftTo(scrollLeft, offsetLeft => {
-        const currLeftNum = offsetLeft;
+      if (browseObj['-moz'] || browseObj.safari) {
+        const currLeftNum = scrollLeft;
         setScrollLeft(xHandleEl, currLeftNum);
         setScrollLeft(bodyScrollElem, currLeftNum);
         setScrollLeft(headerScrollElem, currLeftNum);
@@ -16138,13 +16139,27 @@ const Methods = {
           type: 'table',
           fixed: ''
         });
-      });
+      } else {
+        wheelScrollLeftTo(scrollLeft, offsetLeft => {
+          const currLeftNum = offsetLeft;
+          setScrollLeft(xHandleEl, currLeftNum);
+          setScrollLeft(bodyScrollElem, currLeftNum);
+          setScrollLeft(headerScrollElem, currLeftNum);
+          setScrollLeft(footerScrollElem, currLeftNum);
+          if (scrollXLoad) {
+            $xeTable.triggerScrollXEvent(evnt);
+          }
+          $xeTable.handleScrollEvent(evnt, isRollY, isRollX, bodyScrollElem.scrollTop, currLeftNum, {
+            type: 'table',
+            fixed: ''
+          });
+        });
+      }
     }
     if (isRollY) {
       evnt.preventDefault();
-      wheelScrollTopTo(scrollTop - currScrollTop, offsetTop => {
-        const currTopNum = bodyScrollElem.scrollTop + offsetTop;
-        internalData.inWheelScroll = true;
+      if (browseObj['-moz'] || browseObj.safari) {
+        const currTopNum = scrollTop;
         setScrollTop(yHandleEl, currTopNum);
         setScrollTop(bodyScrollElem, currTopNum);
         setScrollTop(leftScrollElem, currTopNum);
@@ -16157,7 +16172,24 @@ const Methods = {
           type: 'table',
           fixed: ''
         });
-      });
+      } else {
+        wheelScrollTopTo(scrollTop - currScrollTop, offsetTop => {
+          const currTopNum = bodyScrollElem.scrollTop + offsetTop;
+          internalData.inWheelScroll = true;
+          setScrollTop(yHandleEl, currTopNum);
+          setScrollTop(bodyScrollElem, currTopNum);
+          setScrollTop(leftScrollElem, currTopNum);
+          setScrollTop(rightScrollElem, currTopNum);
+          setScrollTop(rowExpandEl, currTopNum);
+          if (scrollYLoad) {
+            $xeTable.triggerScrollYEvent(evnt);
+          }
+          $xeTable.handleScrollEvent(evnt, isRollY, isRollX, currTopNum, bodyScrollElem.scrollLeft, {
+            type: 'table',
+            fixed: ''
+          });
+        });
+      }
     }
   },
   triggerVirtualScrollXEvent(evnt) {
@@ -16321,20 +16353,18 @@ const Methods = {
         ySpaceWidth = maxXWidth;
         isScrollXBig = true;
       }
-      let marginLeft = '';
-      if (scrollXLoad && overflowX) {
-        marginLeft = `${xSpaceLeft}px`;
+      if (!(scrollXLoad && overflowX)) {
+        xSpaceLeft = 0;
       }
       if (headerTableElem) {
-        headerTableElem.style.marginLeft = headerTableElem.getAttribute('xvm') ? marginLeft : '';
+        headerTableElem.style.transform = headerTableElem.getAttribute('xvm') ? `translate(${xSpaceLeft}px, 0px)` : '';
       }
       if (bodyTableElem) {
-        bodyTableElem.style.marginLeft = marginLeft;
+        bodyTableElem.style.transform = `translate(${xSpaceLeft}px, ${reactData.scrollYTop || 0}px)`;
       }
       if (footerTableElem) {
-        footerTableElem.style.marginLeft = footerTableElem.getAttribute('xvm') ? marginLeft : '';
+        footerTableElem.style.transform = footerTableElem.getAttribute('xvm') ? `translate(${xSpaceLeft}px, 0px)` : '';
       }
-      reactData.isScrollXBig = isScrollXBig;
       const containerList = ['main'];
       containerList.forEach(name => {
         const layoutList = ['header', 'body', 'footer'];
@@ -16345,6 +16375,9 @@ const Methods = {
           }
         });
       });
+      reactData.scrollXLeft = xSpaceLeft;
+      reactData.scrollXWidth = ySpaceWidth;
+      reactData.isScrollXBig = isScrollXBig;
       const scrollXSpaceEl = $xeTable.$refs.refScrollXSpaceElem;
       if (scrollXSpaceEl) {
         scrollXSpaceEl.style.width = `${ySpaceWidth}px`;
@@ -16395,6 +16428,8 @@ const Methods = {
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
     const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
     const bodyTableElem = getRefElem(elemStore['main-body-table']);
+    const leftBodyTableElem = getRefElem(elemStore['left-body-table']);
+    const rightbodyTableElem = getRefElem(elemStore['right-body-table']);
     const containerList = ['main', 'left', 'right'];
     let ySpaceTop = 0;
     let scrollYHeight = 0;
@@ -16445,12 +16480,17 @@ const Methods = {
       }
       ySpaceHeight = maxYHeight;
     }
+    if (leftBodyTableElem) {
+      leftBodyTableElem.style.transform = `translate(0px, ${scrollYTop}px)`;
+    }
+    if (bodyTableElem) {
+      bodyTableElem.style.transform = `translate(${reactData.scrollXLeft || 0}px, ${scrollYTop}px)`;
+    }
+    if (rightbodyTableElem) {
+      rightbodyTableElem.style.transform = `translate(0px, ${scrollYTop}px)`;
+    }
     containerList.forEach(name => {
       const layoutList = ['header', 'body', 'footer'];
-      const tableElem = getRefElem(elemStore[`${name}-body-table`]);
-      if (tableElem) {
-        tableElem.style.marginTop = scrollYTop ? `${scrollYTop}px` : '';
-      }
       layoutList.forEach(layout => {
         const ySpaceElem = getRefElem(elemStore[`${name}-${layout}-ySpace`]);
         if (ySpaceElem) {
@@ -21327,6 +21367,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,
@@ -21351,8 +21392,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 : '')
@@ -21363,6 +21407,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,
@@ -21387,8 +21432,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
@@ -28377,6 +28425,7 @@ function renderBody(h, $xeTable) {
       insertRowMaps: {},
       // 已删除行
       removeRowMaps: {},
+      cvCacheMaps: {},
       swYSize: 0,
       swYInterval: 0,
       swYTotal: 0
@@ -28686,10 +28735,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();
     }