vxe-table 3.14.4 → 3.14.5

package/packages/locale/lang/zh-CHT.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: '表尾',
       expFooterTitle: '是否需要表尾',
       expOptColgroup: '分組表頭',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: '如果存在，則支援帶有分組結構的表頭',
       expOptMerge: '合併',
       expMergeTitle: '如果存在，則支援帶有合併結構的儲存格',
-      expOptAllExpand: '展開層級',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: '如果存在，則支援將帶有層級結構的資料全部展開',
       expOptUseStyle: '樣式',
       expUseStyleTitle: '如果存在，則支援帶有樣式的儲存格',

package/packages/locale/lang/zh-CN.ts

@@ -195,10 +195,12 @@ export default {
       expOptFooter: '表尾',
       expFooterTitle: '是否需要表尾',
       expOptColgroup: '分组表头',
+      expOptTitle: '列标题',
+      expTitleTitle: '是否为列标题，否则显示为列的字段名',
       expColgroupTitle: '如果存在，则支持带有分组结构的表头',
       expOptMerge: '合并',
       expMergeTitle: '如果存在，则支持带有合并结构的单元格',
-      expOptAllExpand: '展开层级',
+      expOptAllExpand: '展开树',
       expAllExpandTitle: '如果存在，则支持将带有层级结构的数据全部展开',
       expOptUseStyle: '样式',
       expUseStyleTitle: '如果存在，则支持带样式的单元格',

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

@@ -338,27 +338,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: any) {
-                                      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: any) {
-                                      defaultOptions.original = value
+                                      defaultOptions.isColgroup = value
                                     }
                                   }
                                 })
@@ -368,16 +368,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: any) {
-                                      defaultOptions.isColgroup = value
+                                      defaultOptions.original = value
                                     }
                                   }
                                 }),
@@ -422,6 +420,24 @@ 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: any) {
+                                      defaultOptions.isFooter = value
+                                    }
+                                  }
+                                })
                               ])
                             ])
                         ])

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

@@ -220,7 +220,7 @@ function getBooleanValue (cellValue: any) {
 function getHeaderTitle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: any, column: any) {
   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: any, opts: any, row: any, column: any) {
@@ -1083,6 +1083,7 @@ function handleExportAndPrint ($xeTable: VxeTableConstructor, options: VxeTableP
   const defOpts = Object.assign({
     message: true,
     isHeader: showHeader,
+    isTitle: showHeader,
     isFooter: showFooter,
     isColgroup: isGroup,
     isMerge: hasMerge,
@@ -1261,6 +1262,7 @@ export default {
       const opts = Object.assign({
         message: true,
         isHeader: showHeader,
+        isTitle: showHeader,
         isFooter: showFooter,
         isColgroup: isGroup,
         isMerge: hasMerge,

package/packages/table/src/methods.ts

@@ -249,39 +249,33 @@ function cacheColumnMap ($xeTable: VxeTableConstructor) {
       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) {
@@ -2789,6 +2783,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 = []
@@ -2875,6 +2870,9 @@ const Methods = {
       }
 
       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)
@@ -3814,9 +3812,11 @@ const Methods = {
   getCheckboxRecords (isFull: boolean) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const props = $xeTable
+    const reactData = $xeTable as unknown as TableReactData
     const internalData = $xeTable as unknown as TableInternalData
 
     const { treeConfig } = props
+    const { updateCheckboxFlag } = reactData
     const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps, selectCheckboxMaps } = internalData
     const treeOpts = $xeTable.computeTreeOpts
     const checkboxOpts = $xeTable.computeCheckboxOpts
@@ -3824,26 +3824,28 @@ const Methods = {
     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
   },

package/packages/table/src/table.ts

@@ -625,6 +625,7 @@ export default {
         original: false,
         message: true,
         isHeader: false,
+        isTitle: false,
         isFooter: false
       },
 
@@ -1432,6 +1433,7 @@ export default {
     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'])
@@ -1475,6 +1477,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(',')])
@@ -1569,10 +1577,10 @@ export default {
       warnLog('vxe.error.errProp', [`table.empty-render=${props.emptyRender}`, 'table.empty-render={}'])
     }
 
-    if ((rowOpts.isCurrent || highlightCurrentRow) && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
+    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) && !XEUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
+    if ((columnOpts.isCurrent || highlightCurrentColumn) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
       warnLog('vxe.error.notConflictProp', ['column-config.isCurrent', 'current-column-config.isFollowSelected'])
     }