🔱: [client] sync upgrade with 7 commits [trident-sync]

chore:
Merge branch 'vben'

# Conflicts:
#	package.json
perf: antdv示例改成使用vben框架
chore: vben
chore: vben
chore: vben
This commit is contained in:
GitHub Actions Bot
2025-03-03 19:24:51 +00:00
parent de26ee9383
commit 335d175d57
649 changed files with 36984 additions and 826 deletions
@@ -1,17 +1,26 @@
import LayoutFramework from "/src/layout/layout-framework.vue";
import { crudResources } from "/@/router/source/modules/crud";
// import { uiResources } from "/@/router/source/modules/ui";
// import { integrationResources } from "/@/router/source/modules/integration";
import { sysResources } from "/@/router/source/modules/sys";
import LayoutBasic from "/@/layout/layout-basic.vue";
import type { RouteRecordRaw } from "vue-router";
import { mergeRouteModules } from "/@/vben/utils";
const dynamicRouteFiles = import.meta.glob("./modules/**/*.ts", {
eager: true
});
/** 动态路由 */
const dynamicRoutes: RouteRecordRaw[] = mergeRouteModules(dynamicRouteFiles);
export const frameworkResource = [
{
title: "框架",
name: "framework",
name: "root",
path: "/",
redirect: "/index",
component: LayoutFramework,
component: LayoutBasic,
meta: {
icon: "ion:accessibility"
icon: "ion:accessibility",
hideInBreadcrumb: true
},
children: [
{
@@ -22,12 +31,11 @@ export const frameworkResource = [
meta: {
fixedAside: true,
showOnHeader: false,
icon: "ion:home-outline"
icon: "ion:home-outline",
auth: true
}
},
...crudResources,
// ...integrationResources,
...sysResources
...dynamicRoutes
]
}
];
@@ -15,6 +15,7 @@ export const crudResources = [
component: "/crud/debug/index.vue",
meta: {
isMenu: false
// hideInMenu: true
}
},
{
@@ -794,3 +795,5 @@ export const crudResources = [
]
}
];
export default crudResources;
@@ -1,3 +1,6 @@
import type { RouteRecordRaw } from "vue-router";
import BasicLayout from "/@/vben/layouts/basic/layout.vue";
export const integrationResources = [
{
title: "集成",
@@ -20,3 +23,5 @@ export const integrationResources = [
]
}
];
// export default integrationResources;
@@ -1,4 +1,5 @@
import LayoutPass from "/@/layout/layout-pass.vue";
import BasicLayout from "/@/vben/layouts/basic/layout.vue";
export const sysResources = [
{
@@ -6,7 +7,6 @@ export const sysResources = [
name: "sys",
path: "/sys",
redirect: "/sys/authority",
component: LayoutPass,
meta: {
icon: "ion:settings-outline",
permission: "sys"
@@ -59,3 +59,5 @@ export const sysResources = [
]
}
];
export default sysResources;
@@ -1,3 +1,5 @@
import BasicLayout from "/@/vben/layouts/basic/layout.vue";
export const uiResources = [
{
title: "UI示例",
@@ -28,3 +30,5 @@ export const uiResources = [
]
}
];
export default uiResources;