ls-pro-common 3.1.34 → 3.1.35

package/dist/common.min.js.LICENSE.txt

@@ -4,6 +4,28 @@
 	http://jedwatson.github.io/classnames
 */
 
+/*!
+  Copyright (c) 2011, Yahoo! Inc. All rights reserved.
+  Code licensed under the BSD License:
+  http://developer.yahoo.com/yui/license.html
+  version: 2.9.0
+  */
+
+/*! *****************************************************************************
+  Copyright (c) Microsoft Corporation. All rights reserved.
+  Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+  this file except in compliance with the License. You may obtain a copy of the
+  License at http://www.apache.org/licenses/LICENSE-2.0
+  
+  THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+  WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+  MERCHANTABLITY OR NON-INFRINGEMENT.
+  
+  See the Apache Version 2.0 License for specific language governing permissions
+  and limitations under the License.
+  ***************************************************************************** */
+
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -21,6 +43,15 @@ PERFORMANCE OF THIS SOFTWARE.
 
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
 
+/**
+   * @fileOverview
+   * @name asn1-1.0.js
+   * @author Kenji Urushima kenji.urushima@gmail.com
+   * @version asn1 1.0.13 (2017-Jun-02)
+   * @since jsrsasign 2.1
+   * @license <a href="https://kjur.github.io/jsrsasign/license/">MIT License</a>
+   */
+
 /**
  * @license
  * Lodash <https://lodash.com/>

package/es/components/ViewOffice.d.ts

@@ -8,5 +8,7 @@ declare const ViewDocment: (props: {
     children?: React.ReactNode;
     trigger?: JSX.Element;
     url: string;
+    /** Name 集成方式 modal=弹框,urlOpen=直接通过浏览器新页签打开,iframe=直接集成在页面的iframe中，默认为modal */
+    mode?: 'modal' | 'urlOpen' | 'iframe';
 }) => JSX.Element;
 export default ViewDocment;

package/es/components/ViewOffice.js

@@ -6,8 +6,8 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useState, useMemo } from 'react';
 import { EyeOutlined } from '@ant-design/icons';
