coolcare-lite-scada-component 1.0.70 → 1.0.72

package/es/components/DialogHistory/index.js

@@ -103,7 +103,7 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
   /** 下载excel、pdf */
   var downloadExcel = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _form$getFieldsValue, dateRange, interval, res, fileName, blobUrl, link;
+      var _form$getFieldsValue, dateRange, interval, res, fileName, blobUrl, link, _e$response, _e$message;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -128,12 +128,21 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
               zipFileList: []
             }, {
               responseType: 'blob',
+              shouldHandleBlob: false,
               headers: {
                 'Content-Type': 'application/json'
               }
             });
           case 5:
             res = _context.sent;
+            if (!(!res || res.size === 0)) {
+              _context.next = 10;
+              break;
+            }
+            message.error('服务器返回空文件，请稍后重试');
+            setExcelDownloading(false);
+            return _context.abrupt("return");
+          case 10:
             // 安全的下载方式，避免权限问题
             fileName = "history_".concat(moment(dateRange[0]).format('YYYY-MM-DD HH:mm:ss'), "_").concat(moment(dateRange[1]).format('YYYY-MM-DD HH:mm:ss'), ".zip");
             if (window.navigator && window.navigator.msSaveOrOpenBlob) {
@@ -163,19 +172,26 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
               }, 100);
             }
             setExcelDownloading(false);
-            _context.next = 16;
+            _context.next = 20;
             break;
-          case 11:
-            _context.prev = 11;
+          case 15:
+            _context.prev = 15;
             _context.t0 = _context["catch"](0);
             console.log(_context.t0);
-            message.error('下载excel失败');
+            // 检查是否是网络错误或API错误
+            if (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_e$response = _context.t0.response) === null || _e$response === void 0 ? void 0 : _e$response.status) {
+              message.error("\u4E0B\u8F7D\u5931\u8D25: HTTP ".concat(_context.t0.response.status));
+            } else if (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_e$message = _context.t0.message) === null || _e$message === void 0 ? void 0 : _e$message.includes('response')) {
+              message.error('服务器响应异常，请检查网络连接');
+            } else {
+              message.error('下载excel失败');
+            }
             setExcelDownloading(false);
-          case 16:
+          case 20:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 11]]);
+      }, _callee, null, [[0, 15]]);
     }));
     return function downloadExcel() {
       return _ref2.apply(this, arguments);

package/es/services/request.js

@@ -174,7 +174,7 @@ requestClient.interceptors.response.use(/*#__PURE__*/function () {
             break;
           }
           _context2.next = 7;
-          return response.clone().blob();
+          return response.blob();
         case 7:
           return _context2.abrupt("return", _context2.sent);
         case 8:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "1.0.70",
+  "version": "1.0.72",
   "scripts": {
     "start": " PORT=8000 UMI_ENV=prod umi dev",
     "build:prod": "UMI_ENV=prod umi build",