coolcare-lite-scada-component 1.0.68 → 1.0.69

package/es/components/DialogHistory/index.js

@@ -21,7 +21,7 @@ import { DownHistoryDataToExcelOrPdf, GetPointHistoryData, GetTdIndicatorHistory
 import Echarts from "../ECharts";
 import base64ToBlob from "../../utils/dataURItoBlob";
 // @ts-ignore
-import { saveAs } from 'file-saver';
+
 import styles from "./index.css";
 import ModalChoosePoint from "../ModalChoosePoint";
 import { dateDiff } from "../../utils/date";
@@ -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, blobUrl;
+      var _form$getFieldsValue, dateRange, interval, res, blobUrl, link;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -135,23 +135,28 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
             });
           case 6:
             res = _context.sent;
-            debugger;
-            blobUrl = window.URL.createObjectURL(res);
-            saveAs(blobUrl, "history_".concat(moment(dateRange[0]).format('YYYY-MM-DD HH:mm:ss'), "_").concat(moment(dateRange[1]).format('YYYY-MM-DD HH:mm:ss'), ".zip"));
+            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);
             setExcelDownloading(false);
-            _context.next = 18;
+            _context.next = 23;
             break;
-          case 13:
-            _context.prev = 13;
+          case 18:
+            _context.prev = 18;
             _context.t0 = _context["catch"](0);
             console.log(_context.t0);
             message.error('下载excel失败');
             setExcelDownloading(false);
-          case 18:
+          case 23:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 13]]);
+      }, _callee, null, [[0, 18]]);
     }));
     return function downloadExcel() {
       return _ref2.apply(this, arguments);
@@ -163,9 +168,19 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
     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);
-    saveAs(base64ToBlob(_myChart.getDataURL({
+    var blob = base64ToBlob(_myChart.getDataURL({
       backgroundColor: '#fff'
-    })), 'chart.jpg');
+    }));
+    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);
   };
   var closeModal = function closeModal() {
     form.resetFields();

package/package.json

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