@das-fed/utils 6.4.0-dev.2 → 6.4.0-dev.21

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/esm-map.json

@@ -134,5 +134,6 @@
   "Graph": "/dimple-canvas/use-dimple-canvas/core/antv-x6/index",
   "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"
+  "useKonva": "/dimple-canvas/use-dimple-canvas/core/konva/index",
+  "setShowWatermark": "/common-tools/platform-tools/index"
 }

package/hooks/popup-manager/use-zindex/index.d.ts

@@ -1,5 +1,3 @@
 export declare const useZIndex: () => {
-    initialZIndex: any;
-    currentZIndex: any;
     nextZIndex: () => any;
 };

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

@@ -1,22 +1,9 @@
-import { ref as I, getCurrentInstance as u, inject as s, computed as e, unref as i } from "vue";
-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: () => (c.value++, x.value)
-  };
-}, o = v(), f = () => {
-  const n = e(() => o.initialZIndex.value), t = e(() => o.currentZIndex.value);
-  return {
-    initialZIndex: n,
-    currentZIndex: t,
-    nextZIndex: () => o.nextZIndex()
-  };
-};
+const n = () => [...document.body.querySelectorAll("*")].reduce(
+  (e, t) => Math.max(e, +window.getComputedStyle(t).zIndex || 0),
+  0
+), d = () => ({
+  nextZIndex: () => n() + 1
+});
 export {
-  f as useZIndex
+  d as useZIndex
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "6.4.0-dev.2",
+  "version": "6.4.0-dev.21",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/utils": "6.4.0-dev.2",
+    "@das-fed/utils": "6.4.0-dev.21",
     "@vue/shared": "^3.4.21",
     "@vueuse/core": "^9.6.0",
     "axios": "^1.6.7",
@@ -21,7 +21,7 @@
     "vue": "^3.4.21"
   },
   "devDependencies": {
-    "@das-fed/cli": "6.4.0-dev.2",
+    "@das-fed/cli": "6.4.0-dev.21",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",
@@ -29,7 +29,6 @@
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "ant-design-vue": "3.2.20",
     "consola": "^3.2.3",
-    "element-plus": "2.4.2",
     "execa": "^9.3.0",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",