vxe-table 4.22.4 → 4.23.0-beta.1

package/packages/table/src/util.ts

@@ -2,7 +2,7 @@ import { watch, reactive } from 'vue'
 import XEUtils from 'xe-utils'
 import { ColumnInfo } from './columnInfo'
 import { isPx, isScale, queryElement } from '../../ui/src/dom'
-import { eqEmptyValue } from '../../ui/src/utils'
+import { eqEmptyValue, hasEnableConf } from '../../ui/src/utils'
 
 import type { VxeTableConstructor, VxeTablePrivateMethods, VxeTableDefines, VxeTablePropTypes, TableReactData, TableInternalData } from '../../../types'
 
@@ -976,6 +976,10 @@ export function getLastChildColumn (column: VxeTableDefines.ColumnInfo): VxeTabl
 export function clearTableDefaultStatus ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
   const { props, internalData } = $xeTable
 
+  const { keyboardConfig, mouseConfig } = props
+  const { computeMouseOpts, computeKeyboardOpts } = $xeTable.getComputeMaps()
+  const mouseOpts = computeMouseOpts.value
+  const keyboardOpts = computeKeyboardOpts.value
   internalData.initStatus = false
   const actionList = [
     $xeTable.clearSort(),
@@ -995,12 +999,12 @@ export function clearTableDefaultStatus ($xeTable: VxeTableConstructor & VxeTabl
       $xeTable.clearFilter()
     )
   }
-  if ($xeTable.clearSelected && (props.keyboardConfig || props.mouseConfig)) {
+  if ($xeTable.clearSelected && (hasEnableConf(keyboardConfig, keyboardOpts) || hasEnableConf(mouseConfig, mouseOpts))) {
     actionList.push(
       $xeTable.clearSelected()
     )
   }
-  if ($xeTable.clearCellAreas && props.mouseConfig) {
+  if ($xeTable.clearCellAreas && hasEnableConf(mouseConfig, mouseOpts)) {
     actionList.push(
       $xeTable.clearCellAreas(),
       $xeTable.clearCopyCellArea()

package/packages/ui/index.ts

@@ -269,16 +269,14 @@ VxeUI.setConfig({
       oSize: 0
     },
     scrollbarConfig: {
-      // width: 14,
-      // height: 14,
-      x: {
-        // position: 'bottom',
-        visible: true
-      },
-      y: {
-        // position: 'right',
-        visible: true
-      }
+      // xConfig: {
+      //   // position: 'bottom',
+      //   // visible: true
+      // },
+      // yConfig: {
+      //   // position: 'right',
+      //   // visible: true
+      // }
     },
     undoRedoHistoryConfig: {
       stackSize: 50

package/packages/ui/src/utils.ts

@@ -8,6 +8,16 @@ export function isEnableConf (conf: any): boolean {
   return conf && conf.enabled !== false
 }
 
+/**
+ * 用于开关类型的配置项
+ * 局部启用规则：conf={}
+ * 局部禁用规则：conf={enabled:false}
+ * 全局默认启用规则：conf.enabled=true
+ */
+export function hasEnableConf (conf: any, opts: any): boolean {
+  return opts && (conf ? opts.enabled !== false : opts.enabled)
+}
+
 export function isEmptyValue (cellValue: any) {
   return cellValue === null || cellValue === undefined || cellValue === ''
 }