ls-pro-common 3.1.60 → 3.1.62

package/es/components/DtlLayout.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { ProFormInstance } from 'ls-pro-form';
-import { ButtonProps } from 'antd';
+import { type ButtonProps } from 'antd';
 import './common.less';
 export declare type DtlLyaoutProps = Record<string, any> & {
     /** 返回方法 */

package/es/components/ViewOffice.js

@@ -4,10 +4,11 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React, { useState, useMemo } from 'react';
+import React, { useState, useMemo, useRef } from 'react';
 import { EyeOutlined } from '@ant-design/icons';
-import { getCookie, getCache, getUrlQuery } from '../utils';
+import { getCookie, getUrlQuery } from '../utils';
 import { base64Encode } from 'ls-pro-tools';
+import Loading from './Loading';
 var ViewDocment = function ViewDocment(props) {
   var _props$open = props.open,
     open = _props$open === void 0 ? false : _props$open,
@@ -27,12 +28,24 @@ var ViewDocment = function ViewDocment(props) {
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isZip = _useState4[0],
+    setIsZip = _useState4[1];
+  var _useState5 = useState(mode !== 'modal'),
+    _useState6 = _slicedToArray(_useState5, 2),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
+  var iframeRef = useRef(null);
   var src = useMemo(function () {
     var token = getCookie('token');
     var filename = getUrlQuery('fileName', url); //文件名,上传的文件名为xxx?fileName=xxx.pdf
     if (!filename) {
       //外部文件比如，xxx/ddd.docx，兜底直接给个临时的，但好像有问题，因为后端不知道文件类型
       filename = url.split('/').pop() || Date.now().toString(32);
+      if (filename.includes('?')) {
+        filename = filename.split('?')[0];
+      }
     }
     var href = url;
     if (!url.includes('token=')) {
@@ -40,16 +53,16 @@ var ViewDocment = function ViewDocment(props) {
     }
     if (!href.includes('fullfilename=')) {
       //filename只保留中文，英文和数字
-      filename = filename.replace(/[^a-zA-Z0-9\u4e00-\u9fa5]/g, '');
+      filename = filename.replace(/[^a-zA-Z0-9\u4e00-\u9fa5.]/g, '');
       href = href + (href.includes('?') ? '&' : '?') + 'fullfilename=' + filename;
     }
+    if (filename.endsWith('.zip')) {
+      setIsZip(true);
+    }
     var doc = base64Encode(href);
-    var exportUrl = getCache('exportUrl');
+    // 统一使用生产环境来预览文件
+    // const exportUrl = getCache('exportUrl');
     var domain = 'https://download.lesoon.cloud';
-    // if (exportUrl && exportUrl.includes('//')) {
-    //   // 如果配置了下载域名，则走下载域名，否则走原来域名
-    //   domain = exportUrl;
-    // }
     return domain + '/lesoon/lesoon-kkfileview-api/onlinePreview?url=' + doc;
   }, [url]);
   var triggerDom = /*#__PURE__*/React.createElement(React.Fragment, {
@@ -61,13 +74,14 @@ var ViewDocment = function ViewDocment(props) {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              setVisible(!visible);
+              setVisible(true);
+              setLoading(true);
               (_trigger$props = trigger.props) === null || _trigger$props === void 0 ? void 0 : (_trigger$props$onClic = _trigger$props.onClick) === null || _trigger$props$onClic === void 0 ? void 0 : _trigger$props$onClic.call(_trigger$props, e);
               // 新页签打开
               if (mode === 'urlOpen') {
                 window.open(src, '_blank');
               }
-            case 3:
+            case 4:
             case "end":
               return _context.stop();
           }
@@ -82,7 +96,7 @@ var ViewDocment = function ViewDocment(props) {
   if (mode === 'urlOpen') {
     return /*#__PURE__*/React.createElement(React.Fragment, null, props.children, triggerDom);
   } else if (mode === 'iframe') {
-    /*#__PURE__*/React.createElement(React.Fragment, null, props.children, /*#__PURE__*/React.createElement("div", {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, props.children, /*#__PURE__*/React.createElement("div", {
       className: "view-office-modal",
       style: {
         width: width,
@@ -106,9 +120,21 @@ var ViewDocment = function ViewDocment(props) {
     bodyStyle: {
       height: height
     },
-    footer: null
+    footer: null,
+    destroyOnClose: true
   }, /*#__PURE__*/React.createElement("iframe", {
-    src: src
+    src: src,
+    onLoad: function onLoad() {
+      setLoading(false);
+    },
+    onError: function onError() {
+      setLoading(false);
+      setIsZip(false);
+    },
+    ref: iframeRef,
+    id: "view-office-iframe"
+  }), loading && /*#__PURE__*/React.createElement(Loading, {
+    className: "file-loading"
   })));
 };
 export default ViewDocment;

package/es/components/common.less

@@ -516,7 +516,9 @@ a:hover {
 }
 
 .view-office-modal {
+  position: relative;
   .ant-modal-body {
+    position: relative;
     padding: 0;
   }
   iframe {
@@ -524,6 +526,13 @@ a:hover {
     height: 100%;
     border: none;
   }
+  .file-loading {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+  }
 }
 
 @import url('./antd-custom.less');

package/es/http/bizAjax.d.ts

@@ -1,3 +1,8 @@
+export declare type OptionItemType = {
+    value: string | number;
+    label: string;
+    [key: string]: string | number;
+};
 /**
  * 读取数据字典
  *
@@ -9,7 +14,7 @@
  * @param valueIsNumber 返回值是否为数字,默认false
  * @returns Promise<Record<string,string>[]>
  */
-export declare function getDict(dictCodes: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<any>;
+export declare function getDict(dictCodes: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<OptionItemType[]>;
 /**
  * 加载下拉框的数据源
  *
@@ -24,7 +29,7 @@ export declare function getDict(dictCodes: string, showValue?: boolean, needGate
  * @param valueIsNumber 返回值是否为数字,默认false
  * @returns
  */
-export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<any>;
+export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<OptionItemType[]>;
 /**
  * 获取用户资源Id对应的权限值
  *

package/lib/components/DtlLayout.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { ProFormInstance } from 'ls-pro-form';
-import { ButtonProps } from 'antd';
+import { type ButtonProps } from 'antd';
 import './common.less';
 export declare type DtlLyaoutProps = Record<string, any> & {
     /** 返回方法 */

package/lib/components/ViewOffice.js

@@ -4,10 +4,11 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React, { useState, useMemo } from 'react';
+import React, { useState, useMemo, useRef } from 'react';
 import { EyeOutlined } from '@ant-design/icons';
-import { getCookie, getCache, getUrlQuery } from '../utils';
+import { getCookie, getUrlQuery } from '../utils';
 import { base64Encode } from 'ls-pro-tools';
+import Loading from './Loading';
 var ViewDocment = function ViewDocment(props) {
   var _props$open = props.open,
     open = _props$open === void 0 ? false : _props$open,
@@ -27,12 +28,24 @@ var ViewDocment = function ViewDocment(props) {
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isZip = _useState4[0],
+    setIsZip = _useState4[1];
+  var _useState5 = useState(mode !== 'modal'),
+    _useState6 = _slicedToArray(_useState5, 2),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
+  var iframeRef = useRef(null);
   var src = useMemo(function () {
     var token = getCookie('token');
     var filename = getUrlQuery('fileName', url); //文件名,上传的文件名为xxx?fileName=xxx.pdf
     if (!filename) {
       //外部文件比如，xxx/ddd.docx，兜底直接给个临时的，但好像有问题，因为后端不知道文件类型
       filename = url.split('/').pop() || Date.now().toString(32);
+      if (filename.includes('?')) {
+        filename = filename.split('?')[0];
+      }
     }
     var href = url;
     if (!url.includes('token=')) {
@@ -40,16 +53,16 @@ var ViewDocment = function ViewDocment(props) {
     }
     if (!href.includes('fullfilename=')) {
       //filename只保留中文，英文和数字
-      filename = filename.replace(/[^a-zA-Z0-9\u4e00-\u9fa5]/g, '');
+      filename = filename.replace(/[^a-zA-Z0-9\u4e00-\u9fa5.]/g, '');
       href = href + (href.includes('?') ? '&' : '?') + 'fullfilename=' + filename;
     }
+    if (filename.endsWith('.zip')) {
+      setIsZip(true);
+    }
     var doc = base64Encode(href);
-    var exportUrl = getCache('exportUrl');
+    // 统一使用生产环境来预览文件
+    // const exportUrl = getCache('exportUrl');
     var domain = 'https://download.lesoon.cloud';
-    // if (exportUrl && exportUrl.includes('//')) {
-    //   // 如果配置了下载域名，则走下载域名，否则走原来域名
-    //   domain = exportUrl;
-    // }
     return domain + '/lesoon/lesoon-kkfileview-api/onlinePreview?url=' + doc;
   }, [url]);
   var triggerDom = /*#__PURE__*/React.createElement(React.Fragment, {
@@ -61,13 +74,14 @@ var ViewDocment = function ViewDocment(props) {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              setVisible(!visible);
+              setVisible(true);
+              setLoading(true);
               (_trigger$props = trigger.props) === null || _trigger$props === void 0 ? void 0 : (_trigger$props$onClic = _trigger$props.onClick) === null || _trigger$props$onClic === void 0 ? void 0 : _trigger$props$onClic.call(_trigger$props, e);
               // 新页签打开
               if (mode === 'urlOpen') {
                 window.open(src, '_blank');
               }
-            case 3:
+            case 4:
             case "end":
               return _context.stop();
           }
@@ -82,7 +96,7 @@ var ViewDocment = function ViewDocment(props) {
   if (mode === 'urlOpen') {
     return /*#__PURE__*/React.createElement(React.Fragment, null, props.children, triggerDom);
   } else if (mode === 'iframe') {
-    /*#__PURE__*/React.createElement(React.Fragment, null, props.children, /*#__PURE__*/React.createElement("div", {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, props.children, /*#__PURE__*/React.createElement("div", {
       className: "view-office-modal",
       style: {
         width: width,
@@ -106,9 +120,21 @@ var ViewDocment = function ViewDocment(props) {
     bodyStyle: {
       height: height
     },
-    footer: null
+    footer: null,
+    destroyOnClose: true
   }, /*#__PURE__*/React.createElement("iframe", {
-    src: src
+    src: src,
+    onLoad: function onLoad() {
+      setLoading(false);
+    },
+    onError: function onError() {
+      setLoading(false);
+      setIsZip(false);
+    },
+    ref: iframeRef,
+    id: "view-office-iframe"
+  }), loading && /*#__PURE__*/React.createElement(Loading, {
+    className: "file-loading"
   })));
 };
 export default ViewDocment;

package/lib/components/common.less

@@ -516,7 +516,9 @@ a:hover {
 }
 
 .view-office-modal {
+  position: relative;
   .ant-modal-body {
+    position: relative;
     padding: 0;
   }
   iframe {
@@ -524,6 +526,13 @@ a:hover {
     height: 100%;
     border: none;
   }
+  .file-loading {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+  }
 }
 
 @import url('./antd-custom.less');

package/lib/http/bizAjax.d.ts

@@ -1,3 +1,8 @@
+export declare type OptionItemType = {
+    value: string | number;
+    label: string;
+    [key: string]: string | number;
+};
 /**
  * 读取数据字典
  *
@@ -9,7 +14,7 @@
  * @param valueIsNumber 返回值是否为数字,默认false
  * @returns Promise<Record<string,string>[]>
  */
-export declare function getDict(dictCodes: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<any>;
+export declare function getDict(dictCodes: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<OptionItemType[]>;
 /**
  * 加载下拉框的数据源
  *
@@ -24,7 +29,7 @@ export declare function getDict(dictCodes: string, showValue?: boolean, needGate
  * @param valueIsNumber 返回值是否为数字,默认false
  * @returns
  */
-export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<any>;
+export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<OptionItemType[]>;
 /**
  * 获取用户资源Id对应的权限值
  *

package/package.json

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