-import { getCookie, getCache } from '../utils';
-// import { base64Encode } from 'ls-pro-tools';
+import { getCookie, getCache, getUrlQuery } from '../utils';
+import { base64Encode } from 'ls-pro-tools';
 var ViewDocment = function ViewDocment(props) {
   var _props$open = props.open,
     open = _props$open === void 0 ? false : _props$open,
@@ -20,20 +20,27 @@ var ViewDocment = function ViewDocment(props) {
     height = _props$height === void 0 ? '75vh' : _props$height,
     url = props.url,
     _props$trigger = props.trigger,
-    trigger = _props$trigger === void 0 ? /*#__PURE__*/React.createElement(EyeOutlined, null) : _props$trigger;
+    trigger = _props$trigger === void 0 ? /*#__PURE__*/React.createElement(EyeOutlined, null) : _props$trigger,
+    _props$mode = props.mode,
+    mode = _props$mode === void 0 ? 'modal' : _props$mode;
   var _useState = useState(open),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
   var src = useMemo(function () {
     var token = getCookie('token');
-    var doc = url + (url.includes('?') ? '&' : '?') + 'token=' + token;
+    var filename = getUrlQuery(url, 'fileName'); //文件名,上传的文件名为xxx?fileName=xxx.pdf
+    if (!filename) {
+      //外部文件比如，xxx/ddd.docx，兜底直接给个临时的，但好像有问题，因为后端不知道文件类型
+      filename = url.split('/').pop() || Date.now().toString(32);
+    }
+    var doc = base64Encode(url + (url.includes('?') ? '&' : '?') + 'fullfilename=' + filename + '&token=' + token);
     // 如果是生产环境，走下载域名，其它环境走原来域名
     var domain = '';
     if (location.href.includes('.cloud/') && getCache('exportUrl')) {
       domain = getCache('exportUrl');
     }
-    return domain + '/lesoon/lesoon-kkfileview-api/onlinePreview?url=' + encodeURIComponent(doc);
+    return domain + '/lesoon/lesoon-kkfileview-api/onlinePreview?url=' + doc;
   }, [url]);
   var triggerDom = /*#__PURE__*/React.createElement(React.Fragment, {
     key: "trigger"
@@ -46,7 +53,11 @@ var ViewDocment = function ViewDocment(props) {
             case 0:
               setVisible(!visible);
               (_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);
-            case 2:
+              // 新页签打开
+              if (mode === 'urlOpen') {
+                window.open(src, '_blank');
+              }
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -58,6 +69,19 @@ var ViewDocment = function ViewDocment(props) {
       return onClick;
     }()
   })));
+  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", {
+      className: "view-office-modal",
+      style: {
+        width: width,
+        height: height
+      }
+    }, /*#__PURE__*/React.createElement("iframe", {
+      src: src
+    })));
+  }
   return /*#__PURE__*/React.createElement(React.Fragment, null, triggerDom, props.children, /*#__PURE__*/React.createElement(_Modal, {
     title: title,
     open: visible,

package/es/http/index.js

@@ -4,7 +4,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { extend } from 'umi-request';
-import { getCache, getUrlQuery, setUrlQuery, getCookie, getCacheSessionFirst, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, getBrowserId, setCache } from '../utils';
+import { getCache, getUrlQuery, setUrlQuery, getCookie, getCacheSessionFirst, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, getBrowserId, setCache, isDingtalk } from '../utils';
 //默认超时时间为1分钟
 var request = extend({
   timeout: 60000
@@ -89,6 +89,9 @@ request.interceptors.request.use(function (url, options) {
   }
 
   options.headers['terminal'] = 'PC';
+  if (isDingtalk) {
+    options.headers['terminal'] = 'APP';
+  }
   var expireWarnFlag = getCache('expireWarnFlag', true);
   options.headers.expireWarnFlag = expireWarnFlag === '1' ? '1' : '0';
   var token = getCookie('token');

package/es/utils/index.d.ts

@@ -235,3 +235,4 @@ export declare const downloadFile: (url: string, fileName?: string | undefined,
  * @param props
  */
 export declare const setCurrentResCode: (props: any) => void;
+export declare const isDingtalk: boolean;

package/es/utils/index.js

@@ -526,4 +526,5 @@ export var setCurrentResCode = function setCurrentResCode(props) {
     window.__currentRight__ = getUrlQuery('right', parentParams);
     window.__currentResRight__ = getUrlQuery('resRight', parentParams);
   }
-};
+};
+export var isDingtalk = (window.navigator.userAgent || '').toLowerCase().includes('dingtalk');

package/lib/components/ViewOffice.d.ts

@@ -8,5 +8,7 @@ declare const ViewDocment: (props: {
     children?: React.ReactNode;
     trigger?: JSX.Element;
     url: string;
+    /** Name 集成方式 modal=弹框,urlOpen=直接通过浏览器新页签打开,iframe=直接集成在页面的iframe中，默认为modal */
+    mode?: 'modal' | 'urlOpen' | 'iframe';
 }) => JSX.Element;
 export default ViewDocment;

package/lib/components/ViewOffice.js

@@ -6,8 +6,8 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useState, useMemo } from 'react';
 import { EyeOutlined } from '@ant-design/icons';
-import { getCookie, getCache } from '../utils';
-// import { base64Encode } from 'ls-pro-tools';
+import { getCookie, getCache, getUrlQuery } from '../utils';
+import { base64Encode } from 'ls-pro-tools';
 var ViewDocment = function ViewDocment(props) {
   var _props$open = props.open,
     open = _props$open === void 0 ? false : _props$open,
@@ -20,20 +20,27 @@ var ViewDocment = function ViewDocment(props) {
     height = _props$height === void 0 ? '75vh' : _props$height,
     url = props.url,
     _props$trigger = props.trigger,
-    trigger = _props$trigger === void 0 ? /*#__PURE__*/React.createElement(EyeOutlined, null) : _props$trigger;
+    trigger = _props$trigger === void 0 ? /*#__PURE__*/React.createElement(EyeOutlined, null) : _props$trigger,
+    _props$mode = props.mode,
+    mode = _props$mode === void 0 ? 'modal' : _props$mode;
   var _useState = useState(open),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
   var src = useMemo(function () {
     var token = getCookie('token');
-    var doc = url + (url.includes('?') ? '&' : '?') + 'token=' + token;
+    var filename = getUrlQuery(url, 'fileName'); //文件名,上传的文件名为xxx?fileName=xxx.pdf
+    if (!filename) {
+      //外部文件比如，xxx/ddd.docx，兜底直接给个临时的，但好像有问题，因为后端不知道文件类型
+      filename = url.split('/').pop() || Date.now().toString(32);
+    }
+    var doc = base64Encode(url + (url.includes('?') ? '&' : '?') + 'fullfilename=' + filename + '&token=' + token);
     // 如果是生产环境，走下载域名，其它环境走原来域名
     var domain = '';
     if (location.href.includes('.cloud/') && getCache('exportUrl')) {
       domain = getCache('exportUrl');
     }
-    return domain + '/lesoon/lesoon-kkfileview-api/onlinePreview?url=' + encodeURIComponent(doc);
+    return domain + '/lesoon/lesoon-kkfileview-api/onlinePreview?url=' + doc;
   }, [url]);
   var triggerDom = /*#__PURE__*/React.createElement(React.Fragment, {
     key: "trigger"
@@ -46,7 +53,11 @@ var ViewDocment = function ViewDocment(props) {
             case 0:
               setVisible(!visible);
               (_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);
-            case 2:
+              // 新页签打开
+              if (mode === 'urlOpen') {
+                window.open(src, '_blank');
+              }
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -58,6 +69,19 @@ var ViewDocment = function ViewDocment(props) {
       return onClick;
     }()
   })));
+  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", {
+      className: "view-office-modal",
+      style: {
+        width: width,
+        height: height
+      }
+    }, /*#__PURE__*/React.createElement("iframe", {
+      src: src
+    })));
+  }
   return /*#__PURE__*/React.createElement(React.Fragment, null, triggerDom, props.children, /*#__PURE__*/React.createElement(_Modal, {
     title: title,
     open: visible,

package/lib/http/index.js

@@ -4,7 +4,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { extend } from 'umi-request';
-import { getCache, getUrlQuery, setUrlQuery, getCookie, getCacheSessionFirst, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, getBrowserId, setCache } from '../utils';
+import { getCache, getUrlQuery, setUrlQuery, getCookie, getCacheSessionFirst, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, getBrowserId, setCache, isDingtalk } from '../utils';
 //默认超时时间为1分钟
 var request = extend({
   timeout: 60000
@@ -89,6 +89,9 @@ request.interceptors.request.use(function (url, options) {
   }
 
   options.headers['terminal'] = 'PC';
+  if (isDingtalk) {
+    options.headers['terminal'] = 'APP';
+  }
   var expireWarnFlag = getCache('expireWarnFlag', true);
   options.headers.expireWarnFlag = expireWarnFlag === '1' ? '1' : '0';
   var token = getCookie('token');

package/lib/utils/index.d.ts

@@ -235,3 +235,4 @@ export declare const downloadFile: (url: string, fileName?: string | undefined,
  * @param props
  */
 export declare const setCurrentResCode: (props: any) => void;
+export declare const isDingtalk: boolean;

package/lib/utils/index.js

@@ -526,4 +526,5 @@ export var setCurrentResCode = function setCurrentResCode(props) {
     window.__currentRight__ = getUrlQuery('right', parentParams);
     window.__currentResRight__ = getUrlQuery('resRight', parentParams);
   }
-};
+};
+export var isDingtalk = (window.navigator.userAgent || '').toLowerCase().includes('dingtalk');

package/package.json

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