vxe-table 4.19.15 → 4.19.17

package/packages/table/src/table.ts

@@ -7,7 +7,7 @@ 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 } from './util'
 import { getSlotVNs } from '../../ui/src/vn'
 import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from '../../ui/src/anime'
-import { warnLog, errLog } from '../../ui/src/log'
+import { createComponentLog } from '../../ui/src/log'
 import { getCrossTableDragRowInfo } from './store'
 import Cell from './cell'
 import TableBodyComponent from './body'
@@ -30,9 +30,11 @@ import '../module/validator/hook'
 import '../module/custom/hook'
 import '../render'
 
-import type { VxeTooltipInstance, VxeTabsConstructor, VxeTabsPrivateMethods, ValueOf, VxeComponentSlotType, VxeComponentStyleType } from 'vxe-pc-ui'
+import type { VxeTooltipInstance, VxeTabsConstructor, VxeTabsPrivateMethods, ValueOf, VxeComponentSlotType, VxeComponentStyleType, VxeModalConstructor, VxeModalMethods, VxeSplitterConstructor, VxeSplitterMethods } from 'vxe-pc-ui'
 import type { VxeGridConstructor, VxeGridPrivateMethods, VxeTableConstructor, VxeTablePropTypes, VxeToolbarConstructor, TablePrivateMethods, VxeTablePrivateRef, VxeTablePrivateComputed, VxeTablePrivateMethods, TableMethods, VxeTableMethods, VxeTableDefines, VxeTableEmits, VxeTableProps, VxeColumnPropTypes, VxeTableCustomPanelConstructor } from '../../../types'
 
+const { warnLog, errLog } = createComponentLog('table')
+
 const { getConfig, getIcon, getI18n, renderer, formats, createEvent, globalResize, interceptor, hooks, globalEvents, GLOBAL_EVENT_KEYS, useFns, renderEmptyElement } = VxeUI
 
 const supportMaxRow = 5e6
