@befly-addon/admin 1.0.55 → 1.0.56

package/views/{menu → permission/menu}/index.vue

@@ -13,7 +13,7 @@
 
         <div class="main-content">
             <div class="main-table">
-                <TTable v-bind="withTreeTableProps()" :data="$Data.tableData" :columns="$Data.columns" :loading="$Data.loading" :selected-row-keys="$Data.selectedRowKeys" :active-row-keys="$Data.activeRowKeys" @select-change="$Method.onSelectChange" @active-change="$Method.onActiveChange">
+                <TTable v-bind="withTreeTableProps()" :data="$Data.tableData" :columns="$Data.columns" :loading="$Data.loading" :active-row-keys="$Data.activeRowKeys" row-key="id" height="calc(100vh - 94px)" 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>
@@ -23,18 +23,7 @@
             </div>
 
             <div class="main-detail">
-                <DetailPanel
-                    :data="$Data.currentRow"
-                    :fields="[
-                        { key: 'id', label: 'ID' },
-                        { key: 'name', label: '菜单名称' },
-                        { key: 'path', label: '路由路径' },
-                        { key: 'icon', label: '图标' },
-                        { key: 'sort', label: '排序' },
-                        { key: 'pid', label: '父级ID', default: '顶级菜单' },
-                        { key: 'state', label: '状态' }
-                    ]"
-                />
+                <DetailPanel :data="$Data.currentRow" :fields="$Data.columns" />
             </div>
         </div>
     </div>
@@ -52,23 +41,14 @@ const $Data = $ref({
     tableData: [],
     loading: false,
     columns: withDefaultColumns([
-        {
-            colKey: 'row-select',
-            type: 'single',
-            width: 50,
-            fixed: 'left',
-            checkProps: { allowUncheck: true },
-            ellipsis: false
-        },
-        { colKey: 'name', title: '菜单名称', width: 200, fixed: 'left' },
-        { colKey: 'id', title: '序号', width: 100, align: 'center' },
-        { colKey: 'path', title: '路由路径', width: 250 },
-        { colKey: 'icon', title: '图标', width: 120 },
-        { colKey: 'sort', title: '排序', width: 80, align: 'center' },
-        { colKey: 'state', title: '状态', width: 100, ellipsis: false }
+        { colKey: 'name', title: '菜单名称', fixed: 'left' },
+        { colKey: 'id', title: '序号' },
+        { colKey: 'path', title: '路由路径' },
+        { colKey: 'icon', title: '图标' },
+        { colKey: 'sort', title: '排序' },
+        { colKey: 'state', title: '状态' }
     ]),
     currentRow: null,
-    selectedRowKeys: [],
     activeRowKeys: []
 });
 
