vxe-table 4.13.30 → 4.13.32

package/es/table/module/export/hook.js

@@ -11,7 +11,7 @@ let htmlCellElem;
 const csvBOM = '\ufeff';
 const enterSymbol = '\r\n';
 function defaultFilterExportColumn(column) {
-    return !!column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type || '') > -1;
+    return !!column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type || '') === -1;
 }
 const getConvertColumns = (columns) => {
     const result = [];
@@ -1118,9 +1118,14 @@ hooks.add('tableExportModule', {
                 if (!mode) {
                     mode = selectRecords.length ? 'selected' : 'current';
                 }
-                const customCols = columns && columns.length
-                    ? columns
-                    : XEUtils.searchTree(collectColumn, column => {
+                let isCustomCol = false;
+                let customCols = [];
+                if (columns && columns.length) {
+                    isCustomCol = true;
+                    customCols = columns;
+                }
+                else {
+                    customCols = XEUtils.searchTree(collectColumn, column => {
                         const isColGroup = column.children && column.children.length > 0;
                         let isChecked = false;
                         if (columns && columns.length) {
@@ -1134,9 +1139,10 @@ hooks.add('tableExportModule', {
                         }
                         return isChecked;
                     }, { children: 'children', mapChildren: 'childNodes', original: true });
+                }
                 const handleOptions = Object.assign({}, opts, { filename: '', sheetName: '' });
                 // 如果设置源数据，则默认导出设置了字段的列
-                if (!customCols && !columnFilterMethod) {
+                if (!isCustomCol && !columnFilterMethod) {
                     columnFilterMethod = ({ column }) => {
                         if (excludeFields) {
                             if (XEUtils.includes(excludeFields, column.field)) {

package/es/table/module/validator/hook.js

@@ -1,7 +1,7 @@
 import { nextTick } from 'vue';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
-import { getFuncText } from '../../../ui/src/utils';
+import { eqEmptyValue, getFuncText } from '../../../ui/src/utils';
 import { scrollToView } from '../../../ui/src/dom';
 import { handleFieldOrColumn, getRowid } from '../../src/util';
 import { warnLog, errLog } from '../../../ui/src/log';
@@ -114,7 +114,7 @@ function validRuleValue(rule, val, required) {
 }
 function checkRuleStatus(rule, val) {
     const { required } = rule;
-    const isEmptyVal = XEUtils.eqNull(val);
+    const isEmptyVal = XEUtils.isArray(val) ? !val.length : eqEmptyValue(val);
     if (required) {
         if (isEmptyVal) {
             return false;

package/es/table/src/table.js

@@ -3881,7 +3881,9 @@ export default defineComponent({
                 const column = visibleColumn[cIndex];
                 const colid = column.id;
                 const colRest = fullColumnIdData[colid];
-                colRest.oLeft = offsetLeft;
+                if (colRest) {
+                    colRest.oLeft = offsetLeft;
+                }
                 offsetLeft += column.renderWidth;
             }
         };

package/es/table/src/util.js

@@ -1,4 +1,4 @@
-import { watch, reactive, nextTick } from 'vue';
+import { watch, reactive } from 'vue';
 import XEUtils from 'xe-utils';
 import { ColumnInfo } from './columnInfo';
 import { isPx, isScale, queryElement } from '../../ui/src/dom';
@@ -75,7 +75,7 @@ export function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
         // 还原滚动状态
         return $xeTable.scrollTo(scrollLeft, scrollTop);
     }
-    return nextTick();
+    return $xeTable.clearScroll();
 }
 /**
  * 生成行的唯一主键

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.30";
+export const version = "4.13.32";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -200,13 +200,13 @@ VxeUI.setConfig({
             isReplace: true
         },
         virtualXConfig: {
-            enabled: false,
+            // enabled: false,
             gt: 24,
             preSize: 1,
             oSize: 0
         },
         virtualYConfig: {
-            enabled: false,
+            // enabled: false,
             gt: 100,
             preSize: 1,
             oSize: 0

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.30"}`;
+const version = `table v${"4.13.32"}`;
 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.30";
+const version = "4.13.32";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3338,13 +3338,13 @@ core_.VxeUI.setConfig({
       isReplace: true
     },
     virtualXConfig: {
-      enabled: false,
+      // enabled: false,
       gt: 24,
       preSize: 1,
       oSize: 0
     },
     virtualYConfig: {
-      enabled: false,
+      // enabled: false,
       gt: 100,
       preSize: 1,
       oSize: 0
@@ -3599,7 +3599,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.13.30"}`;
+const log_version = `table v${"4.13.32"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -4050,7 +4050,7 @@ function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
     // 还原滚动状态
     return $xeTable.scrollTo(scrollLeft, scrollTop);
   }
-  return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+  return $xeTable.clearScroll();
 }
 /**
  * 生成行的唯一主键
@@ -10910,7 +10910,7 @@ const matchObj=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe
          */const handleRowGroupVirtualExpand=(rows,expanded)=>{return handleRowGroupBaseExpand(rows,expanded).then(()=>{handleVirtualTreeToList();$xeTable.handleTableData();reactData.rowGroupExpandedFlag++;updateAfterDataIndex();return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();}).then(()=>{return $xeTable.recalculate(true);}).then(()=>{setTimeout(()=>{$xeTable.updateCellAreas();},30);});};const handleCheckAllEvent=(evnt,value)=>{handleCheckedAllCheckboxRow(value);if(evnt){dispatchEvent('checkbox-all',{records:()=>$xeTable.getCheckboxRecords(),reserves:()=>$xeTable.getCheckboxReserveRecords(),indeterminates:()=>$xeTable.getCheckboxIndeterminateRecords(),checked:value},evnt);}};/**
          * 纵向 Y 可视渲染处理
          */const loadScrollYData=()=>{const{isAllOverflow,isScrollYBig}=reactData;const{mergeBodyList,scrollYStore}=internalData;const{preloadSize,startIndex,endIndex,offsetSize}=scrollYStore;const autoOffsetYSize=isAllOverflow?offsetSize:offsetSize+1;const{toVisibleIndex,visibleSize}=handleVirtualYVisible();const offsetItem={startIndex:Math.max(0,isScrollYBig?toVisibleIndex-1:toVisibleIndex-1-offsetSize-preloadSize),endIndex:isScrollYBig?toVisibleIndex+visibleSize:toVisibleIndex+visibleSize+autoOffsetYSize+preloadSize};scrollYStore.visibleStartIndex=toVisibleIndex-1;scrollYStore.visibleEndIndex=toVisibleIndex+visibleSize+1;calculateMergerOffsetIndex(mergeBodyList,offsetItem,'row');const{startIndex:offsetStartIndex,endIndex:offsetEndIndex}=offsetItem;if(toVisibleIndex<=startIndex||toVisibleIndex>=endIndex-visibleSize-1){if(startIndex!==offsetStartIndex||endIndex!==offsetEndIndex){scrollYStore.startIndex=offsetStartIndex;scrollYStore.endIndex=offsetEndIndex;$xeTable.updateScrollYData();}}};const createGetRowCacheProp=prop=>{return function(row){const{fullAllDataRowIdData}=internalData;if(row){const rowid=getRowid($xeTable,row);const rowRest=fullAllDataRowIdData[rowid];if(rowRest){return rowRest[prop];}}return-1;};};const createGetColumnCacheProp=prop=>{return function(column){const{fullColumnIdData}=internalData;if(column){const colRest=fullColumnIdData[column.id];if(colRest){return colRest[prop];}}return-1;};};const lazyScrollXData=()=>{const{lxTimeout,lxRunTime,scrollXStore}=internalData;const{visibleSize}=scrollXStore;const fpsTime=visibleSize>26?26:visibleSize>16?14:6;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=visibleSize>30?32:visibleSize>20?18:8;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,isAllOverflow}=reactData;const{lcsTimeout}=internalData;if(lcsTimeout){clearTimeout(lcsTimeout);}internalData.lcsTimeout=setTimeout(()=>{internalData.lcsRunTime=Date.now();internalData.lcsTimeout=undefined;internalData.intoRunScroll=false;internalData.inVirtualScroll=false;internalData.inWheelScroll=false;internalData.inHeaderScroll=false;internalData.inBodyScroll=false;internalData.inFooterScroll=false;internalData.scrollRenderType='';if(!isAllOverflow){calcCellHeight();updateRowOffsetTop();}if(isRollX&&scrollXLoad){$xeTable.updateScrollXData();}if(isRollY&&scrollYLoad){$xeTable.updateScrollYData().then(()=>{if(!isAllOverflow){calcCellHeight();updateRowOffsetTop();}$xeTable.updateScrollYSpace();});}updateRowExpandStyle();$xeTable.updateCellAreas();},200);};const getWheelSpeed=lastScrollTime=>{let multiple=1;const currTime=Date.now();if(lastScrollTime+25>currTime){multiple=1.18;}else if(lastScrollTime+30>currTime){multiple=1.15;}else if(lastScrollTime+40>currTime){multiple=1.12;}else if(lastScrollTime+55>currTime){multiple=1.09;}else if(lastScrollTime+75>currTime){multiple=1.06;}else if(lastScrollTime+100>currTime){multiple=1.03;}return multiple;};const wheelScrollLeftTo=(scrollLeft,cb)=>{requestAnimationFrame(()=>{cb(scrollLeft);});};const wheelScrollTopTo=(diffNum,cb)=>{const duration=Math.abs(diffNum);const startTime=performance.now();let countTop=0;const step=timestamp=>{let progress=(timestamp-startTime)/duration;if(progress>1){progress=1;}const easedProgress=Math.pow(progress,2);const offsetTop=Math.floor(diffNum*easedProgress)-countTop;countTop+=offsetTop;cb(offsetTop);if(progress<1){requestAnimationFrame(step);}};requestAnimationFrame(step);};const dispatchEvent=(type,params,evnt)=>{emit(type,createEvent(evnt,{$table:$xeTable,$grid:$xeGrid},params));};const handleScrollToRowColumn=(fieldOrColumn,row)=>{const{fullColumnIdData}=internalData;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(column&&fullColumnIdData[column.id]){return colToVisible($xeTable,column,row);}return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();};const handleUpdateResize=()=>{const el=refElem.value;if(el&&el.clientWidth&&el.clientHeight){tableMethods.recalculate();}};const handleUpdateColResize=(evnt,params)=>{$xeTable.analyColumnWidth();$xeTable.recalculate().then(()=>{$xeTable.saveCustomStore('update:width');$xeTable.updateCellAreas();$xeTable.dispatchEvent('column-resizable-change',params,evnt);// 已废弃 resizable-change
-$xeTable.dispatchEvent('resizable-change',params,evnt);setTimeout(()=>$xeTable.recalculate(true),300);});};const handleUpdateRowResize=(evnt,params)=>{reactData.resizeHeightFlag++;$xeTable.recalculate().then(()=>{$xeTable.updateCellAreas();$xeTable.dispatchEvent('row-resizable-change',params,evnt);setTimeout(()=>$xeTable.recalculate(true),300);});};const updateColumnOffsetLeft=()=>{const{visibleColumn,fullColumnIdData}=internalData;let offsetLeft=0;for(let cIndex=0,rLen=visibleColumn.length;cIndex<rLen;cIndex++){const column=visibleColumn[cIndex];const colid=column.id;const colRest=fullColumnIdData[colid];colRest.oLeft=offsetLeft;offsetLeft+=column.renderWidth;}};const updateRowOffsetTop=()=>{const{expandColumn}=reactData;const{afterFullData,fullAllDataRowIdData,rowExpandedMaps}=internalData;const expandOpts=computeExpandOpts.value;const rowOpts=computeRowOpts.value;const cellOpts=computeCellOpts.value;const defaultRowHeight=computeDefaultRowHeight.value;const{handleGetRowId}=createHandleGetRowId($xeTable);let offsetTop=0;for(let rIndex=0,rLen=afterFullData.length;rIndex<rLen;rIndex++){const row=afterFullData[rIndex];const rowid=handleGetRowId(row);const rowRest=fullAllDataRowIdData[rowid]||{};rowRest.oTop=offsetTop;offsetTop+=rowRest.resizeHeight||cellOpts.height||rowOpts.height||rowRest.height||defaultRowHeight;// 是否展开行
+$xeTable.dispatchEvent('resizable-change',params,evnt);setTimeout(()=>$xeTable.recalculate(true),300);});};const handleUpdateRowResize=(evnt,params)=>{reactData.resizeHeightFlag++;$xeTable.recalculate().then(()=>{$xeTable.updateCellAreas();$xeTable.dispatchEvent('row-resizable-change',params,evnt);setTimeout(()=>$xeTable.recalculate(true),300);});};const updateColumnOffsetLeft=()=>{const{visibleColumn,fullColumnIdData}=internalData;let offsetLeft=0;for(let cIndex=0,rLen=visibleColumn.length;cIndex<rLen;cIndex++){const column=visibleColumn[cIndex];const colid=column.id;const colRest=fullColumnIdData[colid];if(colRest){colRest.oLeft=offsetLeft;}offsetLeft+=column.renderWidth;}};const updateRowOffsetTop=()=>{const{expandColumn}=reactData;const{afterFullData,fullAllDataRowIdData,rowExpandedMaps}=internalData;const expandOpts=computeExpandOpts.value;const rowOpts=computeRowOpts.value;const cellOpts=computeCellOpts.value;const defaultRowHeight=computeDefaultRowHeight.value;const{handleGetRowId}=createHandleGetRowId($xeTable);let offsetTop=0;for(let rIndex=0,rLen=afterFullData.length;rIndex<rLen;rIndex++){const row=afterFullData[rIndex];const rowid=handleGetRowId(row);const rowRest=fullAllDataRowIdData[rowid]||{};rowRest.oTop=offsetTop;offsetTop+=rowRest.resizeHeight||cellOpts.height||rowOpts.height||rowRest.height||defaultRowHeight;// 是否展开行
 if(expandColumn&&rowExpandedMaps[rowid]){offsetTop+=rowRest.expandHeight||expandOpts.height||0;}}};const updateRowExpandStyle=()=>{const{expandColumn,scrollYLoad,scrollYTop,isScrollYBig}=reactData;const expandOpts=computeExpandOpts.value;const rowOpts=computeRowOpts.value;const cellOpts=computeCellOpts.value;const defaultRowHeight=computeDefaultRowHeight.value;const{mode}=expandOpts;if(expandColumn&&mode==='fixed'){const{elemStore,fullAllDataRowIdData}=internalData;const rowExpandEl=refRowExpandElem.value;const bodyScrollElem=getRefElem(elemStore['main-body-scroll']);if(rowExpandEl&&bodyScrollElem){let isUpdateHeight=false;external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(rowExpandEl.children,reEl=>{const expandEl=reEl;const rowid=expandEl.getAttribute('rowid')||'';const rowRest=fullAllDataRowIdData[rowid];if(rowRest){const expandHeight=expandEl.offsetHeight+1;const trEl=bodyScrollElem.querySelector(`.vxe-body--row[rowid="${rowid}"]`);let offsetTop=0;if(scrollYLoad){if(isScrollYBig&&trEl){offsetTop=trEl.offsetTop+trEl.offsetHeight;}else{offsetTop=rowRest.oTop+(rowRest.resizeHeight||cellOpts.height||rowOpts.height||rowRest.height||defaultRowHeight);}}else{if(trEl){offsetTop=trEl.offsetTop+trEl.offsetHeight;}}if(isScrollYBig){offsetTop+=scrollYTop;}expandEl.style.top=toCssUnit(offsetTop);if(!isUpdateHeight){if(rowRest.expandHeight!==expandHeight){isUpdateHeight=true;}}rowRest.expandHeight=expandHeight;}});if(isUpdateHeight){reactData.rowExpandHeightFlag++;(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(()=>{updateRowOffsetTop();});}}}};const handleRowExpandScroll=()=>{const{elemStore}=internalData;const rowExpandEl=refRowExpandElem.value;const bodyScrollElem=getRefElem(elemStore['main-body-scroll']);if(rowExpandEl&&bodyScrollElem){rowExpandEl.scrollTop=bodyScrollElem.scrollTop;}};tableMethods={dispatchEvent,getEl(){return refElem.value;},/**
              * 重置表格的一切数据状态
              */clearAll(){return clearTableAllStatus($xeTable);},/**
@@ -15916,7 +15916,7 @@ let htmlCellElem;
 const csvBOM = '\ufeff';
 const enterSymbol = '\r\n';
 function defaultFilterExportColumn(column) {
-  return !!column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type || '') > -1;
+  return !!column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type || '') === -1;
 }
 const getConvertColumns = columns => {
   const result = [];
@@ -17245,28 +17245,35 @@ export_hook_hooks.add('tableExportModule', {
         if (!mode) {
           mode = selectRecords.length ? 'selected' : 'current';
         }
-        const customCols = columns && columns.length ? columns : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(collectColumn, column => {
-          const isColGroup = column.children && column.children.length > 0;
-          let isChecked = false;
-          if (columns && columns.length) {
-            isChecked = handleFilterColumns(opts, column, columns);
-          } else if (excludeFields || includeFields) {
-            isChecked = handleFilterFields(opts, column, includeFields, excludeFields);
-          } else {
-            isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
-          }
-          return isChecked;
-        }, {
-          children: 'children',
-          mapChildren: 'childNodes',
-          original: true
-        });
+        let isCustomCol = false;
+        let customCols = [];
+        if (columns && columns.length) {
+          isCustomCol = true;
+          customCols = columns;
+        } else {
+          customCols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(collectColumn, column => {
+            const isColGroup = column.children && column.children.length > 0;
+            let isChecked = false;
+            if (columns && columns.length) {
+              isChecked = handleFilterColumns(opts, column, columns);
+            } else if (excludeFields || includeFields) {
+              isChecked = handleFilterFields(opts, column, includeFields, excludeFields);
+            } else {
+              isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
+            }
+            return isChecked;
+          }, {
+            children: 'children',
+            mapChildren: 'childNodes',
+            original: true
+          });
+        }
         const handleOptions = Object.assign({}, opts, {
           filename: '',
           sheetName: ''
         });
         // 如果设置源数据，则默认导出设置了字段的列
-        if (!customCols && !columnFilterMethod) {
+        if (!isCustomCol && !columnFilterMethod) {
           columnFilterMethod = ({
             column
           }) => {
@@ -18435,7 +18442,7 @@ function checkRuleStatus(rule, val) {
   const {
     required
   } = rule;
-  const isEmptyVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(val);
+  const isEmptyVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(val) ? !val.length : eqEmptyValue(val);
   if (required) {
     if (isEmptyVal) {
       return false;