vxe-table 4.18.9 → 4.18.10

package/es/table/src/body.js

@@ -337,6 +337,14 @@ export default defineVxeComponent({
                 if (treeConfig) {
                     tdVNs.push(...renderLine(rowid, cellParams, cellHeight));
                 }
+                const clVNs = [];
+                if (!isVNPreEmptyStatus) {
+                    clVNs.push(h('div', {
+                        colid,
+                        rowid,
+                        class: 'vxe-cell--wrapper vxe-body-cell--wrapper'
+                    }, column.renderCell(cellParams)));
+                }
                 tdVNs.push(h('div', {
                     key: 'tc',
                     class: ['vxe-cell', {
@@ -346,15 +354,7 @@ export default defineVxeComponent({
                         }],
                     style: tcStyle,
                     title: showTitle ? $xeTable.getCellLabel(row, column) : null
-                }, isVNPreEmptyStatus
-                    ? []
-                    : [
-                        h('div', {
-                            colid,
-                            rowid,
-                            class: 'vxe-cell--wrapper vxe-body-cell--wrapper'
-                        }, column.renderCell(cellParams))
-                    ]));
+                }, clVNs));
                 if (showValidTip && errorValidItem) {
                     const errRule = errorValidItem.rule;
                     const validSlot = slots ? slots.valid : null;
@@ -440,7 +440,7 @@ export default defineVxeComponent({
             const $xeGrid = $xeTable.xeGrid;
             const $xeGantt = $xeTable.xeGantt;
             const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, editConfig, treeConfig } = tableProps;
-            const { hasFixedColumn, treeExpandedFlag, scrollXLoad, scrollYLoad, isAllOverflow, rowExpandedFlag, expandColumn, selectRadioRow, pendingRowFlag, rowExpandHeightFlag, isRowGroupStatus } = tableReactData;
+            const { hasFixedColumn, treeExpandedFlag, scrollYLoad, isAllOverflow, rowExpandedFlag, expandColumn, selectRadioRow, pendingRowFlag, rowExpandHeightFlag, isRowGroupStatus } = tableReactData;
             const { fullAllDataRowIdData, fullColumnIdData, treeExpandedMaps, pendingRowMaps, rowExpandedMaps } = tableInternalData;
             const checkboxOpts = computeCheckboxOpts.value;
             const radioOpts = computeRadioOpts.value;
@@ -539,7 +539,7 @@ export default defineVxeComponent({
                 const tdVNs = tableColumn.map((column, $columnIndex) => {
                     return renderTdColumn(seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
                 });
-                rows.push(h('tr', Object.assign({ class: trClass, rowid: rowid, style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null, key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || isRowGroupStatus || treeConfig ? rowid : $rowIndex }, trOn), tdVNs));
+                rows.push(h('tr', Object.assign({ class: trClass, rowid: rowid, style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null, key: rowKey || rowOpts.useKey || rowOpts.drag || columnOpts.drag || isRowGroupStatus || treeConfig ? rowid : $rowIndex }, trOn), tdVNs));
                 // 如果行被展开了
                 if (isExpandRow) {
                     const expandOpts = computeExpandOpts.value;

package/es/table/src/table.js

@@ -7280,10 +7280,21 @@ export default defineVxeComponent({
             /**
              * 如果有滚动条，则滚动到对应的行
              */
-            scrollToRow(row, fieldOrColumn, options) {
+            scrollToRow(rowOrRowid, fieldOrColumn, options) {
                 const { isAllOverflow, scrollYLoad, scrollXLoad } = reactData;
-                const { _sToTime } = internalData;
+                const { fullAllDataRowIdData, _sToTime } = internalData;
                 const rest = [];
+                let row;
+                if (XEUtils.isString(rowOrRowid) || XEUtils.isNumber(rowOrRowid)) {
+                    const rowid = rowOrRowid;
+                    const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
+                    if (rowRest) {
+                        row = rowRest.row;
+                    }
+                }
+                else {
+                    row = rowOrRowid;
+                }
                 if (row) {
                     if (props.treeConfig) {
                         rest.push($xeTable.scrollToTreeRow(row));
@@ -13127,7 +13138,10 @@ export default defineVxeComponent({
                             minWidth: tableTipConfig.minWidth,
                             minHeight: tableTipConfig.minHeight,
                             maxWidth: tableTipConfig.maxWidth,
-                            maxHeight: tableTipConfig.maxHeight
+                            maxHeight: tableTipConfig.maxHeight,
+                            placement: tableTipConfig.placement,
+                            defaultPlacement: tableTipConfig.defaultPlacement,
+                            popupClassName: tableTipConfig.popupClassName
                         }, currTooltipSlot
                             ? {
                                 content: () => {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.18.9";
+export const version = "4.18.10";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -66,7 +66,8 @@ VxeUI.setConfig({
             strict: true
         },
         tooltipConfig: {
-            enterable: true
+            enterable: true,
+            defaultPlacement: 'top'
         },
         headerTooltipConfig: {
             enterable: true

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.18.9"}`;
+const version = `table v${"4.18.10"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3144,7 +3144,7 @@ function getDefaultConfig(val1, def1) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.18.8";
+const version = "4.18.10";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3210,7 +3210,8 @@ core_.VxeUI.setConfig({
       strict: true
     },
     tooltipConfig: {
-      enterable: true
+      enterable: true,
+      defaultPlacement: 'top'
     },
     headerTooltipConfig: {
       enterable: true
@@ -3669,7 +3670,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.18.8"}`;
+const log_version = `table v${"4.18.10"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -7997,6 +7998,14 @@ const renderType = 'body';
         if (treeConfig) {
           tdVNs.push(...renderLine(rowid, cellParams, cellHeight));
         }
+        const clVNs = [];
+        if (!isVNPreEmptyStatus) {
+          clVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            colid,
+            rowid,
+            class: 'vxe-cell--wrapper vxe-body-cell--wrapper'
+          }, column.renderCell(cellParams)));
+        }
         tdVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           key: 'tc',
           class: ['vxe-cell', {
@@ -8006,11 +8015,7 @@ const renderType = 'body';
           }],
           style: tcStyle,
           title: showTitle ? $xeTable.getCellLabel(row, column) : null
-        }, isVNPreEmptyStatus ? [] : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-          colid,
-          rowid,
-          class: 'vxe-cell--wrapper vxe-body-cell--wrapper'
-        }, column.renderCell(cellParams))]));
+        }, clVNs));
         if (showValidTip && errorValidItem) {
           const errRule = errorValidItem.rule;
           const validSlot = slots ? slots.valid : null;
@@ -8097,7 +8102,6 @@ const renderType = 'body';
       const {
         hasFixedColumn,
         treeExpandedFlag,
-        scrollXLoad,
         scrollYLoad,
         isAllOverflow,
         rowExpandedFlag,
@@ -8217,7 +8221,7 @@ const renderType = 'body';
           class: trClass,
           rowid: rowid,
           style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowStyle) ? rowStyle(params) : rowStyle : null,
-          key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || isRowGroupStatus || treeConfig ? rowid : $rowIndex,
+          key: rowKey || rowOpts.useKey || rowOpts.drag || columnOpts.drag || isRowGroupStatus || treeConfig ? rowid : $rowIndex,
           ...trOn
         }, tdVNs));
         // 如果行被展开了
@@ -20098,7 +20102,7 @@ if(transform){return handleVirtualTreeExpand(rows,expanded);}else{return handleB
              * 如果有滚动条，则滚动到对应的位置
              */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(scrollLeft){if(!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollLeft)){scrollTop=scrollLeft.top;scrollLeft=scrollLeft.left;}}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(reactData.scrollXLoad){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);if(reactData.scrollYLoad){loadScrollYData();}}return new Promise(resolve=>{setTimeout(()=>{(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(()=>{internalData.intoRunScroll=false;resolve();});},reactData.scrollXLoad||reactData.scrollYLoad?30:0);});},/**
              * 如果有滚动条，则滚动到对应的行
-             */scrollToRow(row,fieldOrColumn,options){const{isAllOverflow,scrollYLoad,scrollXLoad}=reactData;const{_sToTime}=internalData;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,options));}if(_sToTime){clearTimeout(_sToTime);}return Promise.all(rest).then(()=>{if(row){if(!isAllOverflow&&(scrollYLoad||scrollXLoad)){calcCellHeight();calcCellWidth();// 可视区被渲染后位置被偏移
+             */scrollToRow(rowOrRowid,fieldOrColumn,options){const{isAllOverflow,scrollYLoad,scrollXLoad}=reactData;const{fullAllDataRowIdData,_sToTime}=internalData;const rest=[];let row;if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(rowOrRowid)||external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(rowOrRowid)){const rowid=rowOrRowid;const rowRest=rowid?fullAllDataRowIdData[rowid]:null;if(rowRest){row=rowRest.row;}}else{row=rowOrRowid;}if(row){if(props.treeConfig){rest.push($xeTable.scrollToTreeRow(row));}else{rest.push(rowToVisible($xeTable,row));}}if(fieldOrColumn){rest.push(handleScrollToRowColumn(fieldOrColumn,row,options));}if(_sToTime){clearTimeout(_sToTime);}return Promise.all(rest).then(()=>{if(row){if(!isAllOverflow&&(scrollYLoad||scrollXLoad)){calcCellHeight();calcCellWidth();// 可视区被渲染后位置被偏移
 internalData._sToTime=setTimeout(()=>{internalData._sToTime=undefined;if(scrollYLoad){if(props.treeConfig){$xeTable.scrollToTreeRow(row);}else{rowToVisible($xeTable,row);}}if(scrollXLoad&&fieldOrColumn){handleScrollToRowColumn(fieldOrColumn,row,options);}},350);}return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();}});},/**
              * 如果有滚动条，则滚动到第一行
              */scrollToStartRow(fieldOrColumn,options){const{afterFullData}=internalData;return $xeTable.scrollToRow(afterFullData[0],fieldOrColumn,options);},/**
@@ -20454,7 +20458,7 @@ Object.assign($xeTable,tableMethods,tablePrivateMethods);/**
                          * 通用提示
                          */(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUITooltipComponent,{key:'ctp',ref:refCommTooltip,isArrow:false,enterable:false}),/**
                           * 工具提示
-                          */(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUITooltipComponent,{key:'btp',ref:refTooltip,theme:tableTipConfig.theme,enterable:tableTipConfig.enterable,enterDelay:tableTipConfig.enterDelay,leaveDelay:tableTipConfig.leaveDelay,useHTML:tableTipConfig.useHTML,width:tableTipConfig.width,height:tableTipConfig.height,minWidth:tableTipConfig.minWidth,minHeight:tableTipConfig.minHeight,maxWidth:tableTipConfig.maxWidth,maxHeight:tableTipConfig.maxHeight},currTooltipSlot?{content:()=>{const{type,row,column,content:tooltipContent}=tooltipStore;if(currTooltipSlot){if(column&&type==='header'){return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div',{key:type},currTooltipSlot({column,tooltipContent,$table:$xeTable,$grid:$xeGrid,$gantt:$xeGantt}));}if(row&&column&&type==='body'){return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div',{key:type},currTooltipSlot({row,column,tooltipContent,$table:$xeTable,$grid:$xeGrid,$gantt:$xeGantt}));}if(row&&column&&type==='footer'){return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div',{key:type},currTooltipSlot({row,column,tooltipContent,$table:$xeTable,$grid:$xeGrid,$gantt:$xeGantt}));}}return table_renderEmptyElement($xeTable);}}:{}),/**
+                          */(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUITooltipComponent,{key:'btp',ref:refTooltip,theme:tableTipConfig.theme,enterable:tableTipConfig.enterable,enterDelay:tableTipConfig.enterDelay,leaveDelay:tableTipConfig.leaveDelay,useHTML:tableTipConfig.useHTML,width:tableTipConfig.width,height:tableTipConfig.height,minWidth:tableTipConfig.minWidth,minHeight:tableTipConfig.minHeight,maxWidth:tableTipConfig.maxWidth,maxHeight:tableTipConfig.maxHeight,placement:tableTipConfig.placement,defaultPlacement:tableTipConfig.defaultPlacement,popupClassName:tableTipConfig.popupClassName},currTooltipSlot?{content:()=>{const{type,row,column,content:tooltipContent}=tooltipStore;if(currTooltipSlot){if(column&&type==='header'){return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div',{key:type},currTooltipSlot({column,tooltipContent,$table:$xeTable,$grid:$xeGrid,$gantt:$xeGantt}));}if(row&&column&&type==='body'){return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div',{key:type},currTooltipSlot({row,column,tooltipContent,$table:$xeTable,$grid:$xeGrid,$gantt:$xeGantt}));}if(row&&column&&type==='footer'){return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div',{key:type},currTooltipSlot({row,column,tooltipContent,$table:$xeTable,$grid:$xeGrid,$gantt:$xeGantt}));}}return table_renderEmptyElement($xeTable);}}:{}),/**
                           * 校验提示
                           */props.editRules&&validOpts.showErrorMessage&&(validOpts.message==='default'?!height:validOpts.message==='tooltip')?(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUITooltipComponent,{key:'vtp',ref:refValidTooltip,class:[{'old-cell-valid':editRules&&table_getConfig().cellVaildMode==='obsolete'},'vxe-table--valid-error'],theme:validTipConfig.theme,enterable:validTipConfig.enterable,enterDelay:validTipConfig.enterDelay,leaveDelay:validTipConfig.leaveDelay}):table_renderEmptyElement($xeTable)]):table_renderEmptyElement($xeTable)]);};const dataFlag=(0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(0);(0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(()=>props.data?props.data.length:-1,()=>{dataFlag.value++;});(0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(()=>props.data,()=>{dataFlag.value++;});(0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(dataFlag,()=>{const{initStatus}=internalData;const value=props.data||[];if(value&&value.length>=20000){warnLog('vxe.error.errLargeData',['loadData(data), reloadData(data)']);}loadTableData(value,false,true).then(()=>{const{scrollXLoad,scrollYLoad,expandColumn}=reactData;const expandOpts=computeExpandOpts.value;internalData.inited=true;internalData.initStatus=true;if(!initStatus){handleLoadDefaults();}// const checkboxOpts = computeCheckboxOpts.value
 // const checkboxColumn = internalData.tableFullColumn.find(column => column.type === 'checkbox')