npm - gant-core - Versions diffs - 0.1.29 → 0.1.31 - Mend

gant-core 0.1.29 → 0.1.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/lib/cli/index.js +40 -31
package/lib/cli/index.js.map +1 -1
package/lib/cli/template/index.html +0 -1
package/lib/index.d.ts +6 -3
package/lib/index.js +44 -39
package/lib/index.js.map +1 -1
package/package.json +1 -1

package/lib/cli/template/index.html CHANGED Viewed

@@ -3,7 +3,6 @@
   <head>
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <link rel="icon" type="image/png" href="/public/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   </head>
   <body>

package/lib/index.d.ts CHANGED Viewed

@@ -1700,6 +1700,7 @@ interface GantUserConfig extends Configuration, GantCustomConfig {
     devServer?: Configuration$1;
 }
 type CONFIG_TYPE = {
+    IP2_BASE_CONFIG?: BASE_CONFIG_TYPE;
     BASE_CONFIG?: BASE_CONFIG_TYPE;
     MAIN_CONFIG?: MAIN_CONFIG_TYPE;
     SYSMGMT_CONFIG?: SYSMGMT_CONFIG_TYPE;
@@ -1984,6 +1985,7 @@ interface GlobalOptions {
     base?: string;
     menuData?: ServerMenuData | ((res: UserAggregateInfo) => ServerMenuData);
     loginSuccessCallback?: () => void;
+    ssoCallback?: () => boolean;
 }
 declare const MENU_HISTORY_UPDATE = "MENU_HISTORY_UPDATE";
@@ -2065,7 +2067,7 @@ declare class BaseLogin {
 declare class SSOLogin {
     init(ssoConfig?: SSOConfigType): void;
     private ssoConfig;
-    isSso: () => Promise<boolean>;
+    isSso: (ssoCallback?: () => boolean) => Promise<boolean>;
     ssoLogin: () => boolean;
     ssoLoginOut: () => void;
 }
@@ -2080,8 +2082,9 @@ declare class LoginStore extends BaseLogin {
     ssoLogin: SSOLogin;
     validate: ValidateLogin;
     noCheckPermissionsPath?: string[];
+    ssoCallback?: () => boolean;
     constructor();
-    init: (loginConfig?: LOGIN_CONFIG, base?: string) => void;
+    init: (loginConfig?: LOGIN_CONFIG, base?: string, ssoCallback?: () => boolean) => void;
     isNoLoginRequiredPage: () => boolean;
     loginOut: () => Promise<void>;
     loginAuthentication: (params: BeforeLoginCheckCodeParams) => Promise<void>;
@@ -2147,7 +2150,7 @@ interface WEBSOCKETRECROD {
     recipientType: string;
     recipientCode: string;
     title?: string;
-    status?: '01' | '00';
+    status?: "01" | "00";
     senderName?: string;
     senderTime?: string;
     content: string;

package/lib/index.js CHANGED Viewed

@@ -236,38 +236,38 @@ class ParameterStoreClass {
 const parameterStoreInstance = new ParameterStoreClass();
 //计算最终的WebSocketUrl
-const pingMsg = 'ping'; //客户端心跳信息
-const pongMsg = 'pong'; //服务端心跳信息
+const pingMsg = "ping"; //客户端心跳信息
+const pongMsg = "pong"; //服务端心跳信息
 const reconnectTimeout = 10000;
 const pingPongTimeout = 10000; //发送的心跳的间隔时间
-const WS_CONTENT_SUCCESS = 'WS_CONTENT_SUCCESS';
-const WS_CONTENT_ERROR = 'WS_CONTENT_ERROR';
-const WS_CONTENT_CLOSE = 'WS_CONTENT_CLOSE';
+const WS_CONTENT_SUCCESS = "WS_CONTENT_SUCCESS";
+const WS_CONTENT_ERROR = "WS_CONTENT_ERROR";
+const WS_CONTENT_CLOSE = "WS_CONTENT_CLOSE";
 const getWebSocketUrl = (userLoginName) => {
-    const suffix = 'notification-ws';
+    const suffix = "notification-ws";
     const paramStr = `userLoginName=${userLoginName}`;
     const { host, protocol, port, hostname } = window.location;
     //是否是https
-    const isHttps = protocol.includes('https');
+    const isHttps = protocol.includes("https");
     //ws协议
-    let wsProtocol = isHttps ? 'wss' : 'ws';
+    let wsProtocol = isHttps ? "wss" : "ws";
     //默认是host
     let wsHost = host;
     //如果不是是https并且有端口号时,ws端口就是web端口+1
     if (!isHttps && port) {
-        let newhost = parseInt(port) + 1;
+        let newhost = parseInt(port);
         wsHost = `${hostname}:${newhost}`;
     }
     const wsAddress = `${wsProtocol}://${wsHost}/${suffix}?${paramStr}`;
     return wsAddress;
 };
 class GantWebSocket {
-    RECIPIENT_TYPE_ALL = 'all'; // 所有用户均可收到的消息类型【公告等消息】
-    RECIPIENT_TYPE_USER = 'user'; // 某个用户可以收到【用户通知】
-    RECIPIENT_TYPE_OBSERVER = 'obsvr'; // 某个观察者可以收到【接口处理进度】
-    RECIPIENT_TYPE_CONNECTION = 'conn'; // 某个连接成功接收到【ws连接专用】
+    RECIPIENT_TYPE_ALL = "all"; // 所有用户均可收到的消息类型【公告等消息】
+    RECIPIENT_TYPE_USER = "user"; // 某个用户可以收到【用户通知】
+    RECIPIENT_TYPE_OBSERVER = "obsvr"; // 某个观察者可以收到【接口处理进度】
+    RECIPIENT_TYPE_CONNECTION = "conn"; // 某个连接成功接收到【ws连接专用】
     //链接地址
-    webSocketUrl = '';
+    webSocketUrl = "";
     // WebSocket
     ws = null;
     //重链次数
@@ -280,17 +280,17 @@ class GantWebSocket {
     pongTimeoutFn = null;
     reconnectFn = null;
     //是否限制次数
-    repeatLimit = 20;
+    repeatLimit = 2;
     //链接标识
-    connectionId = '';
-    userLoginName = '';
+    connectionId = "";
+    userLoginName = "";
     eventStack = {};
     constructor() { }
     init = (userLoginName, options) => {
         this.userLoginName = userLoginName;
         this.webSocketUrl = getWebSocketUrl(userLoginName);
-        this.disReconnect = get$1(options, 'disReconnect', false);
-        this.repeatLimit = get$1(options, 'repeatLimit', 20);
+        this.disReconnect = get$1(options, "disReconnect", false);
+        this.repeatLimit = get$1(options, "repeatLimit", 20);
         this.createWebSocket();
     };
     createWebSocket = () => {
@@ -385,7 +385,7 @@ class GantWebSocket {
                 }
             }
             catch (err) {
-                console.warn('received error!!!', err);
+                console.warn("received error!!!", err);
             }
         };
         this.ws.onerror = () => {
@@ -394,7 +394,7 @@ class GantWebSocket {
             emitter.emit(WS_CONTENT_ERROR);
         };
         this.ws.onclose = () => {
-            console.warn('webSocket close');
+            console.warn("webSocket close");
             this.ws = null;
             this.heartReset();
             this.reconnect();
@@ -406,7 +406,7 @@ class GantWebSocket {
         const id = uniqueId();
         this.eventStack[id] = {
             recipientType: eventType,
-            type: 'recipientType',
+            type: "recipientType",
             event,
         };
         return id;
@@ -1045,28 +1045,31 @@ class BaseLogin {
 const defaultSsoConfig = {
     sso: false,
-    ssoUrlSearchParams: ['ticket'],
-    ssoCheckTokenUrl: '',
-    ssoSuccessUrlkey: 'successUrl',
-    ssoLoginUrl: window.location.origin + '/fwSecurity/ssoAuth/login.api',
-    ssologinOutUrl: window.location.origin + 'fwSecurity/ssoAuth/logout.api',
+    ssoUrlSearchParams: ["ticket"],
+    ssoCheckTokenUrl: "",
+    ssoSuccessUrlkey: "successUrl",
+    ssoLoginUrl: window.location.origin + "/fwSecurity/ssoAuth/login.api",
+    ssologinOutUrl: window.location.origin + "fwSecurity/ssoAuth/logout.api",
 };
 class SSOLogin {
     init(ssoConfig) {
         this.ssoConfig = { ...this.ssoConfig, ...ssoConfig };
     }
     ssoConfig = defaultSsoConfig;
-    isSso = async () => {
+    isSso = async (ssoCallback) => {
         if (!this.ssoConfig.sso)
-            return;
+            return false;
+        let sso = false;
         try {
-            const onlyRedirect = await checkAuthConfigApi();
-            return !!onlyRedirect;
+            sso = await checkAuthConfigApi();
         }
         catch (error) {
-            console.error('sso', error);
+            console.error("sso", error);
         }
-        return false;
+        if (ssoCallback) {
+            sso = await ssoCallback();
+        }
+        return !!sso;
     };
     ssoLogin = () => {
         //在检测cookie中是否包含userIdentity信息
@@ -1105,16 +1108,18 @@ class LoginStore extends BaseLogin {
     ssoLogin;
     validate;
     noCheckPermissionsPath = [];
+    ssoCallback;
     constructor() {
         super();
         this.ssoLogin = new SSOLogin();
         this.validate = new ValidateLogin();
     }
-    init = (loginConfig, base = '/') => {
+    init = (loginConfig, base = "/", ssoCallback) => {
         this.BASE = base;
+        this.ssoCallback = ssoCallback;
         this.noCheckPermissionsPath = loginConfig?.noCheckPermissionsPath;
         this.ssoLogin.init(loginConfig);
-        this.loginPathname = loginConfig?.loginPathname || '/login';
+        this.loginPathname = loginConfig?.loginPathname || "/login";
     };
     isNoLoginRequiredPage = () => {
         const pathname = window.location.pathname;
@@ -1124,7 +1129,7 @@ class LoginStore extends BaseLogin {
         return isNoLogin;
     };
     loginOut = async () => {
-        const isSSO = await this.ssoLogin.isSso();
+        const isSSO = await this.ssoLogin.isSso(this.ssoCallback);
         if (isSSO)
             this.ssoLogin.ssoLoginOut();
         await this.baseLoginOut();
@@ -1137,7 +1142,7 @@ class LoginStore extends BaseLogin {
     redirectLogin = async () => {
         if (this.isNoLoginRequiredPage())
             return true;
-        const isSSO = await this.ssoLogin.isSso();
+        const isSSO = await this.ssoLogin.isSso(this.ssoCallback);
         if (isSSO) {
             this.ssoLogin.ssoLogin();
             return false;
@@ -1188,8 +1193,8 @@ class GlobalStoreClass {
         this.menuStore.init(isEmpty(localeMenus) ? startMenus : localeMenus, currentUser.id);
     };
     init = async (options) => {
-        const { base = "/", menuData, loginSuccessCallback } = options;
-        this.loginStore.init(options?.loginConfig, base);
+        const { base = "/", menuData, loginSuccessCallback, ssoCallback } = options;
+        this.loginStore.init(options?.loginConfig, base, ssoCallback);
         try {
             //检查token
             const res = await this.loginStore.chekToken();