vxe-table 3.14.3 → 3.14.5

package/es/table/module/export/export-panel.js

@@ -326,27 +326,27 @@ export default {
                                                             }),
                                                             h('vxe-checkbox', {
                                                                 props: {
-                                                                    value: defaultOptions.isFooter,
-                                                                    disabled: !storeData.hasFooter,
-                                                                    title: getI18n('vxe.export.expFooterTitle'),
-                                                                    content: getI18n('vxe.export.expOptFooter')
+                                                                    value: isHeader ? defaultOptions.isTitle : false,
+                                                                    disabled: !isHeader,
+                                                                    title: getI18n('vxe.export.expTitleTitle'),
+                                                                    content: getI18n('vxe.export.expOptTitle')
                                                                 },
                                                                 on: {
                                                                     input(value) {
-                                                                        defaultOptions.isFooter = value;
+                                                                        defaultOptions.isTitle = value;
                                                                     }
                                                                 }
                                                             }),
                                                             h('vxe-checkbox', {
                                                                 props: {
-                                                                    value: hasEmptyData ? false : defaultOptions.original,
-                                                                    disabled: hasEmptyData,
-                                                                    title: getI18n('vxe.export.expOriginalTitle'),
-                                                                    content: getI18n('vxe.export.expOptOriginal')
+                                                                    value: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
+                                                                    disabled: !isHeader || !hasColgroup || !supportMerge,
+                                                                    title: getI18n('vxe.export.expColgroupTitle'),
+                                                                    content: getI18n('vxe.export.expOptColgroup')
                                                                 },
                                                                 on: {
                                                                     input(value) {
-                                                                        defaultOptions.original = value;
+                                                                        defaultOptions.isColgroup = value;
                                                                     }
                                                                 }
                                                             })
@@ -356,16 +356,14 @@ export default {
                                                         }, [
                                                             h('vxe-checkbox', {
                                                                 props: {
-                                                                    // value: supportGroup || (isHeader && hasColgroup && supportMerge) ? defaultOptions.isColgroup : false,
-                                                                    // disabled: !supportGroup && (!isHeader || !hasColgroup || !supportMerge),
-                                                                    value: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
-                                                                    disabled: !isHeader || !hasColgroup || !supportMerge,
-                                                                    title: getI18n('vxe.export.expColgroupTitle'),
-                                                                    content: getI18n('vxe.export.expOptColgroup')
+                                                                    value: hasEmptyData ? false : defaultOptions.original,
+                                                                    disabled: hasEmptyData,
+                                                                    title: getI18n('vxe.export.expOriginalTitle'),
+                                                                    content: getI18n('vxe.export.expOptOriginal')
                                                                 },
                                                                 on: {
                                                                     input(value) {
-                                                                        defaultOptions.isColgroup = value;
+                                                                        defaultOptions.original = value;
                                                                     }
                                                                 }
                                                             }),
@@ -410,6 +408,23 @@ export default {
                                                                     }
                                                                 }
                                                             })
+                                                        ]),
+                                                        h('div', {
+                                                            class: 'vxe-table-export--panel-option-row'
+                                                        }, [
+                                                            h('vxe-checkbox', {
+                                                                props: {
+                                                                    value: defaultOptions.isFooter,
+                                                                    disabled: !storeData.hasFooter,
+                                                                    title: getI18n('vxe.export.expFooterTitle'),
+                                                                    content: getI18n('vxe.export.expOptFooter')
+                                                                },
+                                                                on: {
+                                                                    input(value) {
+                                                                        defaultOptions.isFooter = value;
+                                                                    }
+                                                                }
+                                                            })
                                                         ])
                                                     ])
                                             ])

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

