@das-fed/utils 6.4.0-hot.6 → 6.4.0-hot.60

package/curring-http/type.d.ts

@@ -1,89 +1,89 @@
 import { AxiosInstance, AxiosRequestConfig, AxiosError } from 'axios';
 import { Ref } from 'vue';
-
-
-/** 请求工具配置项 */
-export type CurringConfig = AxiosRequestConfig & {
-  /** 请求实例 */
-  axiosInstance?: AxiosInstance
-
-  /** 请求方法 */
-  method?: Method
-
-  /** 请求的body数据 */
-  data?: any
-
-  /** 请求的query数据 */
-  params?: any
-
-  /** 接口地址前缀 */
-  urlPrefix?: string
-
-  /** 标记为公共接口，不需要鉴权，默认为false */
-  public?: boolean
-
-  /** 请求成功执行的回调 */
-  onSuccess?: (res: any, config: CurringConfig) => Promise<any>
-
-  /** 请求失败执行的回调 */
-  onError?: (error: any, config: CurringConfig) => Promise<any>
-
-  /** 自定义处理请求失败执行的回调 */
-  onCustomError?: (error: any, config: CurringConfig) => Promise<any>
-
-  /** 不管请求成功或失败都会执行的回调 */
-  finally?: (config: CurringConfig) => any
-
-  /** 每次请求之前都会执行的函数 */
-  beforeRun?: (config: CurringConfig) => Promise<CurringConfig>
-
-  /** 自定义错误信息 */
-  customErrorMessage?: (
-    /** 原始错误信息 */
-    message: string,
-
-    /** 原始错误对象 */
-    error: any,
-  ) => string | null | undefined
-
-  /** 忽略错误提示 */
-  ignoreErrorMessage?: boolean
-
-  /** 接口401是否重定向到登录页 */
-  noRedireLogin?: boolean
-
-  /** 开启CSRF安全选项 */
-  csrf?: boolean
-}
-
-export type Method = 'get' | 'post' | 'put' | 'delete' | 'patch'
-
-export type CurringConfigFun = (config: CurringConfig) => CurringConfig | Promise<CurringConfig>
-
-export type CurringRes = {
-  /** 请求时返回的接口数据 */
-  data: Ref<any>
-
-  /** 请求时的错误信息 */
-  error: Ref<any>
-
-  /** 请求时的loading */
-  loading: Ref<boolean>
-
-  /** 发起请求 返回格式 [ error, data ] */
-  run: (payload?: any, config?: CurringConfig) => CurringRunRes
-
-  /** 取消请求控制器 */
-  abortController: Ref<AbortController | null>
-}
-
-/** 返回为数组 [error, data], 请求成功error为null，请求失败data为null */
-export type CurringRunRes = Promise<
-  [
-    /** 请求返回的错误信息，请求成功时为null，请求失败时为错误信息 */
-    error: { code: string | number; msg: string; error: AxiosError } | null,
-
-    /** 请求返回的接口数据，请求成功时为后端数据，请求失败时为null */
-    data: any | null,
-  ]
->
+
+
+/** 请求工具配置项 */
+export type CurringConfig = AxiosRequestConfig & {
+  /** 请求实例 */
+  axiosInstance?: AxiosInstance
+
+  /** 请求方法 */
+  method?: Method
+
+  /** 请求的body数据 */
+  data?: any
+
+  /** 请求的query数据 */
+  params?: any
+
+  /** 接口地址前缀 */
+  urlPrefix?: string
+
+  /** 标记为公共接口，不需要鉴权，默认为false */
+  public?: boolean
+
+  /** 请求成功执行的回调 */
+  onSuccess?: (res: any, config: CurringConfig) => Promise<any>
+
+  /** 请求失败执行的回调 */
+  onError?: (error: any, config: CurringConfig) => Promise<any>
+
+  /** 自定义处理请求失败执行的回调 */
+  onCustomError?: (error: any, config: CurringConfig) => Promise<any>
+
+  /** 不管请求成功或失败都会执行的回调 */
+  finally?: (config: CurringConfig) => any
+
+  /** 每次请求之前都会执行的函数 */
+  beforeRun?: (config: CurringConfig) => Promise<CurringConfig>
+
+  /** 自定义错误信息 */
+  customErrorMessage?: (
+    /** 原始错误信息 */
+    message: string,
+
+    /** 原始错误对象 */
+    error: any,
+  ) => string | null | undefined
+
+  /** 忽略错误提示 */
+  ignoreErrorMessage?: boolean
+
+  /** 接口401是否重定向到登录页 */
+  noRedireLogin?: boolean
+
+  /** 开启CSRF安全选项 */
+  csrf?: boolean
+}
+
+export type Method = 'get' | 'post' | 'put' | 'delete' | 'patch'
+
+export type CurringConfigFun = (config: CurringConfig) => CurringConfig | Promise<CurringConfig>
+
+export type CurringRes = {
+  /** 请求时返回的接口数据 */
+  data: Ref<any>
+
+  /** 请求时的错误信息 */
+  error: Ref<any>
+
+  /** 请求时的loading */
+  loading: Ref<boolean>
+
+  /** 发起请求 返回格式 [ error, data ] */
+  run: (payload?: any, config?: CurringConfig) => CurringRunRes
+
+  /** 取消请求控制器 */
+  abortController: Ref<AbortController | null>
+}
+
+/** 返回为数组 [error, data], 请求成功error为null，请求失败data为null */
+export type CurringRunRes = Promise<
+  [
+    /** 请求返回的错误信息，请求成功时为null，请求失败时为错误信息 */
+    error: { code: string | number; msg: string; error: AxiosError } | null,
+
+    /** 请求返回的接口数据，请求成功时为后端数据，请求失败时为null */
+    data: any | null,
+  ]
+>

