vxe-table 4.20.2 → 4.20.4

package/packages/table/src/table.ts

@@ -4,7 +4,7 @@ import XEUtils from 'xe-utils'
 import { initTpImg, getTpImg, isPx, isScale, hasClass, addClass, removeClass, wheelScrollTopTo, wheelScrollLeftTo, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey, checkTargetElement, hasEventInputTarget } from '../../ui/src/dom'
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils'
 import { VxeUI } from '../../ui'
-import { createReactData, createInternalData, getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, getColReMaxWidth, createHandleUpdateRowId, createHandleGetRowId, getCalcHeight, getCellRestHeight, getLastChildColumn, getRowMaxHeight, handleCustomStoreConfig } from './util'
+import { createReactData, createInternalData, getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, getColReMaxWidth, createHandleUpdateRowId, createHandleGetRowId, getCalcHeight, getCellRestHeight, getLastChildColumn, getRowMaxHeight, handleCustomStoreConfig, encodeRowid } from './util'
 import { getSlotVNs } from '../../ui/src/vn'
 import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from '../../ui/src/anime'
 import { createComponentLog } from '../../ui/src/log'
@@ -2927,7 +2927,8 @@ export default defineVxeComponent({
           handleCheckedAllCheckboxRow(true, true)
         } else if (checkRowKeys) {
           const defSelection: any[] = []
-          checkRowKeys.forEach((rowid: any) => {
+          checkRowKeys.forEach((rowKey: any) => {
+            const rowid = encodeRowid(rowKey)
             if (fullDataRowIdData[rowid]) {
               defSelection.push(fullDataRowIdData[rowid].row)
             }
@@ -2945,7 +2946,8 @@ export default defineVxeComponent({
       if (radioConfig) {
         const { fullDataRowIdData } = internalData
         const radioOpts = computeRadioOpts.value
-        const { checkRowKey: rowid, reserve } = radioOpts
+        const { checkRowKey: rowKey, reserve } = radioOpts
+        const rowid = rowKey ? encodeRowid(rowKey) : null
         if (rowid) {
           if (fullDataRowIdData[rowid]) {
             handleCheckedRadioRow(fullDataRowIdData[rowid].row, true)
@@ -2971,7 +2973,8 @@ export default defineVxeComponent({
           $xeTable.setAllRowExpand(true)
         } else if (expandRowKeys) {
           const defExpandeds: any[] = []
-          expandRowKeys.forEach((rowid: any) => {
+          expandRowKeys.forEach((rowKey: any) => {
+            const rowid = encodeRowid(rowKey)
             if (fullDataRowIdData[rowid]) {
               defExpandeds.push(fullDataRowIdData[rowid].row)
             }
@@ -3228,7 +3231,8 @@ export default defineVxeComponent({
           $xeTable.setAllTreeExpand(true)
         } else if (expandRowKeys) {
           const defExpandeds: any[] = []
-          expandRowKeys.forEach((rowid) => {
+          expandRowKeys.forEach((rowKey) => {
+            const rowid = encodeRowid(rowKey)
             const rowRest = fullAllDataRowIdData[rowid]
             if (rowRest) {
               defExpandeds.push(rowRest.row)
@@ -6584,13 +6588,14 @@ export default defineVxeComponent({
         }
         return handleCheckedCheckboxRow(rows, checked, true)
       },
-      setCheckboxRowKey (keys: any, checked) {
+      setCheckboxRowByKey (keys: any, checked) {
         const { fullAllDataRowIdData } = internalData
         if (!XEUtils.isArray(keys)) {
           keys = [keys]
         }
         const rows: any = []
-        keys.forEach((rowid: string) => {
+        keys.forEach((rowKey: string) => {
+          const rowid = encodeRowid(rowKey)
           const rowRest = fullAllDataRowIdData[rowid]
           if (rowRest) {
             rows.push(rowRest.row)
@@ -6598,6 +6603,9 @@ export default defineVxeComponent({
         })
         return handleCheckedCheckboxRow(rows, checked, true)
       },
+      setCheckboxRowKey (keys, checked) {
+        return $xeTable.setCheckboxRowByKey(keys, checked)
+      },
       isCheckedByCheckboxRow (row) {
         const { updateCheckboxFlag } = reactData
         const { selectCheckboxMaps } = internalData
@@ -6608,11 +6616,12 @@ export default defineVxeComponent({
         }
         return !!updateCheckboxFlag && !!selectCheckboxMaps[getRowid($xeTable, row)]
       },
-      isCheckedByCheckboxRowKey (rowid: any) {
+      isCheckedByCheckboxRowKey (rowKey: any) {
         const { updateCheckboxFlag } = reactData
         const { fullAllDataRowIdData, selectCheckboxMaps } = internalData
         const checkboxOpts = computeCheckboxOpts.value
         const { checkField } = checkboxOpts
+        const rowid = encodeRowid(rowKey)
         if (checkField) {
           const rowRest = fullAllDataRowIdData[rowid]
           if (rowRest) {
@@ -6626,8 +6635,9 @@ export default defineVxeComponent({
         const { treeIndeterminateRowMaps } = internalData
         return !!treeIndeterminateRowMaps[getRowid($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row)
       },
-      isIndeterminateByCheckboxRowKey (rowid: any) {
+      isIndeterminateByCheckboxRowKey (rowKey: any) {
         const { treeIndeterminateRowMaps } = internalData
+        const rowid = encodeRowid(rowKey)
         return !!treeIndeterminateRowMaps[rowid] && !$xeTable.isCheckedByCheckboxRowKey(rowid)
       },
       /**
@@ -6815,14 +6825,18 @@ export default defineVxeComponent({
        * 用于单选行，设置某一行为选中状态
        * @param key 行主键
        */
-      setRadioRowKey (rowid: any) {
+      setRadioByRowKey (rowKey: any) {
         const { fullAllDataRowIdData } = internalData
+        const rowid = encodeRowid(rowKey)
         const rowRest = fullAllDataRowIdData[rowid]
         if (rowRest) {
           return handleCheckedRadioRow(rowRest.row, true)
         }
         return nextTick()
       },
+      setRadioRowKey (rowKey) {
+        return $xeTable.setRadioByRowKey(rowKey)
+      },
       /**
        * 用于当前行，手动清空当前高亮的状态
        */
@@ -14933,35 +14947,35 @@ export default defineVxeComponent({
     })
 
     nextTick(() => {
+      const { showOverflow, showHeaderOverflow, showFooterOverflow } = props
+      const tooltipOpts = computeTooltipOpts.value
+      const headerTooltipOpts = computeHeaderTooltipOpts.value
+      const footerTooltipOpts = computeFooterTooltipOpts.value
       if (props.loading) {
         if (!VxeUILoadingComponent && !slots.loading) {
-          errLog('vxe.error.errProp', ['loading=true', 'loading=false | <template #loading>...</template>'])
           errLog('vxe.error.reqComp', ['vxe-loading'])
+          errLog('vxe.error.errProp', ['loading=true', 'loading=false | <template #loading>...</template>'])
         }
       }
-      if ((props.showOverflow === true || props.showOverflow === 'tooltip') ||
-          (props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip') ||
-          (props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip')) {
-        if (!VxeUITooltipComponent) {
-          if (props.showOverflow === true) {
-            errLog('vxe.error.errProp', ['show-overflow=true', 'show-overflow=title'])
-          }
-          if (props.showOverflow === 'tooltip') {
-            errLog('vxe.error.errProp', ['show-overflow=tooltip', 'show-overflow=title'])
-          }
-          if (props.showHeaderOverflow === true) {
-            errLog('vxe.error.errProp', ['show-header-overflow=true', 'show-header-overflow=title'])
-          }
-          if (props.showHeaderOverflow === 'tooltip') {
-            errLog('vxe.error.errProp', ['show-header-overflow=tooltip', 'show-header-overflow=title'])
-          }
-          if (props.showFooterOverflow === true) {
-            errLog('vxe.error.errProp', ['show-footer-overflow=true', 'show-footer-overflow=title'])
-          }
-          if (props.showFooterOverflow === 'tooltip') {
-            errLog('vxe.error.errProp', ['show-footer-overflow=tooltip', 'show-footer-overflow=title'])
-          }
-          errLog('vxe.error.reqComp', ['vxe-tooltip'])
+      if (!VxeUITooltipComponent) {
+        errLog('vxe.error.reqComp', ['vxe-tooltip'])
+        if (showOverflow === 'tooltip') {
+          errLog('vxe.error.errProp', ['show-overflow=' + showOverflow, 'show-overflow=false,title,ellipsis'])
+        }
+        if (showOverflow === true && tooltipOpts.mode === 'tooltip') {
+          errLog('vxe.error.notSupportProp', ['show-overflow=' + showOverflow, 'tooltip-config.mode=tooltip', 'tooltip-config.mode=title,ellipsis'])
+        }
+        if (showHeaderOverflow === 'tooltip') {
+          errLog('vxe.error.errProp', ['show-header-overflow=' + showHeaderOverflow, 'show-header-overflow=false,title,ellipsis'])
+        }
+        if (showHeaderOverflow === true && headerTooltipOpts.mode === 'tooltip') {
+          errLog('vxe.error.notSupportProp', ['show-header-overflow=' + showHeaderOverflow, 'header-tooltip-config.mode=tooltip', 'header-tooltip-config.mode=title,ellipsis'])
+        }
+        if (showFooterOverflow === 'tooltip') {
+          errLog('vxe.error.errProp', ['show-footer-overflow=' + showFooterOverflow, 'show-footer-overflow=false,title,ellipsis'])
+        }
+        if (showFooterOverflow === true && footerTooltipOpts.mode === 'tooltip') {
+          errLog('vxe.error.notSupportProp', ['show-footer-overflow=' + showFooterOverflow, 'footer-tooltip-config.mode=tooltip', 'footer-tooltip-config.mode=title,ellipsis'])
         }
       }
     })

package/packages/table/src/util.ts

@@ -390,6 +390,7 @@ export function createReactData (): TableReactData {
     mergeFootFlag: 1,
 
     rowHeightStore: {
+      xlarge: 54,
       large: 52,
       default: 48,
       medium: 44,
@@ -651,11 +652,11 @@ export function createHandleGetRowId ($xeTable: VxeTableConstructor) {
 }
 
 // 编码行主键
-export function encodeRowid (rowVal: string) {
+export function encodeRowid (rowVal: string | number) {
   return XEUtils.eqNull(rowVal) ? '' : encodeURIComponent(rowVal)
 }
 
-function getDeepRowIdByKey (row: any, rowKey: string) {
+function getDeepRowIdByKey (row: any, rowKey: string | number) {
   return XEUtils.get(row, rowKey)
 }
 

package/packages/ui/index.ts

@@ -72,6 +72,7 @@ VxeUI.setConfig({
       strict: true
     },
     tooltipConfig: {
+      mode: 'tooltip',
       enterable: true,
       defaultPlacement: 'top'
     },