vxe-table 3.20.9 → 3.20.10

package/es/table/src/body.js

@@ -319,6 +319,16 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
         if (treeConfig) {
             tdVNs.push(...renderLine(h, $xeTable, rowid, cellParams, cellHeight));
         }
+        const clVNs = [];
+        if (!isVNPreEmptyStatus) {
+            clVNs.push(h('div', {
+                attrs: {
+                    colid,
+                    rowid
+                },
+                class: 'vxe-cell--wrapper vxe-body-cell--wrapper'
+            }, column.renderCell(h, cellParams)));
+        }
         tdVNs.push(h('div', {
             key: 'tc',
             class: ['vxe-cell', {
@@ -330,17 +340,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
             attrs: {
                 title: showTitle ? $xeTable.getCellLabel(row, column) : null
             }
-        }, isVNPreEmptyStatus
-            ? []
-            : [
-                h('div', {
-                    attrs: {
-                        colid,
-                        rowid
-                    },
-                    class: 'vxe-cell--wrapper vxe-body-cell--wrapper'
-                }, column.renderCell(h, cellParams))
-            ]));
+        }, clVNs));
         if (showValidTip && errorValidItem) {
             const errRule = errorValidItem.rule;
             const validSlot = slots ? slots.valid : null;
@@ -440,7 +440,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     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 = $xeTable.computeCheckboxOpts;
     const radioOpts = $xeTable.computeRadioOpts;
@@ -546,7 +546,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
                 rowid
             },
             style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : undefined,
-            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,
             on: trOn
         }, tdVNs));
         // 如果行被展开了

package/es/table/src/methods.js

@@ -11989,17 +11989,26 @@ const tableMethods = {
     },
     /**
      * 如果有滚动条，则滚动到对应的行
-     * @param {Row} row 行对象
-     * @param {ColumnInfo} column 列配置
      */
-    scrollToRow(row, fieldOrColumn, options) {
+    scrollToRow(rowOrRowid, fieldOrColumn, options) {
         const $xeTable = this;
         const props = $xeTable;
         const reactData = $xeTable;
         const internalData = $xeTable;
         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));

package/es/table/src/table.js

