gant-core 0.1.25 → 0.1.27

package/lib/index.d.ts

@@ -2040,7 +2040,7 @@ interface GetValidateCodeParams {
     imageWidth?: number;
 }
 
-type LoginErrorType = 'passwordError' | 'validateError' | 'passwordExpiration' | 'SLIDER_VERIFICATION_LOGIN';
+type LoginErrorType = "passwordError" | "validateError" | "passwordExpiration" | "SLIDER_VERIFICATION_LOGIN";
 declare class BaseLogin {
     loginPathname?: string;
     BASE: string;
@@ -2106,7 +2106,7 @@ declare class UserStore {
     getUserSetting: (dataType: string) => Promise<any>;
     updateUserSetting: (dataType: string, data: any) => Promise<any>;
     removeUserSetting: (dataType: string) => Promise<void>;
-    getUserInfo: (userId: string) => Promise<any>;
+    getUserInfo: (userId: string, userLoginName?: boolean) => Promise<any>;
 }
 
 interface ParameterItem {

package/lib/index.js

@@ -616,30 +616,37 @@ const storage = createStorage();
 
 //公司定制化数据接口
 async function setUserDataApi(params, options) {
-    return request('/accountUserSelf/setUserData', {
+    return request("/accountUserSelf/setUserData", {
         data: params,
-        serviceId: 'fwSecurity',
+        serviceId: "fwSecurity",
     }, options);
 }
 //获取公司定制化信息
 async function getUserDataApi(params) {
-    return request('/accountUserSelf/getUserData', {
+    return request("/accountUserSelf/getUserData", {
         data: params,
-        serviceId: 'fwSecurity',
+        serviceId: "fwSecurity",
     });
 }
 //删除公司定制化信息
 async function delUserDataApi(params, options) {
-    return request('/accountUserSelf/delUserData', {
+    return request("/accountUserSelf/delUserData", {
         data: params,
-        serviceId: 'fwSecurity',
+        serviceId: "fwSecurity",
     }, options);
 }
 async function getUserByIdApi(userId) {
-    return request('/security/getUserById', {
-        method: 'POST',
+    return request("/security/getUserById", {
+        method: "POST",
         data: { id: userId },
-        serviceId: 'fwSecurity',
+        serviceId: "fwSecurity",
+    });
+}
+async function getUserByUserLoginNameApi(userLoginName) {
+    return request("/security/getUserByUserLoginName", {
+        method: "POST",
+        data: { userLoginName: userLoginName },
+        serviceId: "fwSecurity",
     });
 }
 
@@ -654,7 +661,7 @@ class UserStore {
     getUserIdentity() {
         if (!isEmpty(this.userIdentity))
             return this.userIdentity;
-        const localUserIdentity = storage?.get('userIdentity');
+        const localUserIdentity = storage?.get("userIdentity");
         return localUserIdentity ? localUserIdentity : {};
     }
     setUserIdentity(identity) {
@@ -662,11 +669,11 @@ class UserStore {
             ...this.userIdentity,
             ...identity,
         };
-        storage.set('userIdentity', this.userIdentity);
+        storage.set("userIdentity", this.userIdentity);
         return this.userIdentity;
     }
     clearUserIdentity() {
-        storage.remove('userIdentity');
+        storage.remove("userIdentity");
         this.userIdentity = {};
     }
     setUserAggregateInfo = ({ delegations, roles, functions, isSuperAdmin, currentUser, }) => {
@@ -708,7 +715,9 @@ class UserStore {
         await delUserDataApi({ dataType, dataId: userId });
         delete this.userSetting[key];
     };
-    getUserInfo = async (userId) => {
+    getUserInfo = async (userId, userLoginName) => {
+        if (userLoginName)
+            return getUserByUserLoginNameApi(userId);
         return await getUserByIdApi(userId);
     };
 }
@@ -929,17 +938,17 @@ function checkCaptchaApi(payload) {
 
 class BaseLogin {
     loginPathname;
-    BASE = '/';
+    BASE = "/";
     get baseLoginPathname() {
-        return `${this.BASE}${this.loginPathname?.replace('/', '')}`;
+        return `${this.BASE}${this.loginPathname?.replace("/", "")}`;
     }
-    tokenValue = '';
+    tokenValue = "";
     get isLoginPathname() {
         const pathname = window.location.pathname;
         return this.baseLoginPathname == pathname;
     }
     getRealPath = (pathname) => {
-        return `${this.BASE}${pathname.replace('/', '')}`;
+        return `${this.BASE}${pathname.replace("/", "")}`;
     };
     chekToken = async () => {
         const res = await checkTokenApi();
@@ -956,15 +965,15 @@ class BaseLogin {
         if (this.isLoginPathname)
             return true;
         const urlParams = new URLSearchParams();
-        if (pathname !== this.BASE)
-            urlParams.append('redirectUrl', url);
+        if (pathname !== this.BASE && pathname !== "/")
+            urlParams.append("redirectUrl", url);
         const searchString = decodeURIComponent(urlParams.toString());
-        window.location.replace(`${this.baseLoginPathname}${!!searchString ? '?' + decodeURIComponent(urlParams.toString()) : ''}`);
+        window.location.replace(`${this.baseLoginPathname}${!!searchString ? "?" + decodeURIComponent(urlParams.toString()) : ""}`);
         return false;
     };
     checkPassword = async () => {
         const res = await checkPasswordApi();
-        if (res === 'noPass') {
+        if (res === "noPass") {
             // 临时清除token，待修改完密码后恢复
             this.tokenValue = await extractTokenApi();
             return false;
@@ -993,26 +1002,26 @@ class BaseLogin {
                 result.data = res;
                 const checked = await this.checkPassword();
                 if (!checked)
-                    result.error = 'passwordExpiration';
+                    result.error = "passwordExpiration";
                 return result;
             }
             //traceId 需要第三方验证 //验证码之后的由业务自行判断
             if (traceId) {
                 result.data = res;
-                result.error = 'SLIDER_VERIFICATION_LOGIN';
+                result.error = "SLIDER_VERIFICATION_LOGIN";
                 return result;
             }
-            result.error = 'passwordError';
+            result.error = "passwordError";
             return result;
         }
         catch (err) {
-            result.error = 'validateError';
+            result.error = "validateError";
             return result;
         }
     };
     loginSuccess = () => {
         const params = new URLSearchParams(window.location.search);
-        let url = params.get('redirectUrl');
+        let url = params.get("redirectUrl");
         if (url)
             window.location.href = url;
         else
@@ -1022,7 +1031,7 @@ class BaseLogin {
         const params = new URLSearchParams();
         const url = window.location.href;
         if (window.location.pathname !== this.BASE)
-            params.append('redirectUrl', url);
+            params.append("redirectUrl", url);
         await accountLogoutApi();
         window.location.replace(`${this.baseLoginPathname}?${params.toString()}`);
     };