vxe-table 4.12.3 → 4.12.5

package/packages/table/module/export/export-panel.ts

@@ -390,7 +390,7 @@ export default defineComponent({
                                 }, [
                                   VxeUICheckboxComponent
                                     ? h(VxeUICheckboxComponent, {
-                                      modelValue: hasEmptyData || defaultOptions.isHeader,
+                                      modelValue: hasEmptyData || isHeader,
                                       disabled: hasEmptyData,
                                       title: getI18n('vxe.export.expHeaderTitle'),
                                       content: getI18n('vxe.export.expOptHeader'),
@@ -401,23 +401,23 @@ export default defineComponent({
                                     : createCommentVNode(),
                                   VxeUICheckboxComponent
                                     ? h(VxeUICheckboxComponent, {
-                                      modelValue: defaultOptions.isFooter,
-                                      disabled: !storeData.hasFooter,
-                                      title: getI18n('vxe.export.expFooterTitle'),
-                                      content: getI18n('vxe.export.expOptFooter'),
+                                      modelValue: isHeader ? defaultOptions.isTitle : false,
+                                      disabled: !isHeader,
+                                      title: getI18n('vxe.export.expTitleTitle'),
+                                      content: getI18n('vxe.export.expOptTitle'),
                                       'onUpdate:modelValue' (value: any) {
-                                        defaultOptions.isFooter = value
+                                        defaultOptions.isTitle = value
                                       }
                                     })
                                     : createCommentVNode(),
                                   VxeUICheckboxComponent
                                     ? h(VxeUICheckboxComponent, {
-                                      modelValue: hasEmptyData ? false : defaultOptions.original,
-                                      disabled: hasEmptyData,
-                                      title: getI18n('vxe.export.expOriginalTitle'),
-                                      content: getI18n('vxe.export.expOptOriginal'),
+                                      modelValue: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
+                                      title: getI18n('vxe.export.expColgroupTitle'),
+                                      disabled: !isHeader || !hasColgroup || !supportMerge,
+                                      content: getI18n('vxe.export.expOptColgroup'),
                                       'onUpdate:modelValue' (value: any) {
-                                        defaultOptions.original = value
+                                        defaultOptions.isColgroup = value
                                       }
                                     })
                                     : createCommentVNode()
@@ -427,15 +427,12 @@ export default defineComponent({
                                 }, [
                                   VxeUICheckboxComponent
                                     ? h(VxeUICheckboxComponent, {
-                                      // modelValue: supportGroup || (isHeader && hasColgroup && supportMerge) ? defaultOptions.isColgroup : false,
-                                      // title: getI18n('vxe.export.expColgroupTitle'),
-                                      // disabled: !supportGroup && (!isHeader || !hasColgroup || !supportMerge),
-                                      modelValue: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
-                                      title: getI18n('vxe.export.expColgroupTitle'),
-                                      disabled: !isHeader || !hasColgroup || !supportMerge,
-                                      content: getI18n('vxe.export.expOptColgroup'),
+                                      modelValue: hasEmptyData ? false : defaultOptions.original,
+                                      disabled: hasEmptyData,
+                                      title: getI18n('vxe.export.expOriginalTitle'),
+                                      content: getI18n('vxe.export.expOptOriginal'),
                                       'onUpdate:modelValue' (value: any) {
-                                        defaultOptions.isColgroup = value
+                                        defaultOptions.original = value
                                       }
                                     })
                                     : createCommentVNode(),
@@ -472,6 +469,21 @@ export default defineComponent({
                                       }
                                     })
                                     : createCommentVNode()
+                                ]),
+                                h('div', {
+                                  class: 'vxe-table-export--panel-option-row'
+                                }, [
+                                  VxeUICheckboxComponent
+                                    ? h(VxeUICheckboxComponent, {
+                                      modelValue: defaultOptions.isFooter,
+                                      disabled: !storeData.hasFooter,
+                                      title: getI18n('vxe.export.expFooterTitle'),
+                                      content: getI18n('vxe.export.expOptFooter'),
+                                      'onUpdate:modelValue' (value: any) {
+                                        defaultOptions.isFooter = value
+                                      }
+                                    })
+                                    : createCommentVNode()
                                 ])
                               ])
                           ])

package/packages/table/module/export/hook.ts

@@ -328,7 +328,7 @@ hooks.add('tableExportModule', {
     function getHeaderTitle (opts: any, column: any) {
       const columnOpts = computeColumnOpts.value
       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) || '')
     }
 
     const toBooleanValue = (cellValue: any) => {
@@ -1026,6 +1026,7 @@ hooks.add('tableExportModule', {
       const defOpts = Object.assign({
         message: true,
         isHeader: showHeader,
+        isTitle: showHeader,
         isFooter: showFooter,
         isColgroup: isGroup,
         isMerge: hasMerge,
@@ -1146,6 +1147,7 @@ hooks.add('tableExportModule', {
         const opts = Object.assign({
           message: true,
           isHeader: showHeader,
+          isTitle: showHeader,
           isFooter: showFooter,
           isColgroup: isGroup,
           isMerge: hasMerge,

package/packages/table/module/keyboard/hook.ts

@@ -455,27 +455,42 @@ hooks.add('tableKeyboardModule', {
       moveArrowSelected (args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
         const { highlightCurrentRow, highlightCurrentColumn } = props
         const rowOpts = computeRowOpts.value
+        const currentRowOpts = computeCurrentRowOpts.value
         const columnOpts = computeColumnOpts.value
-        handleMoveSelected(evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow)
-        // 当前行按键上下移动
-        if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
-          $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt)
+        const currentColumnOpts = computeCurrentColumnOpts.value
+        const params = handleMoveSelected(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 { highlightCurrentRow, highlightCurrentColumn } = props
         const rowOpts = computeRowOpts.value
         const currentRowOpts = computeCurrentRowOpts.value
         const columnOpts = computeColumnOpts.value
         const currentColumnOpts = computeCurrentColumnOpts.value
         const params = handleMoveSelected(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/packages/table/src/table.ts

@@ -241,6 +241,7 @@ export default defineComponent({
         original: false,
         message: true,
         isHeader: false,
+        isTitle: false,
         isFooter: false
       },
 
@@ -886,6 +887,7 @@ export default defineComponent({
       computeBodyMenu,
       computeFooterMenu,
       computeIsMenu,
+      computeMenuList,
       computeMenuOpts,
       computeExportOpts,
       computeImportOpts,
@@ -1316,6 +1318,7 @@ export default defineComponent({
       const expandOpts = computeExpandOpts.value
       const columnOpts = computeColumnOpts.value
       const columnDragOpts = computeColumnDragOpts.value
+      const virtualYOpts = computeVirtualYOpts.value
       const { isCrossDrag, isSelfToChildDrag } = columnDragOpts
       const customOpts = computeCustomOpts.value
       const { storage } = customOpts
@@ -1348,39 +1351,33 @@ export default defineComponent({
           htmlColumn = column
         }
         if (treeNode) {
-          if (process.env.VUE_APP_VXE_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.VUE_APP_VXE_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.VUE_APP_VXE_ENV === 'development') {
-          if (type === 'checkbox') {
-            if (checkboxColumn) {
-              warnLog('vxe.error.colRepet', ['type', type])
-            }
-            if (!checkboxColumn) {
-              checkboxColumn = column
-            }
-          } else if (type === 'radio') {
-            if (radioColumn) {
-              warnLog('vxe.error.colRepet', ['type', type])
-            }
-            if (!radioColumn) {
-              radioColumn = column
-            }
+        if (type === 'checkbox') {
+          if (checkboxColumn) {
+            warnLog('vxe.error.colRepet', ['type', type])
+          }
+          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) {
@@ -1400,6 +1397,9 @@ export default defineComponent({
         tableFullColumn.forEach(handleFunc)
       }
 
+      if (expandColumn && expandOpts.mode !== 'fixed' && virtualYOpts.enabled) {
+        warnLog('vxe.error.notConflictProp', ['column.type="expand', 'virtual-y-config.enabled=false'])
+      }
       if ((expandColumn && expandOpts.mode !== 'fixed') && mouseOpts.area) {
         errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand'])
       }
@@ -2746,6 +2746,7 @@ export default defineComponent({
       const { scrollYLoad: oldScrollYLoad } = reactData
       const { scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop } = internalData
       const treeOpts = computeTreeOpts.value
+      const expandOpts = computeExpandOpts.value
       const { transform } = treeOpts
       const childrenField = treeOpts.children || treeOpts.childrenField
       let treeData = []
@@ -2832,6 +2833,9 @@ export default defineComponent({
         }
 
         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 => column.showOverflow === false)
@@ -4241,6 +4245,7 @@ export default defineComponent({
        */
       getCheckboxRecords (isFull) {
         const { treeConfig } = props
+        const { updateCheckboxFlag } = reactData
         const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps, selectCheckboxMaps } = internalData
         const treeOpts = computeTreeOpts.value
         const checkboxOpts = computeCheckboxOpts.value
@@ -4248,26 +4253,28 @@ export default defineComponent({
         const { checkField } = checkboxOpts
         const childrenField = treeOpts.children || treeOpts.childrenField
         let rowList: any[] = []
-        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 {
-          XEUtils.each(selectCheckboxMaps, (row, rowid) => {
-            if (isFull) {
-              if (fullDataRowIdData[rowid]) {
-                rowList.push(fullDataRowIdData[rowid].row)
-              }
+        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 {
-              if (afterFullRowMaps[rowid]) {
-                rowList.push(afterFullRowMaps[rowid])
-              }
+              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)
+                }
+              } else {
+                if (afterFullRowMaps[rowid]) {
+                  rowList.push(afterFullRowMaps[rowid])
+                }
+              }
+            })
+          }
         }
         return rowList
       },
@@ -10439,7 +10446,7 @@ export default defineComponent({
       }
 
       nextTick(() => {
-        const { data, exportConfig, importConfig, treeConfig, showOverflow } = props
+        const { data, exportConfig, importConfig, treeConfig, showOverflow, highlightCurrentRow, highlightCurrentColumn } = props
         const { scrollXStore, scrollYStore } = internalData
         const editOpts = computeEditOpts.value
         const treeOpts = computeTreeOpts.value
@@ -10451,6 +10458,11 @@ export default defineComponent({
         const mouseOpts = computeMouseOpts.value
         const exportOpts = computeExportOpts.value
         const importOpts = computeImportOpts.value
+        const currentRowOpts = computeCurrentRowOpts.value
+        const currentColumnOpts = computeCurrentColumnOpts.value
+        const virtualXOpts = computeVirtualXOpts.value
+        const virtualYOpts = computeVirtualYOpts.value
+        const keyboardOpts = computeKeyboardOpts.value
 
         if (props.rowId) {
           warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
@@ -10491,6 +10503,12 @@ export default defineComponent({
         if (props.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(',')])
@@ -10553,6 +10571,28 @@ export default defineComponent({
           warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField'])
         }
 
+        if ((rowOpts.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
+          warnLog('vxe.error.notConflictProp', ['row-config.isCurrent', 'current-row-config.isFollowSelected'])
+        }
+        if ((columnOpts.isCurrent || highlightCurrentColumn) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
+          warnLog('vxe.error.notConflictProp', ['column-config.isCurrent', 'current-column-config.isFollowSelected'])
+        }
+
+        // 如果不支持虚拟滚动
+        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) {
           errLog('vxe.error.reqModule', ['Edit'])