@befly-addon/admin 1.1.30 → 1.1.32

package/apis/sysConfig/upd.ts

@@ -1,27 +1,27 @@
-import sysConfigTable from '../../tables/sysConfig.json';
+import sysConfigTable from "../../tables/sysConfig.json";
 
 export default {
-    name: '更新系统配置',
+    name: "更新系统配置",
     fields: {
-        id: '@id',
+        id: "@id",
         ...sysConfigTable
     },
     handler: async (befly, ctx) => {
         try {
             // 检查是否为系统配置
             const config = await befly.db.getDetail({
-                table: 'addon_admin_sys_config',
+                table: "addon_admin_sys_config",
                 where: { id: ctx.body.id }
             });
 
             if (!config?.id) {
-                return befly.tool.No('配置不存在');
+                return befly.tool.No("配置不存在");
             }
 
             // 系统配置只能修改 value
             if (config.isSystem === 1) {
                 await befly.db.updData({
-                    table: 'addon_admin_sys_config',
+                    table: "addon_admin_sys_config",
                     data: {
                         value: ctx.body.value
                     },
@@ -29,7 +29,7 @@ export default {
                 });
             } else {
                 await befly.db.updData({
-                    table: 'addon_admin_sys_config',
+                    table: "addon_admin_sys_config",
                     data: {
                         name: ctx.body.name,
                         code: ctx.body.code,
@@ -44,10 +44,10 @@ export default {
                 });
             }
 
-            return befly.tool.Yes('操作成功');
+            return befly.tool.Yes("操作成功");
         } catch (error) {
-            befly.logger.error({ err: error }, '更新系统配置失败');
-            return befly.tool.No('操作失败');
+            befly.logger.error({ err: error }, "更新系统配置失败");
+            return befly.tool.No("操作失败");
         }
     }
 };

package/libs/emailHelper.ts

@@ -3,10 +3,10 @@
  * 提供邮件发送功能，支持 SMTP 配置
  */
 
-import nodemailer from 'nodemailer';
+import type { BeflyContext } from "befly/types/befly";
+import type { Transporter } from "nodemailer";
 
-import type { Transporter } from 'nodemailer';
-import type { BeflyContext } from 'befly/types/befly.js';
+import nodemailer from "nodemailer";
 
 /** 邮件配置 */
 export interface EmailConfig {
@@ -80,7 +80,7 @@ export class EmailHelper {
         if (!this.transporter) {
             return {
                 success: false,
-                error: '邮件服务未配置，请检查 SMTP 配置'
+                error: "邮件服务未配置，请检查 SMTP 配置"
             };
         }
 
@@ -104,7 +104,7 @@ export class EmailHelper {
         } catch (error: any) {
             return {
                 success: false,
-                error: error.message || '发送失败'
+                error: error.message || "发送失败"
             };
         }
     }
@@ -128,10 +128,10 @@ export class EmailHelper {
     /**
      * 获取当前配置（隐藏密码）
      */
-    getConfig(): Omit<EmailConfig, 'pass'> & { pass: string } {
+    getConfig(): Omit<EmailConfig, "pass"> & { pass: string } {
         return {
             ...this.config,
-            pass: this.config.pass ? '******' : ''
+            pass: this.config.pass ? "******" : ""
         };
     }
 }

package/package.json

@@ -1,58 +1,70 @@
 {
     "name": "@befly-addon/admin",
-    "version": "1.1.30",
-    "title": "管理后台",
-    "description": "Befly - 管理后台功能组件",
-    "type": "module",
+    "version": "1.1.32",
     "private": false,
-    "publishConfig": {
-        "access": "public",
-        "registry": "https://registry.npmjs.org"
+    "description": "Befly - 管理后台功能组件",
+    "keywords": [
+        "addon",
+        "admin",
+        "auth",
+        "befly",
+        "rbac",
+        "typescript"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/chenbimo/befly.git",
+        "directory": "packages/addon-admin"
     },
+    "author": "chenbimo",
+    "license": "Apache-2.0",
+    "type": "module",
     "main": "package.json",
     "exports": {
         ".": "./package.json",
         "./styles/*": "./styles/*"
     },
-    "scripts": {
-        "dev": "vite",
-        "build": "vite build",
-        "preview": "vite preview"
-    },
     "files": [
+        "README.md",
         "apis",
         "libs",
+        "package.json",
         "plugins",
         "styles",
         "tables",
-        "views",
-        "package.json",
-        "README.md"
+        "views"
     ],
-    "keywords": [
-        "befly",
-        "addon",
-        "admin",
-        "rbac",
-        "auth",
-        "typescript"
-    ],
-    "author": "chenbimo",
-    "license": "Apache-2.0",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/chenbimo/befly.git",
-        "directory": "packages/addon-admin"
+    "scripts": {
+        "dev": "vite",
+        "build": "vite build",
+        "preview": "vite preview"
     },
-    "gitHead": "8cb371928961c63d6c3c416c6dd667f8fe285376",
     "dependencies": {
-        "befly": "^3.9.38",
-        "befly-shared": "^1.2.8",
+        "befly": "^3.9.40",
+        "befly-vite": "^1.1.12",
         "nodemailer": "^7.0.11",
         "ua-parser-js": "^2.0.7"
     },
     "devDependencies": {
+        "@iconify-json/lucide": "^1.2.80",
         "@types/nodemailer": "^7.0.4",
-        "@types/ua-parser-js": "^0.7.39"
-    }
+        "@types/ua-parser-js": "^0.7.39",
+        "pinia": "^3.0.4",
+        "tdesign-vue-next": "^1.17.7",
+        "vue": "^3.5.26",
+        "vue-router": "^4.6.4"
+    },
+    "peerDependencies": {
+        "@iconify-json/lucide": "^1.2.80",
+        "pinia": "^3.0.4",
+        "tdesign-vue-next": "^1.17.7",
+        "vue": "^3.5.26",
+        "vue-router": "^4.6.4"
+    },
+    "publishConfig": {
+        "access": "public",
+        "registry": "https://registry.npmjs.org"
+    },
+    "gitHead": "0ba53d2bbdc6a7f2659ef60256cda7302fe585b0",
+    "title": "管理后台"
 }

package/plugins/email.ts

@@ -3,27 +3,27 @@
  * 提供邮件发送功能，支持 SMTP 配置
  */
 
-import { EmailHelper } from '../libs/emailHelper.js';
+import type { EmailConfig } from "../libs/emailHelper.js";
+import type { BeflyContext } from "befly/types/befly";
+import type { Plugin } from "befly/types/plugin";
 
-import type { EmailConfig } from '../libs/emailHelper.js';
-import type { Plugin } from 'befly/types/plugin.js';
-import type { BeflyContext } from 'befly/types/befly.js';
+import { EmailHelper } from "../libs/emailHelper.js";
 
 /** 默认配置 */
 const defaultConfig: EmailConfig = {
-    host: 'smtp.qq.com',
+    host: "smtp.qq.com",
     port: 465,
     secure: true,
-    user: '',
-    pass: '',
-    fromName: 'Befly System'
+    user: "",
+    pass: "",
+    fromName: "Befly System"
 };
 
 /**
  * 邮件插件
  */
 const emailPlugin: Plugin = {
-    after: ['db', 'logger', 'config'],
+    after: ["db", "logger", "config"],
     async handler(befly: BeflyContext): Promise<EmailHelper> {
         // 从 befly.config.addons.admin.email 获取配置
         const addonEmailConfig = befly.config?.addons?.admin?.email || {};

package/tables/role.json

@@ -21,11 +21,13 @@
     },
     "menus": {
         "name": "菜单权限",
-        "type": "array_text"
+        "type": "array_number_text",
+        "detail": "菜单ID数组，如 [1,2,3]"
     },
     "apis": {
         "name": "接口权限",
-        "type": "array_text"
+        "type": "array_number_text",
+        "detail": "接口ID数组，如 [1,2,3]"
     },
     "sort": {
         "name": "排序",

package/views/403_1/index.vue

@@ -13,14 +13,21 @@
 </template>
 
 <script setup>
-import { useRouter } from 'vue-router';
-import { Button as TButton } from 'tdesign-vue-next';
+import { useRouter } from "vue-router";
+import { Button as TButton } from "tdesign-vue-next";
+
+definePage({
+    meta: {
+        title: "403",
+        order: 101
+    }
+});
 
 const router = useRouter();
 
 const $Method = {
     goHome() {
-        router.push('/');
+        router.push("/");
     },
     goBack() {
         router.back();
@@ -56,4 +63,13 @@ const $Method = {
     .error-description {
         font-size: 16px;
         color: var(--text-secondary);
+        margin: 8px 0 24px;
+    }
+
+    .error-actions {
+        display: flex;
+        gap: 12px;
+        justify-content: center;
+    }
+}
 </style>

package/views/config/dict/components/edit.vue

@@ -23,8 +23,8 @@
 </template>
 
 <script setup>
-import { Dialog as TDialog, Form as TForm, FormItem as TFormItem, Input as TInput, Select as TSelect, Option as TOption, Textarea as TTextarea, InputNumber as TInputNumber, MessagePlugin } from 'tdesign-vue-next';
-import { $Http } from '@/plugins/http';
+import { Dialog as TDialog, Form as TForm, FormItem as TFormItem, Input as TInput, Select as TSelect, Option as TOption, Textarea as TTextarea, InputNumber as TInputNumber, MessagePlugin } from "tdesign-vue-next";
+import { $Http } from "@/plugins/http";
 
 const props = defineProps({
     modelValue: Boolean,
@@ -33,27 +33,27 @@ const props = defineProps({
     typeList: Array
 });
 
-const emit = defineEmits(['update:modelValue', 'success']);
+const emit = defineEmits(["update:modelValue", "success"]);
 
 const visible = computed({
     get: () => props.modelValue,
-    set: (val) => emit('update:modelValue', val)
+    set: (val) => emit("update:modelValue", val)
 });
 
 const formRef = $ref(null);
 
 const $Data = $ref({
     formData: {
-        typeCode: '',
-        key: '',
-        label: '',
+        typeCode: "",
+        key: "",
+        label: "",
         sort: 0,
-        remark: ''
+        remark: ""
     },
     rules: {
-        typeCode: [{ required: true, message: '请选择字典类型' }],
-        key: [{ required: true, message: '请输入键值' }],
-        label: [{ required: true, message: '请输入标签' }]
+        typeCode: [{ required: true, message: "请选择字典类型" }],
+        key: [{ required: true, message: "请输入键值" }],
+        label: [{ required: true, message: "请输入标签" }]
     }
 });
 
@@ -61,7 +61,7 @@ const $Method = {
     async handleSubmit() {
         try {
             const valid = await formRef.validate();
-            const apiUrl = props.actionType === 'add' ? '/addon/admin/dict/ins' : '/addon/admin/dict/upd';
+            const apiUrl = props.actionType === "add" ? "/addon/admin/dict/ins" : "/addon/admin/dict/upd";
             const params = {
                 typeCode: $Data.formData.typeCode,
                 key: $Data.formData.key,
@@ -69,22 +69,20 @@ const $Method = {
                 sort: $Data.formData.sort,
                 remark: $Data.formData.remark
             };
-            if (props.actionType === 'upd') {
+            if (props.actionType === "upd") {
                 params.id = props.rowData.id;
             }
 
             const res = await $Http(apiUrl, params);
-            console.log('🔥[ res ]-79', res);
             if (res.code === 0) {
-                MessagePlugin.success(props.actionType === 'add' ? '添加成功' : '更新成功');
+                MessagePlugin.success(props.actionType === "add" ? "添加成功" : "更新成功");
                 visible.value = false;
-                emit('success');
+                emit("success");
             } else {
-                MessagePlugin.error(res.msg || '操作失败');
+                MessagePlugin.error(res.msg || "操作失败");
             }
         } catch (error) {
-            console.error('提交失败:', error);
-            MessagePlugin.error('操作失败');
+            MessagePlugin.error("操作失败");
         }
     },
     handleClose() {
@@ -96,18 +94,18 @@ watch(
     () => props.modelValue,
     (val) => {
         if (val) {
-            if (props.actionType === 'upd' && props.rowData) {
-                $Data.formData.typeCode = props.rowData.typeCode || '';
-                $Data.formData.key = props.rowData.key || '';
-                $Data.formData.label = props.rowData.label || '';
+            if (props.actionType === "upd" && props.rowData) {
+                $Data.formData.typeCode = props.rowData.typeCode || "";
+                $Data.formData.key = props.rowData.key || "";
+                $Data.formData.label = props.rowData.label || "";
                 $Data.formData.sort = props.rowData.sort || 0;
-                $Data.formData.remark = props.rowData.remark || '';
+                $Data.formData.remark = props.rowData.remark || "";
             } else {
-                $Data.formData.typeCode = '';
-                $Data.formData.key = '';
-                $Data.formData.label = '';
+                $Data.formData.typeCode = "";
+                $Data.formData.key = "";
+                $Data.formData.label = "";
                 $Data.formData.sort = 0;
-                $Data.formData.remark = '';
+                $Data.formData.remark = "";
             }
         }
     },

package/views/config/dict/index.vue

@@ -26,7 +26,16 @@
         </div>
         <div class="main-content">
             <div class="main-table">
-                <TTable :data="$Data.tableData" :columns="$Data.columns" :loading="$Data.loading" :active-row-keys="$Data.activeRowKeys" row-key="id" height="calc(100vh - var(--search-height) - var(--pagination-height) - var(--layout-gap) * 4)" active-row-type="single" @active-change="$Method.onActiveChange">
+                <TTable
+                    :data="$Data.tableData"
+                    :columns="$Data.columns"
+                    :loading="$Data.loading"
+                    :active-row-keys="$Data.activeRowKeys"
+                    row-key="id"
+                    height="calc(100vh - var(--search-height) - var(--pagination-height) - var(--layout-gap) * 4)"
+                    active-row-type="single"
+                    @active-change="$Method.onActiveChange"
+                >
                     <template #operation="{ row }">
                         <TDropdown trigger="click" placement="bottom-right" @click="(data) => $Method.onAction(data.value, row)">
                             <TButton theme="primary" size="small">
@@ -62,17 +71,24 @@
 </template>
 
 <script setup>
-import { Button as TButton, Table as TTable, Input as TInput, Select as TSelect, Option as TOption, Dropdown as TDropdown, DropdownMenu as TDropdownMenu, DropdownItem as TDropdownItem, Pagination as TPagination, MessagePlugin, DialogPlugin } from 'tdesign-vue-next';
-import ILucidePlus from '~icons/lucide/plus';
-import ILucideRotateCw from '~icons/lucide/rotate-cw';
-import ILucideSearch from '~icons/lucide/search';
-import ILucidePencil from '~icons/lucide/pencil';
-import ILucideTrash2 from '~icons/lucide/trash-2';
-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 'befly-shared/withDefaultColumns';
+import { Button as TButton, Table as TTable, Input as TInput, Select as TSelect, Option as TOption, Dropdown as TDropdown, DropdownMenu as TDropdownMenu, DropdownItem as TDropdownItem, Pagination as TPagination, MessagePlugin, DialogPlugin } from "tdesign-vue-next";
+import ILucidePlus from "~icons/lucide/plus";
+import ILucideRotateCw from "~icons/lucide/rotate-cw";
+import ILucideSearch from "~icons/lucide/search";
+import ILucidePencil from "~icons/lucide/pencil";
+import ILucideTrash2 from "~icons/lucide/trash-2";
+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 "befly-vite/utils/withDefaultColumns";
+
+definePage({
+    meta: {
+        title: "字典列表",
+        order: 1
+    }
+});
 
 const $Data = $ref({
     tableData: [],
@@ -80,27 +96,27 @@ const $Data = $ref({
     loading: false,
     activeRowKeys: [],
     currentRow: null,
-    searchTypeCode: '',
-    searchKeyword: '',
+    searchTypeCode: "",
+    searchKeyword: "",
     columns: withDefaultColumns([
-        { colKey: 'id', title: 'ID' },
-        { colKey: 'typeName', title: '类型名称' },
-        { colKey: 'typeCode', title: '类型代码' },
-        { colKey: 'label', title: '标签' },
-        { colKey: 'key', title: '键值' },
-        { colKey: 'sort', title: '排序', width: 100 },
-        { colKey: 'remark', title: '备注' },
-        { colKey: 'operation', title: '操作' }
+        { colKey: "id", title: "ID" },
+        { colKey: "typeName", title: "类型名称" },
+        { colKey: "typeCode", title: "类型代码" },
+        { colKey: "label", title: "标签" },
+        { colKey: "key", title: "键值" },
+        { colKey: "sort", title: "排序", width: 100 },
+        { colKey: "remark", title: "备注" },
+        { colKey: "operation", title: "操作" }
     ]),
     pagerConfig: {
         currentPage: 1,
         limit: 30,
         total: 0,
-        align: 'right',
-        layout: 'total, prev, pager, next, jumper'
+        align: "right",
+        layout: "total, prev, pager, next, jumper"
     },
     editVisible: false,
-    actionType: 'add',
+    actionType: "add",
     rowData: {}
 });
 
@@ -111,16 +127,16 @@ const $Method = {
     },
     async apiDictTypeAll() {
         try {
-            const res = await $Http('/addon/admin/dictType/all');
+            const res = await $Http("/addon/admin/dictType/all");
             $Data.typeList = res.data.lists || [];
         } catch (error) {
-            console.error('加载字典类型列表失败:', error);
+            MessagePlugin.error("加载数据失败");
         }
     },
     async apiDictList() {
         $Data.loading = true;
         try {
-            const res = await $Http('/addon/admin/dict/list', {
+            const res = await $Http("/addon/admin/dict/list", {
                 page: $Data.pagerConfig.currentPage,
                 limit: $Data.pagerConfig.limit,
                 typeCode: $Data.searchTypeCode,
@@ -137,29 +153,49 @@ const $Method = {
                 $Data.activeRowKeys = [];
             }
         } catch (error) {
-            console.error('加载字典列表失败:', error);
-            MessagePlugin.error('加载数据失败');
+            MessagePlugin.error("加载数据失败");
         } finally {
             $Data.loading = false;
         }
     },
     async apiDictDel(row) {
-        DialogPlugin.confirm({
-            header: '确认删除',
-            body: `确定要删除字典项"${row.label}"吗？`,
-            status: 'warning'
-        }).then(async () => {
-            try {
-                const res = await $Http('/addon/admin/dict/del', { id: row.id });
-                if (res.code === 0) {
-                    MessagePlugin.success('删除成功');
-                    $Method.apiDictList();
-                } else {
-                    MessagePlugin.error(res.msg || '删除失败');
+        let dialog = null;
+        let destroyed = false;
+
+        const destroy = () => {
+            if (destroyed) return;
+            destroyed = true;
+            if (dialog && typeof dialog.destroy === "function") {
+                dialog.destroy();
+            }
+        };
+
+        dialog = DialogPlugin.confirm({
+            header: "确认删除",
+            body: `确认删除字典项“${row.label}”吗？`,
+            status: "warning",
+            confirmBtn: "删除",
+            cancelBtn: "取消",
+            onConfirm: async () => {
+                if (dialog && typeof dialog.setConfirmLoading === "function") {
+                    dialog.setConfirmLoading(true);
+                }
+
+                try {
+                    await $Http("/addon/admin/dict/del", { id: row.id });
+                    MessagePlugin.success("删除成功");
+                    destroy();
+                    await $Method.apiDictList();
+                } catch (error) {
+                    MessagePlugin.error("删除失败");
+                } finally {
+                    if (dialog && typeof dialog.setConfirmLoading === "function") {
+                        dialog.setConfirmLoading(false);
+                    }
                 }
-            } catch (error) {
-                console.error('删除失败:', error);
-                MessagePlugin.error('删除失败');
+            },
+            onClose: () => {
+                destroy();
             }
         });
     },
@@ -168,8 +204,8 @@ const $Method = {
         $Method.apiDictList();
     },
     handleRefresh() {
-        $Data.searchTypeCode = '';
-        $Data.searchKeyword = '';
+        $Data.searchTypeCode = "";
+        $Data.searchKeyword = "";
         $Data.pagerConfig.currentPage = 1;
         $Method.apiDictList();
     },
@@ -190,15 +226,15 @@ const $Method = {
         $Data.currentRow = context.currentRowData;
     },
     onAction(type, row) {
-        if (type === 'add') {
-            $Data.actionType = 'add';
+        if (type === "add") {
+            $Data.actionType = "add";
             $Data.rowData = {};
             $Data.editVisible = true;
-        } else if (type === 'upd') {
-            $Data.actionType = 'upd';
+        } else if (type === "upd") {
+            $Data.actionType = "upd";
             $Data.rowData = { ...row };
             $Data.editVisible = true;
-        } else if (type === 'del') {
+        } else if (type === "del") {
             $Method.apiDictDel(row);
         }
     }