vxe-table 4.17.12 → 4.17.14

package/lib/index.umd.js

@@ -3141,7 +3141,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.17.12";
+const version = "4.17.14";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3472,6 +3472,7 @@ core_.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',
@@ -3654,7 +3655,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.17.12"}`;
+const log_version = `table v${"4.17.14"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -8568,16 +8569,12 @@ function getColumnLastChild(column) {
     };
     const renderHeads = (isGroup, isOptimizeMode, headerGroups) => {
       const {
-        fixedType,
-        fixedColumn
+        fixedType
       } = props;
       const {
         headerRowClassName,
         headerRowStyle
       } = tableProps;
-      const {
-        visibleColumn
-      } = tableInternalData;
       const floatingFilterOpts = computeFloatingFilterOpts.value;
       const rowVNs = headerGroups.map((cols, $rowIndex) => {
         const params = {
@@ -8596,7 +8593,7 @@ function getColumnLastChild(column) {
         rowVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('tr', {
           key: 'ff',
           class: ['vxe-header--row']
-        }, renderFilterRows(isOptimizeMode, isOptimizeMode && fixedType ? fixedColumn : visibleColumn)));
+        }, renderFilterRows(isOptimizeMode, headerGroups[headerGroups.length - 1])));
       }
       return rowVNs;
     };
@@ -11391,6 +11388,7 @@ const {
 
 const {
   getIcon: menu_panel_getIcon,
+  getI18n: menu_panel_getI18n,
   renderEmptyElement: menu_panel_renderEmptyElement
 } = core_.VxeUI;
 /* harmony default export */ var menu_panel = (defineVxeComponent({
@@ -11442,7 +11440,11 @@ const {
           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);
@@ -11450,6 +11452,7 @@ const {
           const menuContent = getFuncText(item.name);
           return item.visible === false ? menu_panel_renderEmptyElement($xeTable) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('li', {
             class: [item.className, {
+              'link--loading': loading,
               'link--disabled': item.disabled,
               'link--active': item === ctxMenuStore.selected
             }],
@@ -11467,12 +11470,14 @@ const {
             }
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: ['vxe-context-menu--link-prefix', prefixOpts.className || '']
-          }, [prefixIcon && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(prefixIcon) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {}, getSlotVNs(prefixIcon({}))) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+          }, [loading ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+            class: menu_panel_getIcon('TABLE_MENU_OPTION_LOADING')
+          }) : prefixIcon && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(prefixIcon) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {}, getSlotVNs(prefixIcon({}))) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
             class: prefixIcon
-          }), prefixOpts.content ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {}, `${prefixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          })]), prefixOpts.content ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {}, `${prefixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-context-menu--link-content',
             title: menuContent
-          }, menuContent), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          }, loading ? menu_panel_getI18n('vxe.table.menuLoading') : menuContent), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: ['vxe-context-menu--link-suffix', suffixOpts.className || '']
           }, [suffixIcon && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(suffixIcon) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {}, getSlotVNs(suffixIcon({}))) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
             class: suffixIcon || (hasChildMenus ? menu_panel_getIcon().TABLE_MENU_OPTIONS : '')
@@ -11481,6 +11486,9 @@ const {
               '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);
@@ -11488,6 +11496,7 @@ const {
             const childMenuContent = getFuncText(child.name);
             return child.visible === false ? null : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('li', {
               class: [child.className, {
+                'link--loading': childLoading,
                 'link--disabled': child.disabled,
                 'link--active': child === ctxMenuStore.selectChild
               }],
@@ -11505,12 +11514,14 @@ const {
               }
             }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
               class: ['vxe-context-menu--link-prefix', childPrefixOpts.className || '']
-            }, [childPrefixIcon && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(childPrefixIcon) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {}, getSlotVNs(childPrefixIcon({}))) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+            }, [child.loading ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+              class: menu_panel_getIcon('TABLE_MENU_OPTION_LOADING')
+            }) : childPrefixIcon && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(childPrefixIcon) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {}, getSlotVNs(childPrefixIcon({}))) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
               class: childPrefixIcon
-            }), childPrefixOpts.content ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', `${childPrefixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            })]), childPrefixOpts.content ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', `${childPrefixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
               class: 'vxe-context-menu--link-content',
               title: childMenuContent
-            }, childMenuContent), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            }, childLoading ? menu_panel_getI18n('vxe.table.menuLoading') : childMenuContent), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
               class: ['vxe-context-menu--link-suffix', childSuffixOpts.className || '']
             }, [childSuffixIcon && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(childSuffixIcon) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {}, getSlotVNs(childSuffixIcon({}))) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
               class: childSuffixIcon
@@ -12419,7 +12430,7 @@ menu_hook_hooks.add('tableMenuModule', {
         const $xeGrid = $xeTable.xeGrid;
         const $xeGantt = $xeTable.xeGantt;
         // 如果一级菜单有配置 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 = hook_menus.get(menu.code);
           const params = Object.assign({}, internalData._currMenuParams, {
             menu,
@@ -22596,7 +22607,8 @@ const Toolbar = VxeToolbar;
       dragTip: '移动：{0}',
       resizeColTip: '宽：{0} 像素',
       resizeRowTip: '高：{0} 像素',
-      rowGroupContentTotal: '{0}（{1}）'
+      rowGroupContentTotal: '{0}（{1}）',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',