befly-admin 3.11.0 → 3.11.2

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly-admin",
-    "version": "3.11.0",
-    "gitHead": "3a9dc64d2eb69e646f4fd6eebd5d8dbe6516cb69",
+    "version": "3.11.2",
+    "gitHead": "325a7282e0f03b55b77188d4b17f2ad9bd1eb6fd",
     "private": false,
     "description": "Befly Admin - 基于 Vue3 + TDesign Vue Next 的后台管理系统",
     "files": [
@@ -28,10 +28,11 @@
         "preview": "vite preview"
     },
     "dependencies": {
-        "@befly-addon/admin": "^1.7.0",
-        "@iconify-json/lucide": "^1.2.83",
+        "@befly-addon/admin": "^1.7.2",
+        "@iconify-json/lucide": "^1.2.85",
         "axios": "^1.13.2",
-        "befly-vite": "^1.4.4",
+        "befly-shared": "1.4.2",
+        "befly-vite": "^1.4.5",
         "pinia": "^3.0.4",
         "tdesign-vue-next": "^1.18.0",
         "unplugin-vue-router": "^0.19.2",

package/src/layouts/default.vue

@@ -76,7 +76,7 @@
 
 <script setup lang="ts">
 import { DialogPlugin } from "tdesign-vue-next";
-import { arrayToTree } from "@/utils/arrayToTree";
+import { arrayToTree } from "befly-shared/utils/arrayToTree";
 
 const router = useRouter();
 const route = useRoute();

package/src/plugins/http.ts

@@ -1,7 +1,6 @@
 import axios, { AxiosHeaders, type AxiosRequestConfig, type AxiosResponse, type InternalAxiosRequestConfig } from "axios";
+import { cleanParams } from "befly-shared/utils/cleanParams";
 
-import { cleanParams } from "../utils/cleanParams";
-import { getViteEnvString } from "../utils/getViteEnvString";
 import { $Storage } from "./storage";
 
 export type HttpApiResponse<TData> = {
@@ -104,7 +103,7 @@ async function unwrapApiResponse<TData>(promise: Promise<AxiosResponse<HttpApiRe
 
 // 创建 axios 实例
 const request = axios.create({
-    baseURL: getViteEnvString("VITE_API_BASE_URL") || "",
+    baseURL: (import.meta as unknown as { env?: Record<string, string> }).env?.VITE_API_BASE_URL || "",
     timeout: 10000,
     headers: {
         "Content-Type": "application/json"

package/src/plugins/storage.ts

@@ -3,10 +3,8 @@
  * 支持命名空间隔离，统一管理 localStorage 和 sessionStorage
  */
 
-import { getViteEnvString } from "../utils/getViteEnvString";
-
 // 获取命名空间
-const NAMESPACE = getViteEnvString("VITE_STORAGE_NAMESPACE") || "befly";
+const NAMESPACE = (import.meta as unknown as { env?: Record<string, string> }).env?.VITE_STORAGE_NAMESPACE || "befly";
 
 class MemoryStorage implements Storage {
     private map: Map<string, string>;

package/src/types/auto-imports.d.ts

@@ -14,8 +14,8 @@ declare global {
   const EffectScope: typeof import('vue').EffectScope
   const MessagePlugin: typeof import('tdesign-vue-next').MessagePlugin
   const acceptHMRUpdate: typeof import('pinia').acceptHMRUpdate
-  const arrayToTree: typeof import('../utils/arrayToTree').arrayToTree
-  const cleanParams: typeof import('../utils/cleanParams').cleanParams
+  const arrayToTree: typeof import('befly-shared/utils/arrayToTree').arrayToTree
+  const cleanParams: typeof import('befly-shared/utils/cleanParams').cleanParams
   const computed: typeof import('vue').computed
   const createApp: typeof import('vue').createApp
   const createPinia: typeof import('pinia').createPinia
@@ -28,7 +28,6 @@ declare global {
   const getCurrentInstance: typeof import('vue').getCurrentInstance
   const getCurrentScope: typeof import('vue').getCurrentScope
   const getCurrentWatcher: typeof import('vue').getCurrentWatcher
-  const getViteEnvString: typeof import('../utils/getViteEnvString').getViteEnvString
   const h: typeof import('vue').h
   const inject: typeof import('vue').inject
   const isProxy: typeof import('vue').isProxy
@@ -98,9 +97,6 @@ declare global {
   export type { Component, Slot, Slots, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, ShallowRef, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
   import('vue')
   // @ts-ignore
-  export type { ArrayToTreeResult } from '../utils/arrayToTree'
-  import('../utils/arrayToTree')
-  // @ts-ignore
   export type { BeflyAdminConfig } from '../plugins/config'
   import('../plugins/config')
   // @ts-ignore
@@ -120,8 +116,6 @@ declare module 'vue' {
     readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
     readonly MessagePlugin: UnwrapRef<typeof import('tdesign-vue-next')['MessagePlugin']>
     readonly acceptHMRUpdate: UnwrapRef<typeof import('pinia')['acceptHMRUpdate']>
-    readonly arrayToTree: UnwrapRef<typeof import('../utils/arrayToTree')['arrayToTree']>
-    readonly cleanParams: UnwrapRef<typeof import('../utils/cleanParams')['cleanParams']>
     readonly computed: UnwrapRef<typeof import('vue')['computed']>
     readonly createApp: UnwrapRef<typeof import('vue')['createApp']>
     readonly createPinia: UnwrapRef<typeof import('pinia')['createPinia']>
@@ -134,7 +128,6 @@ declare module 'vue' {
     readonly getCurrentInstance: UnwrapRef<typeof import('vue')['getCurrentInstance']>
     readonly getCurrentScope: UnwrapRef<typeof import('vue')['getCurrentScope']>
     readonly getCurrentWatcher: UnwrapRef<typeof import('vue')['getCurrentWatcher']>
-    readonly getViteEnvString: UnwrapRef<typeof import('../utils/getViteEnvString')['getViteEnvString']>
     readonly h: UnwrapRef<typeof import('vue')['h']>
     readonly inject: UnwrapRef<typeof import('vue')['inject']>
     readonly isProxy: UnwrapRef<typeof import('vue')['isProxy']>

package/src/utils/arrayToTree.ts

@@ -1,135 +0,0 @@
-export type ArrayToTreeResult<T extends Record<string, any>> = {
-    flat: Array<T>;
-    tree: Array<T>;
-    map: Map<string, T>;
-};
-
-/**
- * 将一维数组按 { id, pid } 组装为树形结构（纯函数 / 无副作用）。
- *
- * - 默认字段：id / pid / children / sort
- * - pid 为空字符串或父节点不存在时，视为根节点
- * - 内部会 clone 一份节点对象，并写入 children: []
- * - 默认自带递归排序：按 sort 升序；sort 缺省/非法或 < 1 视为 999999；sort 相同按 id 自然序
- */
-export function arrayToTree<T extends Record<string, any>>(items: T[], id: string = "id", pid: string = "pid", children: string = "children", sort: string = "sort"): ArrayToTreeResult<T> {
-    const idKey = typeof id === "string" && id.length > 0 ? id : "id";
-    const pidKey = typeof pid === "string" && pid.length > 0 ? pid : "pid";
-    const childrenKey = typeof children === "string" && children.length > 0 ? children : "children";
-    const sortKey = typeof sort === "string" && sort.length > 0 ? sort : "sort";
-
-    const map = new Map<string, T>();
-    const flat: T[] = [];
-
-    const safeItems = Array.isArray(items) ? items : [];
-
-    const normalizeKey = (value: unknown): string => {
-        if (typeof value === "string") {
-            return value;
-        }
-        if (typeof value === "number" && Number.isFinite(value)) {
-            return String(value);
-        }
-        return "";
-    };
-
-    for (const item of safeItems) {
-        const rawId = item ? (item as any)[idKey] : undefined;
-        const rawPid = item ? (item as any)[pidKey] : undefined;
-
-        const normalizedId = normalizeKey(rawId);
-        const normalizedPid = normalizeKey(rawPid);
-
-        const nextNode = Object.assign({}, item) as T;
-        (nextNode as any)[idKey] = normalizedId;
-        (nextNode as any)[pidKey] = normalizedPid;
-        (nextNode as any)[childrenKey] = [];
-
-        flat.push(nextNode);
-
-        if (normalizedId.length > 0) {
-            map.set(normalizedId, nextNode);
-        }
-    }
-
-    const tree: T[] = [];
-
-    for (const node of flat) {
-        const selfId = normalizeKey(node ? (node as any)[idKey] : undefined);
-        const parentId = normalizeKey(node ? (node as any)[pidKey] : undefined);
-
-        if (parentId.length > 0 && parentId !== selfId) {
-            const parent = map.get(parentId);
-            if (parent && Array.isArray((parent as any)[childrenKey])) {
-                (parent as any)[childrenKey].push(node);
-                continue;
-            }
-        }
-
-        tree.push(node);
-    }
-
-    const collator = new Intl.Collator(undefined, { numeric: true, sensitivity: "base" });
-
-    const getSortValue = (node: T): number => {
-        const raw = node ? (node as any)[sortKey] : undefined;
-        if (typeof raw !== "number") {
-            return 999999;
-        }
-        if (!Number.isFinite(raw)) {
-            return 999999;
-        }
-        if (raw < 1) {
-            return 999999;
-        }
-        return raw;
-    };
-
-    const compareNode = (a: T, b: T): number => {
-        const aSort = getSortValue(a);
-        const bSort = getSortValue(b);
-
-        if (aSort !== bSort) {
-            return aSort - bSort;
-        }
-
-        const aId = a ? (a as any)[idKey] : "";
-        const bId = b ? (b as any)[idKey] : "";
-
-        return collator.compare(typeof aId === "string" ? aId : "", typeof bId === "string" ? bId : "");
-    };
-
-    const sortTreeInPlace = (nodes: Array<T>, seen: WeakSet<object>): void => {
-        if (!Array.isArray(nodes)) {
-            return;
-        }
-
-        if (nodes.length > 1) {
-            nodes.sort(compareNode);
-        }
-
-        for (const node of nodes) {
-            if (typeof node !== "object" || node === null) {
-                continue;
-            }
-
-            if (seen.has(node)) {
-                continue;
-            }
-            seen.add(node);
-
-            const childNodes = (node as any)[childrenKey];
-            if (Array.isArray(childNodes) && childNodes.length > 0) {
-                sortTreeInPlace(childNodes, seen);
-            }
-        }
-    };
-
-    sortTreeInPlace(tree, new WeakSet<object>());
-
-    return {
-        flat: flat,
-        tree: tree,
-        map: map
-    };
-}

package/src/utils/cleanParams.ts

@@ -1,39 +0,0 @@
-export function cleanParams<TData extends Record<string, unknown>>(data: TData, dropValues?: readonly unknown[], dropKeyValue?: Record<string, readonly unknown[]>): Partial<TData> {
-    const globalDropValues = dropValues ?? [];
-    const perKeyDropValues = dropKeyValue ?? {};
-
-    const globalDropSet = new Set<unknown>(globalDropValues);
-
-    const out: Record<string, unknown> = {};
-
-    for (const key of Object.keys(data)) {
-        const value = data[key];
-
-        // 默认强制移除 null / undefined
-        if (value === null || value === undefined) {
-            continue;
-        }
-
-        // 如果该 key 配了规则：以 key 规则为准，不再应用全局 dropValues
-        if (Object.hasOwn(perKeyDropValues, key)) {
-            const keyDropValues = perKeyDropValues[key] ?? [];
-            const keyDropSet = new Set<unknown>(keyDropValues);
-
-            if (keyDropSet.has(value)) {
-                continue;
-            }
-
-            out[key] = value;
-            continue;
-        }
-
-        // 未配置 key 规则：应用全局 dropValues
-        if (globalDropSet.has(value)) {
-            continue;
-        }
-
-        out[key] = value;
-    }
-
-    return out as Partial<TData>;
-}

package/src/utils/getViteEnvString.ts

@@ -1,4 +0,0 @@
-export function getViteEnvString(key: string): string | undefined {
-    const env = (import.meta as unknown as { env?: Record<string, string> }).env;
-    return env?.[key];
-}