vxe-table 3.19.12 → 3.19.13

package/packages/locale/lang/fr-FR.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: 'Déplacer: {0}',
       resizeColTip: 'Largeur: {0} pixels',
       resizeRowTip: 'Hauteur: {0} pixels',
-      rowGroupContentTotal: '{0} ({1})'
+      rowGroupContentTotal: '{0} ({1})',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: 'Veuillez sélectionner au moins un enregistrement!',

package/packages/locale/lang/hu-HU.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: 'Mozgás: {0}',
       resizeColTip: 'Szélesség: {0} pixelek',
       resizeRowTip: 'Magasság: {0} pixelek',
-      rowGroupContentTotal: '{0} ({1})'
+      rowGroupContentTotal: '{0} ({1})',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: 'Kérjük, válasszon legalább egy rekordot!',

package/packages/locale/lang/hy-AM.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: '移动：{0}',
       resizeColTip: '宽：{0} 像素',
       resizeRowTip: '高：{0} 像素',
-      rowGroupContentTotal: '{0}（{1}）'
+      rowGroupContentTotal: '{0}（{1}）',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',

package/packages/locale/lang/id-ID.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: 'Pindahkan: {0}',
       resizeColTip: 'Lebar: {0} piksel',
       resizeRowTip: 'Tinggi: {0} piksel',
-      rowGroupContentTotal: '{0} ({1})'
+      rowGroupContentTotal: '{0} ({1})',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: 'Pilih setidaknya satu catatan!',

package/packages/locale/lang/it-IT.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: 'Muovi: {0}',
       resizeColTip: 'Larghezza: {0} pixel',
       resizeRowTip: 'Altezza: {0} pixel',
-      rowGroupContentTotal: '{0} ({1})'
+      rowGroupContentTotal: '{0} ({1})',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: 'Seleziona almeno un record!',

package/packages/locale/lang/ja-JP.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: '移動：{0}',
       resizeColTip: '幅：{0}ピクセル',
       resizeRowTip: '高：{0}ピクセル',
-      rowGroupContentTotal: '{0}（{1}）'
+      rowGroupContentTotal: '{0}（{1}）',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: '少なくとも1つのレコードを選択してください！',

package/packages/locale/lang/ko-KR.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: '움직임 : {0}',
       resizeColTip: '너비 : {0} 픽셀',
       resizeRowTip: '높음 : {0} 픽셀',
-      rowGroupContentTotal: '{0}（{1}）'
+      rowGroupContentTotal: '{0}（{1}）',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: '하나 이상의 레코드를 선택하십시오!',

package/packages/locale/lang/ms-MY.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: 'Bergerak: {0}',
       resizeColTip: 'Lebar: {0} piksel',
       resizeRowTip: 'Tinggi: {0} piksel',
-      rowGroupContentTotal: '{0}（{1}）'
+      rowGroupContentTotal: '{0}（{1}）',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: 'Sila pilih sekurang -kurangnya satu rekod!',

package/packages/locale/lang/nb-NO.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: 'Flytt: {0}',
       resizeColTip: 'Bredde: {0} piksler',
       resizeRowTip: 'Høyde: {0} piksler',
-      rowGroupContentTotal: '{0} ({1})'
+      rowGroupContentTotal: '{0} ({1})',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: 'Velg minst en post!',

package/packages/locale/lang/pt-BR.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: 'Move: {0}',
       resizeColTip: 'Largura: {0} pixels',
       resizeRowTip: 'Altura: {0} pixels',
-      rowGroupContentTotal: '{0} ({1})'
+      rowGroupContentTotal: '{0} ({1})',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: 'Selecione pelo menos um registro!',

package/packages/locale/lang/ru-RU.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: 'MOVE: {0}',
       resizeColTip: 'Ширина: {0} пиксели',
       resizeRowTip: 'Высокий: {0} пиксели',
