-
Notifications
You must be signed in to change notification settings - Fork 6.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(Menu): Add custom images to menu #3158
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
jinmao88
approved these changes
Oct 16, 2023
likui628
reviewed
Oct 17, 2023
@@ -1,5 +1,6 @@ | |||
<template> | |||
<span :class="`${prefixCls}- flex items-center `"> | |||
<img v-if="getImg" :src="getImg" class="w-18px h-18px align-top mr-2" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
同时存在getImg和getIcon时我觉得还是只显示一个,下面还有几处也是
likui628
reviewed
Oct 17, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
同时存在getImg和getIcon时我觉得还是只显示一个,不过问题不大
嗯调整了,都存在的话,优先显示图片好了 |
zyt520ham
pushed a commit
to zyt520ham/vue-vben-admin
that referenced
this pull request
Oct 17, 2023
* main: feat(Menu): Add custom images to menu (vbenjs#3158) fix: 修复Modal.confirm的返回类型问题,需要有destroy,update的方法 (vbenjs#3161) chore: fix type:check error (vbenjs#3159) fix(BasicForm): useForm 中 scheme 选项 slot 与 component冲突 (vbenjs#3133) chore: replace intro.js with driver.js (vbenjs#3151) fix(ApiSelect): type warning feat(ApiTree): 完善ApiTree组件的重置回显功能. close vbenjs#2307 chore(Demo): restore ApiTree schema show fix(ApiTree): Modify Trigger Selection Event Name fix: ApiTransfer 不支持disabled (vbenjs#3149) fix: vbenjs#3144 Drawer的footer样式错位问题 (vbenjs#3148) feat(BasicButton): BasicButton组件支持icon插槽. close vbenjs#1377 chore(Pagination): Remove the unnecessary pagesize attribute # Conflicts: # pnpm-lock.yaml # src/components/Form/src/components/ApiSelect.vue
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
resolves #856