ls-pro-common 3.0.84 → 3.0.85

package/es/hooks/useDtl/index.js

@@ -9,7 +9,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from "react";
 import { useState, useRef, useCallback, useMemo } from 'react';
 import { PlusCircleOutlined, EditOutlined, DeleteOutlined, ImportOutlined, ExportOutlined } from '@ant-design/icons';
-import { showConfirm, showWarn, showError, showSuccess } from '../../utils';
+import { showConfirm, showWarn, showError, showSuccess, downloadFile } from '../../utils';
 import { httpPost } from '../../http';
 import usePermission from '../usePermission';
 import exportProcess from '../../utils/exportProcess';
@@ -796,7 +796,7 @@ function useDtl(dtlParam) {
               _context9.next = 14;
               break;
             }
-            window.open(result.data);
+            downloadFile(result.data);
             return _context9.abrupt("return", true);
           case 14:
             if (!(((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retCode) === '0')) {

package/es/hooks/useSingle/index.js

@@ -9,7 +9,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from "react";
 import { useState, useRef, useMemo, useCallback } from 'react';
 import { PlusCircleOutlined, EditOutlined, DeleteOutlined, ImportOutlined, ExportOutlined, AuditOutlined } from '@ant-design/icons';
-import { showConfirm, showWarn, showSuccess, showError } from '../../utils';
+import { showConfirm, showWarn, showSuccess, showError, downloadFile } from '../../utils';
 import exportProcess from '../../utils/exportProcess';
 import { httpPost } from '../../http';
 import usePermission from '../usePermission';
@@ -594,7 +594,7 @@ function useSingle(inParam) {
               _context7.next = 14;
               break;
             }
-            window.open(result.data);
+            downloadFile(result.data);
             return _context7.abrupt("return", true);
           case 14:
             if (!(((_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retCode) === '0')) {

package/es/utils/index.js

@@ -900,6 +900,11 @@ export var sleep = function sleep(secord) {
 export var downloadFile = function downloadFile(url, fileName) {
   var a = document.createElement('a');
   a.href = url;
+  // 如果导出域名有配置，则优先使用导出域名
+  var baseExportUrl = getCache('exportUrl') || '';
+  if (baseExportUrl && !url.startsWith('http')) {
+    a.href = baseExportUrl + url;
+  }
   // a.target = '_blank'; // 新开屏有闪烁
   if (fileName) {
     a.setAttribute('download', fileName);

package/lib/hooks/useDtl/index.js

@@ -9,7 +9,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from "react";
 import { useState, useRef, useCallback, useMemo } from 'react';
 import { PlusCircleOutlined, EditOutlined, DeleteOutlined, ImportOutlined, ExportOutlined } from '@ant-design/icons';
-import { showConfirm, showWarn, showError, showSuccess } from '../../utils';
+import { showConfirm, showWarn, showError, showSuccess, downloadFile } from '../../utils';
 import { httpPost } from '../../http';
 import usePermission from '../usePermission';
 import exportProcess from '../../utils/exportProcess';
@@ -796,7 +796,7 @@ function useDtl(dtlParam) {
               _context9.next = 14;
               break;
             }
-            window.open(result.data);
+            downloadFile(result.data);
             return _context9.abrupt("return", true);
           case 14:
             if (!(((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retCode) === '0')) {

package/lib/hooks/useSingle/index.js

@@ -9,7 +9,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from "react";
 import { useState, useRef, useMemo, useCallback } from 'react';
 import { PlusCircleOutlined, EditOutlined, DeleteOutlined, ImportOutlined, ExportOutlined, AuditOutlined } from '@ant-design/icons';
-import { showConfirm, showWarn, showSuccess, showError } from '../../utils';
+import { showConfirm, showWarn, showSuccess, showError, downloadFile } from '../../utils';
 import exportProcess from '../../utils/exportProcess';
 import { httpPost } from '../../http';
 import usePermission from '../usePermission';
@@ -594,7 +594,7 @@ function useSingle(inParam) {
               _context7.next = 14;
               break;
             }
-            window.open(result.data);
+            downloadFile(result.data);
             return _context7.abrupt("return", true);
           case 14:
             if (!(((_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retCode) === '0')) {

package/lib/utils/index.js

@@ -900,6 +900,11 @@ export var sleep = function sleep(secord) {
 export var downloadFile = function downloadFile(url, fileName) {
   var a = document.createElement('a');
   a.href = url;
+  // 如果导出域名有配置，则优先使用导出域名
+  var baseExportUrl = getCache('exportUrl') || '';
+  if (baseExportUrl && !url.startsWith('http')) {
+    a.href = baseExportUrl + url;
+  }
   // a.target = '_blank'; // 新开屏有闪烁
   if (fileName) {
     a.setAttribute('download', fileName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.0.84",
+  "version": "3.0.85",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [