vxe-table 4.19.20 → 4.19.22

package/packages/table/module/custom/hook.ts

@@ -160,38 +160,40 @@ VxeUI.hooks.add('tableCustomModule', {
       return openCustom()
     }
 
-    const saveCustom = () => {
+    const saveCustom = (isDirectly?: boolean) => {
       const { customColumnList, aggHandleFields, rowGroupList } = reactData
       const customOpts = computeCustomOpts.value
       const { allowVisible, allowSort, allowFixed, allowResizable, allowGroup, allowValues } = customOpts
-      XEUtils.eachTree(customColumnList, (column, index, items, path, parentColumn) => {
-        if (parentColumn) {
+      if (!isDirectly) {
+        XEUtils.eachTree(customColumnList, (column, index, items, path, parentColumn) => {
+          if (parentColumn) {
           // 更新子列信息
-          column.fixed = parentColumn.fixed
-        } else {
-          if (allowSort) {
-            const sortIndex = index + 1
-            column.renderSortNumber = sortIndex
-          }
-          if (allowFixed) {
-            column.fixed = column.renderFixed
+            column.fixed = parentColumn.fixed
+          } else {
+            if (allowSort) {
+              const sortIndex = index + 1
+              column.renderSortNumber = sortIndex
+            }
+            if (allowFixed) {
+              column.fixed = column.renderFixed
+            }
           }
-        }
-        if (allowResizable) {
-          if (column.renderVisible && (!column.children || !column.children.length)) {
-            if (column.renderResizeWidth !== column.renderWidth) {
-              column.resizeWidth = column.renderResizeWidth
-              column.renderWidth = column.renderResizeWidth
+          if (allowResizable) {
+            if (column.renderVisible && (!column.children || !column.children.length)) {
+              if (column.renderResizeWidth !== column.renderWidth) {
+                column.resizeWidth = column.renderResizeWidth
+                column.renderWidth = column.renderResizeWidth
+              }
             }
           }
-        }
-        if (allowVisible) {
-          column.visible = column.renderVisible
-        }
-        if (allowGroup && allowValues) {
-          column.aggFunc = column.renderAggFn
-        }
-      })
+          if (allowVisible) {
+            column.visible = column.renderVisible
+          }
+          if (allowGroup && allowValues) {
+            column.aggFunc = column.renderAggFn
+          }
+        })
+      }
       reactData.isCustomStatus = true
       if (allowGroup && !!$xeTable.handlePivotTableAggData) {
         if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
@@ -375,10 +377,12 @@ VxeUI.hooks.add('tableCustomModule', {
         if (customStore.visible) {
           closeCustom()
           emitCustomEvent('close', evnt)
+          $xeTable.dispatchEvent('custom-close', {}, evnt)
         } else {
           customStore.btnEl = evnt.target as HTMLDivElement
           openCustom()
           emitCustomEvent('open', evnt)
+          $xeTable.dispatchEvent('custom-open', {}, evnt)
         }
       },
       customOpenEvent (evnt) {
@@ -390,6 +394,7 @@ VxeUI.hooks.add('tableCustomModule', {
           customStore.btnEl = evnt.target as HTMLDivElement
           $xeTable.openCustom()
           $xeTable.emitCustomEvent('open', evnt)
+          $xeTable.dispatchEvent('custom-open', {}, evnt)
         }
       },
       customCloseEvent (evnt) {
@@ -400,6 +405,7 @@ VxeUI.hooks.add('tableCustomModule', {
           customStore.activeBtn = false
           $xeTable.closeCustom()
           $xeTable.emitCustomEvent('close', evnt)
+          $xeTable.dispatchEvent('custom-close', {}, evnt)
         }
       },
       handleUpdateCustomColumn,

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

@@ -94,26 +94,33 @@ export default defineVxeComponent({
       $xeTable.saveCustom()
       $xeTable.closeCustom()
       $xeTable.emitCustomEvent('confirm', $event)
+      $xeTable.dispatchEvent('custom-confirm', {}, $event)
       $xeTable.emitCustomEvent('close', $event)
+      $xeTable.dispatchEvent('custom-close', {}, $event)
     }
 
     const cancelCloseEvent: VxeButtonEvents.Click = ({ $event }) => {
       $xeTable.closeCustom()
       $xeTable.emitCustomEvent('close', $event)
+      $xeTable.dispatchEvent('custom-close', {}, $event)
     }
 
     const cancelCustomEvent: VxeButtonEvents.Click = ({ $event }) => {
       $xeTable.cancelCustom()
       $xeTable.closeCustom()
       $xeTable.emitCustomEvent('cancel', $event)
+      $xeTable.dispatchEvent('custom-cancel', {}, $event)
       $xeTable.emitCustomEvent('close', $event)
+      $xeTable.dispatchEvent('custom-close', {}, $event)
     }
 
     const handleResetCustomEvent = (evnt: Event) => {
       $xeTable.resetCustom(true)
       $xeTable.closeCustom()
       $xeTable.emitCustomEvent('reset', evnt)
+      $xeTable.dispatchEvent('custom-reset', {}, evnt)
       $xeTable.emitCustomEvent('close', evnt)
+      $xeTable.dispatchEvent('custom-close', {}, evnt)
     }
 
     const resetCustomEvent: VxeButtonEvents.Click = ({ $event }) => {

package/packages/table/module/edit/hook.ts

@@ -557,7 +557,6 @@ hooks.add('tableEditModule', {
         return handleInsertRowAt(records, targetRowOrRowid, true)
       },
       insertChild (records, parentRowOrParentId) {
-        (window as any).aa = internalData
         return handleInsertChildRowAt(records, parentRowOrParentId, null)
       },
       insertChildAt (records, parentRowOrParentId, targetRow) {

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

@@ -1,9 +1,10 @@
 import { nextTick } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../../ui'
-import { getDomNode, getAbsolutePos, getEventTargetNode } from '../../../ui/src/dom'
+import { getDomNode, getAbsolutePos, getEventTargetNode, toCssUnit } from '../../../ui/src/dom'
 import { isEnableConf, hasChildrenList } from '../../../ui/src/utils'
 
+import type { VxeComponentStyleType } from 'vxe-pc-ui'
 import type { TableMenuMethods, TableMenuPrivateMethods } from '../../../../types'
 
 const { menus, hooks, globalEvents, GLOBAL_EVENT_KEYS } = VxeUI
@@ -31,7 +32,7 @@ hooks.add('tableMenuModule', {
       const isContentMenu = computeIsContentMenu.value
       const menuOpts = computeMenuOpts.value
       const config = menuOpts[type]
-      const { zIndex, transfer, visibleMethod } = menuOpts
+      const { zIndex, transfer, width, visibleMethod } = menuOpts
       if (config) {
         const { options, disabled } = config
         if (disabled) {
@@ -58,17 +59,21 @@ hooks.add('tableMenuModule', {
 
               const handleVisible = () => {
                 internalData._currMenuParams = params
+                const ctxStyle: VxeComponentStyleType = {
+                  zIndex: zIndex || internalData.tZindex,
+                  top: `${top}px`,
+                  left: `${left}px`
+                }
+                if (width) {
+                  ctxStyle['--vxe-ui-table-menu-item-width'] = toCssUnit(width)
+                }
                 Object.assign(ctxMenuStore, {
                   visible: true,
                   list: options,
                   selected: null,
                   selectChild: null,
                   showChild: false,
-                  style: {
-                    zIndex: zIndex || internalData.tZindex,
-                    top: `${top}px`,
-                    left: `${left}px`
-                  }
+                  style: ctxStyle
                 })
                 nextTick(() => {
                   const tableMenu = refTableMenu.value

package/packages/table/src/emits.ts

@@ -86,6 +86,11 @@ export const tableEmits: VxeTableEmits = [
   'scroll',
   'scroll-boundary',
   'custom',
+  'custom-open',
+  'custom-close',
+  'custom-cancel',
+  'custom-reset',
+  'custom-confirm',
   'custom-visible-change',
   'custom-visible-all',
   'custom-fixed-change',

package/packages/table/src/table.ts

@@ -9328,11 +9328,14 @@ export default defineVxeComponent({
         // 如果为 null 使用默认逻辑
         if (XEUtils.eqNull(customContent)) {
           isShow = isOver
+          content = cellText
         } else if (customContent !== '' && customContent !== false) {
           // 如果为 '' | false 则不显示
           isShow = true
+          content = customContent
+        } else {
+          content = cellText
         }
-        content = cellText
       }
       if (isShow && content) {
         const tipContent = formatText(content)
@@ -11480,6 +11483,7 @@ export default defineVxeComponent({
         if (evnt.dataTransfer) {
           evnt.dataTransfer.setDragImage(getTpImg(), 0, 0)
         }
+        $xeTable.closeTooltip()
       },
       handleRowDragSwapEvent (evnt, isSyncRow, dragRow, prevDragRow, prevDragPos, prevDragToChild) {
         const { treeConfig, dragConfig } = props
@@ -12152,6 +12156,7 @@ export default defineVxeComponent({
         if (evnt.dataTransfer) {
           evnt.dataTransfer.setDragImage(getTpImg(), 0, 0)
         }
+        $xeTable.closeTooltip()
       },
       handleColDragSwapColumn () {
         handleUpdateColumn()

package/styles/theme/base.scss

@@ -3,9 +3,10 @@
   --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-large: 16px;
   --vxe-ui-font-size-default: 14px;
   --vxe-ui-font-size-medium: 14px;
-  --vxe-ui-font-size-small: 13px;
+  --vxe-ui-font-size-small: 12px;
   --vxe-ui-font-size-mini: 12px;
 
   /*base border*/