vxe-table 4.11.5 → 4.11.7

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.11.5";
+const version = "4.11.7";
 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.5"}`;
+const log_version = `table v${"4.11.7"}`;
 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);
       }
     };
     /**
@@ -13429,15 +13432,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       internalData.tableFullData = fullData;
       internalData.tableFullTreeData = treeData;
       // 缓存数据
-      $xeTable.cacheRowMap(true, isReset);
+      $xeTable.cacheRowMap(true);
       // 原始数据
       internalData.tableSynchData = datas;
       if (isReset) {
         internalData.isResizeCellHeight = false;
-        reactData.rowExpandedMaps = {};
-        reactData.rowExpandLazyLoadedMaps = {};
-        reactData.treeExpandedMaps = {};
-        reactData.treeExpandLazyLoadedMaps = {};
       }
       // 克隆原数据，用于显示编辑状态，与编辑值做对比
       if (keepSource) {
@@ -13925,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);
       }
@@ -14944,7 +14943,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           treeConfig
         } = props;
         const {
-          fullDataRowIdData
+          fullAllDataRowIdData
         } = internalData;
         const treeOpts = computeTreeOpts.value;
         const {
@@ -14960,7 +14959,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             rowid = getRowid($xeTable, rowOrRowid);
           }
           if (rowid) {
-            const rest = fullDataRowIdData[rowid];
+            const rest = fullAllDataRowIdData[rowid];
             const row = rest ? rest.row : null;
             if (row) {
               return row[transform ? mapChildrenField : childrenField] || [];
@@ -14977,7 +14976,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           treeConfig
         } = props;
         const {
-          fullDataRowIdData
+          fullAllDataRowIdData
         } = internalData;
         if (rowOrRowid && treeConfig) {
           let rowid;
@@ -14987,7 +14986,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             rowid = getRowid($xeTable, rowOrRowid);
           }
           if (rowid) {
-            const rest = fullDataRowIdData[rowid];
+            const rest = fullAllDataRowIdData[rowid];
             return rest ? rest.parent : null;
           }
         }
@@ -15003,10 +15002,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        */
       getRowById(cellValue) {
         const {
-          fullDataRowIdData
+          fullAllDataRowIdData
         } = internalData;
         const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cellValue) ? '' : encodeURIComponent(cellValue || '');
-        return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
+        return fullAllDataRowIdData[rowid] ? fullAllDataRowIdData[rowid].row : null;
       },
       /**
        * 根据行获取行的唯一主键
@@ -16372,9 +16371,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         return rowRest && !!rowRest.treeLoaded;
       },
       clearTreeExpandLoaded(rows) {
-        const tExpandedMaps = {
-          ...reactData.treeExpandedMaps
-        };
         const {
           fullAllDataRowIdData
         } = internalData;
@@ -16382,7 +16378,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const {
           transform
         } = treeOpts;
+        let tExpandedMaps = {};
         if (rows) {
+          tExpandedMaps = {
+            ...reactData.treeExpandedMaps
+          };
           if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
             rows = [rows];
           }
@@ -16396,11 +16396,15 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               }
             }
           });
+        } else {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(fullAllDataRowIdData, rowRest => {
+            rowRest.treeLoaded = false;
+          });
         }
-        reactData.treeExpandedMaps = tExpandedMaps;
+        reactData.treeExpandedMaps = {};
         if (transform) {
           handleVirtualTreeToList();
-          return tablePrivateMethods.handleTableData();
+          return $xeTable.handleTableData();
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
@@ -17945,7 +17949,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       /**
        * 更新数据行的 Map
        */
-      cacheRowMap(isReset, isSource) {
+      cacheRowMap() {
         const {
           treeConfig
         } = props;
@@ -17972,9 +17976,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           if (isLazy && row[hasChildField] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[childrenField])) {
             row[childrenField] = null;
           }
-          let cacheItem = fullAllDataRowIdData[rowid];
-          if (isReset || !cacheItem) {
-            cacheItem = {
+          let rowRest = fullAllDataRowIdData[rowid];
+          if (!rowRest) {
+            rowRest = {
               row,
               rowid,
               seq,
@@ -17991,19 +17995,15 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               expandHeight: 0
             };
           }
-          cacheItem.row = row;
-          cacheItem.items = items;
-          cacheItem.parent = parentRow;
-          cacheItem.level = level;
-          cacheItem.index = treeConfig && parentRow ? -1 : index;
-          if (isSource) {
-            fullDataRowIdMaps[rowid] = cacheItem;
-          }
-          fullAllDataRowIdMaps[rowid] = cacheItem;
+          rowRest.row = row;
+          rowRest.items = items;
+          rowRest.parent = parentRow;
+          rowRest.level = level;
+          rowRest.index = treeConfig && parentRow ? -1 : index;
+          fullDataRowIdMaps[rowid] = rowRest;
+          fullAllDataRowIdMaps[rowid] = rowRest;
         };
-        if (isSource) {
-          internalData.fullDataRowIdData = fullDataRowIdMaps;
-        }
+        internalData.fullDataRowIdData = fullDataRowIdMaps;
         internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
         if (treeConfig) {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleRow, {
@@ -21581,7 +21581,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       if (value && value.length >= 50000) {
         warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
       }
-      loadTableData(value, true).then(() => {
+      loadTableData(value, false).then(() => {
         const {
           scrollXLoad,
           scrollYLoad,
@@ -25310,7 +25310,7 @@ export_hook_hooks.add('tableExportModule', {
         isMerge: hasMerge,
         useStyle: true,
         current: 'current',
-        modes: ['current', 'selected'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : [])
+        modes: ['current', 'selected', 'empty'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : [])
       }, 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 || [];
@@ -25451,7 +25451,7 @@ export_hook_hooks.add('tableExportModule', {
           isMerge: hasMerge,
           useStyle: true,
           current: 'current',
-          modes: ['current', 'selected'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []),
+          modes: ['current', 'selected', 'empty'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []),
           download: true,
           type: 'csv'
           // filename: '',
@@ -25707,7 +25707,8 @@ export_hook_hooks.add('tableExportModule', {
                 });
               }
             }
-          } else if (mode === 'current') {
+          }
+          if (mode === 'current') {
             handleOptions.data = afterFullData;
           }
         }
@@ -30978,7 +30979,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: '暂无数据',
@@ -31098,6 +31099,7 @@ const Grid = VxeGrid;
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: '当前数据（当前页的数据）',
         selected: '选中数据（当前页选中的数据）',
         all: '全量数据（包括所有分页的数据）'