Skip to content

Commit

Permalink
chore: change menu icon
Browse files Browse the repository at this point in the history
  • Loading branch information
vben-admin committed Oct 10, 2020
1 parent 67df9b8 commit 66b5616
Show file tree
Hide file tree
Showing 9 changed files with 1,811 additions and 1,800 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

### `Checklist`

> ℹ️ Check all checkboxes - this will indicate that you have done everything in accordance with the rules in [CONTRIBUTING](https://github.com/vuejs/awesome-vue/blob/master/.github/contributing.md).
> ℹ️ Check all checkboxes - this will indicate that you have done everything in accordance with the rules in [CONTRIBUTING](contributing.md).
> 👉 _Put an `x` in the boxes that apply._
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ yarn build # 打包

yarn build:no-cache # 打包,执行之前会先删除缓存

yarn report # 生成构建包表表预览
yarn report # 生成构建包报表预览
```

### 格式化
Expand Down
5 changes: 1 addition & 4 deletions src/components/Menu/src/useOpenKeys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,13 @@ export function useOpenKeys(

function handleOpenChange(openKeys: string[]) {
const rootSubMenuKeys: string[] = [];
for (const menu of unref(menus)) {
const { children, path } = menu;
for (const { children, path } of unref(menus)) {
if (children && children.length > 0) {
rootSubMenuKeys.push(path);
}
}

if (!menuStore.getCollapsedState || !unref(isAppMenu)) {
const latestOpenKey = openKeys.find((key) => menuState.openKeys.indexOf(key) === -1);

if (rootSubMenuKeys.indexOf(latestOpenKey as string) === -1) {
menuState.openKeys = openKeys;
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/router/routes/modules/demo/comp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default {
component: PAGE_LAYOUT_COMPONENT,
redirect: '/comp/basic',
meta: {
icon: 'ant-design:home-outlined',
icon: 'ant-design:table-outlined',
title: '组件',
},
},
Expand Down
2 changes: 1 addition & 1 deletion src/router/routes/modules/demo/feat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default {
component: PAGE_LAYOUT_COMPONENT,
redirect: '/feat/tabs',
meta: {
icon: 'ant-design:home-outlined',
icon: 'ic:outline-featured-play-list',
title: 'Feat',
},
},
Expand Down
2 changes: 1 addition & 1 deletion src/router/routes/modules/demo/iframe.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default {
component: PAGE_LAYOUT_COMPONENT,
redirect: '/frame/antv',
meta: {
icon: 'ant-design:home-outlined',
icon: 'mdi:page-next-outline',
title: '外部页面',
},
},
Expand Down
2 changes: 1 addition & 1 deletion src/router/routes/modules/demo/permission.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default {
component: PAGE_LAYOUT_COMPONENT,
redirect: '/permission/front',
meta: {
icon: 'ant-design:home-outlined',
icon: 'carbon:user-role',
title: '权限管理',
},
},
Expand Down
19 changes: 15 additions & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,24 @@
"noUnusedLocals": true,
"noUnusedParameters": true,
"experimentalDecorators": true,
"lib": ["dom", "esnext"],
"lib": [
"dom",
"esnext"
],
"incremental": true,
"skipLibCheck": true,
"paths": {
"/@/*": ["src/*"],
"/@design/": ["src/design/index.less"]
"/@/*": [
"src/*"
],
"/@design/": [
"src/design/index.less"
]
}
},
"exclude": ["node_modules", "dist"]
"exclude": [
"node_modules",
"dist",
"**/*.js"
]
}
3,575 changes: 1,789 additions & 1,786 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 66b5616

Please sign in to comment.