@befly-addon/admin 1.1.29 → 1.1.31

package/views/people/admin/index.vue

@@ -19,7 +19,16 @@
 
         <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 #state="{ row }">
                         <TTag v-if="row.state === 1" shape="round" theme="success" variant="light-outline">正常</TTag>
                         <TTag v-else-if="row.state === 2" shape="round" theme="warning" variant="light-outline">禁用</TTag>
@@ -61,38 +70,45 @@
 </template>
 
 <script setup>
-import { Button as TButton, Table as TTable, Tag as TTag, 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 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, Tag as TTag, 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 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: [],
     loading: false,
     columns: withDefaultColumns([
-        { colKey: 'username', title: '用户名', fixed: 'left' },
-        { colKey: 'id', title: '序号' },
-        { colKey: 'nickname', title: '昵称' },
-        { colKey: 'roleCode', title: '角色' },
-        { colKey: 'state', title: '状态' },
-        { colKey: 'operation', title: '操作' }
+        { colKey: "username", title: "用户名", fixed: "left" },
+        { colKey: "id", title: "序号" },
+        { colKey: "nickname", title: "昵称" },
+        { colKey: "roleCode", title: "角色" },
+        { colKey: "state", 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: {},
     currentRow: null,
     activeRowKeys: []
@@ -108,7 +124,7 @@ const $Method = {
     async apiAdminList() {
         $Data.loading = true;
         try {
-            const res = await $Http('/addon/admin/admin/list', {
+            const res = await $Http("/addon/admin/admin/list", {
                 page: $Data.pagerConfig.currentPage,
                 limit: $Data.pagerConfig.limit
             });
@@ -124,8 +140,7 @@ const $Method = {
                 $Data.activeRowKeys = [];
             }
         } catch (error) {
-            console.error('加载管理员列表失败:', error);
-            MessagePlugin.error('加载数据失败');
+            MessagePlugin.error("加载数据失败");
         } finally {
             $Data.loading = false;
         }
@@ -133,22 +148,43 @@ const $Method = {
 
     // 删除管理员
     async apiAdminDel(row) {
-        DialogPlugin.confirm({
-            header: '确认删除',
-            body: `确定要删除管理员“${row.username}” 吗？`,
-            status: 'warning'
-        }).then(async () => {
-            try {
-                const res = await $Http('/addon/admin/admin/del', { id: row.id });
-                if (res.code === 0) {
-                    MessagePlugin.success('删除成功');
-                    $Method.apiAdminList();
-                } 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.username}”吗？`,
+            status: "warning",
+            confirmBtn: "删除",
+            cancelBtn: "取消",
+            onConfirm: async () => {
+                if (dialog && typeof dialog.setConfirmLoading === "function") {
+                    dialog.setConfirmLoading(true);
+                }
+
+                try {
+                    await $Http("/addon/admin/admin/del", { id: row.id });
+                    MessagePlugin.success("删除成功");
+                    destroy();
+                    await $Method.apiAdminList();
+                } catch (error) {
+                    MessagePlugin.error("删除失败");
+                } finally {
+                    if (dialog && typeof dialog.setConfirmLoading === "function") {
+                        dialog.setConfirmLoading(false);
+                    }
                 }
-            } catch (error) {
-                console.error('删除失败:', error);
-                MessagePlugin.error('删除失败');
+            },
+            onClose: () => {
+                destroy();
             }
         });
     },
@@ -188,9 +224,9 @@ const $Method = {
     onAction(command, rowData) {
         $Data.actionType = command;
         $Data.rowData = rowData;
-        if (command === 'add' || command === 'upd') {
+        if (command === "add" || command === "upd") {
             $Data.editVisible = true;
-        } else if (command === 'del') {
+        } else if (command === "del") {
             $Method.apiAdminDel(rowData);
         }
     }

package/views/people/index.vue

@@ -0,0 +1,12 @@
+<template>
+    <RouterView />
+</template>
+
+<script setup>
+definePage({
+    meta: {
+        title: "人员管理",
+        order: 10
+    }
+});
+</script>

package/views/permission/api/index.vue

@@ -51,25 +51,32 @@
 </template>
 
 <script setup>
-import { Button as TButton, Table as TTable, Tag as TTag, Input as TInput, MessagePlugin } from 'tdesign-vue-next';
-import ILucideRotateCw from '~icons/lucide/rotate-cw';
-import ILucideSearch from '~icons/lucide/search';
-import { $Http } from '@/plugins/http';
-import { withDefaultColumns } from 'befly-shared/withDefaultColumns';
-import DetailPanel from '@/components/DetailPanel.vue';
+import { Button as TButton, Table as TTable, Tag as TTag, Input as TInput, MessagePlugin } from "tdesign-vue-next";
+import ILucideRotateCw from "~icons/lucide/rotate-cw";
+import ILucideSearch from "~icons/lucide/search";
+import { $Http } from "@/plugins/http";
+import { withDefaultColumns } from "befly-vite/utils/withDefaultColumns";
+import DetailPanel from "@/components/DetailPanel.vue";
+
+definePage({
+    meta: {
+        title: "接口列表",
+        order: 3
+    }
+});
 
 // 响应式数据
 const $Data = $ref({
     tableData: [],
     allData: [],
     loading: false,
-    searchKeyword: '',
+    searchKeyword: "",
     columns: withDefaultColumns([
-        { colKey: 'name', title: '接口名称' },
-        { colKey: 'id', title: '序号' },
-        { colKey: 'path', title: '接口路径' },
-        { colKey: 'method', title: '请求方法' },
-        { colKey: 'addonName', title: '所属组件' }
+        { colKey: "name", title: "接口名称" },
+        { colKey: "id", title: "序号" },
+        { colKey: "path", title: "接口路径" },
+        { colKey: "method", title: "请求方法" },
+        { colKey: "addonName", title: "所属组件" }
     ]),
     currentRow: null,
     activeRowKeys: []
@@ -85,7 +92,7 @@ const $Method = {
     async loadApiAll() {
         $Data.loading = true;
         try {
-            const res = await $Http('/addon/admin/api/all');
+            const res = await $Http("/addon/admin/api/all");
             const list = res.data?.lists || [];
             $Data.allData = list;
             $Data.tableData = list;
@@ -99,8 +106,7 @@ const $Method = {
                 $Data.activeRowKeys = [];
             }
         } catch (error) {
-            console.error('加载接口列表失败:', error);
-            MessagePlugin.error('加载数据失败');
+            MessagePlugin.error("加载数据失败");
         } finally {
             $Data.loading = false;
         }

package/views/permission/index.vue

@@ -0,0 +1,12 @@
+<template>
+    <RouterView />
+</template>
+
+<script setup>
+definePage({
+    meta: {
+        title: "权限设置",
+        order: 20
+    }
+});
+</script>

package/views/permission/menu/index.vue

@@ -13,7 +13,17 @@
 
         <div class="main-content">
             <div class="main-table">
-                <TTable v-bind="withTreeTableProps()" :data="$Data.tableData" :columns="$Data.columns" :loading="$Data.loading" :active-row-keys="$Data.activeRowKeys" row-key="id" height="calc(100vh - var(--search-height) - var(--layout-gap) * 2)" 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(--layout-gap) * 2)"
+                    active-row-type="single"
+                    :tree="{ childrenKey: 'children', treeNodeColumnIndex: 0, defaultExpandAll: true }"
+                    @active-change="$Method.onActiveChange"
+                >
                     <template #state="{ row }">
                         <TTag v-if="row.state === 1" shape="round" theme="success" variant="light-outline">正常</TTag>
                         <TTag v-else-if="row.state === 2" shape="round" theme="warning" variant="light-outline">禁用</TTag>
@@ -30,24 +40,30 @@
 </template>
 
 <script setup>
-import { Button as TButton, Table as TTable, Tag as TTag, MessagePlugin } from 'tdesign-vue-next';
-import ILucideRotateCw from '~icons/lucide/rotate-cw';
-import DetailPanel from '@/components/DetailPanel.vue';
-import { $Http } from '@/plugins/http';
-import { withDefaultColumns } from 'befly-shared/withDefaultColumns';
-import { withTreeTableProps } from '@/utils';
+import { Button as TButton, Table as TTable, Tag as TTag, MessagePlugin } from "tdesign-vue-next";
+import ILucideRotateCw from "~icons/lucide/rotate-cw";
+import DetailPanel from "@/components/DetailPanel.vue";
+import { $Http } from "@/plugins/http";
+import { withDefaultColumns } from "befly-vite/utils/withDefaultColumns";
+
+definePage({
+    meta: {
+        title: "菜单列表",
+        order: 2
+    }
+});
 
 // 响应式数据
 const $Data = $ref({
     tableData: [],
     loading: false,
     columns: withDefaultColumns([
-        { colKey: 'name', title: '菜单名称', fixed: 'left' },
-        { colKey: 'id', title: '序号' },
-        { colKey: 'path', title: '路由路径' },
-        { colKey: 'icon', title: '图标' },
-        { colKey: 'sort', title: '排序' },
-        { colKey: 'state', title: '状态' }
+        { colKey: "name", title: "菜单名称", fixed: "left" },
+        { colKey: "id", title: "序号" },
+        { colKey: "path", title: "路由路径" },
+        { colKey: "icon", title: "图标" },
+        { colKey: "sort", title: "排序" },
+        { colKey: "state", title: "状态" }
     ]),
     currentRow: null,
     activeRowKeys: []
@@ -63,7 +79,7 @@ const $Method = {
     async apiMenuList() {
         $Data.loading = true;
         try {
-            const res = await $Http('/addon/admin/menu/list');
+            const res = await $Http("/addon/admin/menu/list");
             // 构建树形结构
             $Data.tableData = $Method.buildTree(res.data || []);
 
@@ -76,8 +92,7 @@ const $Method = {
                 $Data.activeRowKeys = [];
             }
         } catch (error) {
-            console.error('加载菜单列表失败:', error);
-            MessagePlugin.error('加载数据失败');
+            MessagePlugin.error("加载数据失败");
         } finally {
             $Data.loading = false;
         }

package/views/permission/role/components/api.vue

@@ -16,7 +16,9 @@
                     <div class="group-header">{{ group.title }}</div>
                     <div class="api-checkbox-list">
                         <TCheckboxGroup v-model="$Data.checkedApiIds">
-                            <TCheckbox v-for="api in group.apis" :key="api.id" :value="api.id"> {{ api.label }} </TCheckbox>
+                            <TCheckbox v-for="api in group.apis" :key="api.id" :value="api.id">
+                                {{ api.label }}
+                            </TCheckbox>
                         </TCheckboxGroup>
                     </div>
                 </div>
@@ -35,9 +37,9 @@
 </template>
 
 <script setup>
-import { Dialog as TDialog, Input as TInput, CheckboxGroup as TCheckboxGroup, Checkbox as TCheckbox, Button as TButton, MessagePlugin } from 'tdesign-vue-next';
-import ILucideSearch from '~icons/lucide/search';
-import { $Http } from '@/plugins/http';
+import { Dialog as TDialog, Input as TInput, CheckboxGroup as TCheckboxGroup, Checkbox as TCheckbox, Button as TButton, MessagePlugin } from "tdesign-vue-next";
+import ILucideSearch from "~icons/lucide/search";
+import { $Http } from "@/plugins/http";
 
 const $Prop = defineProps({
     modelValue: {
@@ -50,14 +52,14 @@ const $Prop = defineProps({
     }
 });
 
-const $Emit = defineEmits(['update:modelValue', 'success']);
+const $Emit = defineEmits(["update:modelValue", "success"]);
 
 const $Data = $ref({
     visible: false,
     submitting: false,
     apiData: [],
     filteredApiData: [],
-    searchText: '',
+    searchText: "",
     checkedApiIds: []
 });
 
@@ -78,21 +80,21 @@ const $Method = {
     onClose() {
         $Data.visible = false;
         setTimeout(() => {
-            $Emit('update:modelValue', false);
+            $Emit("update:modelValue", false);
         }, 300);
     },
 
     // 加载所有接口
     async apiApiAll() {
         try {
-            const res = await $Http('/addon/admin/api/all');
+            const res = await $Http("/addon/admin/api/all");
 
             // 将接口列表按 addonTitle 分组
             const apiMap = new Map();
 
             res.data.lists.forEach((api) => {
-                const addonTitle = api.addonTitle || api.addonName || '项目接口';
-                const addonName = api.addonName || 'project';
+                const addonTitle = api.addonTitle || api.addonName || "项目接口";
+                const addonName = api.addonName || "project";
 
                 if (!apiMap.has(addonName)) {
                     apiMap.set(addonName, {
@@ -111,8 +113,7 @@ const $Method = {
 
             $Data.apiData = Array.from(apiMap.values());
         } catch (error) {
-            console.error('加载接口失败:', error);
-            MessagePlugin.error('加载接口失败');
+            MessagePlugin.error("加载接口失败");
         }
     },
 
@@ -121,13 +122,13 @@ const $Method = {
         if (!$Prop.rowData.id) return;
 
         try {
-            const res = await $Http('/addon/admin/role/apiDetail', {
-                roleId: $Prop.rowData.id
+            const res = await $Http("/addon/admin/role/apis", {
+                roleCode: $Prop.rowData.code
             });
 
             $Data.checkedApiIds = res.data.apiIds || [];
         } catch (error) {
-            console.error('加载角色接口失败:', error);
+            MessagePlugin.error("加载数据失败");
         }
     },
 
@@ -152,21 +153,20 @@ const $Method = {
         try {
             $Data.submitting = true;
 
-            const res = await $Http('/addon/admin/role/apiSave', {
-                roleId: $Prop.rowData.id,
+            const res = await $Http("/addon/admin/role/apiSave", {
+                roleCode: $Prop.rowData.code,
                 apiIds: $Data.checkedApiIds
             });
 
             if (res.code === 0) {
-                MessagePlugin.success('保存成功');
+                MessagePlugin.success("保存成功");
                 $Data.visible = false;
-                $Emit('success');
+                $Emit("success");
             } else {
-                MessagePlugin.error(res.msg || '保存失败');
+                MessagePlugin.error(res.msg || "保存失败");
             }
         } catch (error) {
-            console.error('保存失败:', error);
-            MessagePlugin.error('保存失败');
+            MessagePlugin.error("保存失败");
         } finally {
             $Data.submitting = false;
         }
@@ -215,7 +215,7 @@ $Method.initData();
                 gap: 8px;
 
                 &::before {
-                    content: '';
+                    content: "";
                     width: 8px;
                     height: 8px;
                     border-radius: 50%;

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

@@ -41,9 +41,9 @@ import {
     Radio as TRadio,
     Button as TButton,
     MessagePlugin
-} from 'tdesign-vue-next';
-import { fieldClear } from 'befly-shared/fieldClear';
-import { $Http } from '@/plugins/http';
+} from "tdesign-vue-next";
+import { fieldClear } from "befly-vite/utils/fieldClear";
+import { $Http } from "@/plugins/http";
 
 const $Prop = defineProps({
     modelValue: {
@@ -52,7 +52,7 @@ const $Prop = defineProps({
     },
     actionType: {
         type: String,
-        default: 'add'
+        default: "add"
     },
     rowData: {
         type: Object,
@@ -60,7 +60,7 @@ const $Prop = defineProps({
     }
 });
 
-const $Emit = defineEmits(['update:modelValue', 'success']);
+const $Emit = defineEmits(["update:modelValue", "success"]);
 
 // 表单引用
 const $From = $shallowRef({
@@ -74,9 +74,9 @@ const $Data = $ref({
     submitting: false,
     formData: {
         id: 0,
-        name: '',
-        code: '',
-        description: '',
+        name: "",
+        code: "",
+        description: "",
         sort: 0,
         state: 1
     }
@@ -84,19 +84,19 @@ const $Data = $ref({
 
 const $Data2 = $shallowRef({
     formRules: {
-        name: [{ required: true, message: '请输入角色名称', trigger: 'blur' }],
+        name: [{ required: true, message: "请输入角色名称", trigger: "blur" }],
         code: [
-            { required: true, message: '请输入角色代码', trigger: 'blur' },
-            { pattern: /^[a-zA-Z0-9_]+$/, message: '角色代码只能包含字母、数字和下划线', trigger: 'blur' }
+            { required: true, message: "请输入角色代码", trigger: "blur" },
+            { pattern: /^[a-zA-Z0-9_]+$/, message: "角色代码只能包含字母、数字和下划线", trigger: "blur" }
         ],
-        sort: [{ type: 'number', message: '排序必须是数字', trigger: 'blur' }]
+        sort: [{ type: "number", message: "排序必须是数字", trigger: "blur" }]
     }
 });
 
 // 方法集合
 const $Method = {
     async initData() {
-        if ($Prop.actionType === 'upd' && $Prop.rowData.id) {
+        if ($Prop.actionType === "upd" && $Prop.rowData.id) {
             $Data.formData = Object.assign({}, $Prop.rowData);
         }
         $Method.onShow();
@@ -110,7 +110,7 @@ const $Method = {
     onClose() {
         $Data.visible = false;
         setTimeout(() => {
-            $Emit('update:modelValue', false);
+            $Emit("update:modelValue", false);
         }, 300);
     },
     async onSubmit() {
@@ -119,14 +119,14 @@ const $Method = {
             if (!valid) return;
 
             $Data.submitting = true;
-            const formData = $Prop.actionType === 'add' ? fieldClear($Data.formData, { omitKeys: ['id', 'state'] }) : $Data.formData;
-            const res = await $Http($Prop.actionType === 'upd' ? '/addon/admin/role/upd' : '/addon/admin/role/ins', formData);
+            const formData = $Prop.actionType === "add" ? fieldClear($Data.formData, { omitKeys: ["id", "state"] }) : $Data.formData;
+            const res = await $Http($Prop.actionType === "upd" ? "/addon/admin/role/upd" : "/addon/admin/role/ins", formData);
 
             MessagePlugin.success(res.msg);
-            $Emit('success');
+            $Emit("success");
             $Method.onClose();
         } catch (error) {
-            MessagePlugin.error(error.msg || '提交失败');
+            MessagePlugin.error(error.msg || "提交失败");
         } finally {
             $Data.submitting = false;
         }