@@ -209,7 +209,7 @@ function getBooleanValue(cellValue) {
 function getHeaderTitle($xeTable, opts, column) {
     const columnOpts = $xeTable.computeColumnOpts;
     const headExportMethod = column.headerExportMethod || columnOpts.headerExportMethod;
-    return headExportMethod ? headExportMethod({ column, options: opts, $table: $xeTable }) : ((opts.original ? column.field : column.getTitle()) || '');
+    return headExportMethod ? headExportMethod({ column, options: opts, $table: $xeTable }) : ((opts.isTitle ? column.getTitle() : column.field) || '');
 }
 function getFooterCellValue($xeTable, opts, row, column) {
     const columnOpts = $xeTable.computeColumnOpts;
@@ -1016,6 +1016,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     const defOpts = Object.assign({
         message: true,
         isHeader: showHeader,
+        isTitle: showHeader,
         isFooter: showFooter,
         isColgroup: isGroup,
         isMerge: hasMerge,
@@ -1192,6 +1193,7 @@ export default {
             const opts = Object.assign({
                 message: true,
                 isHeader: showHeader,
+                isTitle: showHeader,
                 isFooter: showFooter,
                 isColgroup: isGroup,
                 isMerge: hasMerge,

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

@@ -301,28 +301,46 @@ export default {
             const props = $xeTable;
             const { highlightCurrentRow, highlightCurrentColumn } = props;
             const rowOpts = $xeTable.computeRowOpts;
+            const currentRowOpts = $xeTable.computeCurrentRowOpts;
             const columnOpts = $xeTable.computeColumnOpts;
-            handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow);
-            // 当前行按键上下移动
-            if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
-                $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+            const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
+            const params = handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow);
+            if (rowOpts.isCurrent || highlightCurrentRow) {
+                if (currentRowOpts.isFollowSelected) {
+                    $xeTable.triggerCurrentRowEvent(evnt, params);
+                }
+                else {
+                    // 当前行按键上下移动
+                    if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
+                        $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+                    }
+                }
             }
-            // 当前行按键左右移动
-            if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
-                $xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt);
+            if (columnOpts.isCurrent || highlightCurrentColumn) {
+                if (currentColumnOpts.isFollowSelected) {
+                    $xeTable.triggerCurrentColumnEvent(evnt, params);
+                }
+                else {
+                    // 当前行按键左右移动
+                    if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
+                        $xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt);
+                    }
+                }
             }
         },
         moveEnterSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
             const $xeTable = this;
+            const props = $xeTable;
+            const { highlightCurrentRow, highlightCurrentColumn } = props;
             const rowOpts = $xeTable.computeRowOpts;
             const currentRowOpts = $xeTable.computeCurrentRowOpts;
             const columnOpts = $xeTable.computeColumnOpts;
             const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
             const params = handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow);
