vxe-table 4.19.16 → 4.19.18

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'
@@ -33,6 +33,8 @@ import '../render'
 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
@@ -10827,7 +10829,12 @@ export default defineVxeComponent({
             }
             if (editOpts.trigger === 'manual') {
               if (actived.args && actived.row === row && column !== actived.column) {
-                handleChangeCell(evnt, params)
+                if (editOpts.mode === 'row') {
+                  handleChangeCell(evnt, params)
+                } else {
+                  checkValidate('blur')
+                    .catch((e: any) => e)
+                }
               }
             } else if (!actived.args || row !== actived.row || column !== actived.column) {
               if (editOpts.trigger === 'click') {

package/packages/table/src/util.ts

@@ -774,14 +774,7 @@ export function getCalcHeight (height: number | 'unset' | undefined | null) {
 /**
  * 列宽拖动最大宽度
  */
-export function getColReMaxWidth (params: {
-  $table: VxeTableConstructor & VxeTablePrivateMethods;
-  column: VxeTableDefines.ColumnInfo;
-  columnIndex: number;
-  $columnIndex: number;
-  $rowIndex: number;
-  cell: HTMLTableCellElement;
-}) {
+export function getColReMaxWidth (params: (VxeTableDefines.CellRenderHeaderParams| VxeTableDefines.CellRenderBodyParams | VxeTableDefines.CellRenderFooterParams) & { cell: HTMLTableCellElement }) {
   const { $table, column, cell } = params
   const internalData = $table.internalData
   const { elemStore } = internalData
@@ -819,14 +812,7 @@ export function getColReMaxWidth (params: {
 /**
  * 列宽拖动最小宽度
  */
-export function getColReMinWidth (params: {
-  $table: VxeTableConstructor & VxeTablePrivateMethods;
-  column: VxeTableDefines.ColumnInfo;
-  columnIndex: number;
-  $columnIndex: number;
-  $rowIndex: number;
-  cell: HTMLTableCellElement;
-}) {
+export function getColReMinWidth (params: (VxeTableDefines.CellRenderHeaderParams| VxeTableDefines.CellRenderBodyParams | VxeTableDefines.CellRenderFooterParams) & { cell: HTMLTableCellElement }) {
   const { $table, column, cell } = params
   const tableProps = $table.props
   const internalData = $table.internalData

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)

package/styles/theme/dark.scss

@@ -4,7 +4,7 @@
   color-scheme: dark;
 
   /*font color*/
-  --vxe-ui-font-color: #a0a3a7;
+  --vxe-ui-font-color: rgba(255, 255, 255, 0.6);
   --vxe-ui-font-tinge-color: #33353b;
   --vxe-ui-font-lighten-color: #797b80;
   --vxe-ui-font-darken-color: #47494c;

package/styles/variable.scss

@@ -1,5 +1,5 @@
 /*font color*/
-$vxe-ui-font-color: #606266 !default;
+$vxe-ui-font-color: rgba(0, 0, 0, 0.6) !default;
 $vxe-ui-font-tinge-color: #d4d5d7 !default;
 $vxe-ui-font-lighten-color: #797b80 !default;
 $vxe-ui-font-darken-color: #47494c !default;