befly-admin 3.12.17 → 3.13.0

package/src/components/pagedTableDetail.vue

@@ -37,148 +37,95 @@
     </div>
 </template>
 
-<script setup lang="ts">
+<script setup>
 defineOptions({ name: "PagedTableDetail" });
 
 import { reactive } from "vue";
-
-import type { PrimaryTableCol, TableRowData } from "tdesign-vue-next";
-
-type PagedTableCol = PrimaryTableCol & {
-    // 页面自定义字段：是否为“详情专属列”（默认 false）
-    // - detail: false => 表格展示（同时也会出现在详情里，且顺序靠前）
-    // - detail: true  => 仅在详情展示（顺序靠后）
-    detail?: boolean;
-};
-
-type PagerState = {
-    currentPage: number;
-    limit: number;
-    total: number;
-};
-
-type DeleteConfirmContent = {
-    header: string;
-    body: string;
-    confirmBtn?: string;
-    cancelBtn?: string;
-    status?: "warning" | "danger" | "info" | "success";
-};
-
-type ConfirmDialogInstance = {
-    destroy?: () => void;
-    setConfirmLoading?: (loading: boolean) => void;
-};
-
-type DeleteEndpoint<Row extends TableRowData> = {
-    path: string;
-    idKey?: string;
-    confirm?: DeleteConfirmContent | ((row: Row) => DeleteConfirmContent);
-    dropValues?: readonly (string | number | boolean | null | undefined)[];
-    dropKeyValue?: Record<string, readonly (string | number | boolean | null | undefined)[]>;
-    buildData?: (row: Row) => Record<string, unknown>;
-};
-
-type ListEndpoint = {
-    path: string;
-    pageKey?: string;
-    limitKey?: string;
-    dropValues?: readonly (string | number | boolean | null | undefined)[];
-    dropKeyValue?: Record<string, readonly (string | number | boolean | null | undefined)[]>;
-    buildData?: (pager: { currentPage: number; limit: number }) => Record<string, unknown>;
-};
-
-type Endpoints<Row extends TableRowData> = {
-    list?: ListEndpoint;
-    delete?: DeleteEndpoint<Row>;
-};
-
-type ListResponse<Row extends TableRowData> = {
-    lists: Row[];
-    total: number;
-};
-
-type LoadListOptions = {
-    keepSelection?: boolean;
-    allowPageFallback?: boolean;
-};
-
-const props = withDefaults(
-    defineProps<{
-        columns: PagedTableCol[];
-        rowKey?: string;
-        tableHeight?: string;
-        pageSize?: number;
-        endpoints?: Endpoints<TableRowData>;
-        paginationLayout?: string;
-        autoLoad?: boolean;
-        tableSlotNames?: string[];
-    }>(),
-    {
-        rowKey: "id",
-        tableHeight: "calc(100vh - var(--search-height) - var(--pagination-height) - var(--layout-gap) * 4)",
-        pageSize: 30,
-        endpoints: undefined,
-        paginationLayout: "total, prev, pager, next, jumper",
-        autoLoad: true,
-        tableSlotNames: undefined
+const props = defineProps({
+    columns: {
+        type: Array,
+        required: true
+    },
+    rowKey: {
+        type: String,
+        default: "id"
+    },
+    tableHeight: {
+        type: String,
+        default: "calc(100vh - var(--search-height) - var(--pagination-height) - var(--layout-gap) * 4)"
+    },
+    pageSize: {
+        type: Number,
+        default: 30
+    },
+    endpoints: {
+        type: Object,
+        default: undefined
+    },
+    paginationLayout: {
+        type: String,
+        default: "total, prev, pager, next, jumper"
+    },
+    autoLoad: {
+        type: Boolean,
+        default: true
+    },
+    tableSlotNames: {
+        type: Array,
+        default: undefined
     }
-);
+});
 
-const emit = defineEmits<{
-    (e: "loaded", payload: { rows: TableRowData[]; total: number }): void;
-    (e: "row-change", payload: { row: TableRowData | null }): void;
-    (e: "deleted", payload: { row: TableRowData }): void;
-}>();
+const emit = defineEmits(["loaded", "row-change", "deleted"]);
 
 const slots = useSlots();
 
 const $Data = reactive({
-    rows: [] as TableRowData[],
+    rows: [],
     loading: false,
     pager: {
         currentPage: 1,
         limit: props.pageSize,
         total: 0
-    } as PagerState,
-    currentRow: null as TableRowData | null,
-    activeRowKeys: [] as Array<string | number>
+    },
+    currentRow: null,
+    activeRowKeys: []
 });
 
 let requestSeq = 0;
 
