vxe-table 3.21.16 → 3.21.17

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

@@ -4,10 +4,12 @@ import { isColumnInfo, getCellValue, createHandleGetRowId } from '../../src/util
 import { parseFile, formatText, eqEmptyValue } from '../../../ui/src/utils'
 import { hasClass } from '../../../ui/src/dom'
 import { createHtmlPage, getExportBlobByContent } from './util'
-import { warnLog, errLog } from '../../../ui/src/log'
+import { createComponentLog } from '../../../ui/src/log'
 
 import type { VxeTablePropTypes, VxeTableDefines, TableReactData, VxeTablePrivateMethods, TableInternalData, VxeColumnPropTypes, VxeTableConstructor } from '../../../../types'
 
+const { warnLog, errLog } = createComponentLog('table')
+
 const { getI18n, renderer } = VxeUI
 
 let htmlCellElem: any

package/packages/table/module/filter/panel.ts

@@ -4,11 +4,13 @@ import { VxeUI } from '../../../ui'
 import { formatText, isEnableConf } from '../../../ui/src/utils'
 import { getPropClass, toCssUnit } from '../../../ui/src/dom'
 import { getSlotVNs } from '../../../ui/src/vn'
-import { warnLog } from '../../../ui/src/log'
+import { createComponentLog } from '../../../ui/src/log'
 
 import type { VxeGlobalRendererOptions, VxeComponentSizeType } from 'vxe-pc-ui'
 import type { VxeTableConstructor, VxeTablePrivateMethods, TableInternalData, VxeTableDefines, VxeColumnPropTypes } from '../../../../types'
 
+const { warnLog } = createComponentLog('table')
+
 const { getI18n, getIcon, renderer, globalMixins, renderEmptyElement } = VxeUI
 
 // 全部筛选事件

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

@@ -2,10 +2,12 @@ import XEUtils from 'xe-utils'
 import { VxeUI } from '../../../ui'
 import { getDomNode, getAbsolutePos, getEventTargetNode } from '../../../ui/src/dom'
 import { isEnableConf, hasChildrenList } from '../../../ui/src/utils'
-import { warnLog } from '../../../ui/src/log'
+import { createComponentLog } from '../../../ui/src/log'
 
 import type { VxeTableConstructor, VxeTablePrivateMethods, TableInternalData, TableReactData, VxeTableDefines } from '../../../../types'
 
