Sfoglia il codice sorgente

refactor(yvan-ext): 优化导出 Excel 功能

- 添加判断逻辑,当页大小大于实际数据量时跳出循环
- 移除对 window['__isNNDSL'] 的判断,简化代码
- 删除导出页大小的限制逻辑,提高灵活性
lizw-2015 2 settimane fa
parent
commit
242a704bc5
2 ha cambiato i file con 4 aggiunte e 9 eliminazioni
  1. 3 8
      dist/yvan-ext.js
  2. 1 1
      dist/yvan-ext.js.map

+ 3 - 8
dist/yvan-ext.js

@@ -46557,6 +46557,9 @@ define(['exports', 'axios', 'qs', 'lodash', 'jquery', 'moment', 'recast', 'xlsx'
                                 }
                                 sumCount = sumCount + pageData.length;
                                 excelData.push.apply(excelData, __spread(pageData));
+                                if (pageSize > pageData.length) {
+                                    return [3 /*break*/, 6];
+                                }
                                 return [3 /*break*/, 5];
                             case 4:
                                 e_1 = _a.sent();
@@ -47050,14 +47053,6 @@ define(['exports', 'axios', 'qs', 'lodash', 'jquery', 'moment', 'recast', 'xlsx'
                                     v = defaultGrid.exportExcelPageSize;
                                     sender.setValue(v);
                                 }
-                                if (window['__isNNDSL'] === true) ;
-                                else {
-                                    if (v > 10000) {
-                                        window['system'].msg("导出页大小不能大于10000");
-                                        v = 10000;
-                                        sender.setValue(v);
-                                    }
-                                }
                                 var page = parseInt(grid.exportExcelCurrentPage);
                                 var total = parseInt(grid.exportExcelTotal);
                                 if (page > total / v) {

File diff suppressed because it is too large
+ 1 - 1
dist/yvan-ext.js.map