@befly-addon/admin 1.7.0 → 1.7.1

package/adminViews/config/dict/index.vue

@@ -83,7 +83,7 @@ import ILucideChevronDown from "~icons/lucide/chevron-down";
 import EditDialog from "./components/edit.vue";
 import DetailPanel from "@/components/DetailPanel.vue";
 import { $Http } from "@/plugins/http";
-import { withDefaultColumns } from "../../../utils/withDefaultColumns";
+import { withDefaultColumns } from "befly-shared/utils/withDefaultColumns";
 
 const $Data = $ref({
     tableData: [],

package/adminViews/config/dictType/index.vue

@@ -80,7 +80,7 @@ import ILucideChevronDown from "~icons/lucide/chevron-down";
 import EditDialog from "./components/edit.vue";
 import DetailPanel from "@/components/DetailPanel.vue";
 import { $Http } from "@/plugins/http";
-import { withDefaultColumns } from "../../../utils/withDefaultColumns";
+import { withDefaultColumns } from "befly-shared/utils/withDefaultColumns";
 
 const $Data = $ref({
     tableData: [],

package/adminViews/config/system/index.vue

@@ -91,7 +91,7 @@ import ILucideChevronDown from "~icons/lucide/chevron-down";
 import EditDialog from "./components/edit.vue";
 import DetailPanel from "@/components/DetailPanel.vue";
 import { $Http } from "@/plugins/http";
-import { withDefaultColumns } from "../../../utils/withDefaultColumns";
+import { withDefaultColumns } from "befly-shared/utils/withDefaultColumns";
 
 // 响应式数据
 const $Data = $ref({

package/adminViews/log/email/index.vue

@@ -90,7 +90,7 @@ import ILucideSend from "~icons/lucide/send";
 import ILucideCheckCircle from "~icons/lucide/check-circle";
 import DetailPanel from "@/components/DetailPanel.vue";
 import { $Http } from "@/plugins/http";
-import { withDefaultColumns } from "../../../utils/withDefaultColumns";
+import { withDefaultColumns } from "befly-shared/utils/withDefaultColumns";
 
 const sendFormRef = $ref(null);
 

package/adminViews/log/login/index.vue

@@ -54,7 +54,7 @@ import { Button as TButton, Table as TTable, Tag as TTag, Pagination as TPaginat
 import ILucideRotateCw from "~icons/lucide/rotate-cw";
 import DetailPanel from "@/components/DetailPanel.vue";
 import { $Http } from "@/plugins/http";
-import { withDefaultColumns } from "../../../utils/withDefaultColumns";
+import { withDefaultColumns } from "befly-shared/utils/withDefaultColumns";
 
 // 响应式数据
 const $Data = $ref({

package/adminViews/log/operate/index.vue

@@ -74,7 +74,7 @@ import { Button as TButton, Table as TTable, Tag as TTag, Pagination as TPaginat
 import ILucideRotateCw from "~icons/lucide/rotate-cw";
 import DetailPanel from "@/components/DetailPanel.vue";
 import { $Http } from "@/plugins/http";
-import { withDefaultColumns } from "../../../utils/withDefaultColumns";
+import { withDefaultColumns } from "befly-shared/utils/withDefaultColumns";
 
 // 响应式数据
 const $Data = $ref({

package/adminViews/login_1/index.vue

@@ -70,7 +70,7 @@ import ILucideUser from "~icons/lucide/user";
 import ILucideLock from "~icons/lucide/lock";
 import { $Http } from "@/plugins/http";
 import { $Storage } from "@/plugins/storage";
-import { hashPassword } from "../../utils/hashPassword";
+import { hashPassword } from "befly-shared/utils/hashPassword";
 
 const router = useRouter();
 

package/adminViews/people/admin/components/edit.vue

@@ -47,8 +47,8 @@ import {
     MessagePlugin
 } from "tdesign-vue-next";
 import { $Http } from "@/plugins/http";
-import { fieldClear } from "../../../../utils/fieldClear";
-import { hashPassword } from "../../../../utils/hashPassword";
+import { fieldClear } from "befly-shared/utils/fieldClear";
+import { hashPassword } from "befly-shared/utils/hashPassword";
 
 const $Prop = defineProps({
     modelValue: {

package/adminViews/people/admin/index.vue

@@ -79,7 +79,7 @@ import ILucideChevronDown from "~icons/lucide/chevron-down";
 import EditDialog from "./components/edit.vue";
 import DetailPanel from "@/components/DetailPanel.vue";
 import { $Http } from "@/plugins/http";
-import { withDefaultColumns } from "../../../utils/withDefaultColumns";
+import { withDefaultColumns } from "befly-shared/utils/withDefaultColumns";
 
 // 响应式数据
 const $Data = $ref({

package/adminViews/permission/api/index.vue

@@ -64,7 +64,7 @@ import ILucideRotateCw from "~icons/lucide/rotate-cw";
 import ILucideSearch from "~icons/lucide/search";
 import DetailPanel from "@/components/DetailPanel.vue";
 import { $Http } from "@/plugins/http";
-import { withDefaultColumns } from "../../../utils/withDefaultColumns";
+import { withDefaultColumns } from "befly-shared/utils/withDefaultColumns";
 
 // 响应式数据
 const $Data = $ref({

package/adminViews/permission/menu/index.vue

@@ -44,8 +44,8 @@ import { Button as TButton, Table as TTable, Tag as TTag, MessagePlugin } from "
 import ILucideRotateCw from "~icons/lucide/rotate-cw";
 import DetailPanel from "@/components/DetailPanel.vue";
 import { $Http } from "@/plugins/http";
-import { arrayToTree } from "../../../utils/arrayToTree";
-import { withDefaultColumns } from "../../../utils/withDefaultColumns";
+import { arrayToTree } from "befly-shared/utils/arrayToTree";
+import { withDefaultColumns } from "befly-shared/utils/withDefaultColumns";
 
 // 响应式数据
 const $Data = $ref({

package/adminViews/permission/role/components/edit.vue

@@ -43,7 +43,7 @@ import {
     MessagePlugin
 } from "tdesign-vue-next";
 import { $Http } from "@/plugins/http";
-import { fieldClear } from "../../../../utils/fieldClear";
+import { fieldClear } from "befly-shared/utils/fieldClear";
 
 const $Prop = defineProps({
     modelValue: {

package/adminViews/permission/role/components/menu.vue

@@ -44,7 +44,7 @@
 import { Dialog as TDialog, CheckboxGroup as TCheckboxGroup, Checkbox as TCheckbox, Button as TButton, Input as TInput, MessagePlugin } from "tdesign-vue-next";
 import ILucideSearch from "~icons/lucide/search";
 import { $Http } from "@/plugins/http";
-import { arrayToTree } from "../../../../utils/arrayToTree";
+import { arrayToTree } from "befly-shared/utils/arrayToTree";
 
 const $Prop = defineProps({
     modelValue: {

package/adminViews/permission/role/index.vue

@@ -102,7 +102,7 @@ import MenuDialog from "./components/menu.vue";
 import ApiDialog from "./components/api.vue";
 import DetailPanel from "@/components/DetailPanel.vue";
 import { $Http } from "@/plugins/http";
-import { withDefaultColumns } from "../../../utils/withDefaultColumns";
+import { withDefaultColumns } from "befly-shared/utils/withDefaultColumns";
 
 // 响应式数据
 const $Data = $ref({

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@befly-addon/admin",
-    "version": "1.7.0",
-    "gitHead": "3a9dc64d2eb69e646f4fd6eebd5d8dbe6516cb69",
+    "version": "1.7.1",
+    "gitHead": "540d9551c589cb33d711c593e561f0fffc0aac0c",
     "private": false,
     "description": "Befly - 管理后台功能组件",
     "keywords": [
@@ -53,7 +53,7 @@
         "ua-parser-js": "^2.0.7"
     },
     "devDependencies": {
-        "befly": "3.15.0"
+        "befly": "3.15.1"
     },
     "peerDependencies": {
         "befly": "^3.14.0"

package/adminViews/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/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/utils/fieldClear.ts

@@ -1,85 +0,0 @@
-export interface FieldClearOptions {
-    pickKeys?: string[];
-    omitKeys?: string[];
-    keepValues?: any[];
-    excludeValues?: any[];
-    keepMap?: Record<string, any>;
-}
-
-export type FieldClearResult<T> = T extends Array<infer U> ? Array<FieldClearResult<U>> : T extends object ? { [K in keyof T]?: T[K] } : T;
-
-function isObject(val: unknown): val is Record<string, any> {
-    return val !== null && typeof val === "object" && !Array.isArray(val);
-}
-
-function isArray(val: unknown): val is any[] {
-    return Array.isArray(val);
-}
-
-export function fieldClear<T = any>(data: T | T[], options: FieldClearOptions = {}): FieldClearResult<T> {
-    const pickKeys = options.pickKeys;
-    const omitKeys = options.omitKeys;
-    const keepValues = options.keepValues;
-    const excludeValues = options.excludeValues;
-    const keepMap = options.keepMap;
-
-    const filterObj = (obj: Record<string, any>) => {
-        const result: Record<string, any> = {};
-
-        let keys = Object.keys(obj);
-        if (pickKeys && pickKeys.length) {
-            keys = keys.filter((k) => pickKeys.includes(k));
-        }
-        if (omitKeys && omitKeys.length) {
-            keys = keys.filter((k) => !omitKeys.includes(k));
-        }
-
-        for (const key of keys) {
-            const value = obj[key];
-
-            // 1. keepMap 优先
-            if (keepMap && Object.hasOwn(keepMap, key)) {
-                if (Object.is(keepMap[key], value)) {
-                    result[key] = value;
-                    continue;
-                }
-            }
-
-            // 2. keepValues
-            if (keepValues && keepValues.length && !keepValues.includes(value)) {
-                continue;
-            }
-
-            // 3. excludeValues
-            if (excludeValues && excludeValues.length && excludeValues.includes(value)) {
-                continue;
-            }
-
-            result[key] = value;
-        }
-
-        return result;
-    };
-
-    if (isArray(data)) {
-        return (data as any[])
-            .map((item) => {
-                if (isObject(item)) {
-                    return filterObj(item);
-                }
-                return item;
-            })
-            .filter((item) => {
-                if (isObject(item)) {
-                    return Object.keys(item).length > 0;
-                }
-                return true;
-            }) as FieldClearResult<T>;
-    }
-
-    if (isObject(data)) {
-        return filterObj(data as Record<string, any>) as FieldClearResult<T>;
-    }
-
-    return data as FieldClearResult<T>;
-}

package/utils/hashPassword.ts

@@ -1,19 +0,0 @@
-/**
- * 使用 SHA-256 对密码进行哈希。
- * @param password - 原始密码
- * @param salt - 盐值，默认为 befly
- * @returns 哈希后的密码（十六进制字符串）
- */
-export async function hashPassword(password: string, salt: string = "befly"): Promise<string> {
-    const data = password + salt;
-
-    const encoder = new TextEncoder();
-    const dataBuffer = encoder.encode(data);
-
-    const hashBuffer = await crypto.subtle.digest("SHA-256", dataBuffer);
-
-    const hashArray = Array.from(new Uint8Array(hashBuffer));
-    const hashHex = hashArray.map((b) => b.toString(16).padStart(2, "0")).join("");
-
-    return hashHex;
-}

package/utils/withDefaultColumns.ts

@@ -1,44 +0,0 @@
-/**
- * 为表格列添加默认配置（纯函数）。
- *
- * 默认行为：
- * - base 默认：{ width: 200, ellipsis: true }
- * - 特殊列：operation/state/id
- * - colKey 以 At/At2 结尾时：默认 { align: "center" }
- * - customConfig 可覆盖/扩展默认 specialColumnConfig
- */
-export function withDefaultColumns(columns: any[], customConfig?: Record<string, any>): any[] {
-    const safeColumns = Array.isArray(columns) ? columns : [];
-
-    const specialColumnConfig: Record<string, any> = Object.assign(
-        {
-            operation: { width: 100, align: "center", fixed: "right" },
-            state: { width: 100, align: "center" },
-            id: { width: 200, align: "center" }
-        },
-        customConfig || {}
-    );
-
-    return safeColumns.map((col) => {
-        const colKey = col && (col as any).colKey;
-
-        let specialConfig = colKey ? specialColumnConfig[colKey] : undefined;
-
-        if (!specialConfig && typeof colKey === "string" && (colKey.endsWith("At") || colKey.endsWith("At2"))) {
-            specialConfig = { align: "center" };
-        }
-
-        const base = {
-            width: 200,
-            ellipsis: true
-        };
-
-        const merged = Object.assign({}, base);
-        if (specialConfig) {
-            Object.assign(merged, specialConfig);
-        }
-        Object.assign(merged, col);
-
-        return merged;
-    });
-}