@@ -2301,7 +2301,10 @@ export default {
                             minWidth: tableTipConfig.minWidth,
                             minHeight: tableTipConfig.minHeight,
                             maxWidth: tableTipConfig.maxWidth,
-                            maxHeight: tableTipConfig.maxHeight
+                            maxHeight: tableTipConfig.maxHeight,
+                            placement: tableTipConfig.placement,
+                            defaultPlacement: tableTipConfig.defaultPlacement,
+                            popupClassName: tableTipConfig.popupClassName
                         },
                         scopedSlots: currTooltipSlot
                             ? {

package/es/ui/index.js

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

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.20.8";
+const version = "3.20.10";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2072,7 +2072,8 @@ core_.VxeUI.setConfig({
       strict: true
     },
     tooltipConfig: {
-      enterable: true
+      enterable: true,
+      defaultPlacement: 'top'
     },
     headerTooltipConfig: {
       enterable: true
@@ -2746,7 +2747,7 @@ function wheelScrollTopTo(diffNum, cb) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.20.8"}`;
+const log_version = `table v${"3.20.10"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -7026,9 +7027,7 @@ if(bodyScrollElem&&bodyTableElem&&bodyScrollElem.scrollTop+clientHeight>=maxYHei
      * 如果有滚动条，则滚动到对应的位置
      */scrollTo(scrollLeft,scrollTop){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;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=$xeTable.$refs.refScrollXHandleElem;const yHandleEl=$xeTable.$refs.refScrollYHandleElem;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($xeTable);}}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($xeTable);}}return new Promise(resolve=>{setTimeout(()=>{$xeTable.$nextTick(()=>{internalData.intoRunScroll=false;resolve();});},reactData.scrollXLoad||reactData.scrollYLoad?30:0);});},/**
      * 如果有滚动条，则滚动到对应的行
-     * @param {Row} row 行对象
-     * @param {ColumnInfo} column 列配置
-     */scrollToRow(row,fieldOrColumn,options){const $xeTable=this;const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;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($xeTable,fieldOrColumn,row,options));}if(_sToTime){clearTimeout(_sToTime);}return Promise.all(rest).then(()=>{if(row){if(!isAllOverflow&&(scrollYLoad||scrollXLoad)){calcCellHeight($xeTable);calcCellWidth($xeTable);// 可视区被渲染后位置被偏移
+     */scrollToRow(rowOrRowid,fieldOrColumn,options){const $xeTable=this;const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;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($xeTable,fieldOrColumn,row,options));}if(_sToTime){clearTimeout(_sToTime);}return Promise.all(rest).then(()=>{if(row){if(!isAllOverflow&&(scrollYLoad||scrollXLoad)){calcCellHeight($xeTable);calcCellWidth($xeTable);// 可视区被渲染后位置被偏移
 internalData._sToTime=setTimeout(()=>{internalData._sToTime=undefined;if(scrollYLoad){if(props.treeConfig){$xeTable.scrollToTreeRow(row);}else{rowToVisible($xeTable,row);}}if(scrollXLoad&&fieldOrColumn){handleScrollToRowColumn($xeTable,fieldOrColumn,row,options);}},350);}return $xeTable.$nextTick();}});},/**
      * 如果有滚动条，则滚动到第一行
      */scrollToStartRow(fieldOrColumn,options){const $xeTable=this;const internalData=$xeTable;const{afterFullData}=internalData;return $xeTable.scrollToRow(afterFullData[0],fieldOrColumn,options);},/**
@@ -7515,6 +7514,16 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     if (treeConfig) {
       tdVNs.push(...renderLine(h, $xeTable, rowid, cellParams, cellHeight));
     }
+    const clVNs = [];
+    if (!isVNPreEmptyStatus) {
+      clVNs.push(h('div', {
+        attrs: {
+          colid,
+          rowid
+        },
+        class: 'vxe-cell--wrapper vxe-body-cell--wrapper'
+      }, column.renderCell(h, cellParams)));
+    }
     tdVNs.push(h('div', {
       key: 'tc',
       class: ['vxe-cell', {
@@ -7526,13 +7535,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
       attrs: {
         title: showTitle ? $xeTable.getCellLabel(row, column) : null
       }
-    }, isVNPreEmptyStatus ? [] : [h('div', {
-      attrs: {
-        colid,
-        rowid
-      },
-      class: 'vxe-cell--wrapper vxe-body-cell--wrapper'
-    }, column.renderCell(h, cellParams))]));
+    }, clVNs));
     if (showValidTip && errorValidItem) {
       const errRule = errorValidItem.rule;
       const validSlot = slots ? slots.valid : null;
@@ -7627,7 +7630,6 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
   const {
     hasFixedColumn,
     treeExpandedFlag,
-    scrollXLoad,
     scrollYLoad,
     isAllOverflow,
     rowExpandedFlag,
@@ -7750,7 +7752,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         rowid
       },
       style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowStyle) ? rowStyle(params) : rowStyle : undefined,
-      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,
       on: trOn
     }, tdVNs));
     // 如果行被展开了
@@ -20315,7 +20317,10 @@ function renderBody(h, $xeTable) {
         minWidth: tableTipConfig.minWidth,
         minHeight: tableTipConfig.minHeight,
         maxWidth: tableTipConfig.maxWidth,
-        maxHeight: tableTipConfig.maxHeight
+        maxHeight: tableTipConfig.maxHeight,
+        placement: tableTipConfig.placement,
+        defaultPlacement: tableTipConfig.defaultPlacement,
+        popupClassName: tableTipConfig.popupClassName
       },
       scopedSlots: currTooltipSlot ? {
         content: () => {