vxe-table 4.11.6 → 4.11.8

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.11.6";
+const version = "4.11.8";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3586,7 +3586,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.11.6"}`;
+const log_version = `table v${"4.11.8"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -9989,6 +9989,7 @@ const {
             columns,
             params: defaultOptions.params
           };
+          const hasEmptyData = defaultOptions.mode === 'empty';
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-table-export--panel'
           }, [topSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -10057,7 +10058,8 @@ const {
           }, $xeTable.callSlot(parameterSlot, params))]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-table-export--panel-option-row'
           }, [VxeUICheckboxComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUICheckboxComponent, {
-            modelValue: defaultOptions.isHeader,
+            modelValue: hasEmptyData || defaultOptions.isHeader,
+            disabled: hasEmptyData,
             title: export_panel_getI18n('vxe.export.expHeaderTitle'),
             content: export_panel_getI18n('vxe.export.expOptHeader'),
             'onUpdate:modelValue'(value) {
@@ -10072,7 +10074,8 @@ const {
               defaultOptions.isFooter = value;
             }
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), VxeUICheckboxComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUICheckboxComponent, {
-            modelValue: defaultOptions.original,
+            modelValue: hasEmptyData ? false : defaultOptions.original,
+            disabled: hasEmptyData,
             title: export_panel_getI18n('vxe.export.expOriginalTitle'),
             content: export_panel_getI18n('vxe.export.expOptOriginal'),
             'onUpdate:modelValue'(value) {
@@ -10094,7 +10097,7 @@ const {
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), VxeUICheckboxComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUICheckboxComponent, {
             modelValue: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false,
             title: export_panel_getI18n('vxe.export.expMergeTitle'),
-            disabled: !hasMerge || !supportMerge || !checkedAll,
+            disabled: hasEmptyData || !hasMerge || !supportMerge || !checkedAll,
             content: export_panel_getI18n('vxe.export.expOptMerge'),
             'onUpdate:modelValue'(value) {
               defaultOptions.isMerge = value;
@@ -10109,7 +10112,7 @@ const {
             }
           }), VxeUICheckboxComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUICheckboxComponent, {
             modelValue: hasTree ? defaultOptions.isAllExpand : false,
-            disabled: !hasTree,
+            disabled: hasEmptyData || !hasTree,
             title: export_panel_getI18n('vxe.export.expAllExpandTitle'),
             content: export_panel_getI18n('vxe.export.expOptAllExpand'),
             'onUpdate:modelValue'(value) {
@@ -13006,7 +13009,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       reactData.isIndeterminate = false;
       reactData.treeIndeterminateMaps = {};
       internalData.treeIndeterminateRowMaps = {};
-      tablePrivateMethods.checkSelectionStatus();
+      $xeTable.checkSelectionStatus();
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
     };
     // 还原展开、选中等相关状态
@@ -13055,12 +13058,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       reactData.rowExpandedMaps = expandColumn ? getRecoverRowMaps(rowExpandedMaps) : {}; // 刷新行展开状态
       // 还原保留状态
       if (expandColumn && expandOpts.reserve) {
-        tableMethods.setRowExpand(handleReserveRow(internalData.rowExpandedReserveRowMap), true);
+        $xeTable.setRowExpand(handleReserveRow(internalData.rowExpandedReserveRowMap), true);
       }
       // 树展开
       reactData.treeExpandedMaps = treeConfig ? getRecoverRowMaps(treeExpandedMaps) : {}; // 刷新树展开状态
       if (treeConfig && treeOpts.reserve) {
-        tableMethods.setTreeExpand(handleReserveRow(internalData.treeExpandedReserveRowMap), true);
+        $xeTable.setTreeExpand(handleReserveRow(internalData.treeExpandedReserveRowMap), true);
       }
     };
     /**
@@ -13921,9 +13924,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       handleCheckedAllCheckboxRow(value);
       if (evnt) {
         dispatchEvent('checkbox-all', {
-          records: tableMethods.getCheckboxRecords(),
-          reserves: tableMethods.getCheckboxReserveRecords(),
-          indeterminates: tableMethods.getCheckboxIndeterminateRecords(),
+          records: $xeTable.getCheckboxRecords(),
+          reserves: $xeTable.getCheckboxReserveRecords(),
+          indeterminates: $xeTable.getCheckboxIndeterminateRecords(),
           checked: value
         }, evnt);
       }
@@ -22087,8 +22090,7 @@ hook_hooks.add('tableFilterModule', {
       internalData
     } = $xeTable;
     const {
-      refTableHeader,
-      refTableBody,
+      refElem,
       refTableFilter
     } = $xeTable.getRefMaps();
     const {
@@ -22156,13 +22158,19 @@ hook_hooks.add('tableFilterModule', {
           initStore,
           filterStore
         } = reactData;
+        const {
+          elemStore
+        } = internalData;
         if (filterStore.column === column && filterStore.visible) {
           filterStore.visible = false;
         } else {
           const {
-            target: targetElem,
+            clientY,
             pageX
           } = evnt;
+          const el = refElem.value;
+          const tableRect = el.getBoundingClientRect();
+          const targetElem = evnt.target;
           const {
             visibleWidth
           } = getDomNode();
@@ -22201,11 +22209,8 @@ hook_hooks.add('tableFilterModule', {
           filterStore.visible = true;
           initStore.filter = true;
           (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
-            const tableHeader = refTableHeader.value;
-            const tableBody = refTableBody.value;
-            const headerElem = tableHeader ? tableHeader.$el : null;
-            const bodyElem = tableBody.$el;
-            if (!bodyElem) {
+            const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
+            if (!headerScrollElem) {
               return;
             }
             const tableFilter = refTableFilter.value;
@@ -22214,28 +22219,25 @@ hook_hooks.add('tableFilterModule', {
               return;
             }
             const filterWidth = filterWrapperElem.offsetWidth;
-            const filterHeight = filterWrapperElem.offsetHeight;
             const filterHeadElem = filterWrapperElem.querySelector('.vxe-table--filter-header');
             const filterFootElem = filterWrapperElem.querySelector('.vxe-table--filter-footer');
             const centerWidth = filterWidth / 2;
             const minMargin = 10;
-            const maxLeft = bodyElem.clientWidth - filterWidth - minMargin;
+            const maxLeft = el.clientWidth - filterWidth - minMargin;
             let left, right;
+            const thEl = targetElem.offsetParent;
+            const trEl = thEl.offsetParent;
             const style = {
-              top: `${targetElem.offsetTop + targetElem.offsetParent.offsetTop + targetElem.offsetHeight}px`
+              top: `${targetElem.offsetTop + thEl.offsetTop + targetElem.offsetHeight}px`
             };
             // 判断面板不能大于表格高度
-            let maxHeight = null;
-            const bodyHeight = bodyElem.clientHeight - (headerElem ? headerElem.clientHeight / 2 : 0);
-            if (filterHeight >= bodyHeight) {
-              maxHeight = Math.max(40, bodyHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0));
-            }
+            const maxHeight = Math.max(40, el.clientHeight - (clientY - tableRect.y) - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14);
             if (column.fixed === 'left') {
-              left = targetElem.offsetLeft + targetElem.offsetParent.offsetLeft - centerWidth;
+              left = targetElem.offsetLeft + thEl.offsetLeft - centerWidth;
             } else if (column.fixed === 'right') {
-              right = targetElem.offsetParent.offsetWidth - targetElem.offsetLeft + (targetElem.offsetParent.offsetParent.offsetWidth - targetElem.offsetParent.offsetLeft) - column.renderWidth - centerWidth;
+              right = thEl.offsetWidth - targetElem.offsetLeft + (trEl.offsetWidth - trEl.offsetLeft) - column.renderWidth - centerWidth;
             } else {
-              left = targetElem.offsetLeft + targetElem.offsetParent.offsetLeft - centerWidth - bodyElem.scrollLeft;
+              left = targetElem.offsetLeft + thEl.offsetLeft - centerWidth - headerScrollElem.scrollLeft;
             }
             if (left) {
               const overflowWidth = pageX + filterWidth - centerWidth + minMargin - visibleWidth;
@@ -25307,7 +25309,7 @@ export_hook_hooks.add('tableExportModule', {
         isMerge: hasMerge,
         useStyle: true,
         current: 'current',
-        modes: ['current', 'selected'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : [])
+        modes: (proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []).concat(['current', 'selected', 'empty'])
       }, options);
       const types = defOpts.types || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps);
       const modes = defOpts.modes || [];
@@ -25448,7 +25450,7 @@ export_hook_hooks.add('tableExportModule', {
           isMerge: hasMerge,
           useStyle: true,
           current: 'current',
-          modes: ['current', 'selected'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []),
+          modes: (proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []).concat(['current', 'selected', 'empty']),
           download: true,
           type: 'csv'
           // filename: '',
@@ -25704,7 +25706,8 @@ export_hook_hooks.add('tableExportModule', {
                 });
               }
             }
-          } else if (mode === 'current') {
+          }
+          if (mode === 'current') {
             handleOptions.data = afterFullData;
           }
         }
@@ -30975,7 +30978,7 @@ const Grid = VxeGrid;
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: '暂无数据',
@@ -31043,7 +31046,8 @@ const Grid = VxeGrid;
     },
     button: {
       confirm: '确认',
-      cancel: '取消'
+      cancel: '取消',
+      clear: '清除'
     },
     filter: {
       search: '搜索'
@@ -31095,6 +31099,7 @@ const Grid = VxeGrid;
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: '当前数据（当前页的数据）',
         selected: '选中数据（当前页选中的数据）',
         all: '全量数据（包括所有分页的数据）'