Sfoglia il codice sorgente

excel 导出支持 100000

yuliang 2 anni fa
parent
commit
680dc5a604
3 ha cambiato i file con 19 aggiunte e 6 eliminazioni
  1. 14 5
      dist/yvan-ext.js
  2. 1 1
      dist/yvan-ext.js.map
  3. 4 0
      yarn.lock

+ 14 - 5
dist/yvan-ext.js

@@ -23188,7 +23188,7 @@ define(['exports', 'axios', 'qs', 'lodash', 'jquery', 'moment', 'recast', 'xlsx'
                         config.filter = {
                             type: 'list',
                             options: _$2.map(r.data, function (r) { return ({
-                                id: '' + r.id,
+                                id: r.id,
                                 text: r.text,
                             }); })
                         };
@@ -27067,10 +27067,19 @@ define(['exports', 'axios', 'qs', 'lodash', 'jquery', 'moment', 'recast', 'xlsx'
                                     v = defaultGrid.exportExcelPageSize;
                                     sender.setValue(v);
                                 }
-                                if (v > 10000) {
-                                    window['system'].msg("导出页大小不能大于10000");
-                                    v = 10000;
-                                    sender.setValue(v);
+                                if (window['__isNNDSL'] === true) {
+                                    if (v > 100000) {
+                                        window['system'].msg("导出页大小不能大于100000");
+                                        v = 100000;
+                                        sender.setValue(v);
+                                    }
+                                }
+                                else {
+                                    if (v > 10000) {
+                                        window['system'].msg("导出页大小不能大于10000");
+                                        v = 10000;
+                                        sender.setValue(v);
+                                    }
                                 }
                                 var page = parseInt(grid.exportExcelCurrentPage);
                                 var total = parseInt(grid.exportExcelTotal);

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


+ 4 - 0
yarn.lock

@@ -2,3 +2,7 @@
 # yarn lockfile v1
 
 
+lodash@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==