vxe-table 3.19.12 → 3.19.14

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.19.12";
+const version = "3.19.14";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2337,6 +2337,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',
@@ -2713,7 +2714,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.19.12"}`;
+const log_version = `table v${"3.19.14"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -8093,18 +8094,13 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
   const props = _vm;
   const $xeTable = _vm.$parent;
   const tableProps = $xeTable;
-  const tableInternalData = $xeTable;
   const {
-    fixedType,
-    fixedColumn
+    fixedType
   } = props;
   const {
     headerRowClassName,
     headerRowStyle
   } = tableProps;
-  const {
-    visibleColumn
-  } = tableInternalData;
   const floatingFilterOpts = $xeTable.computeFloatingFilterOpts;
   const rowVNs = headerGroups.map((cols, $rowIndex) => {
     const params = {
@@ -8123,7 +8119,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
     rowVNs.push(h('tr', {
       key: 'ff',
       class: ['vxe-header--row']
-    }, renderFilterRows(h, _vm, isOptimizeMode, isOptimizeMode && fixedType ? fixedColumn : visibleColumn)));
+    }, renderFilterRows(h, _vm, isOptimizeMode, headerGroups[headerGroups.length - 1])));
   }
   return rowVNs;
 }
@@ -11215,6 +11211,7 @@ const {
 
 const {
   getIcon: menu_panel_getIcon,
+  getI18n: menu_panel_getI18n,
   renderEmptyElement: menu_panel_renderEmptyElement
 } = core_.VxeUI;
 /* harmony default export */ var menu_panel = ({
@@ -11273,7 +11270,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);
@@ -11281,6 +11282,7 @@ const {
         const menuContent = getFuncText(item.name);
         return item.visible === false ? menu_panel_renderEmptyElement($xeTable) : h('li', {
           class: [item.className, {
+            'link--loading': loading,
             'link--disabled': item.disabled,
             'link--active': item === ctxMenuStore.selected
           }],
@@ -11300,14 +11302,16 @@ const {
           }
         }, [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) ? h('span', {}, getSlotVNs(prefixIcon.call($xeTable, {}))) : h('i', {
+        }, [loading ? 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) ? h('span', {}, getSlotVNs(prefixIcon.call($xeTable, {}))) : h('span', {}, [h('i', {
           class: prefixIcon
-        }), prefixOpts.content ? h('span', {}, `${prefixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)]), h('span', {
+        })]), prefixOpts.content ? h('span', {}, `${prefixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)]), h('span', {
           class: 'vxe-context-menu--link-content',
           attrs: {
             title: menuContent
           }
-        }, menuContent), h('div', {
+        }, loading ? menu_panel_getI18n('vxe.table.menuLoading') : menuContent), 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) ? h('span', {}, getSlotVNs(suffixIcon.call($xeTable, {}))) : h('i', {
           class: suffixIcon || (hasChildMenus ? menu_panel_getIcon().TABLE_MENU_OPTIONS : '')
@@ -11316,6 +11320,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);
@@ -11323,6 +11330,7 @@ const {
           const childMenuContent = getFuncText(child.name);
           return child.visible === false ? null : h('li', {
             class: [child.className, {
+              'link--loading': childLoading,
               'link--disabled': child.disabled,
               'link--active': child === ctxMenuStore.selectChild
             }],
@@ -11342,14 +11350,16 @@ const {
             }
           }, [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) ? h('span', {}, getSlotVNs(childPrefixIcon.call($xeTable, {}))) : h('i', {
+          }, [child.loading ? 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) ? h('span', {}, getSlotVNs(childPrefixIcon({}))) : h('span', {}, [h('i', {
             class: childPrefixIcon
-          }), childPrefixOpts.content ? h('span', `${childPrefixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)]), h('span', {
+          })]), childPrefixOpts.content ? h('span', `${childPrefixOpts.content}`) : menu_panel_renderEmptyElement($xeTable)]), h('span', {
             class: 'vxe-context-menu--link-content',
             attrs: {
               title: childMenuContent
             }
-          }, childMenuContent), h('div', {
+          }, childLoading ? menu_panel_getI18n('vxe.table.menuLoading') : childMenuContent), 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) ? h('span', {}, getSlotVNs(childSuffixIcon.call($xeTable, {}))) : h('i', {
             class: childSuffixIcon
@@ -12249,7 +12259,7 @@ const {
       const $xeGantt = $xeTable.$xeGantt;
       const internalData = $xeTable;
       // 如果一级菜单有配置 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 = mixin_menus.get(menu.code);
         const params = Object.assign({}, internalData._currMenuParams, {
           menu,
@@ -15189,7 +15199,7 @@ const convertToRows = originColumns => {
             errLog('vxe.error.errProp', ['all', 'mode=current,selected']);
           }
           if ($xeGGWrapper && !handleOptions.remote) {
-            const gridReactData = $xeGGWrapper;
+            const gridReactData = $xeGGWrapper.reactData;
             const proxyOpts = $xeGGWrapper.computeProxyOpts;
             const {
               sortData
@@ -24221,7 +24231,8 @@ const Toolbar = VxeToolbar;
       dragTip: '移动：{0}',
       resizeColTip: '宽：{0} 像素',
       resizeRowTip: '高：{0} 像素',
-      rowGroupContentTotal: '{0}（{1}）'
+      rowGroupContentTotal: '{0}（{1}）',
+      menuLoading: '加载中...'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',