Skip to content

Commit

Permalink
Merge branch 'template' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
yuntian001 committed Jun 21, 2023
2 parents 78da9fe + 417b49f commit e340609
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 3 deletions.
27 changes: 27 additions & 0 deletions TEMPLATE-CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,32 @@


## [1.1.17](https://github.com/meadmin-cn/meadmin-template/compare/template-1.1.16...template-1.1.17) (2023-06-21)


### 其他[chore]

* vue-request 版本改为正式版本 ([8c7a6c1](https://github.com/meadmin-cn/meadmin-template/commit/8c7a6c141c64560d46e7e88e564a0b01f7229a75))


### 重构[refactor]

* 路由声明移除LayoutPage ([0d3447e](https://github.com/meadmin-cn/meadmin-template/commit/0d3447e4ae179688f074ac2d282347dbd4d403a9))
* 移除LayoutPage引用 ([41d5624](https://github.com/meadmin-cn/meadmin-template/commit/41d5624a6f85c11d1b9404a315fb0ff6e8e972d7))


### Bug 修复[fix]

* 修复超过三级的菜单只有一个子元素时菜单不提升bug ([7abc316](https://github.com/meadmin-cn/meadmin-template/commit/7abc3166d27899367ee9f92bcee26214662f271c))
* 修复当子菜单只有一层并且其子菜单为空数组时渲染出错bug ([3d23151](https://github.com/meadmin-cn/meadmin-template/commit/3d231517128ed730349bed8310a651e83e99dd8d))
* 修复结构store失去响应问题 ([b3f74d8](https://github.com/meadmin-cn/meadmin-template/commit/b3f74d8cff9d1f24be22371388b2bb89584320d9))


### 新功能[feat]

* 加上KeyOfMap、ValueOfMap ([3b0c0ac](https://github.com/meadmin-cn/meadmin-template/commit/3b0c0ac9bd67710263a2d1763279c2d6eb8c79e8))
* 面包屑展示加上子元素判断 ([c236f8c](https://github.com/meadmin-cn/meadmin-template/commit/c236f8c47464e655cd16b1c4d84e66ba17759d5a))
* 优化路由声明,自动声明动态路由的跟路由,动态路由菜单允许只有一级 ([99766d2](https://github.com/meadmin-cn/meadmin-template/commit/99766d27f8090356a31e2c2be66def8d63a9f9b5))

## [1.1.16](https://github.com/meadmin-cn/meadmin-template/compare/template-1.1.15...template-1.1.16) (2023-05-25)


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "meadmin-template",
"private": true,
"version": "1.1.16",
"version": "1.1.17",
"type": "module",
"author": {
"name": "meadmin-cn",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ const setBreadcrumbList = (route: RouteLocationNormalized) => {
let temp = { children: routes.value } as unknown as RouteRecordRaw;
route.meta.menuIndex!.forEach((item) => {
temp = temp.children![item];
if (temp.meta && temp.meta.title && temp.meta.breadcrumb !== false) {
if (
temp.meta?.title &&
temp.meta.breadcrumb !== false &&
(temp.meta.breadcrumb || temp.children?.filter((v) => v.meta?.breadcrumb !== false).length !== 1)
) {
list.push({
name: temp.name,
path: temp.path,
Expand Down
1 change: 1 addition & 0 deletions types/auto-imports.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export {}
declare global {
const EffectScope: typeof import('vue')['EffectScope']
const ElLoading: typeof import('element-plus/es')['ElLoading']
const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']
const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
Expand Down
2 changes: 1 addition & 1 deletion types/vue-router.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ declare module 'vue-router' {
// 若你想不管路由下面的 children 声明的个数都显示你的根路由
// 你可以设置 alwaysShow: true,这样它就会忽略之前定义的规则,一直显示根路由
alwaysShow?: boolean;
// 是否需要面包屑false不需要 ture或undefined为需要
// 是否需要面包屑 false不展示在面包屑,ture一直展示在面包屑,undefined当只有一个子元素面包屑时跳过展示
breadcrumb?: boolean;
//路由在菜单的index deep映射(会动态计算不要设置默认值)
menuIndex?: number[];
Expand Down

0 comments on commit e340609

Please sign in to comment.