@befly-addon/admin 1.5.2 → 1.6.0

package/adminViews/permission/api/index.vue

@@ -75,7 +75,7 @@ const $Data = $ref({
     columns: withDefaultColumns([
         { colKey: "name", title: "接口名称" },
         { colKey: "auth", title: "登录" },
-        { colKey: "routePath", title: "接口路径" },
+        { colKey: "path", title: "接口路径" },
         { colKey: "method", title: "请求方法" },
         { colKey: "addonName", title: "所属组件" }
     ]),
@@ -125,7 +125,7 @@ const $Method = {
             return;
         }
         const keyword = $Data.searchKeyword.toLowerCase();
-        $Data.tableData = $Data.allData.filter((item) => item.name?.toLowerCase().includes(keyword) || item.routePath?.toLowerCase().includes(keyword));
+        $Data.tableData = $Data.allData.filter((item) => item.name?.toLowerCase().includes(keyword) || item.path?.toLowerCase().includes(keyword));
     },
 
     // 高亮行变化

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

@@ -12,10 +12,10 @@
 
             <!-- 接口分组列表 -->
             <div class="api-container">
-                <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.checkedApiPaths">
+                <TCheckboxGroup v-model="$Data.checkedApiPaths">
+                    <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">
                             <TCheckbox v-for="api in group.apis" :key="api.value" :value="api.value">
                                 <div class="api-checkbox-label">
                                     <div class="api-label-main">
@@ -23,25 +23,25 @@
                                     </div>
                                 </div>
                             </TCheckbox>
-                        </TCheckboxGroup>
+                        </div>
                     </div>
-                </div>
+                </TCheckboxGroup>
             </div>
         </div>
 
         <template #footer>
             <div class="dialog-footer">
-                <t-space>
+                <TSpace>
                     <TButton theme="default" @click="$Method.onClose">取消</TButton>
                     <TButton theme="primary" :loading="$Data.submitting" @click="$Method.onSubmit">保存</TButton>
-                </t-space>
+                </TSpace>
             </div>
         </template>
     </TDialog>
 </template>
 
 <script setup lang="ts">
-import { Dialog as TDialog, Input as TInput, CheckboxGroup as TCheckboxGroup, Checkbox as TCheckbox, Button as TButton, MessagePlugin } from "tdesign-vue-next";
+import { Dialog as TDialog, Input as TInput, CheckboxGroup as TCheckboxGroup, Checkbox as TCheckbox, Button as TButton, Space as TSpace, MessagePlugin } from "tdesign-vue-next";
 import ILucideSearch from "~icons/lucide/search";
 import { $Http } from "@/plugins/http";
 
@@ -85,7 +85,8 @@ const $Method = {
             const apis = group && group.apis;
             const list = Array.isArray(apis) ? apis : [];
             for (const api of list) {
-                if (api && api.auth === 0 && typeof api.value === "string" && api.value) {
+                const isPublic = api && (api.auth === 0 || api.auth === "0" || api.auth === false);
+                if (isPublic && typeof api.value === "string" && api.value) {
                     merged.add(api.value);
                 }
             }
@@ -113,32 +114,54 @@ const $Method = {
         try {
             const res = await $Http("/addon/admin/api/all");
 
-            // 将接口列表按 addonTitle 分组
+            // 将接口列表按 parentPath 分组展示（routePath 已迁移为 path）
             const apiMap = new Map();
 
-            res.data.lists.forEach((api) => {
-                const addonTitle = api.addonTitle || api.addonName || "项目接口";
-                const addonName = api.addonName || "app";
+            const lists = res && res.data && Array.isArray(res.data.lists) ? res.data.lists : [];
+            for (const api of lists) {
+                const apiPath = api && typeof api.path === "string" ? api.path : "";
+                if (!apiPath) {
+                    continue;
+                }
+
+                const parentPath = api && typeof api.parentPath === "string" ? api.parentPath : "";
+                const groupKey = parentPath || "(未分组)";
 
-                if (!apiMap.has(addonName)) {
-                    apiMap.set(addonName, {
-                        name: addonName,
-                        title: addonTitle,
+                if (!apiMap.has(groupKey)) {
+                    apiMap.set(groupKey, {
+                        name: groupKey,
+                        title: groupKey,
                         apis: []
                     });
                 }
 
-                apiMap.get(addonName).apis.push({
-                    value: api.routePath,
-                    name: api.name || "",
-                    path: api.routePath || "",
-                    label: `${api.name || ""} ${api.routePath ? `(${api.routePath})` : ""}`.trim(),
-                    description: api.description,
-                    auth: api.auth
+                apiMap.get(groupKey).apis.push({
+                    value: apiPath,
+                    name: (api && typeof api.name === "string" ? api.name : "") || apiPath,
+                    path: apiPath,
+                    label: `${(api && typeof api.name === "string" ? api.name : "") || ""} ${apiPath ? `(${apiPath})` : ""}`.trim(),
+                    description: api ? api.description : undefined,
+                    auth: api ? api.auth : undefined,
+                    parentPath: parentPath
+                });
+            }
+
+            const groups = Array.from(apiMap.values());
+            for (const group of groups) {
+                group.apis.sort((a, b) => {
+                    const ap = typeof a.path === "string" ? a.path : "";
+                    const bp = typeof b.path === "string" ? b.path : "";
+                    return ap.localeCompare(bp);
                 });
+            }
+
+            groups.sort((a, b) => {
+                const at = typeof a.title === "string" ? a.title : "";
+                const bt = typeof b.title === "string" ? b.title : "";
+                return at.localeCompare(bt);
             });
 
-            $Data.apiData = Array.from(apiMap.values());
+            $Data.apiData = groups;
         } catch (error) {
             MessagePlugin.error("加载接口失败");
         }
@@ -169,7 +192,12 @@ const $Method = {
         const searchLower = $Data.searchText.toLowerCase();
         $Data.filteredApiData = $Data.apiData
             .map((group) => {
-                const apis = group.apis.filter((api) => api.label.toLowerCase().includes(searchLower));
+                const apis = group.apis.filter((api) => {
+                    const label = api && typeof api.label === "string" ? api.label : "";
+                    const name = api && typeof api.name === "string" ? api.name : "";
+                    const path = api && typeof api.path === "string" ? api.path : "";
+                    return label.toLowerCase().includes(searchLower) || name.toLowerCase().includes(searchLower) || path.toLowerCase().includes(searchLower);
+                });
                 return {
                     name: group.name,
                     title: group.title,
@@ -218,6 +246,12 @@ $Method.initData();
         flex: 1;
         overflow-y: auto;
 
+        /* CheckboxGroup 默认可能是 inline 布局，容易被内容撑开；这里强制占满容器宽度 */
+        :deep(.t-checkbox-group) {
+            display: block;
+            width: 100%;
+        }
+
         .api-group {
             margin-bottom: 16px;
             border: 1px solid var(--border-color);
@@ -225,7 +259,22 @@ $Method.initData();
             overflow: hidden;
 
             .api-checkbox-list {
-                padding: 10px;
+                padding: 12px 16px;
+                display: flex;
+                flex-wrap: wrap;
+                gap: 12px;
+
+                :deep(.t-checkbox) {
+                    margin: 0;
+                    flex: 0 0 calc(33.333% - 8px);
+                    min-width: 0;
+
+                    .t-checkbox__label {
+                        white-space: nowrap;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                    }
+                }
             }
 
             &:last-child {

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

@@ -135,8 +135,3 @@ const $Method = {
 
 $Method.initData();
 </script>
-
-<style scoped lang="scss">
-.comp-role-edit {
-}
-</style>

package/apis/api/list.ts

@@ -11,7 +11,7 @@ export default {
             const result = await befly.db.getList({
                 table: "addon_admin_api",
                 where: {
-                    $or: ctx.body.keyword ? [{ name$like: `%${ctx.body.keyword}%` }, { routePath$like: `%${ctx.body.keyword}%` }] : undefined
+                    $or: ctx.body.keyword ? [{ name$like: `%${ctx.body.keyword}%` }, { path$like: `%${ctx.body.keyword}%` }] : undefined
                 },
                 orderBy: ["id#ASC"],
                 page: ctx.body.page,

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@befly-addon/admin",
-    "version": "1.5.2",
-    "gitHead": "990c7108a9a791b9816c447309ec586d08b96ab4",
+    "version": "1.6.0",
+    "gitHead": "0d60e323a83a1fc53822147de877af19cdb972c0",
     "private": false,
     "description": "Befly - 管理后台功能组件",
     "keywords": [

package/tables/api.json

@@ -14,13 +14,20 @@
         "default": 1,
         "detail": "0=免登录，1=需登录"
     },
-    "routePath": {
+    "path": {
         "name": "接口路径",
         "type": "string",
         "min": 1,
         "max": 200,
         "index": true
     },
+    "parentPath": {
+        "name": "父级路径",
+        "type": "string",
+        "min": 1,
+        "max": 200,
+        "index": true
+    },
     "addonName": {
         "name": "所属插件",
         "type": "string",