-            if ((rowOpts.isCurrent && currentRowOpts.isFollowSelected)) {
+            if (((rowOpts.isCurrent || highlightCurrentRow) && currentRowOpts.isFollowSelected)) {
                 $xeTable.triggerCurrentRowEvent(evnt, params);
             }
-            if (columnOpts.isCurrent && currentColumnOpts.isFollowSelected) {
+            if ((columnOpts.isCurrent || highlightCurrentColumn) && currentColumnOpts.isFollowSelected) {
                 $xeTable.triggerCurrentColumnEvent(evnt, params);
             }
         },

package/es/table/src/methods.js

@@ -230,41 +230,35 @@ function cacheColumnMap($xeTable) {
             htmlColumn = column;
         }
         if (treeNode) {
-            if (process.env.NODE_ENV === 'development') {
-                if (treeNodeColumn) {
-                    warnLog('vxe.error.colRepet', ['tree-node', treeNode]);
-                }
+            if (treeNodeColumn) {
+                warnLog('vxe.error.colRepet', ['tree-node', treeNode]);
             }
             if (!treeNodeColumn) {
                 treeNodeColumn = column;
             }
         }
         else if (type === 'expand') {
-            if (process.env.NODE_ENV === 'development') {
-                if (expandColumn) {
-                    warnLog('vxe.error.colRepet', ['type', type]);
-                }
+            if (expandColumn) {
+                warnLog('vxe.error.colRepet', ['type', type]);
             }
             if (!expandColumn) {
                 expandColumn = column;
             }
         }
-        if (process.env.NODE_ENV === 'development') {
-            if (type === 'checkbox') {
-                if (checkboxColumn) {
-                    warnLog('vxe.error.colRepet', ['type', type]);
-                }
-                if (!checkboxColumn) {
-                    checkboxColumn = column;
-                }
+        if (type === 'checkbox') {
+            if (checkboxColumn) {
+                warnLog('vxe.error.colRepet', ['type', type]);
             }
-            else if (type === 'radio') {
-                if (radioColumn) {
-                    warnLog('vxe.error.colRepet', ['type', type]);
-                }
-                if (!radioColumn) {
-                    radioColumn = column;
-                }
+            if (!checkboxColumn) {
+                checkboxColumn = column;
+            }
+        }
+        else if (type === 'radio') {
+            if (radioColumn) {
+                warnLog('vxe.error.colRepet', ['type', type]);
+            }
+            if (!radioColumn) {
+                radioColumn = column;
             }
         }
         if (isAllOverflow && column.showOverflow === false) {
@@ -2656,6 +2650,7 @@ const Methods = {
         const { scrollYLoad: oldScrollYLoad } = reactData;
         const { scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
+        const expandOpts = $xeTable.computeExpandOpts;
         const { transform } = treeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         let treeData = [];
@@ -2742,6 +2737,9 @@ const Methods = {
                 scrollYStore.endIndex = scrollYStore.visibleSize;
             }
             if (sYLoad) {
+                if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
+                    errLog('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
+                }
                 // if (showOverflow) {
                 //   if (!rowOpts.height) {
                 //     const errColumn = internalData.tableFullColumn.find((column: any) => column.showOverflow === false)
@@ -3652,8 +3650,10 @@ const Methods = {
     getCheckboxRecords(isFull) {
         const $xeTable = this;
         const props = $xeTable;
+        const reactData = $xeTable;
         const internalData = $xeTable;
         const { treeConfig } = props;
+        const { updateCheckboxFlag } = reactData;
         const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps, selectCheckboxMaps } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         const checkboxOpts = $xeTable.computeCheckboxOpts;
@@ -3661,29 +3661,31 @@ const Methods = {
         const { checkField } = checkboxOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         let rowList = [];
-        if (checkField) {
-            if (treeConfig) {
-                const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData);
-                rowList = XEUtils.filterTree(currTableData, row => XEUtils.get(row, checkField), { children: transform ? mapChildrenField : childrenField });
+        if (updateCheckboxFlag) {
+            if (checkField) {
+                if (treeConfig) {
+                    const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData);
+                    rowList = XEUtils.filterTree(currTableData, row => XEUtils.get(row, checkField), { children: transform ? mapChildrenField : childrenField });
+                }
+                else {
+                    const currTableData = isFull ? tableFullData : afterFullData;
+                    rowList = currTableData.filter((row) => XEUtils.get(row, checkField));
+                }
             }
             else {
-                const currTableData = isFull ? tableFullData : afterFullData;
-                rowList = currTableData.filter((row) => XEUtils.get(row, checkField));
-            }
-        }
-        else {
-            XEUtils.each(selectCheckboxMaps, (row, rowid) => {
-                if (isFull) {
-                    if (fullDataRowIdData[rowid]) {
-                        rowList.push(fullDataRowIdData[rowid].row);
+                XEUtils.each(selectCheckboxMaps, (row, rowid) => {
+                    if (isFull) {
+                        if (fullDataRowIdData[rowid]) {
+                            rowList.push(fullDataRowIdData[rowid].row);
+                        }
                     }
-                }
-                else {
-                    if (afterFullRowMaps[rowid]) {
-                        rowList.push(afterFullRowMaps[rowid]);
+                    else {
+                        if (afterFullRowMaps[rowid]) {
+                            rowList.push(afterFullRowMaps[rowid]);
+                        }
                     }
-                }
-            });
+                });
+            }
         }
         return rowList;
     },

package/es/table/src/table.js

@@ -599,6 +599,7 @@ export default {
                 original: false,
                 message: true,
                 isHeader: false,
+                isTitle: false,
                 isFooter: false
             },
             rowExpandedFlag: 1,
@@ -1328,8 +1329,9 @@ export default {
             swYInterval: 0,
             swYTotal: 0
         });
-        const { data, exportConfig, importConfig, treeConfig, showOverflow } = props;
+        const { data, exportConfig, importConfig, treeConfig, showOverflow, highlightCurrentRow, highlightCurrentColumn } = props;
         const { scrollXStore, scrollYStore } = internalData;
+        const columnOpts = $xeTable.computeColumnOpts;
         const editOpts = $xeTable.computeEditOpts;
         const treeOpts = $xeTable.computeTreeOpts;
         const radioOpts = $xeTable.computeRadioOpts;
@@ -1340,6 +1342,11 @@ export default {
         const mouseOpts = $xeTable.computeMouseOpts;
         const exportOpts = $xeTable.computeExportOpts;
         const importOpts = $xeTable.computeImportOpts;
+        const currentRowOpts = $xeTable.computeCurrentRowOpts;
+        const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
+        const virtualXOpts = $xeTable.computeVirtualXOpts;
+        const virtualYOpts = $xeTable.computeVirtualYOpts;
+        const keyboardOpts = $xeTable.computeKeyboardOpts;
         if (props.rowId) {
             warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
         }
@@ -1382,6 +1389,12 @@ export default {
         if (this.highlightHoverColumn) {
             warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover']);
         }
+        // if (props.scrollY) {
+        //   warnLog('vxe.error.delProp', ['scroll-y', 'virtual-y-config'])
+        // }
+        // if (props.scrollX) {
+        //   warnLog('vxe.error.delProp', ['scroll-x', 'virtual-x-config'])
+        // }
         // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
         if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), importOpts.types)) {
             warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')]);
@@ -1449,29 +1462,49 @@ export default {
                 warnLog('vxe.error.errProp', [`table.context-menu=${this.contextMenu}`, 'table.context-menu={}']);
             }
         }
-        if (this.menuConfig && !XEUtils.isObject(this.menuConfig)) {
-            warnLog('vxe.error.errProp', [`table.menu-config=${this.menuConfig}`, 'table.menu-config={}']);
+        if (props.menuConfig && !XEUtils.isObject(props.menuConfig)) {
+            warnLog('vxe.error.errProp', [`table.menu-config=${props.menuConfig}`, 'table.menu-config={}']);
+        }
+        if (props.exportConfig && !XEUtils.isObject(props.exportConfig)) {
+            warnLog('vxe.error.errProp', [`table.export-config=${props.exportConfig}`, 'table.export-config={}']);
+        }
+        if (props.importConfig && !XEUtils.isObject(props.importConfig)) {
+            warnLog('vxe.error.errProp', [`table.import-config=${props.importConfig}`, 'table.import-config={}']);
+        }
+        if (props.printConfig && !XEUtils.isObject(props.printConfig)) {
+            warnLog('vxe.error.errProp', [`table.print-config=${props.printConfig}`, 'table.print-config={}']);
         }
-        if (this.exportConfig && !XEUtils.isObject(this.exportConfig)) {
-            warnLog('vxe.error.errProp', [`table.export-config=${this.exportConfig}`, 'table.export-config={}']);
+        if (props.treeConfig && !XEUtils.isObject(props.treeConfig)) {
+            warnLog('vxe.error.errProp', [`table.tree-config=${props.treeConfig}`, 'table.tree-config={}']);
         }
-        if (this.importConfig && !XEUtils.isObject(this.importConfig)) {
-            warnLog('vxe.error.errProp', [`table.import-config=${this.importConfig}`, 'table.import-config={}']);
+        if (props.customConfig && !XEUtils.isObject(props.customConfig)) {
+            warnLog('vxe.error.errProp', [`table.custom-config=${props.customConfig}`, 'table.custom-config={}']);
         }
-        if (this.printConfig && !XEUtils.isObject(this.printConfig)) {
-            warnLog('vxe.error.errProp', [`table.print-config=${this.printConfig}`, 'table.print-config={}']);
+        if (props.editConfig && !XEUtils.isObject(props.editConfig)) {
+            warnLog('vxe.error.errProp', [`table.edit-config=${props.editConfig}`, 'table.edit-config={}']);
         }
-        if (this.treeConfig && !XEUtils.isObject(this.treeConfig)) {
-            warnLog('vxe.error.errProp', [`table.tree-config=${this.treeConfig}`, 'table.tree-config={}']);
+        if (props.emptyRender && !XEUtils.isObject(props.emptyRender)) {
+            warnLog('vxe.error.errProp', [`table.empty-render=${props.emptyRender}`, 'table.empty-render={}']);
         }
-        if (this.customConfig && !XEUtils.isObject(this.customConfig)) {
-            warnLog('vxe.error.errProp', [`table.custom-config=${this.customConfig}`, 'table.custom-config={}']);
+        if ((rowOpts.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
+            warnLog('vxe.error.notConflictProp', ['row-config.isCurrent', 'current-row-config.isFollowSelected']);
         }
-        if (this.editConfig && !XEUtils.isObject(this.editConfig)) {
-            warnLog('vxe.error.errProp', [`table.edit-config=${this.editConfig}`, 'table.edit-config={}']);
+        if ((columnOpts.isCurrent || highlightCurrentColumn) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
+            warnLog('vxe.error.notConflictProp', ['column-config.isCurrent', 'current-column-config.isFollowSelected']);
         }
-        if (this.emptyRender && !XEUtils.isObject(this.emptyRender)) {
-            warnLog('vxe.error.errProp', [`table.empty-render=${this.emptyRender}`, 'table.empty-render={}']);
+        // 如果不支持虚拟滚动
+        if (props.spanMethod) {
+            if (virtualXOpts.enabled) {
+                warnLog('vxe.error.notConflictProp', ['span-method', 'virtual-x-config.enabled=false']);
+            }
+            if (virtualYOpts.enabled) {
+                warnLog('vxe.error.notConflictProp', ['span-method', 'virtual-y-config.enabled=false']);
+            }
+        }
+        if (props.footerSpanMethod) {
+            if (virtualXOpts.enabled) {
+                warnLog('vxe.error.notConflictProp', ['footer-span-method', 'virtual-x-config.enabled=false']);
+            }
         }
         // 检查是否有安装需要的模块
         if (props.editConfig && !$xeTable.insert) {

package/es/ui/index.js

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