package/directive/hoverInside/index.d.ts

@@ -1,6 +1,6 @@
 import { Directive } from 'vue';
 
 /**
- * 指令：鼠标移入移除dom事件
+ * 指令：鼠标移入移出dom事件
  */
 export declare const vHoverInside: Directive<HTMLElement>;

package/dom-check-in/index.js

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

package/dom-watcher/index.d.ts

@@ -5,7 +5,7 @@ interface Config {
     attributes?: boolean;
     /** 要监视的特定属性名称的数组，如果未包含此属性，则对所有属性的更改都会触发变动通知； */
     attributeFilter?: any[];
-    /** 	在attributes属性已经设为true的前提下, 将发生变化的属性节点之前的属性值记录下来(记录在MutationRecord对象的oldValue属性中)； */
+    /** 在attributes属性已经设为true的前提下, 将发生变化的属性节点之前的属性值记录下来(记录在MutationRecord对象的oldValue属性中)； */
     attributeOldValue?: boolean;
     /** 在characterData属性已经设为true的前提下，将发生变化characterData节点之前的文本内容记录下来(记录在MutationRecord对象的oldValue属性中)； */
     characterDataOldValue?: boolean;

package/esm-map.json

@@ -112,7 +112,6 @@
   "getAccessTokenInfo": "/token-tools/index",
   "setAccessToken": "/token-tools/index",
   "removeAccessToken": "/token-tools/index",
-  "clearAllCookies": "/token-tools/index",
   "socketService": "/webSocket-service/index",
   "getTokenFromQuery": "/common-info/getInfoFromUrl/index",
   "getProjectInfoFromQuery": "/common-info/getInfoFromUrl/index",
@@ -135,5 +134,13 @@
   "useAntvX6": "/dimple-canvas/use-dimple-canvas/core/antv-x6/index",
   "addObject": "/dimple-canvas/use-dimple-canvas/core/konva/utils/add-object/index",
   "useKonva": "/dimple-canvas/use-dimple-canvas/core/konva/index",
-  "setShowWatermark": "/common-tools/platform-tools/index"
+  "setShowWatermark": "/common-tools/platform-tools/index",
+  "extractFilename": "/common-tools/extract-file-name/index",
+  "setBrowseTitle": "/common-tools/update-browser-title/index",
+  "getPersonalConfig": "/common-info/index",
+  "getProjectMessage": "/common-info/index",
+  "analyApi": "/api-services/modules/iot/index",
+  "calcTextWidth": "/common-tools/calc-text-width/index",
+  "getFileExtension": "/common-tools/get-file-extension/index",
+  "getLanguages": "/common-info/index"
 }

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": "6.4.0-hot.6",
+  "version": "6.4.0-hot.60",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/utils": "6.4.0-hot.6",
+    "@das-fed/utils": "6.4.0-hot.60",
     "@vue/shared": "^3.4.21",
     "@vueuse/core": "^9.6.0",
     "axios": "^1.6.7",
@@ -21,7 +21,8 @@
     "vue": "^3.4.21"
   },
   "devDependencies": {
-    "@das-fed/cli": "6.4.0-hot.6",
+    "@das-fed/cli": "6.4.0-hot.60",
+    "@das-fed/web": "6.4.0-hot.60",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",