From 8b34c0a80d5b9b8431a67fefafddded48a480570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=AD=E5=A6=82?= <8775@163.com> Date: Wed, 23 Oct 2024 22:26:08 +0800 Subject: [PATCH] 5.0 --- .../sop-admin-frontend/mock/asyncRoutes.ts | 37 ++++++++++--------- .../src/components/ApiSelect/index.vue | 25 ++++++++++++- .../sop-admin-frontend/src/router/index.ts | 2 +- .../src/router/modules/error.ts | 3 +- .../src/views/isv/perm/permGroupApi.vue | 2 +- .../src/views/welcome/index.vue | 4 +- 6 files changed, 49 insertions(+), 24 deletions(-) diff --git a/sop-admin/sop-admin-frontend/mock/asyncRoutes.ts b/sop-admin/sop-admin-frontend/mock/asyncRoutes.ts index 64108c39..51bf4db2 100644 --- a/sop-admin/sop-admin-frontend/mock/asyncRoutes.ts +++ b/sop-admin/sop-admin-frontend/mock/asyncRoutes.ts @@ -45,25 +45,26 @@ const apiRouters = [ } } ] - }, - { - path: "/sys", - meta: { - title: "系统管理", - icon: "ri:settings-2-line", - rank: 10 - }, - children: [ - { - path: "/admin/user/index", - name: "AdminUser", - meta: { - title: "用户管理", - roles: ["admin"] - } - } - ] } + // , + // { + // path: "/sys", + // meta: { + // title: "系统管理", + // icon: "ri:settings-2-line", + // rank: 10 + // }, + // children: [ + // { + // path: "/admin/user/index", + // name: "AdminUser", + // meta: { + // title: "用户管理", + // roles: ["admin"] + // } + // } + // ] + // } ]; export default defineFakeRoute([ diff --git a/sop-admin/sop-admin-frontend/src/components/ApiSelect/index.vue b/sop-admin/sop-admin-frontend/src/components/ApiSelect/index.vue index 6aa91789..c1cfc524 100644 --- a/sop-admin/sop-admin-frontend/src/components/ApiSelect/index.vue +++ b/sop-admin/sop-admin-frontend/src/components/ApiSelect/index.vue @@ -14,12 +14,23 @@ import { total, handlePaginationChange } from "@/components/ApiSelect/index"; + +defineProps({ + title: { + type: String, + default: "选择接口" + }, + tableTip: { + type: String, + default: "" + } +}); diff --git a/sop-admin/sop-admin-frontend/src/router/index.ts b/sop-admin/sop-admin-frontend/src/router/index.ts index f9da282c..6f6e2832 100644 --- a/sop-admin/sop-admin-frontend/src/router/index.ts +++ b/sop-admin/sop-admin-frontend/src/router/index.ts @@ -37,7 +37,7 @@ import { * 如何排除文件请看:https://cn.vitejs.dev/guide/features.html#negative-patterns */ const modules: Record = import.meta.glob( - ["./modules/**/*.ts", "!./modules/**/remaining.ts", "!./modules/**/error.ts"], + ["./modules/**/*.ts", "!./modules/**/remaining.ts"], { eager: true } diff --git a/sop-admin/sop-admin-frontend/src/router/modules/error.ts b/sop-admin/sop-admin-frontend/src/router/modules/error.ts index bc880664..897090b9 100644 --- a/sop-admin/sop-admin-frontend/src/router/modules/error.ts +++ b/sop-admin/sop-admin-frontend/src/router/modules/error.ts @@ -7,7 +7,8 @@ export default { icon: "ri:information-line", // showLink: false, title: $t("menus.pureAbnormal"), - rank: 9 + rank: 9, + showLink: false }, children: [ { diff --git a/sop-admin/sop-admin-frontend/src/views/isv/perm/permGroupApi.vue b/sop-admin/sop-admin-frontend/src/views/isv/perm/permGroupApi.vue index 8cdda8d0..ee21fe3e 100644 --- a/sop-admin/sop-admin-frontend/src/views/isv/perm/permGroupApi.vue +++ b/sop-admin/sop-admin-frontend/src/views/isv/perm/permGroupApi.vue @@ -42,6 +42,6 @@ import { actionButtons } from "./permGroupApi"; 授权接口 - + diff --git a/sop-admin/sop-admin-frontend/src/views/welcome/index.vue b/sop-admin/sop-admin-frontend/src/views/welcome/index.vue index 4365e31b..34da4e28 100644 --- a/sop-admin/sop-admin-frontend/src/views/welcome/index.vue +++ b/sop-admin/sop-admin-frontend/src/views/welcome/index.vue @@ -5,5 +5,7 @@ defineOptions({