-      rowGroupContentTotal: '{0}（{1}）'
+      rowGroupContentTotal: '{0}（{1}）',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: 'Пожалуйста, выберите хотя бы одну запись!',

package/packages/locale/lang/th-TH.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: 'ย้าย: {0}',
       resizeColTip: 'ความกว้าง: {0} พิกเซล',
       resizeRowTip: 'ความสูง: {0} พิกเซล',
-      rowGroupContentTotal: '{0} ({1})'
+      rowGroupContentTotal: '{0} ({1})',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: 'กรุณาเลือกอย่างน้อยหนึ่งบันทึก!',

package/packages/locale/lang/ug-CN.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: 'يۆتكەش：{0}',
       resizeColTip: '宽：{0} 像素',
       resizeRowTip: '高：{0} 像素',
-      rowGroupContentTotal: '{0}（{1}）'
+      rowGroupContentTotal: '{0}（{1}）',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: 'كەم بولغاندا بىر تال ئۇچۇر تاللاڭ',

package/packages/locale/lang/uk-UA.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: 'Перемістити: {0}',
       resizeColTip: 'Ширина: {0} пікселів',
       resizeRowTip: 'Висота: {0} пікселів',
-      rowGroupContentTotal: '{0} ({1})'
+      rowGroupContentTotal: '{0} ({1})',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: 'Виберіть принаймні один запис!',

package/packages/locale/lang/uz-UZ.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: "Ko'chiring: {0}",
       resizeColTip: 'Kengligi: {0} piksel',
       resizeRowTip: 'Yuqori: {0} piksel',
-      rowGroupContentTotal: '{0}（{1}）'
+      rowGroupContentTotal: '{0}（{1}）',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: 'Iltimos, kamida bitta yozuvni tanlang!',

package/packages/locale/lang/vi-VN.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: 'Di chuyển: {0}',
       resizeColTip: 'Chiều rộng: {0} pixel',
       resizeRowTip: 'Cao: {0} pixel',
-      rowGroupContentTotal: '{0}（{1}）'
+      rowGroupContentTotal: '{0}（{1}）',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: 'Vui lòng chọn ít nhất một bản ghi!',

package/packages/locale/lang/zh-CHT.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: '移動：{0}',
       resizeColTip: '寬：{0} 像素',
       resizeRowTip: '高：{0} 像素',
-      rowGroupContentTotal: '{0}（{1}）'
+      rowGroupContentTotal: '{0}（{1}）',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: '請至少選擇一條記錄！',

package/packages/locale/lang/zh-CN.ts

@@ -89,7 +89,8 @@ export default {
       dragTip: '移动：{0}',
       resizeColTip: '宽：{0} 像素',
       resizeRowTip: '高：{0} 像素',
-      rowGroupContentTotal: '{0}（{1}）'
+      rowGroupContentTotal: '{0}（{1}）',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',

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

@@ -4,7 +4,7 @@ import { getDomNode, getAbsolutePos, getEventTargetNode } from '../../../ui/src/
 import { isEnableConf, hasChildrenList } from '../../../ui/src/utils'
 import { warnLog } from '../../../ui/src/log'
 
-import type { VxeTableConstructor, VxeTablePrivateMethods, TableInternalData, TableReactData } from '../../../../types'
+import type { VxeTableConstructor, VxeTablePrivateMethods, TableInternalData, TableReactData, VxeTableDefines } from '../../../../types'
 
 const { menus, globalEvents, GLOBAL_EVENT_KEYS } = VxeUI
 
@@ -247,11 +247,11 @@ export default {
       }
       $xeTable.closeFilter()
     },
