Переглянути джерело

表格大批量导出优化,提高健壮性

lizw 3 роки тому
батько
коміт
01ff4cba7c
2 змінених файлів з 16 додано та 11 видалено
  1. 15 10
      dist/yvan-ext.js
  2. 1 1
      dist/yvan-ext.js.map

+ 15 - 10
dist/yvan-ext.js

@@ -42900,7 +42900,7 @@ define(['exports'], function (exports) { 'use strict';
             .field("static", Boolean, defaults["false"])
             .field("computed", Boolean, defaults["false"])
             .field("optional", Boolean, defaults["false"])
-            .field("key", or(def("Identifier"), def("StringLiteral"), def("NumericLiteral"),
+            .field("key", or(def("Identifier"), def("StringLiteral"), def("NumericLiteral"), 
         // Only allowed if .computed is true.
         def("Expression")))
             // classMethodOrDeclareMethodCommon
@@ -43093,7 +43093,7 @@ define(['exports'], function (exports) { 'use strict';
         or("public", "private", "protected", void 0), defaults["undefined"]);
         // Defined already in es6 and babel-core.
         def("ClassBody")
-            .field("body", [or(def("MethodDefinition"), def("VariableDeclarator"), def("ClassPropertyDefinition"), def("ClassProperty"), def("ClassPrivateProperty"), def("ClassMethod"), def("ClassPrivateMethod"),
+            .field("body", [or(def("MethodDefinition"), def("VariableDeclarator"), def("ClassPropertyDefinition"), def("ClassProperty"), def("ClassPrivateProperty"), def("ClassMethod"), def("ClassPrivateMethod"), 
             // Just need to add these types:
             def("TSDeclareMethod"), TSTypeMember)]);
     }
@@ -48707,7 +48707,7 @@ define(['exports'], function (exports) { 'use strict';
      * and an object is returned with the following properties:
      *
      *   - line: The line number in the generated source, or null.  The
-     *     line number is 1-based.
+     *     line number is 1-based. 
      *   - column: The column number in the generated source, or null.
      *     The column number is 0-based.
      */
@@ -58460,7 +58460,7 @@ define(['exports'], function (exports) { 'use strict';
             reprints.forEach(function (reprint) {
                 var oldComment = reprint.oldPath.getValue();
                 assert_1.default.ok(oldComment.leading || oldComment.trailing);
-                patcher.replace(oldComment.loc,
+                patcher.replace(oldComment.loc, 
                 // Comments can't have .comments, so it doesn't matter whether we
                 // print with comments or without.
                 print(reprint.newPath).indentTail(oldComment.loc.indent));
@@ -60060,7 +60060,7 @@ define(['exports'], function (exports) { 'use strict';
             case "EnumStringBody":
             case "EnumSymbolBody": {
                 if (n.type === "EnumSymbolBody" || n.explicitType) {
-                    parts.push(" of ",
+                    parts.push(" of ", 
                     // EnumBooleanBody => boolean, etc.
                     n.type.slice(4, -4).toLowerCase());
                 }
@@ -62755,7 +62755,7 @@ define(['exports'], function (exports) { 'use strict';
                 }
             };
         };
-        SystemEventFu.prototype.loadForm = function (invokeUrl, invokeParam,
+        SystemEventFu.prototype.loadForm = function (invokeUrl, invokeParam, 
         //可以是 scope.XX / system.XX / string / lookup表达式
         writeTarget) {
             return function (sender) {
@@ -63646,7 +63646,7 @@ define(['exports'], function (exports) { 'use strict';
     var BlobBuilder = typeof BlobBuilder !== 'undefined' ? BlobBuilder :
       typeof WebKitBlobBuilder !== 'undefined' ? WebKitBlobBuilder :
       typeof MSBlobBuilder !== 'undefined' ? MSBlobBuilder :
-      typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder :
+      typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder : 
       false;
 
     /**
@@ -95424,7 +95424,7 @@ define(['exports'], function (exports) { 'use strict';
                 var editingPlugin = me.editingPlugin || me.ownerGrid.editingPlugin;
                 var rowIdx = (_b = (_a = editingPlugin === null || editingPlugin === void 0 ? void 0 : editingPlugin.activeEditor) === null || _a === void 0 ? void 0 : _a.context) === null || _b === void 0 ? void 0 : _b.rowIdx;
                 var record;
-                if (!rowIdx) {
+                if (typeof rowIdx === 'undefined') {
                     record = me.getSelectionModel().getLastSelected();
                 }
                 else {
@@ -95615,7 +95615,12 @@ define(['exports'], function (exports) { 'use strict';
                 });
             },
             exportBigExcelClick: function () {
+                var _a;
                 var me = this;
+                if (!((_a = me.dbInfo) === null || _a === void 0 ? void 0 : _a.jdbcurl) || !me.exportDataSql) {
+                    showErrorDialog('当前表格不支持大批量导出');
+                    return;
+                }
                 var config = me.config;
                 var scope = lookupScope(me);
                 var excelFileName = config.excelFileName || scope.vjson.title || lodash.uniqueId("excel-");
@@ -97219,7 +97224,7 @@ define(['exports'], function (exports) { 'use strict';
                 return me;
             },
             selectedUpdate: function (date) {
-                var me = this,
+                var me = this, 
                 //t         = date.getTime(),
                 t = Ext.Date.clearTime(date, true).getTime(), cells = me.cells, cls = me.selectedCls, cellItems = cells.elements, c, cLen = cellItems.length, cell;
                 cells.removeCls(cls);
@@ -130083,7 +130088,7 @@ define(['exports'], function (exports) { 'use strict';
     		case 0x03: case 0x83: case 0x8B: case 0x8C: return DBF.to_workbook(d, o);
     		case 0x7B: if(n[1] === 0x5C && n[2] === 0x72 && n[3] === 0x74) return RTF.to_workbook(d, o); break;
     		case 0x0A: case 0x0D: case 0x20: return read_plaintext_raw(d, o);
-    		case 0x89: if(n[1] === 0x50 && n[2] === 0x4E && n[3] === 0x47) throw new Error("PNG Image File is not a spreadsheet"); break;
+    		case 0x89: if(n[1] === 0x50 && n[2] === 0x4E && n[3] === 0x47) throw new Error("PNG Image File is not a spreadsheet"); break; 
     	}
     	if(DBF.versions.indexOf(n[0]) > -1 && n[2] <= 12 && n[3] <= 31) return DBF.to_workbook(d, o);
     	return read_prn(data, d, o, str);

Різницю між файлами не показано, бо вона завелика
+ 1 - 1
dist/yvan-ext.js.map