gant-core 0.1.26 → 0.1.28

package/lib/cli/index.js

@@ -48724,7 +48724,7 @@ const createCwdConfig = (cwd, name, vue) => {
 };
 
 var name = "gant-core";
-var version = "0.1.26";
+var version = "0.1.28";
 var description = "";
 var main = "lib/index.js";
 var bin = {

package/lib/index.d.ts

@@ -2098,6 +2098,7 @@ declare class UserStore {
     userSetting: {
         [type: string]: any;
     };
+    users: User[];
     getUserIdentity(): UserIdentityType;
     setUserIdentity(identity: Partial<UserIdentityType>): UserIdentityType;
     clearUserIdentity(): void;
@@ -2106,7 +2107,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

@@ -1,6 +1,6 @@
 import axios__default from 'axios';
 export * from 'axios';
-import { forEach, groupBy, reduce, find, pick, get as get$1, uniqueId, omit, isEmpty, cloneDeep, mapValues, uniqBy, toLower, isObject, mergeWith, has, join } from 'lodash-es';
+import { forEach, groupBy, reduce, find, pick, get as get$1, uniqueId, omit, isEmpty, findIndex, cloneDeep, mapValues, uniqBy, toLower, isObject, mergeWith, has, join } from 'lodash-es';
 import mitt from 'mitt';
 
 class InterceptorManager {
@@ -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",
     });
 }
 
@@ -651,10 +658,11 @@ class UserStore {
     functions = []; //用户授权功能点
     delegations = []; //用户代理信息
     userSetting = {};
+    users = [];
     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 +670,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,8 +716,15 @@ class UserStore {
         await delUserDataApi({ dataType, dataId: userId });
         delete this.userSetting[key];
     };
-    getUserInfo = async (userId) => {
-        return await getUserByIdApi(userId);
+    getUserInfo = async (userId, userLoginName) => {
+        const index = findIndex(this.users, (itemUser) => userLoginName ? itemUser.userLoginName === userId : itemUser.id === userId);
+        if (index > -1)
+            return get$1(this.users, `[${index}]`);
+        const userInfo = userLoginName
+            ? await getUserByUserLoginNameApi(userId)
+            : await getUserByIdApi(userId);
+        this.users.push(userInfo);
+        return userInfo;
     };
 }