@@ -62,8 +64,10 @@ export default defineVxeComponent({
     const VxeUILoadingComponent = VxeUI.getComponent('VxeLoading')
     const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip')
 
+    const $xeModal = inject<(VxeModalConstructor & VxeModalMethods) | null>('$xeModal', null)
     const $xeTabs = inject<(VxeTabsConstructor & VxeTabsPrivateMethods) | null>('$xeTabs', null)
     const $xeParentTable = inject<(VxeTableConstructor & VxeTablePrivateMethods) | null>('$xeTable', null)
+    const $xeSplitter = inject<(VxeSplitterConstructor & VxeSplitterMethods) | null>('$xeSplitter', null)
     const $xeGrid = inject<(VxeGridConstructor & VxeGridPrivateMethods) | null>('$xeGrid', null)
     const $xeGantt = inject<VxeTableDefines.InjectGanttType | null>('$xeGantt', null)
     const $xeGGWrapper = $xeGrid || $xeGantt
@@ -786,6 +790,18 @@ export default defineVxeComponent({
       return []
     })
 
+    const combineTabsResizeFlag = computed(() => {
+      return $xeTabs ? $xeTabs.reactData.resizeFlag : null
+    })
+
+    const combineModalResizeFlag = computed(() => {
+      return $xeModal ? $xeModal.reactData.resizeFlag : null
+    })
+
+    const combineSplitterResizeFlag = computed(() => {
+      return $xeSplitter ? $xeSplitter.reactData.resizeFlag : null
+    })
+
     const refMaps: VxeTablePrivateRef = {
       refElem,
       refTooltip,
@@ -9249,11 +9265,36 @@ export default defineVxeComponent({
       const { tooltipStore } = reactData
       const { column, row } = params
       const { showAll, contentMethod } = tipOpts
-      const customContent = contentMethod ? contentMethod(params) : null
-      const useCustom = contentMethod && !XEUtils.eqNull(customContent)
-      const content = useCustom ? customContent : XEUtils.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim()
+      const cellText = XEUtils.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim()
       const isOver = tipOverEl.scrollWidth > tipOverEl.clientWidth
-      if (content && (showAll || useCustom || isOver)) {
+      let isShow = false
+      let customContent: any = null
+      let content = ''
+      if (contentMethod) {
+        customContent = contentMethod(params)
+      }
+      // 是否全部展示
+      if (showAll) {
+        // 如果为 null 默认显示
+        if (XEUtils.eqNull(customContent)) {
+          isShow = true
+          content = cellText
+        } else if (customContent !== '' && customContent !== false) {
+          // 如果为 '' | false 则不显示
+          isShow = true
+          content = '' + customContent
+        }
+      } else {
+        // 如果为 null 使用默认逻辑
+        if (XEUtils.eqNull(customContent)) {
+          isShow = isOver
+        } else if (customContent !== '' && customContent !== false) {
+          // 如果为 '' | false 则不显示
+          isShow = true
+        }
+        content = cellText
+      }
+      if (isShow && content) {
         const tipContent = formatText(content)
         Object.assign(tooltipStore, {
           row,
@@ -14382,11 +14423,19 @@ export default defineVxeComponent({
       }
     })
 
-    if ($xeTabs) {
-      watch(() => $xeTabs ? $xeTabs.reactData.resizeFlag : null, () => {
-        handleGlobalResizeEvent()
-      })
-    }
+    const layoutReFlag = ref(0)
+    watch(combineTabsResizeFlag, () => {
+      layoutReFlag.value++
+    })
+    watch(combineModalResizeFlag, () => {
+      layoutReFlag.value++
+    })
+    watch(combineSplitterResizeFlag, () => {
+      layoutReFlag.value++
+    })
+    watch(layoutReFlag, () => {
+      handleGlobalResizeEvent()
+    })
 
     handleKeyField()
 

package/packages/toolbar/src/toolbar.ts

@@ -3,11 +3,13 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { getSlotVNs } from '../../ui/src/vn'
-import { warnLog, errLog } from '../../ui/src/log'
+import { createComponentLog } from '../../ui/src/log'
 
 import type { ValueOf, VxeButtonEvents, VxeComponentSlotType, VxeButtonDefines } from 'vxe-pc-ui'
 import type { VxeGridConstructor, GridPrivateMethods, ToolbarMethods, ToolbarInternalData, VxeToolbarConstructor, VxeToolbarEmits, VxeToolbarPropTypes, ToolbarPrivateRef, ToolbarReactData, VxeTableConstructor, VxeTablePrivateMethods } from '../../../types'
 
+const { warnLog, errLog } = createComponentLog('toolbar')
+
 const { getConfig, getIcon, getI18n, renderer, commands, createEvent, useFns } = VxeUI
 
 function createReactData (): ToolbarReactData {
@@ -206,7 +208,7 @@ export default defineVxeComponent({
       if ($xeGGWrapper) {
         $xeGGWrapper.triggerZoomEvent($event)
       } else {
-        warnLog('vxe.error.notProp', ['[toolbar] zoom'])
+        warnLog('vxe.error.notProp', ['zoom'])
       }
     }
 
@@ -322,7 +324,7 @@ export default defineVxeComponent({
               if (tCommandMethod) {
                 tCommandMethod(params)
               } else {
-                errLog('vxe.error.notCommands', [`[toolbar] ${code}`])
+                errLog('vxe.error.notCommands', [code])
               }
             }
             $xeToolbar.dispatchEvent('button-click', params, $event)
@@ -348,7 +350,7 @@ export default defineVxeComponent({
               if (tCommandMethod) {
                 tCommandMethod(params)
               } else {
-                errLog('vxe.error.notCommands', [`[toolbar] ${code}`])
+                errLog('vxe.error.notCommands', [code])
               }
             }
             $xeToolbar.dispatchEvent('tool-click', params, $event)
@@ -646,40 +648,40 @@ export default defineVxeComponent({
       const refreshOpts = computeRefreshOpts.value
       const queryMethod = refreshOpts.queryMethod || refreshOpts.query
       if (props.refresh && !$xeGGWrapper && !queryMethod) {
-        warnLog('vxe.error.notFunc', ['[toolbar] queryMethod'])
+        warnLog('vxe.error.notFunc', ['queryMethod'])
       }
 
       if (XEUtils.isPlainObject(props.custom)) {
-        warnLog('vxe.error.delProp', ['[toolbar] custom={...}', 'custom=boolean & custom-options={...}'])
+        warnLog('vxe.error.delProp', ['custom={...}', 'custom=boolean & custom-options={...}'])
       }
       if (XEUtils.isPlainObject(props.print)) {
-        warnLog('vxe.error.delProp', ['[toolbar] print={...}', 'print=boolean & print-options={...}'])
+        warnLog('vxe.error.delProp', ['print={...}', 'print=boolean & print-options={...}'])
       }
       if (XEUtils.isPlainObject(props.export)) {
-        warnLog('vxe.error.delProp', ['[toolbar] export={...}', 'export=boolean & export-options={...}'])
+        warnLog('vxe.error.delProp', ['export={...}', 'export=boolean & export-options={...}'])
       }
       if (XEUtils.isPlainObject(props.import)) {
-        warnLog('vxe.error.delProp', ['[toolbar] import={...}', 'import=boolean & import-options={...}'])
+        warnLog('vxe.error.delProp', ['import={...}', 'import=boolean & import-options={...}'])
       }
       if (XEUtils.isPlainObject(props.refresh)) {
-        warnLog('vxe.error.delProp', ['[toolbar] refresh={...}', 'refresh=boolean & refresh-options={...}'])
+        warnLog('vxe.error.delProp', ['refresh={...}', 'refresh=boolean & refresh-options={...}'])
       }
       if (XEUtils.isPlainObject(props.refresh)) {
-        warnLog('vxe.error.delProp', ['[toolbar] zoom={...}', 'zoom=boolean & zoom-options={...}'])
+        warnLog('vxe.error.delProp', ['zoom={...}', 'zoom=boolean & zoom-options={...}'])
       }
 
       const customOpts = computeCustomOpts.value
       if (customOpts.isFooter) {
-        warnLog('vxe.error.delProp', ['[toolbar] toolbar.custom.isFooter', 'table.custom-config.showFooter'])
+        warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter'])
       }
       if (customOpts.showFooter) {
-        warnLog('vxe.error.delProp', ['[toolbar] toolbar.custom.showFooter', 'table.custom-config.showFooter'])
+        warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter'])
       }
       if (customOpts.immediate) {
-        warnLog('vxe.error.delProp', ['[toolbar] toolbar.custom.immediate', 'table.custom-config.immediate'])
+        warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate'])
       }
       if (customOpts.trigger) {
-        warnLog('vxe.error.delProp', ['[toolbar] toolbar.custom.trigger', 'table.custom-config.trigger'])
+        warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger'])
       }
       if (props.refresh || props.import || props.export || props.print || props.zoom) {
         if (!VxeUIButtonComponent) {

package/packages/ui/src/log.ts

@@ -2,7 +2,17 @@ import { VxeUI } from '@vxe-ui/core'
 
 const { log } = VxeUI
 
-const version = `table v${process.env.VUE_APP_VXE_VERSION}`
+const tableVersion = `table v${process.env.VUE_APP_VXE_VERSION}`
 
-export const warnLog = log.create('warn', version)
-export const errLog = log.create('error', version)
+export function createComponentLog (name: string) {
+  const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : ''
+  const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : ''
+  const designVersion = VxeUI.designVersion ? `design v${VxeUI.designVersion}` : ''
+  return {
+    warnLog: log.create('warn', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name),
+    errLog: log.create('error', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name)
+  }
+}
+
+export const warnLog = log.create('warn', tableVersion)
+export const errLog = log.create('error', tableVersion)