ls-pro-common 3.1.20 → 3.1.22

package/es/components/InputTable.d.ts

@@ -94,7 +94,7 @@ declare const InputTable: React.ForwardRefExoticComponent<{
     /** @name 填充其它表单项目配置 */
     fillMap?: Record<string, string> | undefined;
     /** @name 输入后检查数据的触发方式，默认为entry回车触发 */
-    triggerCheck?: "none" | "entry" | "blur" | undefined;
+    triggerCheck?: "none" | "blur" | "entry" | undefined;
     /** @name 每次展示面板时都加载数据，接合 tableConfig里的 manualRequest 一起使用 */
     loadOnShow?: boolean | undefined;
     placement?: TooltipPlacement | undefined;

package/es/hooks/usePermission/index.js

@@ -1,6 +1,6 @@
 import { useMemo, useCallback, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
-import { getUrlQuery, getResourceProps, getCache, getLoginName, getCookie, setCookie } from '../../utils';
+import { getUrlQuery, getResourceProps, getCache, getLoginName, getCookie, setCookie, setCache } from '../../utils';
 function usePermission() {
   var routeLocation = useLocation();
   /** @name 资源ID */
@@ -45,6 +45,24 @@ function usePermission() {
     if (getUrlQuery('token') && !getCookie('token')) {
       setCookie('token', getUrlQuery('token'));
     }
+    //从外部系统转token和用户进来。
+    var handleMessage = function handleMessage(e) {
+      if (e.data.type === 'FROM_OTHER_SYSTEM') {
+        var _e$data = e.data,
+          token = _e$data.token,
+          user = _e$data.user;
+        if (token && !getCookie('token')) {
+          setCookie('token', token);
+        }
+        if (user && !getCache('user')) {
+          setCache('user', user);
+        }
+      }
+    };
+    window.addEventListener('message', handleMessage);
+    return function () {
+      window.removeEventListener('message', handleMessage);
+    };
   }, []);
   return {
     resourceId: resourceId,

package/es/http/index.d.ts

@@ -70,4 +70,5 @@ export declare function getDict(dictCodes: string, showValue?: boolean, needGate
  * @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 const checkResourceRight: (ids: string[]) => Promise<any>;
 export default request;

package/es/http/index.js

@@ -469,4 +469,10 @@ function _fetchOptions() {
   }));
   return _fetchOptions.apply(this, arguments);
 }
+export var checkResourceRight = function checkResourceRight(ids) {
+  var url = '/lesoon/lesoon-petrel-permission-api/sysUserRole/selectResourceIds';
+  return httpPost(url, {
+    resourceIds: ids
+  }, true, false);
+};
 export default request;

package/es/utils/index.d.ts

@@ -194,13 +194,15 @@ export declare const deepClone: (obj: any) => any;
 /**
  * 在主工程中打开模块
  *
- * @param option {path:模块路由,需要加工程编码, resourceId: 资源Id，两者传一个即可,data:参数}
+ * @param option {path:模块路由,需要加工程编码, resourceId: 资源Id，两者传一个即可,data:参数,moduleName:模块名称}
  */
 export declare const openPageInMain: (option: {
-    path?: string;
-    resourceId?: string;
+    [key: string]: any;
+    path?: string | undefined;
+    resourceId?: string | undefined;
     data?: any;
-    ifRefreshTarget?: boolean;
+    ifRefreshTarget?: boolean | undefined;
+    moduleName?: string | undefined;
 }) => void;
 /** 处理主题 */
 export declare const handleTheme: () => void;

package/es/utils/index.js

@@ -429,7 +429,7 @@ export var deepClone = function deepClone(obj) {
 /**
  * 在主工程中打开模块
  *
- * @param option {path:模块路由,需要加工程编码, resourceId: 资源Id，两者传一个即可,data:参数}
+ * @param option {path:模块路由,需要加工程编码, resourceId: 资源Id，两者传一个即可,data:参数,moduleName:模块名称}
  */
 export var openPageInMain = function openPageInMain(option) {
   var win = top || window;

package/lib/components/InputTable.d.ts

@@ -94,7 +94,7 @@ declare const InputTable: React.ForwardRefExoticComponent<{
     /** @name 填充其它表单项目配置 */
     fillMap?: Record<string, string> | undefined;
     /** @name 输入后检查数据的触发方式，默认为entry回车触发 */
-    triggerCheck?: "none" | "entry" | "blur" | undefined;
+    triggerCheck?: "none" | "blur" | "entry" | undefined;
     /** @name 每次展示面板时都加载数据，接合 tableConfig里的 manualRequest 一起使用 */
     loadOnShow?: boolean | undefined;
     placement?: TooltipPlacement | undefined;

package/lib/hooks/usePermission/index.js

@@ -1,6 +1,6 @@
 import { useMemo, useCallback, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
-import { getUrlQuery, getResourceProps, getCache, getLoginName, getCookie, setCookie } from '../../utils';
+import { getUrlQuery, getResourceProps, getCache, getLoginName, getCookie, setCookie, setCache } from '../../utils';
 function usePermission() {
   var routeLocation = useLocation();
   /** @name 资源ID */
@@ -45,6 +45,24 @@ function usePermission() {
     if (getUrlQuery('token') && !getCookie('token')) {
       setCookie('token', getUrlQuery('token'));
     }
+    //从外部系统转token和用户进来。
+    var handleMessage = function handleMessage(e) {
+      if (e.data.type === 'FROM_OTHER_SYSTEM') {
+        var _e$data = e.data,
+          token = _e$data.token,
+          user = _e$data.user;
+        if (token && !getCookie('token')) {
+          setCookie('token', token);
+        }
+        if (user && !getCache('user')) {
+          setCache('user', user);
+        }
+      }
+    };
+    window.addEventListener('message', handleMessage);
+    return function () {
+      window.removeEventListener('message', handleMessage);
+    };
   }, []);
   return {
     resourceId: resourceId,

package/lib/http/index.d.ts

@@ -70,4 +70,5 @@ export declare function getDict(dictCodes: string, showValue?: boolean, needGate
  * @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 const checkResourceRight: (ids: string[]) => Promise<any>;
 export default request;

package/lib/http/index.js

@@ -469,4 +469,10 @@ function _fetchOptions() {
   }));
   return _fetchOptions.apply(this, arguments);
 }
+export var checkResourceRight = function checkResourceRight(ids) {
+  var url = '/lesoon/lesoon-petrel-permission-api/sysUserRole/selectResourceIds';
+  return httpPost(url, {
+    resourceIds: ids
+  }, true, false);
+};
 export default request;

package/lib/utils/index.d.ts

@@ -194,13 +194,15 @@ export declare const deepClone: (obj: any) => any;
 /**
  * 在主工程中打开模块
  *
- * @param option {path:模块路由,需要加工程编码, resourceId: 资源Id，两者传一个即可,data:参数}
+ * @param option {path:模块路由,需要加工程编码, resourceId: 资源Id，两者传一个即可,data:参数,moduleName:模块名称}
  */
 export declare const openPageInMain: (option: {
-    path?: string;
-    resourceId?: string;
+    [key: string]: any;
+    path?: string | undefined;
+    resourceId?: string | undefined;
     data?: any;
-    ifRefreshTarget?: boolean;
+    ifRefreshTarget?: boolean | undefined;
+    moduleName?: string | undefined;
 }) => void;
 /** 处理主题 */
 export declare const handleTheme: () => void;

package/lib/utils/index.js

@@ -429,7 +429,7 @@ export var deepClone = function deepClone(obj) {
 /**
  * 在主工程中打开模块
  *
- * @param option {path:模块路由,需要加工程编码, resourceId: 资源Id，两者传一个即可,data:参数}
+ * @param option {path:模块路由,需要加工程编码, resourceId: 资源Id，两者传一个即可,data:参数,moduleName:模块名称}
  */
 export var openPageInMain = function openPageInMain(option) {
   var win = top || window;

package/package.json

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