@das-fed/utils 1.0.8 → 6.3.0-beta.0

package/dimple-canvas/use-dimple-canvas/core/konva/utils/remove-object.d.ts

@@ -1,3 +1,4 @@
-import type { Canvas } from '@das-fed/utils/dimple-canvas/use-dimple-canvas/core/type';
+import { Canvas } from '@das-fed/utils/dimple-canvas/use-dimple-canvas/core/type';
+
 declare const removeObject: (canvas: Canvas | null | undefined, key: string) => void;
 export { removeObject };

package/dimple-canvas/use-dimple-canvas/core/konva/utils/transform-axis.d.ts

@@ -1,8 +1,9 @@
-import type { Canvas } from '@das-fed/utils/dimple-canvas/use-dimple-canvas/core/type';
+import { Canvas } from '@das-fed/utils/dimple-canvas/use-dimple-canvas/core/type';
+
 declare const transformAxis: (containerEl: HTMLDivElement, canvas: Canvas | null | undefined, coordinate: {
-    [key: string]: any;
     x: number;
     y: number;
+    [key: string]: any;
 }) => {
     x: number;
     y: number;

package/dimple-canvas/use-dimple-canvas/core/konva/utils/transformer.d.ts

@@ -1,4 +1,5 @@
-import type { Canvas, Layer } from '@das-fed/utils/dimple-canvas/use-dimple-canvas/core/type';
+import { Canvas, Layer } from '@das-fed/utils/dimple-canvas/use-dimple-canvas/core/type';
+
 declare const initTransformer: (canvas?: Canvas | null, layer?: Layer | null) => any;
 declare const removeTransformer: () => void;
 export { initTransformer, removeTransformer };

package/dimple-canvas/use-dimple-canvas/index.d.ts

@@ -1,8 +1,9 @@
 import { useKonva, Konva } from '@das-fed/utils/dimple-canvas/use-dimple-canvas/core/konva';
 import { useAntvX6, Graph } from '@das-fed/utils/dimple-canvas/use-dimple-canvas/core/antv-x6';
+
 type HookTypeMap = {
     konva: ReturnType<typeof useKonva>;
     'antv-x6': ReturnType<typeof useAntvX6>;
 };
-declare const useDimpleCanvas: <T extends "konva" | "antv-x6" = "konva">(core?: T, initOptions?: Graph.Options) => T extends "antv-x6" ? any : any;
+declare const useDimpleCanvas: <T extends "konva" | "antv-x6" = "konva">(core?: T, initOptions?: Graph.Options) => T extends 'antv-x6' ? HookTypeMap['antv-x6'] : HookTypeMap['konva'];
 export { useDimpleCanvas, Konva, Graph };

package/directive/auth.js

@@ -1,6 +1,6 @@
-import { getUrlParams as g, flatTree as P } from "@das-fed/utils/common-tools";
-import { getSubApps as v, getPageAuth as i } from "@das-fed/utils/common-info";
-import { getEl as o } from "@das-fed/utils/directive/utils";
+import { getUrlParams as i, flatTree as P } from "@das-fed/utils/common-tools";
+import { getSubApps as v, getPageAuth as o } from "@das-fed/utils/common-info";
+import { getEl as h } from "@das-fed/utils/directive/utils";
 const A = (e, t) => {
   if (!e || !t)
     return !1;
@@ -15,46 +15,46 @@ const A = (e, t) => {
       }
     return r;
   }
-}, h = (e) => {
-  var d;
-  const t = (e == null ? void 0 : e.code) ?? "", r = (e == null ? void 0 : e.path) ?? location.pathname, s = (e == null ? void 0 : e.applicationCode) ?? "";
+}, m = (e) => {
+  var n;
+  const t = (e == null ? void 0 : e.code) ?? "", r = (e == null ? void 0 : e.path) ?? (location == null ? void 0 : location.pathname) ?? "", s = (e == null ? void 0 : e.applicationCode) ?? i(location.href, "app");
   let l = "";
-  if (l = e != null && e.menuCode ? e.menuCode : g(location.href, "menu"), !l) {
-    const c = ((d = v().currentSubApp) == null ? void 0 : d.menus) ?? [];
+  if (l = e != null && e.menuCode ? e.menuCode : i(location.href, "menu"), !l) {
+    const c = ((n = v().currentSubApp) == null ? void 0 : n.menus) ?? [];
     if (c && c.length) {
-      const n = P(c).filter((f) => f == null ? void 0 : f.routeUrl);
-      if (n && n.length) {
-        const f = n.find((u) => u != null && u.applicationPath ? r == null ? void 0 : r.includes("/" + u.applicationPath + u.routeUrl) : r == null ? void 0 : r.includes(u.routeUrl));
+      const d = P(c).filter((f) => f == null ? void 0 : f.routeUrl);
+      if (d && d.length) {
+        const f = d.find((u) => u != null && u.applicationPath ? r == null ? void 0 : r.includes("/" + u.applicationPath + u.routeUrl) : r == null ? void 0 : r.includes(u.routeUrl));
         f && (l = (f == null ? void 0 : f.code) ?? "");
       }
     }
   }
   let a = !1;
   if (t) {
-    const c = i(l, s) ?? [];
+    const c = o(l, s) ?? [];
     a = A(c, t);
   } else
-    a = !!i(l, s);
+    a = !!o(l, s);
   return a;
-}, m = (e, t) => {
+}, g = (e, t) => {
   t === "hide" ? e.classList.add("is-hide") : (e.setAttribute("disabled", ""), e.classList.add("is-disabled"));
 }, b = (e, t) => {
   t === "hide" ? e.classList.remove("is-hide") : (e.removeAttribute("disabled"), e.classList.remove("is-disabled"));
 }, U = (e, t) => {
   let r = (e ? t.value : t) || {};
   typeof r == "string" && (r = { code: r });
-  const s = (r == null ? void 0 : r.type) ?? "hide", l = h(r);
+  const s = (r == null ? void 0 : r.type) ?? "hide", l = m(r);
   if (e)
     if (!t.oldValue)
-      l || o(e, r).then((a) => {
-        m(a, s);
+      l || h(e, r).then((a) => {
+        g(a, s);
       });
     else {
-      const a = h(t.oldValue), d = l;
-      if (a === d)
+      const a = m(t.oldValue), n = l;
+      if (a === n)
         return;
-      o(e, r).then((c) => {
-        d ? b(c, s) : m(c, s);
+      h(e, r).then((c) => {
+        n ? b(c, s) : g(c, s);
       });
     }
   return l;

package/directive/clickOutside.d.ts

@@ -1,5 +1,6 @@
-import type { Directive } from 'vue';
+import { Directive } from 'vue';
+
 /**
- * 指令：点击当前区域或者指定区域之外的位置
+ * 点击当前区域或者指定区域之外的位置
  */
 export declare const vClickOutside: Directive<HTMLElement>;

package/directive/hoverInside.d.ts

@@ -1,4 +1,5 @@
-import type { Directive } from 'vue';
+import { Directive } from 'vue';
+
 /**
  * 指令：鼠标移入移除dom事件
  */

package/dom-check-in/index.js

@@ -1,8 +1,8 @@
-const g = (e) => {
-  const t = window.event;
-  let n = Number(t.clientX), i = Number(t.clientY), l = Number(e.getBoundingClientRect().left), u = Number(e.getBoundingClientRect().left + e.clientWidth), r = Number(e.getBoundingClientRect().top), c = Number(e.getBoundingClientRect().top + e.clientHeight);
-  return n > l && n < u && i > r && i < c;
+const o = (e) => {
+  const r = window.event;
+  let t = Number(r.clientX), n = Number(r.clientY), i = Number(e.getBoundingClientRect().left), u = Number(i + e.clientWidth), l = Number(e.getBoundingClientRect().top), c = Number(l + e.clientHeight);
+  return console.log(t, i, u, n, l, c), t > i && t < u && n > l && n < c;
 };
 export {
-  g as domCheckIn
+  o as domCheckIn
 };

package/hooks/popup-manager/use-zindex.js

@@ -1,15 +1,15 @@
 import { ref as I, getCurrentInstance as u, inject as s, computed as e, unref as i } from "vue";
-const Z = (n) => typeof n == "number", d = I(0), l = 2e3, a = Symbol("zIndexContextKey"), m = (n) => {
-  const t = n || (u() ? s(a, void 0) : void 0), r = e(() => {
-    const c = i(t);
-    return Z(c) ? c : l;
-  }), x = e(() => r.value + d.value);
+const Z = (n) => typeof n == "number", c = I(0), l = 2e3, a = Symbol("zIndexContextKey"), v = (n) => {
+  const t = u() ? s(a, void 0) : void 0, r = e(() => {
+    const d = i(t);
+    return Z(d) ? d : l;
+  }), x = e(() => r.value + c.value);
   return {
     initialZIndex: r,
     currentZIndex: x,
-    nextZIndex: () => (d.value++, x.value)
+    nextZIndex: () => (c.value++, x.value)
   };
-}, o = m(), z = () => {
+}, o = v(), f = () => {
   const n = e(() => o.initialZIndex.value), t = e(() => o.currentZIndex.value);
   return {
     initialZIndex: n,
@@ -18,5 +18,5 @@ const Z = (n) => typeof n == "number", d = I(0), l = 2e3, a = Symbol("zIndexCont
   };
 };
 export {
-  z as useZIndex
+  f as useZIndex
 };

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

@@ -0,0 +1,4 @@
+export declare const appcategory: any;
+export declare const superadminAppcategory: any;
+export declare const enterpriserightQueryportalmenu: any;
+export declare const superadminQuerymenu: any;

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

@@ -0,0 +1,8 @@
+import { portal as r, superadminPortal as e, enterpriseright as t } from "@das-fed/utils/api-services/modules";
+const o = r.get("/appcategory"), a = e.get("/appcategory"), n = t.get("/permissionset/user-portal-menu"), s = e.get("/user-menu");
+export {
+  o as appcategory,
+  n as enterpriserightQueryportalmenu,
+  a as superadminAppcategory,
+  s as superadminQuerymenu
+};

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

@@ -0,0 +1,9 @@
+export declare const useGetAuth: () => {
+    getApplication: (code?: string, appName?: 'superadmin' | 'enterpriseadmin') => Promise<any>;
+    getMenu: (code: string, menuCode?: string, path?: string, appName?: 'superadmin' | 'enterpriseadmin') => Promise<any>;
+    getAuth: (options: {
+        applicationCode: string;
+        menuCode: string;
+        code: string;
+    }, appName?: 'superadmin' | 'enterpriseadmin') => Promise<any>;
+};

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

@@ -0,0 +1,57 @@
+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 = () => {
+  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 = {
+      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)
+      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;
+    if (i)
+      u = p.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);
+    }
+    return u;
+  };
+  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 });
+      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) => {
+        let c = (u == null ? void 0 : u.originalCode) ?? u.code;
+        return c.includes(s + ".") && (c = c.replace(s + ".", "").replaceAll(".", "-")), c === a;
+      });
+    }
+  };
+};
+export {
+  k as useGetAuth
+};

package/nextTiken/index.d.ts

@@ -1,13 +1,12 @@
-import type { PersonalInfo, TenantInfo } from '@das-fed/utils/common-info/type';
+import { PersonalInfo, TenantInfo } from '@das-fed/utils/common-info/type';
+
 /** 等待获取到token */
 export declare const tokenNextTick_1: () => Promise<string>;
 /** 等待获取到projectId */
-export declare const projectNextTick: () => Promise<string>;
+export declare const projectNextTick: () => Promise<string | number>;
 /** 等待获取到token和projectId */
 export declare const tokenNextTick: () => Promise<boolean>;
 /** 等待获取到userInfo */
 export declare const userInfoNextTick: () => Promise<PersonalInfo>;
 /** 等待获取到租户信息 */
 export declare const tenantInfoNextTick: () => Promise<TenantInfo>;
-/** 等待获取到默认页配置 */
-export declare const defaultInfoNextTick: () => Promise<any>;

package/nextTiken/index.js

@@ -1,62 +1,50 @@
-import { getToken as s, getProjectInfo as r, getPersonalInfo as i, getTenantInfo as u } from "@das-fed/utils/common-info";
+import { getToken as r, getProjectInfo as c, getPersonalInfo as s, getTenantInfo as i } from "@das-fed/utils/common-info";
 const k = () => new Promise((n) => {
-  const t = () => {
-    const e = s();
-    if (e)
-      return n(e);
-    setTimeout(() => t(), 50);
+  const e = () => {
+    const t = r();
+    if (t)
+      return n(t);
+    setTimeout(() => e(), 50);
   };
-  t();
+  e();
 }), m = () => new Promise((n) => {
-  const t = () => {
-    var o;
-    const e = ((o = r()) == null ? void 0 : o.id) ?? "";
-    if (e)
-      return n(e);
-    setTimeout(() => t(), 50);
+  const e = () => {
+    const t = c().id ? c().id : "";
+    if (t)
+      return n(t);
+    setTimeout(() => e(), 50);
   };
-  t();
+  e();
 }), T = () => new Promise((n) => {
-  const t = () => {
-    var c;
-    const e = s(), o = ((c = r()) == null ? void 0 : c.id) ?? "";
-    if (e && o)
+  const e = () => {
+    const t = r(), o = c().id ? c().id : "";
+    if (t && o)
       return n(!0);
-    setTimeout(() => t(), 50);
+    setTimeout(() => e(), 50);
   };
-  t();
-}), I = () => new Promise((n) => {
-  const t = () => {
-    const e = i();
-    if (e != null && e.id)
-      return n(e);
-    setTimeout(() => t(), 50);
+  e();
+}), f = () => new Promise((n) => {
+  const e = () => {
+    const t = s();
+    if (t != null && t.id)
+      return n(t);
+    setTimeout(() => e(), 50);
   };
-  t();
-}), P = () => new Promise((n) => {
-  const t = () => {
+  e();
+}), d = () => new Promise((n) => {
+  const e = () => {
     var o;
-    const e = u();
-    if ((o = e == null ? void 0 : e.tenant) != null && o.id)
-      return n(e);
-    setTimeout(() => t(), 50);
-  };
-  t();
-}), g = () => new Promise((n) => {
-  const t = () => {
-    var o, c;
-    const e = JSON.parse(sessionStorage.getItem("home-config") || "{}");
-    if (e != null && e.info && ((o = r()) == null ? void 0 : o.id) === ((c = e == null ? void 0 : e.info) == null ? void 0 : c.projectId))
-      return n(e.info);
-    setTimeout(() => t(), 50);
+    const t = i();
+    if ((o = t == null ? void 0 : t.tenant) != null && o.id)
+      return n(t);
+    setTimeout(() => e(), 50);
   };
-  t();
+  e();
 });
 export {
-  g as defaultInfoNextTick,
   m as projectNextTick,
-  P as tenantInfoNextTick,
+  d as tenantInfoNextTick,
   T as tokenNextTick,
   k as tokenNextTick_1,
-  I as userInfoNextTick
+  f as userInfoNextTick
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "1.0.8",
+  "version": "6.3.0-beta.0",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,9 +9,9 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/ui": "1.1.3",
-    "@das-fed/utils": "1.0.8",
+    "@das-fed/utils": "workspace:^",
     "@vue/shared": "^3.4.21",
+    "@vueuse/core": "^9.6.0",
     "axios": "^1.6.7",
     "dayjs": "^1.11.10",
     "konva": "^9.3.6",
@@ -21,8 +21,9 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.0.4",
-    "consola": "^3.2.3",
+    "@vitejs/plugin-vue-jsx": "^3.1.0",
     "ant-design-vue": "3.2.20",
+    "consola": "^3.2.3",
     "element-plus": "2.4.2",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",