@befly-addon/admin 1.2.8 → 1.2.12

package/adminViews/config/dict/index.vue

@@ -101,7 +101,6 @@ const $Data = $ref({
     searchTypeCode: "",
     searchKeyword: "",
     columns: withDefaultColumns([
-        { colKey: "id", title: "ID" },
         { colKey: "typeName", title: "类型名称" },
         { colKey: "typeCode", title: "类型代码" },
         { colKey: "label", title: "标签" },

package/adminViews/config/dictType/index.vue

@@ -96,7 +96,6 @@ const $Data = $ref({
     currentRow: null,
     searchKeyword: "",
     columns: withDefaultColumns([
-        { colKey: "id", title: "ID" },
         { colKey: "code", title: "类型代码" },
         { colKey: "name", title: "类型名称" },
         { colKey: "description", title: "描述" },

package/adminViews/config/system/index.vue

@@ -106,7 +106,6 @@ const $Data = $ref({
     loading: false,
     columns: withDefaultColumns([
         { colKey: "name", title: "配置名称", fixed: "left", width: 150 },
-        { colKey: "id", title: "序号", width: 80 },
         { colKey: "code", title: "配置代码", ellipsis: true },
         { colKey: "value", title: "配置值", ellipsis: true, width: 200 },
         { colKey: "valueType", title: "值类型", width: 100 },

package/adminViews/log/email/index.vue

@@ -107,7 +107,6 @@ const $Data = $ref({
     loading: false,
     columns: withDefaultColumns([
         { colKey: "username", title: "发送人", fixed: "left" },
-        { colKey: "id", title: "序号" },
         { colKey: "toEmail", title: "收件人" },
         { colKey: "subject", title: "主题" },
         { colKey: "sendTime", title: "发送时间" },

package/adminViews/log/login/index.vue

@@ -69,7 +69,6 @@ const $Data = $ref({
     loading: false,
     columns: withDefaultColumns([
         { colKey: "username", title: "用户名", fixed: "left" },
-        { colKey: "id", title: "序号" },
         { colKey: "ip", title: "登录IP" },
         { colKey: "browserName", title: "浏览器" },
         { colKey: "osName", title: "操作系统" },

package/adminViews/log/operate/index.vue

@@ -89,7 +89,6 @@ const $Data = $ref({
     loading: false,
     columns: withDefaultColumns([
         { colKey: "username", title: "操作人", fixed: "left", width: 100 },
-        { colKey: "id", title: "序号", width: 80 },
         { colKey: "module", title: "模块", width: 100 },
         { colKey: "action", title: "操作", width: 80 },
         { colKey: "path", title: "请求路径", ellipsis: true },

package/adminViews/people/admin/index.vue

@@ -94,7 +94,6 @@ const $Data = $ref({
     loading: false,
     columns: withDefaultColumns([
         { colKey: "username", title: "用户名", fixed: "left" },
-        { colKey: "id", title: "序号" },
         { colKey: "nickname", title: "昵称" },
         { colKey: "roleCode", title: "角色" },
         { colKey: "state", title: "状态" },

package/adminViews/permission/api/index.vue

@@ -73,7 +73,6 @@ const $Data = $ref({
     searchKeyword: "",
     columns: withDefaultColumns([
         { colKey: "name", title: "接口名称" },
-        { colKey: "id", title: "序号" },
         { colKey: "path", title: "接口路径" },
         { colKey: "method", title: "请求方法" },
         { colKey: "addonName", title: "所属组件" }

package/adminViews/permission/menu/index.vue

@@ -60,7 +60,6 @@ const $Data = $ref({
     loading: false,
     columns: withDefaultColumns([
         { colKey: "name", title: "菜单名称" },
-        { colKey: "id", title: "序号" },
         { colKey: "path", title: "路由路径" },
         { colKey: "parentPath", title: "父级路径" },
         { colKey: "sort", title: "排序" },

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

@@ -19,13 +19,8 @@
                             <TCheckbox v-for="api in group.apis" :key="api.value" :value="api.value">
                                 <div class="api-checkbox-label">
                                     <div class="api-label-main">
-                                        <div class="api-name" :title="api.name">{{ api.name }}</div>
-                                        <div class="api-path" :title="api.path">{{ api.path }}</div>
+                                        <div class="api-name" :title="api.path ? `${api.name}\n${api.path}` : api.name">{{ api.name }}</div>
                                     </div>
-
-                                    <span class="api-copy" title="复制路径" @click.stop="$Method.copyApiPath(api.path)">
-                                        <ILucideCopy :size="14" />
-                                    </span>
                                 </div>
                             </TCheckbox>
                         </TCheckboxGroup>
@@ -47,7 +42,6 @@
 
 <script setup>
 import { Dialog as TDialog, Input as TInput, CheckboxGroup as TCheckboxGroup, Checkbox as TCheckbox, Button as TButton, MessagePlugin } from "tdesign-vue-next";
-import ILucideCopy from "~icons/lucide/copy";
 import ILucideSearch from "~icons/lucide/search";
 import { $Http } from "@/plugins/http";
 
@@ -164,47 +158,6 @@ const $Method = {
             .filter((group) => group.apis.length > 0);
     },
 
-    async copyApiPath(path) {
-        if (typeof path !== "string" || path.trim().length === 0) {
-            MessagePlugin.warning("路径为空");
-            return;
-        }
-
-        const value = path.trim();
-
-        try {
-            if (navigator && navigator.clipboard && navigator.clipboard.writeText) {
-                await navigator.clipboard.writeText(value);
-                MessagePlugin.success("已复制");
-                return;
-            }
-        } catch (error) {
-            // ignore and fallback
-        }
-
-        try {
-            const textarea = document.createElement("textarea");
-            textarea.value = value;
-            textarea.setAttribute("readonly", "readonly");
-            textarea.style.position = "fixed";
-            textarea.style.left = "-9999px";
-            textarea.style.top = "-9999px";
-            document.body.appendChild(textarea);
-            textarea.select();
-            const ok = document.execCommand("copy");
-            document.body.removeChild(textarea);
-
-            if (ok) {
-                MessagePlugin.success("已复制");
-                return;
-            }
-
-            MessagePlugin.error("复制失败");
-        } catch (error) {
-            MessagePlugin.error("复制失败");
-        }
-    },
-
     // 提交表单
     async onSubmit() {
         try {
@@ -329,30 +282,6 @@ $Method.initData();
     white-space: nowrap;
 }
 
-.api-path {
-    max-width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    opacity: 0.7;
-    font-size: 12px;
-}
-
-.api-copy {
-    flex: 0 0 auto;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    width: 24px;
-    height: 24px;
-    border-radius: 6px;
-    cursor: pointer;
-}
-
-.api-copy:hover {
-    background: rgba(0, 0, 0, 0.06);
-}
-
 .dialog-footer {
     width: 100%;
     display: flex;

package/adminViews/permission/role/components/menu.vue

@@ -1,17 +1,48 @@
 <template>
-    <TDialog v-model:visible="$Data.visible" title="菜单权限" width="600px" :append-to-body="true" :show-footer="true" top="10vh" @close="$Method.onClose">
+    <TDialog v-model:visible="$Data.visible" title="菜单权限" width="900px" :append-to-body="true" :show-footer="true" top="5vh" @close="$Method.onClose">
         <div class="comp-role-menu">
-            <TTree v-model:value="$Data.menuTreeCheckedKeys" :data="$Data.menuTreeData" value-mode="all" :keys="{ value: 'path', label: 'name', children: 'children' }" checkable expand-all />
+            <!-- 搜索框 -->
+            <div class="search-box">
+                <TInput v-model="$Data.searchText" placeholder="搜索菜单名称或路径" clearable @change="$Method.onSearch">
+                    <template #prefix-icon>
+                        <ILucideSearch />
+                    </template>
+                </TInput>
+            </div>
+
+            <div class="menu-container">
+                <div class="menu-group" v-for="group in $Data.filteredMenuGroups" :key="group.name">
+                    <div class="group-header">{{ group.title }}</div>
+                    <div class="menu-checkbox-list">
+                        <TCheckboxGroup v-model="$Data.checkedMenuPaths">
+                            <TCheckbox v-for="menu in group.menus" :key="menu.value" :value="menu.value">
+                                <div class="menu-checkbox-label">
+                                    <div class="menu-label-main">
+                                        <div class="menu-name" :title="menu.path ? `${menu.name}\n${menu.path}` : menu.name">
+                                            {{ menu.name }}
+                                        </div>
+                                    </div>
+                                </div>
+                            </TCheckbox>
+                        </TCheckboxGroup>
+                    </div>
+                </div>
+            </div>
         </div>
         <template #footer>
-            <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>
 </template>
 
 <script setup>
-import { Dialog as TDialog, Tree as TTree, Button as TButton, MessagePlugin } from "tdesign-vue-next";
+import { Dialog as TDialog, CheckboxGroup as TCheckboxGroup, Checkbox as TCheckbox, Button as TButton, Input as TInput, MessagePlugin } from "tdesign-vue-next";
+import ILucideSearch from "~icons/lucide/search";
 import { $Http } from "@/plugins/http";
 import { arrayToTree } from "befly-shared/utils/arrayToTree";
 
@@ -31,14 +62,17 @@ const $Emit = defineEmits(["update:modelValue", "success"]);
 const $Data = $ref({
     visible: false,
     submitting: false,
-    menuTreeData: [],
-    menuTreeCheckedKeys: []
+    searchText: "",
+    menuGroups: [],
+    filteredMenuGroups: [],
+    checkedMenuPaths: []
 });
 
 // 方法集合
 const $Method = {
     async initData() {
         await Promise.all([$Method.apiMenuAll(), $Method.apiRoleMenuDetail()]);
+        $Data.filteredMenuGroups = $Data.menuGroups;
         $Method.onShow();
     },
 
@@ -62,7 +96,45 @@ const $Method = {
             const lists = Array.isArray(res?.data?.lists) ? res.data.lists : [];
 
             const treeResult = arrayToTree(lists, "path", "parentPath", "children", "sort");
-            $Data.menuTreeData = treeResult.tree;
+            const roots = Array.isArray(treeResult?.tree) ? treeResult.tree : [];
+
+            const groups = [];
+            for (const root of roots) {
+                const rootPath = typeof root?.path === "string" ? root.path : "";
+                const rootName = typeof root?.name === "string" ? root.name : "";
+
+                const menus = [];
+
+                const walk = (node, depth) => {
+                    const name = typeof node?.name === "string" ? node.name : "";
+                    const path = typeof node?.path === "string" ? node.path : "";
+                    if (path.length > 0) {
+                        menus.push({
+                            value: path,
+                            name: name,
+                            path: path,
+                            depth: depth,
+                            label: `${name} ${path}`.trim()
+                        });
+                    }
+
+                    const children = Array.isArray(node?.children) ? node.children : [];
+                    for (const child of children) {
+                        walk(child, depth + 1);
+                    }
+                };
+
+                walk(root, 0);
+
+                const groupTitle = rootName.length > 0 ? rootName : rootPath;
+                groups.push({
+                    name: rootPath.length > 0 ? rootPath : groupTitle,
+                    title: groupTitle.length > 0 ? groupTitle : "未命名菜单",
+                    menus: menus
+                });
+            }
+
+            $Data.menuGroups = groups;
         } catch (error) {
             MessagePlugin.error("加载菜单失败");
         }
@@ -78,12 +150,38 @@ const $Method = {
             });
 
             // menus 返回的 data 直接就是菜单 path 数组
-            $Data.menuTreeCheckedKeys = Array.isArray(res.data) ? res.data : [];
+            $Data.checkedMenuPaths = Array.isArray(res.data) ? res.data : [];
         } catch (error) {
             MessagePlugin.error("加载数据失败");
         }
     },
 
+    // 搜索过滤（按“名称 + 路径”匹配；展示结构与接口弹框一致）
+    onSearch() {
+        const kw = typeof $Data.searchText === "string" ? $Data.searchText.trim().toLowerCase() : "";
+        if (kw.length === 0) {
+            $Data.filteredMenuGroups = $Data.menuGroups;
+            return;
+        }
+
+        $Data.filteredMenuGroups = $Data.menuGroups
+            .map((group) => {
+                const menus = Array.isArray(group?.menus)
+                    ? group.menus.filter((menu) => {
+                          const label = typeof menu?.label === "string" ? menu.label : "";
+                          return label.toLowerCase().includes(kw);
+                      })
+                    : [];
+
+                return {
+                    name: group.name,
+                    title: group.title,
+                    menus: menus
+                };
+            })
+            .filter((group) => Array.isArray(group.menus) && group.menus.length > 0);
+    },
+
     // 提交表单
     async onSubmit() {
         try {
@@ -91,7 +189,7 @@ const $Method = {
 
             const res = await $Http("/addon/admin/role/menuSave", {
                 roleCode: $Prop.rowData.code,
-                menuPaths: $Data.menuTreeCheckedKeys
+                menuPaths: $Data.checkedMenuPaths
             });
 
             if (res.code === 0) {
@@ -114,5 +212,95 @@ $Method.initData();
 
 <style scoped lang="scss">
 .comp-role-menu {
+    height: 60vh;
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+
+    .menu-container {
+        flex: 1;
+        overflow-y: auto;
+
+        .menu-group {
+            margin-bottom: 16px;
+            border: 1px solid var(--border-color);
+            border-radius: var(--border-radius-small);
+            overflow: hidden;
+
+            &:last-child {
+                margin-bottom: 0;
+            }
+
+            .group-header {
+                padding: 12px 16px;
+                background-color: var(--bg-color-hover);
+                font-weight: 500;
+                font-size: var(--font-size-sm);
+                color: var(--text-primary);
+                display: flex;
+                align-items: center;
+                gap: 8px;
+
+                &::before {
+                    content: "";
+                    width: 8px;
+                    height: 8px;
+                    border-radius: 50%;
+                    background-color: var(--primary-color);
+                    opacity: 0.3;
+                    flex-shrink: 0;
+                }
+            }
+
+            .menu-checkbox-list {
+                padding: 10px;
+
+                :deep(.t-checkbox-group) {
+                    display: flex;
+                    flex-wrap: wrap;
+                    gap: 12px;
+                    width: 100%;
+                }
+
+                :deep(.t-checkbox) {
+                    flex: 0 0 calc(33.333% - 8px);
+                    margin: 0;
+                    min-width: 0;
+                }
+
+                :deep(.t-checkbox__label) {
+                    min-width: 0;
+                }
+            }
+        }
+    }
+}
+
+.menu-checkbox-label {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 8px;
+}
+
+.menu-label-main {
+    min-width: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 2px;
+}
+
+.menu-name {
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.dialog-footer {
+    width: 100%;
+    display: flex;
+    justify-content: center;
 }
 </style>

package/adminViews/permission/role/index.vue

@@ -33,6 +33,12 @@
                         <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 #menuCount="{ row }">
+                        {{ $Method.getPathCount(row.menus) }}
+                    </template>
+                    <template #apiCount="{ row }">
+                        {{ $Method.getPathCount(row.apis) }}
+                    </template>
                     <template #operation="{ row }">
                         <TDropdown trigger="click" placement="bottom-right" @click="(data) => $Method.onAction(data.value, row)">
                             <TButton theme="primary" size="small">
@@ -112,12 +118,13 @@ const $Data = $ref({
     activeRowKeys: [],
     currentRow: null,
     columns: withDefaultColumns([
-        { colKey: "id", title: "ID" },
         { colKey: "name", title: "角色名称" },
-        { colKey: "code", title: "角色代码" },
-        { colKey: "description", title: "描述" },
+        { colKey: "code", title: "角色代码",width:150 },
+        { colKey: "menuCount", title: "菜单数量", align: "center",width:100 },
+        { colKey: "apiCount", title: "接口数量", align: "center",width:100 },
         { colKey: "sort", title: "排序" },
         { colKey: "state", title: "状态" },
+        { colKey: "description", title: "描述" },
         { colKey: "operation", title: "操作" }
     ]),
     pagerConfig: {
@@ -136,6 +143,10 @@ const $Data = $ref({
 
 // 方法
 const $Method = {
+    getPathCount(value) {
+        if (!Array.isArray(value)) return 0;
+        return value.filter((p) => typeof p === "string" && p.trim().length > 0).length;
+    },
     async initData() {
         await $Method.apiRoleList();
     },

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@befly-addon/admin",
-    "version": "1.2.8",
-    "gitHead": "f97afb740dabb7d42dd1f9d6bae5ec4744359d1c",
+    "version": "1.2.12",
+    "gitHead": "9c9fd0cd8165bb5b4025e538a3c5fb228acb39cd",
     "private": false,
     "description": "Befly - 管理后台功能组件",
     "keywords": [
@@ -47,9 +47,9 @@
         "preview": "vite preview"
     },
     "dependencies": {
-        "befly": "^3.10.8",
-        "befly-shared": "^1.3.5",
-        "befly-vite": "^1.2.6",
+        "befly": "^3.10.12",
+        "befly-shared": "^1.3.8",
+        "befly-vite": "^1.2.9",
         "nodemailer": "^7.0.12",
         "ua-parser-js": "^2.0.7"
     },