vxe-table 4.13.11 → 4.13.12

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/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.13.11";
+export const version = "4.13.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${"4.13.11"}`;
+const version = `table v${"4.13.12"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.13.11";
+const version = "4.13.12";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3599,7 +3599,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.13.11"}`;
+const log_version = `table v${"4.13.12"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -4033,22 +4033,18 @@ const convertHeaderColumnToRows = originColumns => {
 };
 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 (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
 }
 /**
  * 生成行的唯一主键
@@ -11180,11 +11176,11 @@ if(transform){return handleVirtualTreeExpand(rows,expanded);}else{return handleB
              * 如果有滚动条，则滚动到对应的位置
              * @param {Number} scrollLeft 左距离
              * @param {Number} scrollTop 上距离
-             */scrollTo(scrollLeft,scrollTop){const{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=refScrollXHandleElem.value;const yHandleEl=refScrollYHandleElem.value;internalData.intoRunScroll=true;if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollLeft)){setScrollLeft(xHandleEl,scrollLeft);setScrollLeft(bodyScrollElem,scrollLeft);setScrollLeft(headerScrollElem,scrollLeft);setScrollLeft(footerScrollElem,scrollLeft);}if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollTop)){setScrollTop(yHandleEl,scrollTop);setScrollTop(bodyScrollElem,scrollTop);setScrollTop(leftScrollElem,scrollTop);setScrollTop(rightScrollElem,scrollTop);}if(reactData.scrollXLoad||reactData.scrollYLoad){return new Promise(resolve=>{setTimeout(()=>{(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(()=>{internalData.intoRunScroll=false;resolve();});},30);});}return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();},/**
+             */scrollTo(scrollLeft,scrollTop){const{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=refScrollXHandleElem.value;const yHandleEl=refScrollYHandleElem.value;internalData.intoRunScroll=true;if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollLeft)){setScrollLeft(xHandleEl,scrollLeft);setScrollLeft(bodyScrollElem,scrollLeft);setScrollLeft(headerScrollElem,scrollLeft);setScrollLeft(footerScrollElem,scrollLeft);loadScrollXData();}if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollTop)){setScrollTop(yHandleEl,scrollTop);setScrollTop(bodyScrollElem,scrollTop);setScrollTop(leftScrollElem,scrollTop);setScrollTop(rightScrollElem,scrollTop);loadScrollYData();}if(reactData.scrollXLoad||reactData.scrollYLoad){return new Promise(resolve=>{setTimeout(()=>{(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(()=>{internalData.intoRunScroll=false;resolve();});},30);});}return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();},/**
              * 如果有滚动条，则滚动到对应的行
              * @param {Row} row 行对象
              * @param {ColumnInfo} fieldOrColumn 列配置
-             */scrollToRow(row,fieldOrColumn){const{isAllOverflow,scrollYLoad,scrollXLoad}=reactData;const rest=[];if(row){if(props.treeConfig){rest.push(tablePrivateMethods.scrollToTreeRow(row));}else{rest.push(rowToVisible($xeTable,row));}}if(fieldOrColumn){rest.push(handleScrollToRowColumn(fieldOrColumn,row));}return Promise.all(rest).then(()=>{if(row){if(!isAllOverflow&&(scrollYLoad||scrollXLoad)){calcCellHeight();calcCellWidth();}return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();}});},/**
+             */scrollToRow(row,fieldOrColumn){const{isAllOverflow,scrollYLoad,scrollXLoad}=reactData;const rest=[];if(row){if(props.treeConfig){rest.push($xeTable.scrollToTreeRow(row));}else{rest.push(rowToVisible($xeTable,row));}}if(fieldOrColumn){rest.push(handleScrollToRowColumn(fieldOrColumn,row));}return Promise.all(rest).then(()=>{if(row){if(!isAllOverflow&&(scrollYLoad||scrollXLoad)){calcCellHeight();calcCellWidth();}return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();}});},/**
              * 如果有滚动条，则滚动到对应的列
              */scrollToColumn(fieldOrColumn){const{fullColumnIdData}=internalData;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(column&&fullColumnIdData[column.id]){return colToVisible($xeTable,column);}return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();},/**
              * 手动清除滚动相关信息，还原到初始状态