@das-fed/utils 7.0.2-beta.1 → 7.0.2-beta.3

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

@@ -2023,7 +2023,7 @@ const Ir = async () => {
   return localStorage.getItem("thirdLogouSource") === "zhongshen" && (e = !0), e;
 }, jr = (e) => {
   if (localStorage.getItem("thirdLogouSource") === "zhongshen") {
-    const r = `https://iam.shenyejituan.com:6443/idp/profile/OAUTH2/Redirect/GLO?redirctToUrl=${encodeURIComponent(e)}&entityId=AIoT&redirectToLogin=true`;
+    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;
   }
 }, z = (e) => {

package/hooks/use-get-auth/index.d.ts

@@ -1,6 +1,6 @@
 export declare const useGetAuth: () => {
     getApplication: (code?: string, appName?: "superadmin" | "enterpriseadmin") => unknown;
-    getMenu: (code: string, menuCode?: string, path?: string, appName?: "superadmin" | "enterpriseadmin") => unknown;
+    getMenu: (code: string, menuCode?: string | null, path?: string | null, appName?: "superadmin" | "enterpriseadmin", ignorePath?: boolean) => unknown;
     getAuth: (options: {
         applicationCode: string;
         menuCode: string;

package/hooks/use-get-auth/index.js

@@ -1,53 +1,53 @@
-import { flatTree as w } from "@das-fed/utils/common-tools";
-import { projectNextTick as A } from "@das-fed/utils/nextTiken";
-import { vAuth as M } from "@das-fed/utils/directive/auth";
-import { portal as T, superadminPortal as y, enterpriseright as U } from "@das-fed/utils/api-services/modules";
-const v = T.get("/appcategory"), B = y.get("/appcategory"), C = U.get("/permissionset/user-portal-menu"), L = y.get("/user-menu"), k = () => {
+import { flatTree as M } from "@das-fed/utils/common-tools";
+import { projectNextTick as y } from "@das-fed/utils/nextTiken";
+import { vAuth as T } from "@das-fed/utils/directive/auth";
+import { portal as U, superadminPortal as w, enterpriseright as v } from "@das-fed/utils/api-services/modules";
+const B = U.get("/appcategory"), C = w.get("/appcategory"), L = v.get("/permissionset/user-portal-menu"), P = w.get("/user-menu"), G = () => {
   const d = async (r, i = "enterpriseadmin") => {
     let t = null, s = {};
-    await A(), i === "superadmin" ? t = B().run : (s = { userType: 1 }, t = v().run);
-    const [a, l] = await t(s);
-    if (a || !l || !l.length) return null;
-    const f = l.map((o) => o.apps).flat();
-    return r ? f.find((o) => o.code === r) : f;
-  }, g = async (r, i, t, s = "enterpriseadmin") => {
-    var c;
-    await A();
-    let a = null, l = {
+    await y(), i === "superadmin" ? t = C().run : (s = { userType: 1 }, t = B().run);
+    const [o, l] = await t(s);
+    if (o || !l || !l.length) return null;
+    const p = l.map((e) => e.apps).flat();
+    return r ? p.find((e) => e.code === r) : p;
+  }, g = async (r, i, t, s = "enterpriseadmin", o = !1) => {
+    var h;
+    await y();
+    let l = null, p = {
       code: r,
       showBtn: !0
     };
-    s === "superadmin" ? a = L().run : (l.userType = 1, a = C().run);
-    const [f, e] = await a(l);
-    if (f || !e || !e.length)
+    s === "superadmin" ? l = P().run : (p.userType = 1, l = L().run);
+    const [a, e] = await l(p);
+    if (a || !e || !e.length)
       return i || t ? void 0 : [];
     if (!i && !t) return e;
-    const o = e != null && e.length ? e.filter((n) => n.routeUrl) : [], m = e != null && e.length ? e.filter((n) => !n.routeUrl && n.children).map((n) => n.children).flat() : [], p = [...o, ...m];
-    let u;
+    const m = e != null && e.length ? o ? e : e.filter((n) => n.routeUrl) : [], f = e != null && e.length ? e.filter((n) => !n.routeUrl && n.children).map((n) => n.children).flat() : [], u = [...m, ...f];
+    let c;
     if (i)
-      u = p.find((n) => n.code === i || n.originalCode === i);
+      c = u.find((n) => n.code === i || n.originalCode === i);
     else if (t) {
-      const n = t.replace(((c = p[0]) == null ? void 0 : c.applicationPath) ?? "", "").replace(/\/\//g, "/");
-      u = p.find((h) => h.routeUrl && h.routeUrl === n);
+      const n = t.replace(((h = u[0]) == null ? void 0 : h.applicationPath) ?? "", "").replace(/\/\//g, "/");
+      c = u.find((A) => A.routeUrl && A.routeUrl === n);
     }
-    return u;
+    return c;
   };
   return {
     getApplication: d,
     getMenu: g,
     getAuth: async (r, i = "enterpriseadmin") => {
-      var p;
-      const t = (r == null ? void 0 : r.applicationCode) ?? "", s = (r == null ? void 0 : r.menuCode) ?? "", a = (r == null ? void 0 : r.code) ?? "";
-      if (JSON.parse(sessionStorage.getItem("permission-btn") || "{}")[s]) return M(null, { applicationCode: t, menuCode: s, code: a });
+      var f;
+      const t = (r == null ? void 0 : r.applicationCode) ?? "", s = (r == null ? void 0 : r.menuCode) ?? "", o = (r == null ? void 0 : r.code) ?? "";
+      if (JSON.parse(sessionStorage.getItem("permission-btn") || "{}")[s]) return T(null, { applicationCode: t, menuCode: s, code: o });
       if (!await d(t, i)) return !1;
-      const e = await g(t, s, i);
-      return !e || !(e != null && e.children) || !((p = e.children) != null && p.length) ? !1 : !!w(e.children).find((u) => {
+      const a = await g(t, s, i);
+      return !a || !(a != null && a.children) || !((f = a.children) != null && f.length) ? !1 : !!M(a.children).find((u) => {
         let c = (u == null ? void 0 : u.originalCode) ?? u.code;
-        return c.includes(s + ".") && (c = c.replace(s + ".", "").replaceAll(".", "-")), c === a;
+        return c.includes(s + ".") && (c = c.replace(s + ".", "").replaceAll(".", "-")), c === o;
       });
     }
   };
 };
 export {
-  k as useGetAuth
+  G as useGetAuth
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "7.0.2-beta.1",
+  "version": "7.0.2-beta.3",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/utils": "7.0.2-beta.1",
+    "@das-fed/utils": "7.0.2-beta.3",
     "@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.2-beta.1",
-    "@das-fed/web": "7.0.2-beta.1",
+    "@das-fed/cli": "7.0.2-beta.3",
+    "@das-fed/web": "7.0.2-beta.3",
     "@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,5 +1,9 @@
 import { Ref } from 'vue';
 
 /** 简化组件内使用modelValue时的watch过程 */
-declare const useModelValue: (props: any, propKey: string) => Ref;
+declare const useModelValue: (
+/** 组件的props */
+props: any, 
+/** 组件props需要使用modelValue的key */
+propKey: string) => Ref;
 export { useModelValue };