-function getColKey(col: PrimaryTableCol): string {
-    const record = col as unknown as Record<string, unknown>;
+function getColKey(col) {
+    const record = col;
     const rawColKey = record["colKey"];
     if (typeof rawColKey === "string") return rawColKey;
     if (typeof rawColKey === "number") return String(rawColKey);
     return "";
 }
 
-function filterValidColumns(input: unknown): PrimaryTableCol[] {
+function filterValidColumns(input) {
     if (!Array.isArray(input)) {
         return [];
     }
 
-    const out: PrimaryTableCol[] = [];
+    const out = [];
 
-    for (const col of input as Array<unknown>) {
+    for (const col of input) {
         if (!col || typeof col !== "object") {
             continue;
         }
-        const key = getColKey(col as PrimaryTableCol);
+        const key = getColKey(col);
         if (key.length === 0) {
             continue;
         }
-        out.push(col as PrimaryTableCol);
+        out.push(col);
     }
 
     return out;
 }
 
-function mergeDetailColumns(mainColumns: PrimaryTableCol[], extraColumns: PrimaryTableCol[]): PrimaryTableCol[] {
-    const out: PrimaryTableCol[] = [];
-    const set = new Set<string>();
+function mergeDetailColumns(mainColumns, extraColumns) {
+    const out = [];
+    const set = new Set();
 
     for (const col of mainColumns) {
         out.push(col);
@@ -202,15 +149,15 @@ function mergeDetailColumns(mainColumns: PrimaryTableCol[], extraColumns: Primar
     return out;
 }
 
-function isDetail(col: PagedTableCol): boolean {
-    const record = col as unknown as Record<string, unknown>;
+function isDetail(col) {
+    const record = col;
     if (record["detail"] === true) return true;
     return false;
 }
 
 const tableColumns = computed(() => {
-    const out: PagedTableCol[] = [];
-    const cols = filterValidColumns(props.columns) as PagedTableCol[];
+    const out = [];
+    const cols = filterValidColumns(props.columns);
     for (const col of cols) {
         if (isDetail(col)) continue;
         out.push(col);
@@ -222,8 +169,8 @@ const detailFields = computed(() => {
     // 只维护一个 columns：
     // - detail: false（默认）=> 表格展示（同时也会出现在详情里，且顺序靠前）
     // - detail: true          => 仅在详情展示（顺序靠后）
-    const extras: PagedTableCol[] = [];
-    const cols = filterValidColumns(props.columns) as PagedTableCol[];
+    const extras = [];
+    const cols = filterValidColumns(props.columns);
     for (const col of cols) {
         if (!isDetail(col)) continue;
         extras.push(col);
@@ -239,8 +186,8 @@ const detailFields = computed(() => {
 
 const forwardedTableSlotNames = computed(() => {
     if (Array.isArray(props.tableSlotNames) && props.tableSlotNames.length > 0) {
-        const out: string[] = [];
-        const set = new Set<string>();
+        const out = [];
+        const set = new Set();
         for (const name of props.tableSlotNames) {
             if (typeof name !== "string") continue;
             const trimmed = name.trim();
@@ -252,7 +199,7 @@ const forwardedTableSlotNames = computed(() => {
         return out;
     }
 
-    const names: string[] = [];
+    const names = [];
     const reserved = ["toolLeft", "toolRight", "detail", "dialogs", "operation", "default"]; // operation 单独处理
 
     for (const key of Object.keys(slots)) {
@@ -263,23 +210,23 @@ const forwardedTableSlotNames = computed(() => {
     return names;
 });
 
-function setCurrentRow(row: TableRowData | null): void {
+function setCurrentRow(row) {
     $Data.currentRow = row;
     emit("row-change", { row: row });
 }
 
-function getRowKeyValue(row: TableRowData): string | number | null {
+function getRowKeyValue(row) {
     const key = props.rowKey;
     if (!key) return null;
 
-    const record = row as Record<string, unknown>;
+    const record = row;
     const raw = record[key];
     if (typeof raw === "string") return raw;
     if (typeof raw === "number") return raw;
     return null;
 }
 
-function applyAutoSelection(list: TableRowData[], preferKey: string | number | null): void {
+function applyAutoSelection(list, preferKey) {
     if (!Array.isArray(list) || list.length === 0) {
         setCurrentRow(null);
         $Data.activeRowKeys = [];
@@ -297,7 +244,7 @@ function applyAutoSelection(list: TableRowData[], preferKey: string | number | n
         }
     }
 
-    const first = list[0] as TableRowData;
+    const first = list[0];
     const firstKey = getRowKeyValue(first);
     setCurrentRow(first);
 
@@ -309,7 +256,7 @@ function applyAutoSelection(list: TableRowData[], preferKey: string | number | n
     $Data.activeRowKeys = [firstKey];
 }
 
-function getLastPage(total: number, limit: number): number {
+function getLastPage(total, limit) {
     if (total <= 0) return 1;
     if (limit <= 0) return 1;
     const pages = Math.ceil(total / limit);
@@ -317,7 +264,7 @@ function getLastPage(total: number, limit: number): number {
     return pages;
 }
 
-async function loadList(options?: LoadListOptions): Promise<void> {
+async function loadList(options) {
     const listEndpoint = props.endpoints?.list;
     if (!listEndpoint) {
         return;
@@ -333,7 +280,7 @@ async function loadList(options?: LoadListOptions): Promise<void> {
         const pageKey = listEndpoint.pageKey || "page";
         const limitKey = listEndpoint.limitKey || "limit";
 
-        const data: Record<string, unknown> = {};
+        const data = {};
         data[pageKey] = $Data.pager.currentPage;
         data[limitKey] = $Data.pager.limit;
 
@@ -349,10 +296,10 @@ async function loadList(options?: LoadListOptions): Promise<void> {
             }
         }
 
-        const res = (await $Http.post<ListResponse<TableRowData>>(listEndpoint.path, data, {
+        const res = await $Http.post(listEndpoint.path, data, {
             dropValues: listEndpoint.dropValues,
             dropKeyValue: listEndpoint.dropKeyValue
-        })) as HttpApiResponse<ListResponse<TableRowData>>;
+        });
 
         // 并发保护：旧请求返回后不应覆盖新请求的状态
         if (seq !== requestSeq) {
@@ -393,7 +340,7 @@ async function loadList(options?: LoadListOptions): Promise<void> {
     }
 }
 
-async function reload(options?: { keepSelection?: boolean; resetPage?: boolean }): Promise<void> {
+async function reload(options) {
     if (options?.resetPage) {
         $Data.pager.currentPage = 1;
     }
@@ -403,18 +350,18 @@ async function reload(options?: { keepSelection?: boolean; resetPage?: boolean }
     });
 }
 
-function onPageChange(info: { currentPage: number }): void {
+function onPageChange(info) {
     $Data.pager.currentPage = info.currentPage;
     void reload({ keepSelection: true });
 }
 
-function onPageSizeChange(info: { pageSize: number }): void {
+function onPageSizeChange(info) {
     $Data.pager.limit = info.pageSize;
     $Data.pager.currentPage = 1;
     void reload({ keepSelection: false });
 }
 
-function onActiveChange(value: Array<string | number>, context: { activeRowList?: Array<{ row: TableRowData }> }): void {
+function onActiveChange(value, context) {
     // 禁止取消高亮：如果新值为空，保持当前选中
     if (value.length === 0) {
         if ($Data.activeRowKeys.length > 0) {
@@ -446,7 +393,7 @@ function onActiveChange(value: Array<string | number>, context: { activeRowList?
     }
 }
 
-function getDeleteConfirmContent(ep: DeleteEndpoint<TableRowData>, row: TableRowData): DeleteConfirmContent {
+function getDeleteConfirmContent(ep, row) {
     const confirm = ep.confirm;
     if (!confirm) {
         return {
@@ -463,7 +410,7 @@ function getDeleteConfirmContent(ep: DeleteEndpoint<TableRowData>, row: TableRow
     return confirm;
 }
 
-async function deleteRow(row: TableRowData): Promise<void> {
+async function deleteRow(row) {
     const ep = props.endpoints?.delete;
     if (!ep) {
         MessagePlugin.error("未配置删除接口");
@@ -471,7 +418,7 @@ async function deleteRow(row: TableRowData): Promise<void> {
     }
 
     const idKey = ep.idKey || "id";
-    const record = row as Record<string, unknown>;
+    const record = row;
     const rawId = record[idKey];
 
     if (rawId === null || rawId === undefined || rawId === "") {
@@ -481,7 +428,7 @@ async function deleteRow(row: TableRowData): Promise<void> {
 
     const confirmContent = getDeleteConfirmContent(ep, row);
 
-    let dialog: ConfirmDialogInstance | null = null;
+    let dialog = null;
     let destroyed = false;
 
     const destroy = () => {
@@ -504,7 +451,7 @@ async function deleteRow(row: TableRowData): Promise<void> {
             }
 
             try {
-                const data: Record<string, unknown> = {};
+                const data = {};
                 data[idKey] = rawId;
 
                 if (ep.buildData) {
@@ -539,8 +486,8 @@ async function deleteRow(row: TableRowData): Promise<void> {
     });
 }
 
-function buildOperationSlotProps(scope: Record<string, unknown>): Record<string, unknown> {
-    const out: Record<string, unknown> = {};
+function buildOperationSlotProps(scope) {
+    const out = {};
 
     for (const k of Object.keys(scope)) {
         out[k] = scope[k];

package/src/layouts/1.vue

@@ -2,7 +2,7 @@
     <router-view />
 </template>
 
-<script setup lang="ts">
+<script setup>
 // 空布局 - 不包含任何框架结构
 // 用于登录页等不需要导航栏和侧边栏的页面
 </script>

package/src/layouts/2.vue

@@ -2,7 +2,7 @@
     <router-view />
 </template>
 
-<script setup lang="ts">
+<script setup>
 // 布局 2 - 空布局
 // 用于特殊页面，不包含任何框架结构
 </script>

package/src/layouts/default.vue

@@ -5,7 +5,7 @@
             <!-- Logo 区域 -->
             <div class="sidebar-logo">
                 <div class="logo-icon">
-                    <i-lucide:box style="width: 24px; height: 24px; color: var(--primary-color)" />
+                    <MenuIcon style="width: 24px; height: 24px; color: var(--primary-color)" />
                 </div>
                 <h2>{{ $Config.appTitle }}</h2>
             </div>
@@ -17,19 +17,19 @@
                         <!-- 无子菜单 -->
                         <t-menu-item v-if="!menu.children || menu.children.length === 0" :value="menu.path">
                             <template #icon>
-                                <i-lucide:home v-if="menu.path === '/dashboard' || menu.path === '/addon/admin/' || menu.path === '/addon/admin'" style="margin-right: 8px" />
-                                <i-lucide:file-text v-else style="margin-right: 8px" />
+                                <LinkIcon v-if="menu.path === '/dashboard' || menu.path === '/core/' || menu.path === '/core'" style="margin-right: 8px" />
+                                <CodeIcon v-else style="margin-right: 8px" />
                             </template>
                             {{ menu.name }}
                         </t-menu-item>
                         <!-- 有子菜单 -->
                         <t-submenu v-else :value="String(menu.id)" :title="menu.name">
                             <template #icon>
-                                <i-lucide:folder style="margin-right: 8px" />
+                                <MenuIcon style="margin-right: 8px" />
                             </template>
                             <t-menu-item v-for="child in menu.children" :key="child.id" :value="child.path">
                                 <template #icon>
-                                    <i-lucide:file-text style="margin-right: 8px" />
+                                    <CodeIcon style="margin-right: 8px" />
                                 </template>
                                 {{ child.name }}
                             </t-menu-item>
@@ -41,16 +41,16 @@
             <!-- 底部操作区域 -->
             <div class="sidebar-footer">
                 <div class="footer-item" @click="handleSettings">
-                    <i-lucide:settings style="width: 18px; height: 18px" />
+                    <SettingIcon style="width: 18px; height: 18px" />
                     <span>系统设置</span>
                 </div>
                 <div class="footer-user">
                     <t-upload :action="$Config.uploadUrl" :headers="{ Authorization: $Storage.local.get('token') }" :show-upload-list="false" accept="image/*" @success="onAvatarUploadSuccess">
                         <div class="user-avatar" :class="{ 'has-avatar': $Data.userInfo.avatar }">
                             <img v-if="$Data.userInfo.avatar" :src="$Data.userInfo.avatar" alt="avatar" />
-                            <i-lucide:user v-else style="width: 16px; height: 16px; color: #fff" />
+                            <UserIcon v-else style="width: 16px; height: 16px; color: #fff" />
                             <div class="avatar-overlay">
-                                <i-lucide:camera style="width: 14px; height: 14px; color: #fff" />
+                                <CloudIcon style="width: 14px; height: 14px; color: #fff" />
                             </div>
                         </div>
                     </t-upload>
@@ -60,7 +60,7 @@
                     </div>
                     <t-button theme="default" variant="text" size="small" @click="handleLogout">
                         <template #icon>
-                            <i-lucide:log-out style="width: 16px; height: 16px" />
+                            <CloseCircleIcon style="width: 16px; height: 16px" />
                         </template>
                     </t-button>
                 </div>
@@ -74,18 +74,20 @@
     </div>
 </template>
 
-<script setup lang="ts">
-import { arrayToTree } from "befly-shared/utils/arrayToTree";
+<script setup>
+import { arrayToTree } from "befly-admin-ui/utils/arrayToTree";
+import { isString } from "../utils/is.js";
+import { CloseCircleIcon, CloudIcon, CodeIcon, LinkIcon, MenuIcon, SettingIcon, UserIcon } from "tdesign-icons-vue-next";
 
 import { reactive } from "vue";
 
 const router = useRouter();
 const route = useRoute();
 
-const loginPath = "/addon/admin/login";
+const loginPath = "/core/login";
 
 const normalizePath = (path) => {
-    if (typeof path !== "string") {
+    if (!isString(path)) {
         return path;
     }
 
@@ -97,7 +99,7 @@ const normalizePath = (path) => {
 // - parentPath 为空/"/" 视为根节点（空字符串）
 // - 避免把所有一级菜单挂到 "/"（首页）下面
 const normalizeParentPath = (parentPath) => {
-    if (typeof parentPath !== "string") {
+    if (!isString(parentPath)) {
         return "";
     }
 
@@ -128,7 +130,7 @@ const $Data = reactive({
 
 async function fetchUserMenus() {
     try {
-        const { data } = await $Http.post("/addon/admin/menu/all");
+        const { data } = await $Http.post("/core/menu/all");
         const lists = Array.isArray(data?.lists) ? data.lists : [];
 
         const normalizedLists = lists.map((menu) => {
@@ -164,7 +166,7 @@ function setActiveMenu() {
     const expandedKeys = [];
     let menu = currentMenu;
 
-    while (typeof menu.parentPath === "string" && menu.parentPath.length > 0) {
+    while (isString(menu.parentPath) && menu.parentPath.length > 0) {
         const parent = $Data.userMenusFlat.find((m) => {
             const parentMenuPath = normalizePath(m?.path);
             const currentParentPath = normalizeParentPath(menu?.parentPath);
@@ -185,7 +187,7 @@ function setActiveMenu() {
 }
 
 function onMenuClick(path) {
-    if (typeof path === "string" && path.startsWith("/")) {
+    if (isString(path) && path.startsWith("/")) {
         router.push(path);
     }
 }
@@ -232,7 +234,7 @@ async function handleLogout() {
 }
 
 function handleSettings() {
-    router.push("/addon/admin/settings");
+    router.push("/core/settings");
 }
 
 function onAvatarUploadSuccess(res) {

package/src/{main.ts → main.js}

@@ -1,7 +1,7 @@
 // 引入 TDesign 样式
 import "tdesign-vue-next/es/style/index.css";
-// 引入 addonAdmin 的 CSS 变量
-import "@befly-addon/admin/styles/variables.scss";
+// 引入 adminUI 的 CSS 变量
+import "befly-admin-ui/styles/variables.scss";
 // 引入全局基础样式（reset、通用类、滚动条等）
 import "@/styles/global.scss";
 import App from "./App.vue";

package/src/plugins/{config.ts → config.js}

@@ -3,29 +3,18 @@
  * 存放框架内置的配置变量，不建议修改
  */
 
-export type BeflyAdminConfig = {
-    appTitle: string;
-    apiBaseUrl: string;
-    uploadUrl: string;
-    storageNamespace: string;
-    loginPath: string;
-    homePath: string;
-    isDev: boolean;
-    isProd: boolean;
-};
-
 /**
  * 内置配置对象
  */
-export const $Config: BeflyAdminConfig = {
+export const $Config = {
     appTitle: import.meta.env["VITE_APP_TITLE"] || "野蜂飞舞",
     apiBaseUrl: import.meta.env["VITE_API_BASE_URL"] || "",
 
     uploadUrl: import.meta.env["VITE_UPLOAD_URL"] || ((import.meta.env["VITE_API_BASE_URL"] || "").length > 0 ? `${import.meta.env["VITE_API_BASE_URL"]}/upload` : "/upload"),
     storageNamespace: import.meta.env["VITE_STORAGE_NAMESPACE"] || "befly_admin",
 
-    loginPath: import.meta.env["VITE_LOGIN_PATH"] || "/addon/admin/login",
-    homePath: import.meta.env["VITE_HOME_PATH"] || "/addon/admin",
+    loginPath: import.meta.env["VITE_LOGIN_PATH"] || "/core/login",
+    homePath: import.meta.env["VITE_HOME_PATH"] || "/core/",
     isDev: import.meta.env.DEV,
     isProd: import.meta.env.PROD
 };

package/src/plugins/{global.ts → global.js}

@@ -5,10 +5,10 @@
 
 export const useGlobal = defineStore("global", () => {
     // ==================== 全局数据 ====================
-    const data = reactive<Record<string, unknown>>({});
+    const data = reactive({});
 
     // ==================== 全局方法 ====================
-    const method: Record<string, unknown> = {};
+    const method = {};
 
     // ==================== 返回 ====================
     return {