vxe-table 4.20.1 → 4.20.3

package/packages/table/src/table.ts

@@ -14933,35 +14933,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,

package/packages/ui/index.ts

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

package/styles/theme/base.scss

@@ -3,6 +3,7 @@
   --vxe-ui-font-family: -apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;
   
   /*font size*/
+  --vxe-ui-font-size-xlarge: 16px;
   --vxe-ui-font-size-large: 16px;
   --vxe-ui-font-size-default: 14px;
   --vxe-ui-font-size-medium: 14px;
@@ -14,6 +15,8 @@
 
   /*input*/
   --vxe-ui-input-disabled-color: #dcdfe6;
+  --vxe-ui-input-height-xlarge: 40px;
+  --vxe-ui-input-height-large: 36px;
   --vxe-ui-input-height-default: 34px;
   --vxe-ui-input-height-medium: 32px;
   --vxe-ui-input-height-small: 30px;
@@ -31,6 +34,8 @@
   --vxe-ui-table-tree-node-line-style: dotted;
   --vxe-ui-table-header-font-weight: 700;
 
+  --vxe-ui-table-row-height-xlarge: 54px;
+  --vxe-ui-table-row-height-large: 52px;
   --vxe-ui-table-row-height-default: 48px;
   --vxe-ui-table-row-height-medium: 44px;
   --vxe-ui-table-row-height-small: 40px;
@@ -40,12 +45,16 @@
   --vxe-ui-table-column-icon-border-color: #c0c4cc;
   --vxe-ui-table-column-icon-border-hover-color: #515A6E;
 
+  --vxe-ui-table-cell-padding-xlarge: 10px;
+  --vxe-ui-table-cell-padding-large: 9px;
   --vxe-ui-table-cell-padding-default: 8px;
   --vxe-ui-table-cell-padding-medium: 7px;
   --vxe-ui-table-cell-padding-small: 6px;
   --vxe-ui-table-cell-padding-mini: 5px;
   --vxe-ui-table-cell-placeholder-color: #C0C4CC;
   --vxe-ui-table-cell-negative-color: #f56c6c;
+  --vxe-ui-table-cell-input-height-xlarge: var(--vxe-ui-table-row-height-xlarge) - 6;
+  --vxe-ui-table-cell-input-height-large: var(--vxe-ui-table-row-height-large) - 6;
   --vxe-ui-table-cell-input-height-default: var(--vxe-ui-table-row-height-default) - 6;
   --vxe-ui-table-cell-input-height-medium: var(--vxe-ui-table-row-height-medium) - 6;
   --vxe-ui-table-cell-input-height-small: var(--vxe-ui-table-row-height-small) - 6;
@@ -99,6 +108,8 @@
 
   /*toolbar*/
   --vxe-ui-toolbar-custom-active-background-color: #D9DADB;
+  --vxe-ui-toolbar-height-xlarge: 54px;
+  --vxe-ui-toolbar-height-large: 52px;
   --vxe-ui-toolbar-height-default: 48px;
   --vxe-ui-toolbar-height-medium: 46px;
   --vxe-ui-toolbar-height-small: 44px;

package/styles/variable.scss

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