vxe-table 3.22.7 → 3.22.9

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

@@ -1252,7 +1252,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
         const isColGroup = column.children && column.children.length > 0;
         let isChecked = false;
         const isExtraChecked = extraFdMaps[column.field];
-        if (columns && columns.length) {
+        if (columns) {
             isChecked = handleFilterColumns(defOpts, column, columns);
         }
         else if (excludeFields || includeFields) {
@@ -1458,7 +1458,7 @@ export default {
             }
             let isCustomCol = false;
             let customCols = [];
-            if (columns && columns.length) {
+            if (columns) {
                 isCustomCol = true;
                 customCols = XEUtils.searchTree(columns, () => true, { children: 'children', mapChildren: 'childNodes', original: true });
             }
@@ -1467,7 +1467,7 @@ export default {
                     const isColGroup = column.children && column.children.length > 0;
                     let isChecked = false;
                     const isExtraChecked = extraFdMaps[column.field];
-                    if (columns && columns.length) {
+                    if (columns) {
                         isChecked = handleFilterColumns(opts, column, columns);
                     }
                     else if (excludeFields || includeFields) {

package/es/table/src/cell.js

@@ -175,8 +175,8 @@ function renderTitleContent(h, params, content) {
     const headerTooltipOpts = $table.computeHeaderTooltipOpts;
     const showAllTip = headerTooltipOpts.showAll;
     const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
-    const showTitle = headOverflow === 'title';
-    const showTooltip = headOverflow === true || headOverflow === 'tooltip';
+    const showTitle = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'title';
+    const showTooltip = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'tooltip';
     const ons = {};
     if (showTitle || showTooltip || showAllTip) {
         ons.mouseenter = (evnt) => {

package/es/table/src/footer.js

@@ -39,9 +39,9 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
         const isPadding = XEUtils.isBoolean(footerCellOpts.padding) ? footerCellOpts.padding : cellOpts.padding;
         const footOverflow = XEUtils.eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
         const footAlign = footerAlign || (compConf ? compConf.tableFooterCellAlign : '') || allFooterAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
-        const showEllipsis = footOverflow === 'ellipsis';
-        const showTitle = footOverflow === 'title';
-        const showTooltip = footOverflow === true ? footerTooltipOpts.mode === 'tooltip' : footOverflow === 'tooltip';
+        const showEllipsis = (footOverflow === true ? footerTooltipOpts.mode : footOverflow) === 'ellipsis';
+        const showTitle = (footOverflow === true ? footerTooltipOpts.mode : footOverflow) === 'title';
+        const showTooltip = (footOverflow === true ? footerTooltipOpts.mode : footOverflow) === 'tooltip';
         const hasEllipsis = showTitle || showTooltip || showEllipsis;
         const showResizable = (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable));
         const attrs = { colid };

package/es/table/src/header.js

@@ -235,9 +235,9 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
         const isPadding = XEUtils.isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding;
         const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
         const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
-        const showEllipsis = headOverflow === 'ellipsis';
-        const showTitle = headOverflow === 'title';
-        const showTooltip = headOverflow === true ? headerTooltipOpts.mode === 'tooltip' : headOverflow === 'tooltip';
+        const showEllipsis = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'ellipsis';
+        const showTitle = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'title';
+        const showTooltip = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'tooltip';
         const hasEllipsis = showTitle || showTooltip || showEllipsis;
         let hasFilter = false;
         let firstFilterOption = null;

package/es/table/src/methods.js

@@ -122,10 +122,13 @@ function handleCustomRestore($xeTable, storeData) {
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
+    const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
     const { aggregateConfig, rowGroupConfig } = props;
     const { collectColumn } = internalData;
-    const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
-    let { alignData, headerAlignData, footerAlignData, resizableData, sortData, visibleData, fixedData, aggGroupData, aggFuncData } = storeData;
+    const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc, isCustomPager } = handleCustomStoreConfig($xeTable);
+    let { alignData, headerAlignData, footerAlignData, resizableData, sortData, visibleData, fixedData, aggGroupData, aggFuncData, pagerData } = storeData;
     // 处理还原
     if ((isCustomAlign && alignData) ||
         (isCustomHeaderAlign && headerAlignData) ||
@@ -135,7 +138,8 @@ function handleCustomRestore($xeTable, storeData) {
         (isCustomVisible && visibleData) ||
         (isCustomFixed && fixedData) ||
         (isCustomAggGroup && aggGroupData) ||
-        (isCustomAggFunc && aggFuncData)) {
+        (isCustomAggFunc && aggFuncData) ||
+        (isCustomPager && pagerData && $xeGGWrapper)) {
         const sortColMaps = {};
         if (isCustomSort && sortData) {
             // 转换兼容老版本数据，即将废弃兼容
@@ -623,7 +627,7 @@ function updateAfterTreeIndex($xeTable) {
     const fullMaps = {};
     let rowNum = 0;
     const { handleGetRowId } = createHandleGetRowId($xeTable);
-    XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
+    XEUtils.eachTree(afterTreeFullData, (row, index, items, path, parentRow) => {
         const rowid = handleGetRowId(row);
         const rowRest = fullAllDataRowIdData[rowid];
         const seq = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
@@ -631,10 +635,11 @@ function updateAfterTreeIndex($xeTable) {
             rowRest.seq = seq;
             rowRest._seq = rowNum;
             rowRest.treeIndex = index;
+            rowRest._index = rowNum;
             rowRest._tIndex = rowNum;
         }
         else {
-            const rest = { row, rowid, _seq: rowNum, seq, index: -1, $index: -1, _index: -1, treeIndex: -1, _tIndex: rowNum, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+            const rest = { row, rowid, _seq: rowNum, seq, index, $index: -1, _index: rowNum, treeIndex: index, _tIndex: rowNum, items, parent: parentRow, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
             fullAllDataRowIdData[rowid] = rest;
             fullDataRowIdData[rowid] = rest;
         }
@@ -4193,7 +4198,7 @@ function calcCellWidth($xeTable) {
     const autoWidthColumnList = $xeTable.computeAutoWidthColumnList;
     const { fullColumnIdData } = internalData;
     const el = $xeTable.$refs.refElem;
-    if (el) {
+    if (el && autoWidthColumnList.length) {
         el.setAttribute('data-calc-col', 'Y');
         autoWidthColumnList.forEach(column => {
             const colid = column.id;
@@ -4289,12 +4294,12 @@ function updateRowExpandStyle($xeTable) {
         return;
     }
     const expandOpts = $xeTable.computeExpandOpts;
-    const rowOpts = $xeTable.computeRowOpts;
-    const cellOpts = $xeTable.computeCellOpts;
-    const defaultRowHeight = $xeTable.computeDefaultRowHeight;
     const { mode } = expandOpts;
     if (expandColumn && mode === 'fixed') {
         const { elemStore, fullAllDataRowIdData } = internalData;
+        const rowOpts = $xeTable.computeRowOpts;
+        const cellOpts = $xeTable.computeCellOpts;
+        const defaultRowHeight = $xeTable.computeDefaultRowHeight;
         const rowExpandEl = $xeTable.$refs.refRowExpandElem;
         const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
         if (rowExpandEl && bodyScrollElem) {
@@ -6515,6 +6520,9 @@ const tableMethods = {
      */
     getCustomStoreData() {
         const $xeTable = this;
+        const $xeGrid = $xeTable.$xeGrid;
+        const $xeGantt = $xeTable.$xeGantt;
+        const $xeGGWrapper = $xeGrid || $xeGantt;
         const props = $xeTable;
         const reactData = $xeTable;
         const internalData = $xeTable;
@@ -6523,7 +6531,7 @@ const tableMethods = {
         const { isRowGroupStatus, rowGroupList } = reactData;
         const { fullColumnFieldData, collectColumn } = internalData;
         const { storage, checkMethod } = customOpts;
-        const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
+        const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc, isCustomPager } = handleCustomStoreConfig($xeTable);
         const alignData = {};
         const headerAlignData = {};
         const footerAlignData = {};
@@ -6534,6 +6542,7 @@ const tableMethods = {
         const aggGroupData = {};
         const aggFuncData = {};
         const storeData = {
+            pagerData: isCustomPager && $xeGGWrapper && $xeGGWrapper.getCustomPagerData ? $xeGGWrapper.getCustomPagerData() : undefined,
             alignData: undefined,
             headerAlignData: undefined,
             footerAlignData: undefined,
@@ -6670,7 +6679,7 @@ const tableMethods = {
         const tableId = $xeTable.computeTableId;
         const customOpts = $xeTable.computeCustomOpts;
         const { updateStore, storage } = customOpts;
-        const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
+        const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc, isCustomPager } = handleCustomStoreConfig($xeTable);
         if (type !== 'reset') {
             // fix：修复拖动列宽，重置按钮无法点击的问题
             reactData.isCustomStatus = true;
@@ -6685,13 +6694,15 @@ const tableMethods = {
                 isCustomFixed ||
                 isCustomSort ||
                 isCustomAggGroup ||
-                isCustomAggFunc)) {
+                isCustomAggFunc ||
+                isCustomPager)) {
             if (!tableId) {
                 errLog('vxe.error.reqProp', ['id']);
                 return $xeTable.$nextTick();
             }
             const storeData = type === 'reset'
                 ? {
+                    pagerData: {},
                     alignData: {},
                     headerAlignData: {},
                     footerAlignData: {},
@@ -9930,6 +9941,7 @@ const tableMethods = {
             status: false
         };
         if (!(el && prevDragRow && dragRow)) {
+            handleRowDragEndClearStatus($xeTable);
             return Promise.resolve(errRest);
         }
         // 判断是否有拖动
@@ -10033,6 +10045,9 @@ const tableMethods = {
                 }
             }
             const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
+            if (dEndMethod) {
+                handleRowDragEndClearStatus($xeTable);
+            }
             return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then((status) => {
                 if (!status) {
                     return errRest;
@@ -10340,6 +10355,9 @@ const tableMethods = {
                 const errRest = {
                     status: false
                 };
+                if (dragEndMethod) {
+                    handleRowDragEndClearStatus($xeTable);
+                }
                 Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
                     if (!status) {
                         if ($oldTable) {

package/es/table/src/table.js

@@ -1626,9 +1626,9 @@ export default {
         // if (treeConfig && (treeOpts.showLine || treeOpts.line) && !showOverflow) {
         //   warnLog('vxe.error.reqProp', ['show-overflow'])
         // }
-        if (treeConfig && !treeOpts.transform && props.stripe) {
-            warnLog('vxe.error.noTree', ['stripe']);
-        }
+        // if (treeConfig && !treeOpts.transform && props.stripe) {
+        //   warnLog('vxe.error.noTree', ['stripe'])
+        // }
         if (treeConfig && !treeOpts.transform) {
             if (sortOpts.isDeep) {
                 warnLog('vxe.error.reqSupportProp', ['transform=false', 'sort-config.isDeep=false']);

package/es/table/src/util.js

@@ -146,6 +146,8 @@ export function createInternalData() {
         tooltipTimeout: null,
         initStatus: false,
         isActivated: false,
+        // rceTimeout: undefined,
+        // rceRunTime: undefined,
         rceDelay: 0
         // _sToTime: null
     };
@@ -1030,6 +1032,7 @@ export function handleCustomStoreConfig($xeTable) {
     const isCustomSort = hangleBolleanDefaultValue(storageOpts.sort, isAllCustom);
     const isCustomAggGroup = hangleBolleanDefaultValue(storageOpts.aggGroup, isAllCustom);
     const isCustomAggFunc = hangleBolleanDefaultValue(storageOpts.aggFunc, isAllCustom);
+    const isCustomPager = hangleBolleanDefaultValue(storageOpts.pager, isAllCustom);
     return {
         isCustomAlign,
         isCustomHeaderAlign,
@@ -1039,6 +1042,7 @@ export function handleCustomStoreConfig($xeTable) {
         isCustomFixed,
         isCustomSort,
         isCustomAggGroup,
-        isCustomAggFunc
+        isCustomAggFunc,
+        isCustomPager
     };
 }

package/es/table/style.css

@@ -1832,6 +1832,25 @@
   display: block;
 }
 
+.vxe-table {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-default);
+}
+.vxe-table.size--xlarge {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-xlarge);
+}
+.vxe-table.size--large {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-large);
+}
+.vxe-table.size--medium {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-medium);
+}
+.vxe-table.size--small {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-small);
+}
+.vxe-table.size--mini {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-mini);
+}
+
 .vxe-table-slots,
 .vxe-table--file-form {
   display: none;
@@ -2961,7 +2980,7 @@
 /*table*/
 .vxe-table--render-default {
   position: relative;
-  font-size: var(--vxe-ui-font-size-default);
+  font-size: var(--vxe-ui-table-current-font-size);
   color: var(--vxe-ui-font-color);
   font-family: var(--vxe-ui-font-family);
   direction: ltr;
@@ -3247,9 +3266,6 @@
 .vxe-table--render-default.border--none .vxe-table--border-line {
   display: none;
 }
-.vxe-table--render-default.size--medium {
-  font-size: var(--vxe-ui-font-size-medium);
-}
 .vxe-table--render-default.size--medium .vxe-table--empty-placeholder,
 .vxe-table--render-default.size--medium .vxe-table--empty-block {
   min-height: var(--vxe-ui-table-row-height-medium);
@@ -3275,9 +3291,6 @@
 .vxe-table--render-default.size--medium .vxe-cell--valid-error-tip {
   padding: 0 var(--vxe-ui-table-cell-padding-medium);
 }
-.vxe-table--render-default.size--small {
-  font-size: var(--vxe-ui-font-size-small);
-}
 .vxe-table--render-default.size--small .vxe-table--empty-placeholder,
 .vxe-table--render-default.size--small .vxe-table--empty-block {
   min-height: var(--vxe-ui-table-row-height-small);
@@ -3303,9 +3316,6 @@
 .vxe-table--render-default.size--small .vxe-cell--valid-error-tip {
   padding: 0 var(--vxe-ui-table-cell-padding-small);
 }
-.vxe-table--render-default.size--mini {
-  font-size: var(--vxe-ui-font-size-mini);
-}
 .vxe-table--render-default.size--mini .vxe-table--empty-placeholder,
 .vxe-table--render-default.size--mini .vxe-table--empty-block {
   min-height: var(--vxe-ui-table-row-height-mini);
@@ -3847,7 +3857,7 @@
   width: 100%;
   position: absolute;
   left: 50%;
-  font-size: var(--vxe-ui-table-validate-error-font-size);
+  font-size: var(--vxe-ui-table-validate-error-font-size, var(--vxe-ui-table-current-font-size));
   line-height: 1em;
   transform: translate(-50%, -2px);
   text-align: left;
@@ -3862,7 +3872,7 @@
   pointer-events: auto;
 }
 .vxe-table--render-default .vxe-body--column .vxe-cell--valid-error-theme-beautify {
-  padding: 0.2em 0.6em 0.25em 0.6em;
+  padding: var(--vxe-ui-table-validate-error-padding, 0.2em 0.6em);
   color: #fff;
   background-color: var(--vxe-ui-table-validate-error-color);
 }