coolcare-lite-scada-component 1.0.69 → 1.0.71

package/es/components/DialogHistory/index.js

@@ -103,15 +103,14 @@ 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, 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:
             _context.prev = 0;
             setExcelDownloading(true);
             _form$getFieldsValue = form.getFieldsValue(), dateRange = _form$getFieldsValue.dateRange, interval = _form$getFieldsValue.interval;
-            debugger;
-            _context.next = 6;
+            _context.next = 5;
             return DownHistoryDataToExcelOrPdf({
               pointIdList: pointIdList,
               timeInterval: interval,
@@ -133,30 +132,65 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
                 'Content-Type': 'application/json'
               }
             });
-          case 6:
+          case 5:
             res = _context.sent;
-            blobUrl = window.URL.createObjectURL(res); // 使用原生方式下载，兼容 npm 插件环境
-            link = document.createElement('a');
-            link.href = blobUrl;
-            link.download = "history_".concat(moment(dateRange[0]).format('YYYY-MM-DD HH:mm:ss'), "_").concat(moment(dateRange[1]).format('YYYY-MM-DD HH:mm:ss'), ".zip");
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
-            window.URL.revokeObjectURL(blobUrl);
+            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) {
+              // IE浏览器
+              window.navigator.msSaveOrOpenBlob(res, fileName);
+            } else {
+              blobUrl = window.URL.createObjectURL(res);
+              link = document.createElement('a');
+              link.style.display = 'none';
+              link.href = blobUrl;
+              link.download = fileName;
+              link.target = '_blank';
+
+              // 确保在用户交互上下文中执行
+              document.body.appendChild(link);
+
+              // 使用 setTimeout 确保在下一个事件循环中执行
+              setTimeout(function () {
+                try {
+                  link.click();
+                } catch (clickError) {
+                  // 如果点击失败，尝试打开新窗口
+                  window.open(blobUrl, '_blank');
+                }
+                document.body.removeChild(link);
+                window.URL.revokeObjectURL(blobUrl);
+              }, 100);
+            }
             setExcelDownloading(false);
-            _context.next = 23;
+            _context.next = 20;
             break;
-          case 18:
-            _context.prev = 18;
+          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 23:
+          case 20:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 18]]);
+      }, _callee, null, [[0, 15]]);
     }));
     return function downloadExcel() {
       return _ref2.apply(this, arguments);
@@ -165,22 +199,38 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
 
   /** 下载图表 */
   var downloadImg = function downloadImg() {
-    var _chart$current, _chart$current$getEch;
-    // @ts-ignore
-    var _myChart = chart === null || chart === void 0 ? void 0 : (_chart$current = chart.current) === null || _chart$current === void 0 ? void 0 : (_chart$current$getEch = _chart$current.getEchartsInstance) === null || _chart$current$getEch === void 0 ? void 0 : _chart$current$getEch.call(_chart$current);
-    var blob = base64ToBlob(_myChart.getDataURL({
-      backgroundColor: '#fff'
-    }));
-    var blobUrl = window.URL.createObjectURL(blob);
-
-    // 使用原生方式下载，兼容 npm 插件环境
-    var link = document.createElement('a');
-    link.href = blobUrl;
-    link.download = 'chart.jpg';
-    document.body.appendChild(link);
-    link.click();
-    document.body.removeChild(link);
-    window.URL.revokeObjectURL(blobUrl);
+    try {
+      var _chart$current, _chart$current$getEch;
+      // @ts-ignore
+      var _myChart = chart === null || chart === void 0 ? void 0 : (_chart$current = chart.current) === null || _chart$current === void 0 ? void 0 : (_chart$current$getEch = _chart$current.getEchartsInstance) === null || _chart$current$getEch === void 0 ? void 0 : _chart$current$getEch.call(_chart$current);
+      var blob = base64ToBlob(_myChart.getDataURL({
+        backgroundColor: '#fff'
+      }));
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        // IE浏览器
+        window.navigator.msSaveOrOpenBlob(blob, 'chart.jpg');
+      } else {
+        var blobUrl = window.URL.createObjectURL(blob);
+        var link = document.createElement('a');
+        link.style.display = 'none';
+        link.href = blobUrl;
+        link.download = 'chart.jpg';
+        link.target = '_blank';
+        document.body.appendChild(link);
+        setTimeout(function () {
+          try {
+            link.click();
+          } catch (clickError) {
+            window.open(blobUrl, '_blank');
+          }
+          document.body.removeChild(link);
+          window.URL.revokeObjectURL(blobUrl);
+        }, 100);
+      }
+    } catch (e) {
+      console.error('下载图表失败:', e);
+      message.error('下载图表失败');
+    }
   };
   var closeModal = function closeModal() {
     form.resetFields();

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.69",
+  "version": "1.0.71",
   "scripts": {
     "start": " PORT=8000 UMI_ENV=prod umi dev",
     "build:prod": "UMI_ENV=prod umi build",