befly-admin 3.12.6 → 3.12.8

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly-admin",
-    "version": "3.12.6",
-    "gitHead": "607fe5ea9c06653ec6da8a9e4175d1f9c7b98c13",
+    "version": "3.12.8",
+    "gitHead": "c30de9bab631596341b6bc28490579a9923c87d6",
     "private": false,
     "description": "Befly Admin - 基于 Vue3 + TDesign Vue Next 的后台管理系统",
     "files": [
@@ -23,16 +23,16 @@
         "registry": "https://registry.npmjs.org"
     },
     "scripts": {
-        "dev": "vite",
-        "build": "vite build",
-        "preview": "vite preview"
+        "dev": "bunx --bun vite",
+        "build": "bunx --bun vite build",
+        "preview": "bunx --bun vite preview"
     },
     "dependencies": {
         "@befly-addon/admin": "^1.8.5",
         "@iconify-json/lucide": "^1.2.86",
         "axios": "^1.13.2",
         "befly-shared": "^1.4.5",
-        "befly-vite": "^1.4.8",
+        "befly-vite": "^1.4.9",
         "pinia": "^3.0.4",
         "tdesign-vue-next": "^1.18.0",
         "vite": "^8.0.0-beta.8",

package/src/components/pagedTableDetail.vue

@@ -30,7 +30,7 @@
         </div>
 
         <div class="main-page">
-            <TPagination :current-page="$Data.pager.currentPage" :page-size="$Data.pager.limit" :total="$Data.pager.total" :align="paginationAlign" :layout="paginationLayout" @current-change="onPageChange" @page-size-change="onPageSizeChange" />
+            <TPagination :current-page="$Data.pager.currentPage" :page-size="$Data.pager.limit" :total="$Data.pager.total" align="right" :layout="paginationLayout" @current-change="onPageChange" @page-size-change="onPageSizeChange" />
         </div>
 
         <slot name="dialogs" :reload="reload" :current-row="$Data.currentRow"></slot>
@@ -64,6 +64,11 @@ type DeleteConfirmContent = {
     status?: "warning" | "danger" | "info" | "success";
 };
 
+type ConfirmDialogInstance = {
+    destroy?: () => void;
+    setConfirmLoading?: (loading: boolean) => void;
+};
+
 type DeleteEndpoint<Row extends TableRowData> = {
     path: string;
     idKey?: string;
@@ -100,25 +105,19 @@ type LoadListOptions = {
 const props = withDefaults(
     defineProps<{
         columns: PagedTableCol[];
-        detailFields?: PrimaryTableCol[];
-        detailColumns?: PrimaryTableCol[];
         rowKey?: string;
         tableHeight?: string;
         pageSize?: number;
         endpoints?: Endpoints<TableRowData>;
-        paginationAlign?: "left" | "center" | "right";
         paginationLayout?: string;
         autoLoad?: boolean;
         tableSlotNames?: string[];
     }>(),
     {
-        detailFields: undefined,
-        detailColumns: undefined,
         rowKey: "id",
         tableHeight: "calc(100vh - var(--search-height) - var(--pagination-height) - var(--layout-gap) * 4)",
         pageSize: 30,
         endpoints: undefined,
-        paginationAlign: "right",
         paginationLayout: "total, prev, pager, next, jumper",
         autoLoad: true,
         tableSlotNames: undefined
@@ -219,18 +218,9 @@ const tableColumns = computed(() => {
 });
 
 const detailFields = computed(() => {
-    // A：完全自定义（兼容存量）
-    if (props.detailFields && Array.isArray(props.detailFields)) {
-        return filterValidColumns(props.detailFields);
-    }
-
-    // B：表格列只展示关键字段，详情列 = columns（关键字段） + detailColumns（其他字段）
-    if (props.detailColumns && Array.isArray(props.detailColumns)) {
-        const extras = filterValidColumns(props.detailColumns);
-        return mergeDetailColumns(tableColumns.value, extras);
-    }
-
-    // C：单列定义：只维护一个 columns：detail 字段为详情专属列，详情 = 表格列（在前） + 详情列（在后）
+    // 只维护一个 columns：
+    // - detail: false（默认）=> 表格展示（同时也会出现在详情里，且顺序靠前）
+    // - detail: true          => 仅在详情展示（顺序靠后）
     const extras: PagedTableCol[] = [];
     const cols = filterValidColumns(props.columns) as PagedTableCol[];
     for (const col of cols) {
@@ -242,7 +232,7 @@ const detailFields = computed(() => {
         return mergeDetailColumns(tableColumns.value, extras);
     }
 
-    // D：默认复用表格列
+    // 默认复用表格列
     return tableColumns.value;
 });
 
@@ -388,7 +378,7 @@ async function loadList(options?: LoadListOptions): Promise<void> {
         if (seq !== requestSeq) {
             return;
         }
-        void showMessageError("加载数据失败");
+        void MessagePlugin.error("加载数据失败");
     } finally {
         if (seq === requestSeq) {
             $Data.loading = false;
@@ -466,7 +456,7 @@ function getDeleteConfirmContent(ep: DeleteEndpoint<TableRowData>, row: TableRow
 async function deleteRow(row: TableRowData): Promise<void> {
     const ep = props.endpoints?.delete;
     if (!ep) {
-        await showMessageError("未配置删除接口");
+        MessagePlugin.error("未配置删除接口");
         return;
     }
 
@@ -475,13 +465,13 @@ async function deleteRow(row: TableRowData): Promise<void> {
     const rawId = record[idKey];
 
     if (rawId === null || rawId === undefined || rawId === "") {
-        await showMessageError("删除失败：缺少主键");
+        MessagePlugin.error("删除失败：缺少主键");
         return;
     }
 
     const confirmContent = getDeleteConfirmContent(ep, row);
 
-    let dialog: { destroy?: () => void; setConfirmLoading?: (v: boolean) => void } | null = null;
+    let dialog: ConfirmDialogInstance | null = null;
     let destroyed = false;
 
     const destroy = () => {
@@ -492,7 +482,7 @@ async function deleteRow(row: TableRowData): Promise<void> {
         }
     };
 
-    dialog = await openConfirmDialog({
+    dialog = DialogPlugin.confirm({
         header: confirmContent.header,
         body: confirmContent.body,
         status: confirmContent.status || "warning",
@@ -521,12 +511,12 @@ async function deleteRow(row: TableRowData): Promise<void> {
                     dropKeyValue: ep.dropKeyValue
                 });
 
-                await showMessageSuccess("删除成功");
+                MessagePlugin.success("删除成功");
                 destroy();
                 emit("deleted", { row: row });
                 await reload({ keepSelection: true });
             } catch (error) {
-                await showMessageError("删除失败");
+                MessagePlugin.error("删除失败");
             } finally {
                 if (dialog && typeof dialog.setConfirmLoading === "function") {
                     dialog.setConfirmLoading(false);

package/src/layouts/default.vue

@@ -206,7 +206,7 @@ async function fetchUserMenus() {
         $Data.userMenus = treeResult.tree;
         setActiveMenu();
     } catch (error) {
-        void showMessageError("获取用户菜单失败");
+        void MessagePlugin.error("获取用户菜单失败");
     }
 }
 
@@ -265,7 +265,7 @@ async function handleLogout() {
         }
     };
 
-    dialog = await openConfirmDialog({
+    dialog = DialogPlugin.confirm({
         header: "确认退出登录",
         body: "确定要退出登录吗？",
         status: "warning",
@@ -277,10 +277,10 @@ async function handleLogout() {
             try {
                 $Storage.local.remove("token");
                 await router.push(loginPath);
-                await showMessageSuccess("退出成功");
+                MessagePlugin.success("退出成功");
                 destroy();
             } catch (error) {
-                await showMessageError("退出失败");
+                MessagePlugin.error("退出失败");
                 destroy();
             } finally {
                 if (dialog && typeof dialog.setConfirmLoading === "function") {
@@ -301,7 +301,7 @@ function handleSettings() {
 function onAvatarUploadSuccess(res) {
     if (res.response?.code === 0 && res.response?.data?.url) {
         $Data.userInfo.avatar = res.response.data.url;
-        void showMessageSuccess("头像上传成功");
+        void MessagePlugin.success("头像上传成功");
     }
 }
 

package/src/main.ts

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

package/src/plugins/http.ts

@@ -73,7 +73,7 @@ function isNormalizedHttpError(value: unknown): value is HttpError {
 async function showNetworkErrorToast(): Promise<void> {
     try {
         // 在测试/非浏览器环境下，提示组件可能不可用；仅在需要展示提示时再加载。
-        await showMessageError("网络连接失败");
+        MessagePlugin.error("网络连接失败");
     } catch {
         // ignore
     }

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

@@ -59,7 +59,6 @@ declare global {
   const onUnmounted: typeof import('vue').onUnmounted
   const onUpdated: typeof import('vue').onUpdated
   const onWatcherCleanup: typeof import('vue').onWatcherCleanup
-  const openConfirmDialog: typeof import('../utils/tdesignPlugins').openConfirmDialog
   const provide: typeof import('vue').provide
   const reactive: typeof import('vue').reactive
   const readonly: typeof import('vue').readonly
@@ -71,9 +70,6 @@ declare global {
   const shallowReactive: typeof import('vue').shallowReactive
   const shallowReadonly: typeof import('vue').shallowReadonly
   const shallowRef: typeof import('vue').shallowRef
-  const showMessageError: typeof import('../utils/tdesignPlugins').showMessageError
-  const showMessageSuccess: typeof import('../utils/tdesignPlugins').showMessageSuccess
-  const showMessageWarning: typeof import('../utils/tdesignPlugins').showMessageWarning
   const storeToRefs: typeof import('pinia').storeToRefs
   const toRaw: typeof import('vue').toRaw
   const toRef: typeof import('vue').toRef
@@ -102,9 +98,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 { ConfirmDialogStatus, ConfirmDialogOptions, ConfirmDialogInstance } from '../utils/tdesignPlugins'
-  import('../utils/tdesignPlugins')
-  // @ts-ignore
   export type { BeflyAdminConfig } from '../plugins/config'
   import('../plugins/config')
   // @ts-ignore
@@ -166,7 +159,6 @@ declare module 'vue' {
     readonly onUnmounted: UnwrapRef<typeof import('vue')['onUnmounted']>
     readonly onUpdated: UnwrapRef<typeof import('vue')['onUpdated']>
     readonly onWatcherCleanup: UnwrapRef<typeof import('vue')['onWatcherCleanup']>
-    readonly openConfirmDialog: UnwrapRef<typeof import('../utils/tdesignPlugins')['openConfirmDialog']>
     readonly provide: UnwrapRef<typeof import('vue')['provide']>
     readonly reactive: UnwrapRef<typeof import('vue')['reactive']>
     readonly readonly: UnwrapRef<typeof import('vue')['readonly']>
@@ -177,9 +169,6 @@ declare module 'vue' {
     readonly shallowReactive: UnwrapRef<typeof import('vue')['shallowReactive']>
     readonly shallowReadonly: UnwrapRef<typeof import('vue')['shallowReadonly']>
     readonly shallowRef: UnwrapRef<typeof import('vue')['shallowRef']>
-    readonly showMessageError: UnwrapRef<typeof import('../utils/tdesignPlugins')['showMessageError']>
-    readonly showMessageSuccess: UnwrapRef<typeof import('../utils/tdesignPlugins')['showMessageSuccess']>
-    readonly showMessageWarning: UnwrapRef<typeof import('../utils/tdesignPlugins')['showMessageWarning']>
     readonly storeToRefs: UnwrapRef<typeof import('pinia')['storeToRefs']>
     readonly toRaw: UnwrapRef<typeof import('vue')['toRaw']>
     readonly toRef: UnwrapRef<typeof import('vue')['toRef']>

package/src/views/index2.vue

@@ -142,14 +142,7 @@
     </div>
 </template>
 
-<script setup lang="ts">
-definePage({
-    meta: {
-        title: "数据面板",
-        layout: "default"
-    }
-});
-</script>
+<script setup lang="ts"></script>
 
 <style lang="scss" scoped>
 .dashboard {

package/src/types/unplugin-vue-router-client.d.ts

@@ -1,3 +0,0 @@
-// 让 TypeScript 识别 unplugin-vue-router 的 definePage 宏
-// 注意：这不会在运行时引入任何代码，仅用于类型声明
-import "unplugin-vue-router/client";

package/src/utils/tdesignPlugins.ts

@@ -1,57 +0,0 @@
-let messagePluginPromise: Promise<typeof import("tdesign-vue-next/es/message/plugin")> | null = null;
-let dialogPluginPromise: Promise<typeof import("tdesign-vue-next/es/dialog/plugin")> | null = null;
-
-export async function showMessageSuccess(content: string): Promise<void> {
-    const mod = await getMessagePlugin();
-    mod.MessagePlugin.success(content);
-}
-
-export async function showMessageError(content: string): Promise<void> {
-    const mod = await getMessagePlugin();
-    mod.MessagePlugin.error(content);
-}
-
-export async function showMessageWarning(content: string): Promise<void> {
-    const mod = await getMessagePlugin();
-    mod.MessagePlugin.warning(content);
-}
-
-export type ConfirmDialogStatus = "warning" | "danger" | "info" | "success";
-
-export type ConfirmDialogOptions = {
-    header: string;
-    body: string;
-    status?: ConfirmDialogStatus;
-    confirmBtn?: string;
-    cancelBtn?: string;
-    onConfirm?: () => void | Promise<void>;
-    onClose?: () => void;
-};
-
-export type ConfirmDialogInstance = {
-    destroy?: () => void;
-    setConfirmLoading?: (loading: boolean) => void;
-};
-
-export async function openConfirmDialog(options: ConfirmDialogOptions): Promise<ConfirmDialogInstance> {
-    const mod = await getDialogPlugin();
-    return mod.DialogPlugin.confirm(options);
-}
-
-async function getMessagePlugin(): Promise<typeof import("tdesign-vue-next/es/message/plugin")> {
-    if (messagePluginPromise) {
-        return messagePluginPromise;
-    }
-
-    messagePluginPromise = import("tdesign-vue-next/es/message/plugin");
-    return messagePluginPromise;
-}
-
-async function getDialogPlugin(): Promise<typeof import("tdesign-vue-next/es/dialog/plugin")> {
-    if (dialogPluginPromise) {
-        return dialogPluginPromise;
-    }
-
-    dialogPluginPromise = import("tdesign-vue-next/es/dialog/plugin");
-    return dialogPluginPromise;
-}