-    ctxMenuMouseoverEvent (evnt: any, item: any, child: any) {
+    ctxMenuMouseoverEvent (evnt: Event, item: any, child: any) {
       const $xeTable = this as unknown as VxeTableConstructor & VxeTablePrivateMethods
       const reactData = $xeTable as unknown as TableReactData
 
-      const menuElem = evnt.currentTarget
+      const menuElem = evnt.currentTarget as HTMLDivElement
       const { ctxMenuStore } = reactData
       evnt.preventDefault()
       evnt.stopPropagation()
@@ -261,7 +261,7 @@ export default {
         ctxMenuStore.showChild = hasChildrenList(item)
         if (ctxMenuStore.showChild) {
           $xeTable.$nextTick(() => {
-            const childWrapperElem = menuElem.nextElementSibling
+            const childWrapperElem = menuElem.nextElementSibling as HTMLDivElement
             if (childWrapperElem) {
               const { boundingTop, boundingLeft, visibleHeight, visibleWidth } = getAbsolutePos(menuElem)
               const posTop = boundingTop + menuElem.offsetHeight
@@ -289,7 +289,7 @@ export default {
         }
       }
     },
-    ctxMenuMouseoutEvent (evnt: any, item: any) {
+    ctxMenuMouseoutEvent (evnt: Event, item: VxeTableDefines.MenuFirstOption | VxeTableDefines.MenuChildOption) {
       const $xeTable = this as unknown as VxeTableConstructor & VxeTablePrivateMethods
       const reactData = $xeTable as unknown as TableReactData
 
@@ -302,14 +302,14 @@ export default {
     /**
      * 快捷菜单点击事件
      */
-    ctxMenuLinkEvent (evnt: any, menu: any) {
+    ctxMenuLinkEvent (evnt: Event, menu: VxeTableDefines.MenuFirstOption | VxeTableDefines.MenuChildOption) {
       const $xeTable = this as unknown as VxeTableConstructor & VxeTablePrivateMethods
       const $xeGrid = $xeTable.$xeGrid
       const $xeGantt = $xeTable.$xeGantt
       const internalData = $xeTable as unknown as TableInternalData
 
       // 如果一级菜单有配置 code 则允许点击，否则不能点击
-      if (!menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
+      if (!menu.loading && !menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
         const gMenuOpts = menus.get(menu.code)
         const params = Object.assign({}, internalData._currMenuParams, { menu, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, $event: evnt })
         if (gMenuOpts && gMenuOpts.menuMethod) {

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

@@ -6,7 +6,7 @@ import { getSlotVNs } from '../../../ui/src/vn'
 
 import type { VxeTableConstructor, VxeTablePrivateMethods, TableReactData } from '../../../../types'
 
-const { getIcon, renderEmptyElement } = VxeUI
+const { getIcon, getI18n, renderEmptyElement } = VxeUI
 
 export default {
   name: 'VxeTableMenuPanel',
@@ -60,7 +60,8 @@ export default {
             class: 'vxe-context-menu--option-wrapper',
             key: gIndex
           }, options.map((item, index) => {
-            const hasChildMenus = item.children && item.children.some((child) => child.visible !== false)
+            const { children, loading } = item
+            const hasChildMenus = children && children.some((child) => child.visible !== false)
             const prefixOpts = Object.assign({}, item.prefixConfig)
             const prefixIcon = prefixOpts.icon || item.prefixIcon
             const suffixOpts = Object.assign({}, item.suffixConfig)
@@ -70,6 +71,7 @@ export default {
               ? renderEmptyElement($xeTable)
               : h('li', {
                 class: [item.className, {
+                  'link--loading': loading,
                   'link--disabled': item.disabled,
                   'link--active': item === ctxMenuStore.selected
                 }],
@@ -92,11 +94,17 @@ export default {
                   h('div', {
                     class: ['vxe-context-menu--link-prefix', prefixOpts.className || '']
                   }, [
-                    prefixIcon && XEUtils.isFunction(prefixIcon)
-                      ? h('span', {}, getSlotVNs(prefixIcon.call($xeTable, {})))
-                      : h('i', {
-                        class: prefixIcon
-                      }),
+                    loading
+                      ? h('span', {
+                        class: getIcon('TABLE_MENU_OPTION_LOADING')
+                      })
+                      : (prefixIcon && XEUtils.isFunction(prefixIcon)
+                          ? h('span', {}, getSlotVNs(prefixIcon.call($xeTable, {})))
+                          : h('span', {}, [
+                            h('i', {
+                              class: prefixIcon
+                            })
+                          ])),
                     prefixOpts.content ? h('span', {}, `${prefixOpts.content}`) : renderEmptyElement($xeTable)
                   ]),
                   h('span', {
@@ -104,7 +112,7 @@ export default {
                     attrs: {
                       title: menuContent
                     }
-                  }, menuContent),
+                  }, loading ? getI18n('vxe.table.menuLoading') : menuContent),
                   h('div', {
                     class: ['vxe-context-menu--link-suffix', suffixOpts.className || '']
                   }, [
@@ -122,6 +130,7 @@ export default {
                       'is--show': item === ctxMenuStore.selected && ctxMenuStore.showChild
                     }]
                   }, item.children.map((child, cIndex) => {
+                    const { loading: childLoading } = child
                     const childPrefixOpts = Object.assign({}, child.prefixConfig)
                     const childPrefixIcon = childPrefixOpts.icon || child.prefixIcon
                     const childSuffixOpts = Object.assign({}, child.suffixConfig)
@@ -131,6 +140,7 @@ export default {
                       ? null
                       : h('li', {
                         class: [child.className, {
+                          'link--loading': childLoading,
                           'link--disabled': child.disabled,
                           'link--active': child === ctxMenuStore.selectChild
                         }],
@@ -153,11 +163,17 @@ export default {
                           h('div', {
                             class: ['vxe-context-menu--link-prefix', childPrefixOpts.className || '']
                           }, [
-                            childPrefixIcon && XEUtils.isFunction(childPrefixIcon)
-                              ? h('span', {}, getSlotVNs(childPrefixIcon.call($xeTable, {})))
-                              : h('i', {
-                                class: childPrefixIcon
-                              }),
+                            child.loading
+                              ? h('span', {
+                                class: getIcon('TABLE_MENU_OPTION_LOADING')
+                              })
+                              : (childPrefixIcon && XEUtils.isFunction(childPrefixIcon)
+                                  ? h('span', {}, getSlotVNs(childPrefixIcon({})))
+                                  : h('span', {}, [
+                                    h('i', {
+                                      class: childPrefixIcon
+                                    })
+                                  ])),
                             childPrefixOpts.content ? h('span', `${childPrefixOpts.content}`) : renderEmptyElement($xeTable)
                           ]),
                           h('span', {
@@ -165,7 +181,7 @@ export default {
                             attrs: {
                               title: childMenuContent
                             }
-                          }, childMenuContent),
+                          }, childLoading ? getI18n('vxe.table.menuLoading') : childMenuContent),
                           h('div', {
                             class: ['vxe-context-menu--link-suffix', childSuffixOpts.className || '']
                           }, [

package/packages/ui/index.ts

@@ -342,6 +342,7 @@ VxeUI.setIcon({
   TABLE_RADIO_DISABLED_UNCHECKED: iconPrefix + 'radio-unchecked-fill',
   TABLE_CUSTOM_SORT: iconPrefix + 'drag-handle',
   TABLE_MENU_OPTIONS: iconPrefix + 'arrow-right',
+  TABLE_MENU_OPTION_LOADING: iconPrefix + 'repeat roll',
   TABLE_DRAG_ROW: iconPrefix + 'drag-handle',
   TABLE_DRAG_COLUMN: iconPrefix + 'drag-handle',
   TABLE_DRAG_STATUS_ROW: iconPrefix + 'sort',

package/styles/components/table-module/menu.scss

@@ -61,6 +61,7 @@
         color: #2B2B2B;
       }
     }
+    &.link--loading,
     &.link--disabled {
       & > .vxe-context-menu--link {
         color: var(--vxe-ui-font-disabled-color);