+const { warnLog } = createComponentLog('table')
+
 const { menus, globalEvents, GLOBAL_EVENT_KEYS } = VxeUI
 
 export default {

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

@@ -3,11 +3,13 @@ import { VxeUI } from '../../../ui'
 import { eqEmptyValue, getFuncText } from '../../../ui/src/utils'
 import { scrollToView } from '../../../ui/src/dom'
 import { handleFieldOrColumn, getRowid } from '../../src/util'
-import { warnLog, errLog } from '../../../ui/src/log'
+import { createComponentLog } from '../../../ui/src/log'
 
 import type { VxeTooltipInstance } from 'vxe-pc-ui'
 import type { VxeTableDefines, TableInternalData, TableReactData, VxeTableConstructor, VxeTablePrivateMethods } from '../../../../types'
 
+const { warnLog, errLog } = createComponentLog('table')
+
 const { getConfig, validators } = VxeUI
 
 /**

package/packages/table/render/index.ts

@@ -4,10 +4,12 @@ import { VxeUI } from '../../ui'
 import { getCellValue, setCellValue } from '../src/util'
 import { getFuncText, formatText, isEmptyValue } from '../../ui/src/utils'
 import { getOnName, getModelEvent, getChangeEvent, hasInputType } from '../../ui/src/vn'
-import { errLog } from '../../ui/src/log'
+import { createComponentLog } from '../../ui/src/log'
 
 import type { VxeGlobalRendererHandles, VxeColumnPropTypes, VxeTableConstructor, VxeTablePrivateMethods, VxeTableDefines } from '../../../types'
 
+const { errLog } = createComponentLog('table')
+
 const { getConfig, renderer, getI18n, getComponent } = VxeUI
 
 const componentDefaultModelProp = 'value'

package/packages/table/src/columnInfo.ts

@@ -3,10 +3,12 @@ import { VxeUI } from '../../ui'
 import { toFilters } from './util'
 import { isEnableConf, getFuncText } from '../../ui/src/utils'
 import { isPx } from '../../ui/src/dom'
-import { warnLog, errLog } from '../../ui/src/log'
+import { createComponentLog } from '../../ui/src/log'
 
 import type { VxeTableConstructor, VxeTablePrivateMethods, VxeTableDefines, VxeColumnProps } from '../../../types'
 
+const { warnLog, errLog } = createComponentLog('table')
+
 const { getI18n, formats, renderer } = VxeUI
 
 export class ColumnInfo {

package/packages/table/src/methods.ts

@@ -6,12 +6,14 @@ import Cell from './cell'
 import { getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, getColReMaxWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem, 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 type { VxeTooltipInstance, ValueOf } from 'vxe-pc-ui'
 import type { VxeTableDefines, VxeColumnPropTypes, VxeTableEmits, TableReactData, VxeTableConstructor, VxeToolbarConstructor, VxeToolbarInstance, TableInternalData, VxeGridConstructor, VxeTablePrivateMethods, VxeTablePropTypes, VxeGridPrivateMethods } from '../../../types'
 
+const { warnLog, errLog } = createComponentLog('table')
+
 const { getConfig, getI18n, renderer, formats, interceptor, createEvent, globalEvents, GLOBAL_EVENT_KEYS } = VxeUI
 
 const browseObj = XEUtils.browse()

package/packages/table/src/table.ts

@@ -10,7 +10,7 @@ import TableHeaderComponent from './header'
 import TableFooterComponent from './footer'
 import { tableProps } from './props'
 import { getSlotVNs } from '../../ui/src/vn'
-import { warnLog, errLog } from '../../ui/src/log'
+import { createComponentLog } from '../../ui/src/log'
 import { crossTableDragRowGlobal, getCrossTableDragRowInfo } from './store'
 import TableCustomPanelComponent from '../module/custom/panel'
 import TableFilterPanelComponent from '../module/filter/panel'
@@ -29,6 +29,8 @@ import customMixin from '../module/custom/mixin'
 import type { VxeTabsConstructor, VxeTabsPrivateMethods, VxeComponentStyleType, VxeModalConstructor, VxeModalMethods } from 'vxe-pc-ui'
 import type { VxeTableConstructor, VxeTablePrivateMethods, VxeTablePropTypes, TableInternalData, TableReactData, VxeTableDefines } from '../../../types'
 
+const { warnLog, errLog } = createComponentLog('table')
+
 const { getConfig, getIcon, getI18n, renderer, globalResize, globalEvents, globalMixins, renderEmptyElement } = VxeUI
 
 function handleUpdateMergeBodyCells ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, merges: VxeTableDefines.MergeOptions | VxeTableDefines.MergeOptions[]) {

package/packages/table/src/util.ts

@@ -1,11 +1,13 @@
 import XEUtils from 'xe-utils'
 import { ColumnInfo } from './columnInfo'
 import { isScale, isPx, queryElement } from '../../ui/src/dom'
-import { warnLog, errLog } from '../../ui/src/log'
+import { createComponentLog } from '../../ui/src/log'
 import { eqEmptyValue } from '../../ui/src/utils'
 
 import type { VxeTableDefines, VxeTableConstructor, TableReactData, TableInternalData, VxeTablePrivateMethods, VxeTablePropTypes } from '../../../types'
 
+const { warnLog, errLog } = createComponentLog('table')
+
 export function createInternalData (): TableInternalData {
   return {
     tZindex: 0,

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, VxeComponentSizeType, VxeComponentSlotType, VxeButtonDefines } from 'vxe-pc-ui'
 import type { VxeGridConstructor, GridPrivateMethods, ToolbarInternalData, VxeTableDefines, VxeToolbarEmits, VxeToolbarPropTypes, VxeTablePropTypes, ToolbarReactData, VxeTableConstructor, VxeTablePrivateMethods } from '../../../types'
 
+const { warnLog, errLog } = createComponentLog('toolbar')
+
 const { getConfig, getIcon, getI18n, renderer, commands, createEvent, globalMixins, renderEmptyElement } = VxeUI
 
 function createReactData (): ToolbarReactData {
@@ -72,11 +74,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
   data () {
     const xID = XEUtils.uniqueId()
     const reactData = createReactData()
-    const internalData = createInternalData()
     return {
+      ...({} as {
+        internalData: ToolbarInternalData
+      }),
       xID,
-      reactData,
-      internalData
+      reactData
     }
   },
   computed: {
@@ -255,7 +258,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       if ($xeGGWrapper) {
         $xeGGWrapper.triggerZoomEvent($event)
       } else {
-        warnLog('vxe.error.notProp', ['[toolbar] zoom'])
+        warnLog('vxe.error.notProp', ['zoom'])
       }
     },
     importEvent () {
@@ -389,7 +392,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
               if (tCommandMethod) {
                 tCommandMethod(params)
               } else {
-                errLog('vxe.error.notCommands', [`[toolbar] ${code}`])
+                errLog('vxe.error.notCommands', [code])
               }
             }
             $xeToolbar.dispatchEvent('button-click', params, $event)
@@ -420,7 +423,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
               if (tCommandMethod) {
                 tCommandMethod(params)
               } else {
-                errLog('vxe.error.notCommands', [`[toolbar] ${code}`])
+                errLog('vxe.error.notCommands', [code])
               }
             }
             $xeToolbar.dispatchEvent('tool-click', params, $event)
@@ -790,31 +793,33 @@ export default /* define-vxe-component start */ defineVxeComponent({
     const $xeGantt = $xeToolbar.$xeGantt
     const $xeGGWrapper = $xeGrid || $xeGantt
 
+    $xeToolbar.internalData = createInternalData()
+
     $xeToolbar.$nextTick(() => {
       const refreshOpts = $xeToolbar.computeRefreshOpts
       const $xeTable = $xeToolbar.fintTable() as any
       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={...}'])
       }
 
       if ($xeTable) {
@@ -822,16 +827,16 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
       const customOpts = $xeToolbar.computeCustomOpts
       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'])
       }
     })
 

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)