@das-fed/utils 6.4.0-dev.61 → 6.4.0-dev.63

package/common-info/index.js

@@ -17,8 +17,8 @@ const y = i, T = () => {
   return JSON.stringify(e) === "{}" && t.personalInfo && (e = t.personalInfo), {
     id: e.id ?? "",
     name: e.name ?? "",
-    phone: e.phone ?? "",
     userName: e.userName ?? "",
+    phone: e.phone ?? "",
     email: e.email ?? "",
     headPicture: e.headPicture ?? ""
   };
@@ -29,11 +29,22 @@ const y = i, T = () => {
     userName: e.userName ?? "",
     name: e.name ?? "",
     areaCode: e.areaCode ?? "",
+    region: e.region ?? "",
     phone: e.phone ?? "",
+    email: e.email ?? "",
     flag: e.flag ?? null,
-    tenant: e.tenant ?? {}
+    tenant: e.tenant ?? {},
+    headPicture: e.headPicture ?? "",
+    nickName: e.nickName ?? "",
+    gender: e.gender ?? null,
+    status: e.status ?? null,
+    statusName: e.statusName ?? null,
+    tags: e.tags ?? [],
+    type: e.type ?? null,
+    address: e.address ?? "",
+    description: e.description ?? ""
   };
-}, C = () => {
+}, N = () => {
   let e = JSON.parse(sessionStorage.getItem("projectInfo") || "{}");
   const t = u();
   return JSON.stringify(e) === "{}" && t.projectInfo && (e = t.projectInfo), {
@@ -82,22 +93,23 @@ const y = i, T = () => {
     enable: (e == null ? void 0 : e.enable) ?? !1,
     originalCode: (e == null ? void 0 : e.originalCode) ?? "",
     routeUrl: (e == null ? void 0 : e.routeUrl) ?? "",
+    displayPosition: (e == null ? void 0 : e.displayPosition) ?? 1,
     type: (e == null ? void 0 : e.type) ?? null
   };
-}, f = () => {
+}, v = () => {
   const e = JSON.parse(sessionStorage.getItem("personal-config") || "{}");
   return {
     style: (e == null ? void 0 : e.style) ?? "",
     skinStyle: (e == null ? void 0 : e.skinStyle) ?? ""
   };
-}, N = (e, t) => {
-  const r = "permission-btn", o = m(), a = g(location.href, "app") || "", n = t || a || o.currentSubAppCode;
-  if (!n) return;
-  const s = g(location.href, "menu") || "", l = e || s || o.currentSubApp.currentMenuCode, c = JSON.parse(sessionStorage.getItem(r) || "{}");
+}, C = (e, t) => {
+  const r = "permission-btn", a = m(), o = g(location.href, "app") || "", s = t || o || a.currentSubAppCode;
+  if (!s) return;
+  const n = g(location.href, "menu") || "", l = e || n || a.currentSubApp.currentMenuCode, c = JSON.parse(sessionStorage.getItem(r) || "{}");
   if (!c || JSON.stringify(c) === "{}") return;
-  const p = c[n][l];
-  return p && p.length ? p : c[n]["origin-auth"] ? c[n]["origin-auth"][l] ?? [] : [];
-}, v = (e, t) => N(e, t) ?? [], m = () => {
+  const p = c[s][l];
+  return p && p.length ? p : c[s]["origin-auth"] ? c[s]["origin-auth"][l] ?? [] : [];
+}, f = (e, t) => C(e, t) ?? [], m = () => {
   const e = JSON.parse(sessionStorage.getItem("subApps") || "{}");
   return {
     appcategorys: e.appcategorys ?? [],
@@ -106,20 +118,20 @@ const y = i, T = () => {
     subAppList: e.subAppList ?? [],
     menuCollapses: e.menuCollapses ?? []
   };
-}, D = (e, t = !1) => {
-  var o, a;
+}, k = (e, t = !1) => {
+  var a, o;
   const r = m().subAppList;
   if (e)
-    return t ? ((o = r == null ? void 0 : r.find((n) => n.code === e)) == null ? void 0 : o.originalMenus) ?? [] : ((a = r == null ? void 0 : r.find((n) => n.code === e)) == null ? void 0 : a.menus) ?? [];
+    return t ? ((a = r == null ? void 0 : r.find((s) => s.code === e)) == null ? void 0 : a.originalMenus) ?? [] : ((o = r == null ? void 0 : r.find((s) => s.code === e)) == null ? void 0 : o.menus) ?? [];
   {
-    let n = {};
-    return t ? r == null || r.forEach((s) => {
-      n[s.code] = s.originalMenus ?? [];
-    }) : r == null || r.forEach((s) => {
-      n[s.code] = s.menus ?? [];
-    }), n;
+    let s = {};
+    return t ? r == null || r.forEach((n) => {
+      s[n.code] = n.originalMenus ?? [];
+    }) : r == null || r.forEach((n) => {
+      s[n.code] = n.menus ?? [];
+    }), s;
   }
-}, U = () => {
+}, D = () => {
   const e = JSON.parse(sessionStorage.getItem("tabs") || "{}");
   return {
     currentCode: e.currentCode ?? "",
@@ -127,7 +139,7 @@ const y = i, T = () => {
     tabMap: e.tabMap ?? {},
     preTab: e.preTab ?? {}
   };
-}, k = () => {
+}, U = () => {
   const e = u(), t = sessionStorage.getItem("minioAddress");
   return t || (e.baseURL ? e.baseURL : location.origin);
 }, E = () => ({
@@ -135,21 +147,21 @@ const y = i, T = () => {
 }), z = () => localStorage.getItem("fav-icon") || "./logo.svg";
 y() || I();
 var d;
-(d = C()) != null && d.id || S();
+(d = N()) != null && d.id || S();
 export {
   z as getFavIcon,
   M as getHomeInfo,
   E as getInstanceInfo,
-  D as getMenus,
-  k as getMinioAddress,
-  N as getPageAuth,
-  v as getPageAuthBtn,
-  f as getPersonalConfig,
+  k as getMenus,
+  U as getMinioAddress,
+  C as getPageAuth,
+  f as getPageAuthBtn,
+  v as getPersonalConfig,
   A as getPersonalInfo,
-  C as getProjectInfo,
+  N as getProjectInfo,
   O as getProjectMessage,
   m as getSubApps,
-  U as getTabInfo,
+  D as getTabInfo,
   J as getTenantInfo,
   y as getToken,
   T as getUserInfo

package/common-info/type.d.ts

@@ -29,20 +29,57 @@ export interface TenantInfo {
   userId: string
   /** 用户名 */
   userName: string
+  /** 用户名称 */
   name: string
+  /** 昵称 */
+  nickName: string
+  /** 手机号 */
+  phone: string
+  /** 邮箱 */
+  email: string
+  /** 性别 1 男 2 女 */
+  gender: number
+  /** 用户状态 1 正常 2 锁定 3 禁用*/
+  status: number
+  /** 状态名称 */
+  statusName: string
+  /** 用户类型。0：普通 1：管理员 */
+  type: number
   /** 租户信息 */
   tenant: {
+    /** 租户ID */
     id: string
+    /** 租户名 */
     name: string
+    /** 域，如：qq，das */
+    domain: string
+    /** 管理员用户ID */
     adminUserId: string
+    /** 租户描述 */
     description: string
-    domain: string
+    /** 是否开通三员权限管理，0表示未开通，1表示已开通。 */
+    thirdManaged: number
   }
   /** 用户标识 2 - B端身份, 4 - C 端身份, 6 - B+C 端身份 */
   flag: number
+  /** 当前区号 */
   areaCode: string
-  /** 手机号 */
-  phone: string
+  /** 地区 */
+  region: string
+  /** 地址 */
+  address: string
+  /** 描述 */
+  description: string
+
+  /** 头像 */
+  headPicture: string
+  /** 用户标签 */
+  tags: {
+    id: number
+    key: string
+    value: string
+    desc: string
+  }[]
 }
 
 export interface HomeInfo {
@@ -54,6 +91,8 @@ export interface HomeInfo {
   enable: boolean
   originalCode: string
   routeUrl: string
+  /** 首页展示位置 1在应用中心左侧 2在应用中心右侧 */
+  displayPosition: 1 | 2
   type: number | null
 }
 

package/create-api-service/sso/index.d.ts

@@ -9,13 +9,11 @@ declare const tokenStorage: () => {
         accessToken: any;
         accessTokenExpiredAt: any;
         refreshToken: any;
-        redirectUri: any;
     };
     save: (data: {
         accessToken?: string | null;
         accessTokenExpiredAt?: string | number | null;
         refreshToken?: string | null;
-        redirectUri?: string;
         info?: any;
     }) => void;
     remove: () => void;