@das-fed/utils 7.0.4-test.3 → 7.0.5-test.1

package/common-info/index.js

@@ -2,7 +2,7 @@ import { getConfig as u } from "@das-fed/utils/config";
 import { getUrlParams as d } from "@das-fed/utils/common-tools";
 import { getAccessToken as I } from "@das-fed/utils/token-tools";
 import { getTokenFromQuery as S, getProjectInfoFromQuery as y } from "@das-fed/utils/common-info/getInfoFromUrl";
-const N = I, T = () => {
+const N = I, A = () => {
   var r;
   let e = JSON.parse(sessionStorage.getItem("tenantInfo") || "{}");
   return {
@@ -60,7 +60,7 @@ const N = I, T = () => {
     leaf: (e == null ? void 0 : e.leaf) ?? !1,
     optional: (e == null ? void 0 : e.leaf) ?? !0
   };
-}, f = () => {
+}, v = () => {
   let e = JSON.parse(sessionStorage.getItem("project-message") || "{}");
   return {
     id: (e == null ? void 0 : e.id) ?? 0,
@@ -85,7 +85,7 @@ const N = I, T = () => {
     autoTimezone: (e == null ? void 0 : e.autoTimezone) ?? !1,
     currency: (e == null ? void 0 : e.currency) ?? {}
   };
-}, v = () => {
+}, f = () => {
   const e = JSON.parse(sessionStorage.getItem("home-config") || "{}");
   return {
     applicationCode: (e == null ? void 0 : e.applicationCode) ?? "",
@@ -118,7 +118,6 @@ const N = I, T = () => {
     currentSubApp: e.currentSubApp ?? {},
     currentSubAppCode: e.currentSubAppCode ?? "",
     subAppList: e.subAppList ?? [],
-    fixedApps: e.fixedApps ?? [],
     menuCollapses: e.menuCollapses ?? []
   };
 }, U = (e, t = !1) => {
@@ -134,7 +133,7 @@ const N = I, T = () => {
       s[n.code] = n.menus ?? [];
     }), s;
   }
-}, x = () => {
+}, E = () => {
   const e = JSON.parse(sessionStorage.getItem("tabs") || "{}");
   return {
     currentCode: e.currentCode ?? "",
@@ -142,10 +141,10 @@ const N = I, T = () => {
     tabMap: e.tabMap ?? {},
     preTab: e.preTab ?? {}
   };
-}, E = () => {
+}, z = () => {
   const e = u(), t = sessionStorage.getItem("minioAddress");
   return t || (e.baseURL ? e.baseURL : location.origin);
-}, z = () => ({
+}, x = () => ({
   instanceInfo: JSON.parse(sessionStorage.getItem("instance") || "{}").instanceInfo ?? {}
 }), F = () => localStorage.getItem("fav-icon") || "./logo.svg";
 N() || S();
@@ -153,20 +152,20 @@ var i;
 (i = C()) != null && i.id || y();
 export {
   F as getFavIcon,
-  v as getHomeInfo,
-  z as getInstanceInfo,
+  f as getHomeInfo,
+  x as getInstanceInfo,
   M as getLanguages,
   U as getMenus,
-  E as getMinioAddress,
+  z as getMinioAddress,
   j as getPageAuth,
   D as getPageAuthBtn,
   k as getPersonalConfig,
   J as getPersonalInfo,
   C as getProjectInfo,
-  f as getProjectMessage,
+  v as getProjectMessage,
   m as getSubApps,
-  x as getTabInfo,
+  E as getTabInfo,
   O as getTenantInfo,
   N as getToken,
-  T as getUserInfo
+  A as getUserInfo
 };

package/common-info/type.d.ts

@@ -188,8 +188,6 @@ export interface SubAppsInfo {
   currentSubAppCode: string
   /** 当前打开的应用 */
   subAppList: any[]
-  /** 常用应用 */
-  fixedApps: any[]
   /** 当前菜单折叠的应用key集合 */
   menuCollapses: any[]
 }

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

@@ -1,5 +1,5 @@
 declare const getQuery: (name: any) => any;
-declare const real_uri: string;
+declare const real_uri: any;
 declare const getTokenParams: any;
 declare const getTokenFromCode: () => unknown;
 declare const getToken: (config: any) => unknown;

package/create-api-service/sso/index.js

@@ -1683,22 +1683,22 @@ b.getAdapter = Tt.getAdapter;
 b.HttpStatusCode = be;
 b.default = b;
 const {
-  Axios: Gr,
-  AxiosError: Xr,
-  CanceledError: Zr,
-  isCancel: Yr,
-  CancelToken: eo,
-  VERSION: to,
-  all: no,
-  Cancel: ro,
-  isAxiosError: oo,
-  spread: so,
-  toFormData: io,
-  AxiosHeaders: ao,
-  HttpStatusCode: co,
-  formToJSON: uo,
-  getAdapter: lo,
-  mergeConfig: fo
+  Axios: Qr,
+  AxiosError: Gr,
+  CanceledError: Xr,
+  isCancel: Zr,
+  CancelToken: Yr,
+  VERSION: eo,
+  all: to,
+  Cancel: no,
+  isAxiosError: ro,
+  spread: oo,
+  toFormData: so,
+  AxiosHeaders: io,
+  HttpStatusCode: ao,
+  formToJSON: co,
+  getAdapter: uo,
+  mergeConfig: lo
 } = b;
 /*! js-cookie v3.0.5 | MIT */
 function Q(e) {
@@ -1923,7 +1923,7 @@ const Y = (e) => new URL(location.href).searchParams.get(e), I = {
   // 清除登录信息
   token: "/api/justauth/oauth-server/v1/visitor/oauth/token"
   // 通过code获取token
-}, { baseURL: Ze, noRedireLogin: Fr = !1 } = Oe(), Ir = "/home", $ = location.origin + Ir, F = {
+}, { baseURL: Ze, noRedireLogin: Fr = !1 } = Oe(), $ = location.origin + "/home", F = {
   response_type: "code",
   scope: "sever",
   client_id: "sys",
@@ -1946,11 +1946,11 @@ const Y = (e) => new URL(location.href).searchParams.get(e), I = {
 };
 localStorage.getItem("idelTime") && Nt(Number(localStorage.getItem("idelTime")));
 let et = "";
-const Br = async () => {
-  const e = Y("code") || "", t = Y("redirect_url") || "/", n = Y("kingdee_token") || "";
+const Ir = async () => {
+  const e = Y("code") || "", t = Y("redirect_url") || "", n = Y("kingdee_token") || "";
   if (!e) return v();
   if (e === et)
-    return Ye(["code", "state", "kingdee_token", "redirect_url"]), window.__isAutoCloseApp = !1, window.location.replace(decodeURIComponent(t)), v();
+    return Ye(["code", "state", "kingdee_token", "redirect_url"]), t && (window.__isAutoCloseApp = !1, window.location.replace(decodeURIComponent(t))), v();
   et = e, Ye(["code", "state", "kingdee_token", "redirect_url"]);
   let r = {};
   const o = {
@@ -1992,7 +1992,7 @@ const Br = async () => {
   } catch {
     return z({ ...F, redirect_uri: $ });
   }
-}, H = ee(!1), po = async (e) => {
+}, H = ee(!1), fo = async (e) => {
   if (e.public) return "";
   if (Lt.value) return z({ ...F, redirect_uri: $ });
   if (H.value)
@@ -2013,15 +2013,15 @@ const Br = async () => {
   let r = v();
   H.value = !0;
   try {
-    typeof t == "number" && t > 0 && +/* @__PURE__ */ new Date() + 6e4 > t && (r = await Hr(F)), r = await Br(), H.value = !1;
+    typeof t == "number" && t > 0 && +/* @__PURE__ */ new Date() + 6e4 > t && (r = await qr(F)), r = await Ir(), H.value = !1;
   } catch {
     H.value = !1;
   }
   return r;
-}, jr = () => {
+}, Br = () => {
   let e = !1;
   return localStorage.getItem("thirdLogouSource") === "zhongshen" && (e = !0), e;
-}, qr = (e) => {
+}, jr = (e) => {
   if (localStorage.getItem("thirdLogouSource") === "zhongshen") {
     const r = `https://iam.shenyejituan.com:443/idp/profile/OAUTH2/Redirect/GLO?redirctToUrl=${encodeURIComponent(e)}&entityId=AIoT&redirectToLogin=true`;
     localStorage.removeItem("thirdLogouSource"), location.href = r;
@@ -2032,8 +2032,8 @@ const Br = async () => {
   if (Re) return Re(e);
   e.logout = "true", n && (e.locale = "locale");
   const r = Object.keys(e).filter((s) => s !== "client_secret").map((s) => `${s}=${e[s]}`).join("&"), o = `${t}${I.oauth}?${r}`;
-  if (localStorage.removeItem("idelTime"), sessionStorage.clear(), J().remove(), jr())
-    qr(o);
+  if (localStorage.removeItem("idelTime"), sessionStorage.clear(), J().remove(), Br())
+    jr(o);
   else {
     try {
       b.create().get(I.logoutCurpage, { baseURL: t });
@@ -2043,7 +2043,7 @@ const Br = async () => {
   }
 };
 vr(z);
-const Hr = async (e) => {
+const qr = async (e) => {
   const { baseURL: t } = Oe(), { refreshToken: n } = J().getData();
   try {
     await b.create().get(I.token, { baseURL: t });
@@ -2081,10 +2081,13 @@ const Hr = async (e) => {
     refreshToken: ue("refreshToken")
   }),
   save: (e) => {
-    Bt(e.accessToken ?? "", {
-      accessTokenExpiredAt: e.accessTokenExpiredAt,
-      refreshToken: e.refreshToken
-    }), qt(e);
+    Bt(
+      e.accessToken || "",
+      {
+        accessTokenExpiredAt: e.accessTokenExpiredAt,
+        refreshToken: e.refreshToken
+      }
+    ), qt(e);
   },
   remove: () => {
     It(), jt();
@@ -2092,8 +2095,8 @@ const Hr = async (e) => {
 });
 export {
   Y as getQuery,
-  po as getToken,
-  Br as getTokenFromCode,
+  fo as getToken,
+  Ir as getTokenFromCode,
   F as getTokenParams,
   z as login,
   $ as real_uri,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "7.0.4-test.3",
+  "version": "7.0.5-test.1",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/utils": "7.0.4-test.3",
+    "@das-fed/utils": "7.0.5-test.1",
     "@vue/shared": "^3.4.21",
     "@vueuse/core": "^9.6.0",
     "axios": "^1.6.7",
@@ -21,8 +21,8 @@
     "vue": "^3.4.21"
   },
   "devDependencies": {
-    "@das-fed/cli": "7.0.4-test.3",
-    "@das-fed/web": "7.0.4-test.3",
+    "@das-fed/cli": "7.0.5-test.1",
+    "@das-fed/web": "7.0.5-test.1",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",

package/vue/hooks/use-model-value/index.d.ts

@@ -1,9 +1,5 @@
 import { Ref } from 'vue';
 
 /** 简化组件内使用modelValue时的watch过程 */
-declare const useModelValue: (
-/** 组件的props */
-props: any, 
-/** 组件props需要使用modelValue的key */
-propKey: string) => Ref;
+declare const useModelValue: (props: any, propKey: string) => Ref;
 export { useModelValue };