ls-pro-common 3.1.1 → 3.1.3

package/es/components/RecordLog/index.d.ts

@@ -6,7 +6,9 @@
 import React from 'react';
 import './index.less';
 export interface RecordLogProps {
-    recordKey: string;
+    recordKey?: string;
+    bizNo?: string;
+    param?: any;
     fieldsMap?: Record<string, string>;
     showResourceName?: boolean;
     style?: React.CSSProperties;

package/es/components/RecordLog/index.js

@@ -1,5 +1,6 @@
 import "antd/es/empty/style";
 import _Empty from "antd/es/empty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /**
  * 记录变更日志
@@ -22,6 +23,10 @@ var RecordLog = function RecordLog(props) {
     setLogData = _useState2[1];
   var _props$recordKey = props.recordKey,
     recordKey = _props$recordKey === void 0 ? '' : _props$recordKey,
+    _props$bizNo = props.bizNo,
+    bizNo = _props$bizNo === void 0 ? '' : _props$bizNo,
+    _props$param = props.param,
+    param = _props$param === void 0 ? {} : _props$param,
     _props$fieldsMap = props.fieldsMap,
     fieldsMap = _props$fieldsMap === void 0 ? {} : _props$fieldsMap,
     _props$showResourceNa = props.showResourceName,
@@ -34,10 +39,14 @@ var RecordLog = function RecordLog(props) {
     var params = {
       pageSize: 5000,
       sort: 'createTime desc',
-      where: {
-        dataCode: recordKey
-      }
+      where: _objectSpread({}, param)
     };
+    if (recordKey) {
+      params.where.dataCode = recordKey;
+    }
+    if (bizNo) {
+      params.where.bizNo = bizNo;
+    }
     httpGet(url, params).then(function (res) {
       var rows = (res === null || res === void 0 ? void 0 : res.rows) || [];
       rows.forEach(function (row) {

package/es/components/ViewOffice.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-declare const TagCheck: (props: {
+declare const ViewDocment: (props: {
     open?: boolean;
     onCancel?: () => void;
     title?: string;
@@ -9,4 +9,4 @@ declare const TagCheck: (props: {
     trigger?: JSX.Element;
     url: string;
 }) => JSX.Element;
-export default TagCheck;
+export default ViewDocment;

package/es/components/ViewOffice.js

@@ -7,7 +7,8 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useState, useMemo } from 'react';
 import { EyeOutlined } from '@ant-design/icons';
 import { getCookie } from '../utils';
-var TagCheck = function TagCheck(props) {
+// import { base64Encode } from 'ls-pro-tools';
+var ViewDocment = function ViewDocment(props) {
   var _props$open = props.open,
     open = _props$open === void 0 ? false : _props$open,
     _onCancel = props.onCancel,
@@ -27,7 +28,7 @@ var TagCheck = function TagCheck(props) {
   var src = useMemo(function () {
     var token = getCookie('token');
     var doc = url + (url.includes('?') ? '&' : '?') + 'token=' + token;
-    return 'https://view.officeapps.live.com/op/embed.aspx?src=' + encodeURIComponent(doc);
+    return 'https://dowload.lesoon.cloud/lesoon/lesoon-kkfileview-api/onlinePreview?url=' + encodeURIComponent(doc);
   }, [url]);
   var triggerDom = /*#__PURE__*/React.createElement(React.Fragment, {
     key: "trigger"
@@ -71,4 +72,4 @@ var TagCheck = function TagCheck(props) {
     src: src
   })));
 };
-export default TagCheck;
+export default ViewDocment;

package/es/hooks/usePermission/index.js

@@ -1,6 +1,6 @@
-import { useMemo, useCallback } from 'react';
+import { useMemo, useCallback, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
-import { getUrlQuery, getResourceProps, getCache, getLoginName } from '../../utils';
+import { getUrlQuery, getResourceProps, getCache, getLoginName, getCookie, setCookie } from '../../utils';
 function usePermission() {
   var routeLocation = useLocation();
   /** @name 资源ID */
@@ -32,13 +32,20 @@ function usePermission() {
   }, []);
   /**
    * 检查是否有权限
+   *
    * @param val 权限值
    */
   var checkRight = useCallback(function (val) {
     if (!val) return true;
-    if (location.href.includes("//localhost")) return true;
+    if (location.href.includes('//localhost')) return true;
     return (permissionVal & val) === val && (resRightVal & val) === val;
   }, []);
+  useEffect(function () {
+    // 如果外部转入token,而cookie中没有，则设置cookie。
+    if (getUrlQuery('token') && !getCookie('token')) {
+      setCookie('token', getUrlQuery('token'));
+    }
+  }, []);
   return {
     resourceId: resourceId,
     permissionVal: permissionVal,
@@ -54,5 +61,4 @@ function usePermission() {
     canPrint: checkRight(512)
   };
 }
-;
 export default usePermission;

package/es/utils/index.js

@@ -31,6 +31,12 @@ export var getResourceProps = function getResourceProps(name) {
   // window.lsResourceList 为主工程写入的资源
   // @ts-ignore
   var resList = window.lsResourceList || parent.window.lsResourceList || [];
+  if (resList.length === 0) {
+    resList = getCache('allRes') || [];
+    if (!Array.isArray(resList)) {
+      resList = [];
+    }
+  }
   if (id) {
     obj = resList.find(function (o) {
       return o.resourceId === id;

package/lib/components/RecordLog/index.d.ts

@@ -6,7 +6,9 @@
 import React from 'react';
 import './index.less';
 export interface RecordLogProps {
-    recordKey: string;
+    recordKey?: string;
+    bizNo?: string;
+    param?: any;
     fieldsMap?: Record<string, string>;
     showResourceName?: boolean;
     style?: React.CSSProperties;

package/lib/components/RecordLog/index.js

@@ -1,5 +1,6 @@
 import "antd/es/empty/style";
 import _Empty from "antd/es/empty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /**
  * 记录变更日志
@@ -22,6 +23,10 @@ var RecordLog = function RecordLog(props) {
     setLogData = _useState2[1];
   var _props$recordKey = props.recordKey,
     recordKey = _props$recordKey === void 0 ? '' : _props$recordKey,
+    _props$bizNo = props.bizNo,
+    bizNo = _props$bizNo === void 0 ? '' : _props$bizNo,
+    _props$param = props.param,
+    param = _props$param === void 0 ? {} : _props$param,
     _props$fieldsMap = props.fieldsMap,
     fieldsMap = _props$fieldsMap === void 0 ? {} : _props$fieldsMap,
     _props$showResourceNa = props.showResourceName,
@@ -34,10 +39,14 @@ var RecordLog = function RecordLog(props) {
     var params = {
       pageSize: 5000,
       sort: 'createTime desc',
-      where: {
-        dataCode: recordKey
-      }
+      where: _objectSpread({}, param)
     };
+    if (recordKey) {
+      params.where.dataCode = recordKey;
+    }
+    if (bizNo) {
+      params.where.bizNo = bizNo;
+    }
     httpGet(url, params).then(function (res) {
       var rows = (res === null || res === void 0 ? void 0 : res.rows) || [];
       rows.forEach(function (row) {

package/lib/components/ViewOffice.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-declare const TagCheck: (props: {
+declare const ViewDocment: (props: {
     open?: boolean;
     onCancel?: () => void;
     title?: string;
@@ -9,4 +9,4 @@ declare const TagCheck: (props: {
     trigger?: JSX.Element;
     url: string;
 }) => JSX.Element;
-export default TagCheck;
+export default ViewDocment;

package/lib/components/ViewOffice.js

@@ -7,7 +7,8 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useState, useMemo } from 'react';
 import { EyeOutlined } from '@ant-design/icons';
 import { getCookie } from '../utils';
-var TagCheck = function TagCheck(props) {
+// import { base64Encode } from 'ls-pro-tools';
+var ViewDocment = function ViewDocment(props) {
   var _props$open = props.open,
     open = _props$open === void 0 ? false : _props$open,
     _onCancel = props.onCancel,
@@ -27,7 +28,7 @@ var TagCheck = function TagCheck(props) {
   var src = useMemo(function () {
     var token = getCookie('token');
     var doc = url + (url.includes('?') ? '&' : '?') + 'token=' + token;
-    return 'https://view.officeapps.live.com/op/embed.aspx?src=' + encodeURIComponent(doc);
+    return 'https://dowload.lesoon.cloud/lesoon/lesoon-kkfileview-api/onlinePreview?url=' + encodeURIComponent(doc);
   }, [url]);
   var triggerDom = /*#__PURE__*/React.createElement(React.Fragment, {
     key: "trigger"
@@ -71,4 +72,4 @@ var TagCheck = function TagCheck(props) {
     src: src
   })));
 };
-export default TagCheck;
+export default ViewDocment;

package/lib/hooks/usePermission/index.js

@@ -1,6 +1,6 @@
-import { useMemo, useCallback } from 'react';
+import { useMemo, useCallback, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
-import { getUrlQuery, getResourceProps, getCache, getLoginName } from '../../utils';
+import { getUrlQuery, getResourceProps, getCache, getLoginName, getCookie, setCookie } from '../../utils';
 function usePermission() {
   var routeLocation = useLocation();
   /** @name 资源ID */
@@ -32,13 +32,20 @@ function usePermission() {
   }, []);
   /**
    * 检查是否有权限
+   *
    * @param val 权限值
    */
   var checkRight = useCallback(function (val) {
     if (!val) return true;
-    if (location.href.includes("//localhost")) return true;
+    if (location.href.includes('//localhost')) return true;
     return (permissionVal & val) === val && (resRightVal & val) === val;
   }, []);
+  useEffect(function () {
+    // 如果外部转入token,而cookie中没有，则设置cookie。
+    if (getUrlQuery('token') && !getCookie('token')) {
+      setCookie('token', getUrlQuery('token'));
+    }
+  }, []);
   return {
     resourceId: resourceId,
     permissionVal: permissionVal,
@@ -54,5 +61,4 @@ function usePermission() {
     canPrint: checkRight(512)
   };
 }
-;
 export default usePermission;

package/lib/utils/index.js

@@ -31,6 +31,12 @@ export var getResourceProps = function getResourceProps(name) {
   // window.lsResourceList 为主工程写入的资源
   // @ts-ignore
   var resList = window.lsResourceList || parent.window.lsResourceList || [];
+  if (resList.length === 0) {
+    resList = getCache('allRes') || [];
+    if (!Array.isArray(resList)) {
+      resList = [];
+    }
+  }
   if (id) {
     obj = resList.find(function (o) {
       return o.resourceId === id;

package/package.json

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