@@ -86,14 +66,12 @@ const $Method = {
             // 构建树形结构
             $Data.tableData = $Method.buildTree(res.data || []);
 
-            // 自动选中并高亮第一行
+            // 自动高亮第一行
             if ($Data.tableData.length > 0) {
                 $Data.currentRow = $Data.tableData[0];
-                $Data.selectedRowKeys = [$Data.tableData[0].id];
                 $Data.activeRowKeys = [$Data.tableData[0].id];
             } else {
                 $Data.currentRow = null;
-                $Data.selectedRowKeys = [];
                 $Data.activeRowKeys = [];
             }
         } catch (error) {
@@ -146,33 +124,16 @@ const $Method = {
         $Method.apiMenuList();
     },
 
-    // 单选变化
-    onSelectChange(value, { selectedRowData }) {
-        $Data.selectedRowKeys = value;
-        $Data.activeRowKeys = value;
-        if (selectedRowData && selectedRowData.length > 0) {
-            $Data.currentRow = selectedRowData[0];
-        } else if ($Data.tableData.length > 0) {
-            $Data.currentRow = $Data.tableData[0];
-            $Data.selectedRowKeys = [$Data.tableData[0].id];
-            $Data.activeRowKeys = [$Data.tableData[0].id];
-        } else {
-            $Data.currentRow = null;
-        }
-    },
-
     // 高亮行变化
-    onActiveChange(value, { activeRowData }) {
+    onActiveChange(value, context) {
+        // 禁止取消高亮：如果新值为空，保持当前选中
+        if (value.length === 0 && $Data.activeRowKeys.length > 0) {
+            return;
+        }
         $Data.activeRowKeys = value;
-        $Data.selectedRowKeys = value;
-        if (activeRowData && activeRowData.length > 0) {
-            $Data.currentRow = activeRowData[0];
-        } else if ($Data.tableData.length > 0) {
-            $Data.currentRow = $Data.tableData[0];
-            $Data.selectedRowKeys = [$Data.tableData[0].id];
-            $Data.activeRowKeys = [$Data.tableData[0].id];
-        } else {
-            $Data.currentRow = null;
+        // 更新当前高亮的行数据
+        if (context.activeRowList && context.activeRowList.length > 0) {
+            $Data.currentRow = context.activeRowList[0].row;
         }
     }
 };

package/views/permission/menu/meta.json

@@ -0,0 +1,4 @@
+{
+    "name": "菜单列表",
+    "order": 2
+}

package/views/permission/meta.json

@@ -0,0 +1,4 @@
+{
+    "name": "权限设置",
+    "order": 20
+}

package/views/{role → permission/role}/components/api.vue

@@ -12,7 +12,7 @@
 
             <!-- 接口分组列表 -->
             <div class="api-container">
-                <div v-for="group in $Data.filteredApiData" :key="group.name" class="api-group">
+                <div class="api-group" v-for="group in $Data.filteredApiData" :key="group.name">
                     <div class="group-header">{{ group.title }}</div>
                     <div class="api-checkbox-list">
                         <TCheckboxGroup v-model="$Data.checkedApiIds">
@@ -24,13 +24,11 @@
         </div>
 
         <template #footer>
-            <div class="footer-left">
-                <TButton size="small" @click="$Method.onCheckAll">全选</TButton>
-                <TButton size="small" @click="$Method.onUncheckAll">取消全选</TButton>
-            </div>
-            <div class="footer-right">
-                <TButton @click="$Method.onClose">取消</TButton>
-                <TButton theme="primary" :loading="$Data.submitting" @click="$Method.onSubmit">保存</TButton>
+            <div class="dialog-footer">
+                <t-space>
+                    <TButton theme="default" @click="$Method.onClose">取消</TButton>
+                    <TButton theme="primary" :loading="$Data.submitting" @click="$Method.onSubmit">保存</TButton>
+                </t-space>
             </div>
         </template>
     </TDialog>
@@ -149,22 +147,6 @@ const $Method = {
             .filter((group) => group.apis.length > 0);
     },
 
-    // 全选
-    onCheckAll() {
-        const allApiIds = [];
-        $Data.apiData.forEach((group) => {
-            group.apis.forEach((api) => {
-                allApiIds.push(api.id);
-            });
-        });
-        $Data.checkedApiIds = allApiIds;
-    },
-
-    // 取消全选
-    onUncheckAll() {
-        $Data.checkedApiIds = [];
-    },
-
     // 提交表单
     async onSubmit() {
         try {
@@ -214,6 +196,10 @@ $Method.initData();
             border-radius: var(--border-radius-small);
             overflow: hidden;
 
+            .api-checkbox-list {
+                padding: 10px;
+            }
+
             &:last-child {
                 margin-bottom: 0;
             }
@@ -267,20 +253,9 @@ $Method.initData();
     }
 }
 
-// 底部操作栏布局
-:deep(.t-dialog__footer) {
+.dialog-footer {
+    width: 100%;
     display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .footer-left {
-        display: flex;
-        gap: 8px;
-    }
-
-    .footer-right {
-        display: flex;
-        gap: 8px;
-    }
+    justify-content: center;
 }
 </style>

package/views/{role → permission/role}/components/edit.vue

@@ -9,15 +9,15 @@
                     <TInput v-model="$Data.formData.code" placeholder="请输入角色代码，如：admin" />
                 </TFormItem>
                 <TFormItem label="角色描述" prop="description">
-                    <TInput v-model="$Data.formData.description" type="textarea" placeholder="请输入角色描述" :rows="3" />
+                    <TInput v-model="$Data.formData.description" placeholder="请输入角色描述" />
                 </TFormItem>
                 <TFormItem label="排序" prop="sort">
                     <TInputNumber v-model="$Data.formData.sort" :min="0" :max="9999" />
                 </TFormItem>
                 <TFormItem label="状态" prop="state">
                     <TRadioGroup v-model="$Data.formData.state">
-                        <TRadio :label="1">正常</TRadio>
-                        <TRadio :label="2">禁用</TRadio>
+                        <TRadio :value="1">正常</TRadio>
+                        <TRadio :value="2">禁用</TRadio>
                     </TRadioGroup>
                 </TFormItem>
             </TForm>
@@ -42,6 +42,7 @@ import {
     Button as TButton,
     MessagePlugin
 } from 'tdesign-vue-next';
+import { fieldClear } from 'befly-shared/fieldClear';
 import { $Http } from '@/plugins/http';
 
 const $Prop = defineProps({
@@ -118,14 +119,14 @@ const $Method = {
             if (!valid) return;
 
             $Data.submitting = true;
-            const res = await $Http($Prop.actionType === 'upd' ? '/addon/admin/roleUpd' : '/addon/admin/roleIns', $Data.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($Prop.actionType === 'upd' ? '更新成功' : '添加成功');
-            $Data.visible = false;
+            MessagePlugin.success(res.msg);
             $Emit('success');
+            $Method.onClose();
         } catch (error) {
-            console.error('提交失败:', error);
-            MessagePlugin.error('提交失败');
+            MessagePlugin.error(error.msg || '提交失败');
         } finally {
             $Data.submitting = false;
         }

package/views/{role → permission/role}/components/menu.vue

@@ -1,7 +1,7 @@
 <template>
     <TDialog v-model:visible="$Data.visible" title="菜单权限" width="600px" :append-to-body="true" :show-footer="true" top="10vh" @close="$Method.onClose">
         <div class="comp-role-menu">
-            <TTree :data="$Data.menuTreeData" node-key="id" show-checkbox default-expand-all :props="{ label: 'name' }" :ref="(el) => ($From.tree = el)" />
+            <TTree v-model:value="$Data.menuTreeCheckedKeys" :data="$Data.menuTreeData" value-mode="all" :keys="{ value: 'id', label: 'name', children: 'children' }" checkable expand-all />
         </div>
         <template #footer>
             <TButton @click="$Method.onClose">取消</TButton>
@@ -11,7 +11,6 @@
 </template>
 
 <script setup>
-import { nextTick } from 'vue';
 import { Dialog as TDialog, Tree as TTree, Button as TButton, MessagePlugin } from 'tdesign-vue-next';
 import { arrayToTree } from '@/utils';
 import { $Http } from '@/plugins/http';
@@ -29,11 +28,6 @@ const $Prop = defineProps({
 
 const $Emit = defineEmits(['update:modelValue', 'success']);
 
-// 表单引用
-const $From = $shallowRef({
-    tree: null
-});
-
 const $Data = $ref({
     visible: false,
     submitting: false,
@@ -85,13 +79,6 @@ const $Method = {
 
             // roleMenuDetail 返回的 data 直接就是菜单 ID 数组
             $Data.menuTreeCheckedKeys = Array.isArray(res.data) ? res.data : [];
-
-            // 等待树渲染完成后设置选中状态
-            nextTick(() => {
-                if ($From.tree && $Data.menuTreeCheckedKeys.length > 0) {
-                    $From.tree.setCheckedKeys($Data.menuTreeCheckedKeys);
-                }
-            });
         } catch (error) {
             console.error('加载角色菜单失败:', error);
         }
@@ -100,21 +87,11 @@ const $Method = {
     // 提交表单
     async onSubmit() {
         try {
-            if (!$From.tree) {
-                MessagePlugin.error('菜单树未初始化');
-                return;
-            }
-
             $Data.submitting = true;
 
-            // 获取选中的节点（包括半选中的父节点）
-            const checkedKeys = $From.tree.getCheckedKeys();
-            const halfCheckedKeys = $From.tree.getHalfCheckedKeys();
-            const menuIds = [...checkedKeys, ...halfCheckedKeys];
-
             const res = await $Http('/addon/admin/role/menuSave', {
                 roleId: $Prop.rowData.id,
-                menuIds
+                menuIds: $Data.menuTreeCheckedKeys
             });
 
             if (res.code === 0) {

package/views/{role → permission/role}/index.vue

@@ -9,7 +9,7 @@
                 </TButton>
             </div>
             <div class="right">
-                <TButton @click="$Method.handleRefresh">
+                <TButton shape="circle" @click="$Method.handleRefresh">
                     <template #icon>
                         <ILucideRotateCw />
                     </template>
@@ -18,15 +18,18 @@
         </div>
         <div class="main-content">
             <div class="main-table">
-                <TTable v-bind="withTableProps()" :data="$Data.tableData" :columns="$Data.columns" :loading="$Data.loading" :active-row-keys="$Data.activeRowKeys" @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 - 94px)" active-row-type="single" @active-change="$Method.onActiveChange">
                     <template #state="{ row }">
-                        <TTag v-if="row.state === 1" theme="success">正常</TTag>
-                        <TTag v-else-if="row.state === 2" theme="warning">禁用</TTag>
-                        <TTag v-else theme="danger">已删除</TTag>
+                        <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>
+                        <TTag v-else shape="round" theme="danger" variant="light-outline">已删除</TTag>
                     </template>
                     <template #operation="{ row }">
-                        <TDropdown trigger="click" min-column-width="120" @click="(data) => $Method.onAction(data.value, row)">
-                            <TButton variant="text" size="small">操作</TButton>
+                        <TDropdown trigger="click" placement="bottom-right" @click="(data) => $Method.onAction(data.value, row)">
+                            <TButton theme="primary" size="small">
+                                操作
+                                <template #suffix> <t-icon name="chevron-down" size="16" /></template>
+                            </TButton>
                             <TDropdownMenu slot="dropdown">
                                 <TDropdownItem value="upd">
                                     <ILucidePencil />
@@ -51,17 +54,7 @@
             </div>
 
             <div class="main-detail">
-                <DetailPanel
-                    :data="$Data.currentRow"
-                    :fields="[
-                        { key: 'id', label: 'ID' },
-                        { key: 'name', label: '角色名称' },
-                        { key: 'code', label: '角色代码' },
-                        { key: 'description', label: '描述' },
-                        { key: 'sort', label: '排序' },
-                        { key: 'state', label: '状态' }
-                    ]"
-                />
+                <DetailPanel :data="$Data.currentRow" :fields="$Data.columns" />
             </div>
         </div>
 
@@ -93,7 +86,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, withTableProps } from '@/utils';
+import { withDefaultColumns } from '@/utils';
 
 // 响应式数据
 const $Data = $ref({
@@ -102,13 +95,13 @@ const $Data = $ref({
     activeRowKeys: [],
     currentRow: null,
     columns: withDefaultColumns([
-        { colKey: 'index', title: '序号', width: 100, align: 'center' },
-        { colKey: 'name', title: '角色名称', width: 150 },
-        { colKey: 'code', title: '角色代码', width: 150 },
-        { colKey: 'description', title: '描述', minWidth: 150 },
-        { colKey: 'sort', title: '排序', width: 80, align: 'center' },
-        { colKey: 'state', title: '状态', width: 100, align: 'center', ellipsis: false },
-        { colKey: 'operation', title: '操作', width: 120, align: 'center', fixed: 'right', ellipsis: false }
+        { colKey: 'id', title: 'ID' },
+        { colKey: 'name', title: '角色名称' },
+        { colKey: 'code', title: '角色代码' },
+        { colKey: 'description', title: '描述' },
+        { colKey: 'sort', title: '排序' },
+        { colKey: 'state', title: '状态' },
+        { colKey: 'operation', title: '操作' }
     ]),
     pagerConfig: {
         currentPage: 1,
@@ -196,18 +189,16 @@ const $Method = {
         $Method.apiRoleList();
     },
 
-    // 高亮行变化（点击行选中）
-    onActiveChange(value, { activeRowData }) {
+    // 高亮行变化
+    onActiveChange(value, context) {
+        // 禁止取消高亮：如果新值为空，保持当前选中
+        if (value.length === 0 && $Data.activeRowKeys.length > 0) {
+            return;
+        }
         $Data.activeRowKeys = value;
         // 更新当前高亮的行数据
-        if (activeRowData && activeRowData.length > 0) {
-            $Data.currentRow = activeRowData[0];
-        } else if ($Data.tableData.length > 0) {
-            // 如果取消高亮，默认显示第一行
-            $Data.currentRow = $Data.tableData[0];
-            $Data.activeRowKeys = [$Data.tableData[0].id];
-        } else {
-            $Data.currentRow = null;
+        if (context.activeRowList && context.activeRowList.length > 0) {
+            $Data.currentRow = context.activeRowList[0].row;
         }
     },
 

package/views/permission/role/meta.json

@@ -0,0 +1,4 @@
+{
+    "name": "角色管理",
+    "order": 1
+}