zmdms-webui 1.8.4 → 1.8.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/es/table/excel.js
CHANGED
|
@@ -249,7 +249,7 @@ function exportToExcelSimple(records, config) {
|
|
|
249
249
|
* excel导出
|
|
250
250
|
*/
|
|
251
251
|
function useExcelExport(records, config) {
|
|
252
|
-
var columns = config.columns,
|
|
252
|
+
var columns = config.columns, isAutoMerge = config.isAutoMerge, columnHeaders = config.columnHeaders;
|
|
253
253
|
// 计算需要合并的字段key集合
|
|
254
254
|
var mergeKeys = useMergeKeys(columns, isAutoMerge);
|
|
255
255
|
// 需要合计的字段
|
|
@@ -258,7 +258,7 @@ function useExcelExport(records, config) {
|
|
|
258
258
|
.filter(function (item) { return item.isSummary; })
|
|
259
259
|
.map(function (item) { return item.dataIndex; });
|
|
260
260
|
}, [columns]);
|
|
261
|
-
var exportFunction = useMemoizedFn(function () {
|
|
261
|
+
var exportFunction = useMemoizedFn(function (fileName) {
|
|
262
262
|
exportToExcelSimple(records, {
|
|
263
263
|
columns: columns,
|
|
264
264
|
mergeKeys: mergeKeys,
|
package/dist/es/table/table.js
CHANGED