admin/wot-design-uni
1
0
Fork 0
mirror of https://gitee.com/wot-design-uni/wot-design-uni.git synced 2025-12-06 17:18:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 🐛 修复 Button 按钮设置为 block 无效的问题 (#762)

Browse Source
This commit is contained in:
不如摸鱼去 2024-12-05 23:44:45 +08:00 committed by GitHub
parent 356cb4ad11
commit ea8bc66710
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/uni_modules/wot-design-uni/components/wd-button/index.scss
View File

@ -42,9 +42,7 @@
@include b(button) {
position: relative;
display: inline-flex;
justify-content: center;
align-items: center;
display: inline-block;
outline: none;
-webkit-appearance: none;
outline: none;
@ -79,6 +77,13 @@
border-radius: 0;
}
@include e(content) {
display: flex;
justify-content: center;
align-items: center;
height: 100%;
}
@include m(active) {
&:active::before {
opacity: 0.15;
@ -147,9 +152,10 @@
padding: $-button-medium-padding;
border-radius: $-button-medium-radius;
font-size: $-button-medium-fs;
min-width: 120px;
@include when(round) {
min-width: 120px;
@include when(icon) {
min-width: 0;
@ -280,7 +286,7 @@
}
@include when(block) {
display: flex;
display: block;
}
@include when(icon) {

10
src/uni_modules/wot-design-uni/components/wd-button/wd-button.vue
View File

@ -38,11 +38,13 @@
@chooseavatar="handleChooseavatar"
@agreeprivacyauthorization="handleAgreePrivacyAuthorization"
>
<view v-if="loading" class="wd-button__loading">
<view class="wd-button__loading-svg" :style="loadingStyle"></view>
<view class="wd-button__content">
<view v-if="loading" class="wd-button__loading">
<view class="wd-button__loading-svg" :style="loadingStyle"></view>
</view>
<wd-icon v-else-if="icon" custom-class="wd-button__icon" :name="icon" :classPrefix="classPrefix"></wd-icon>
<view class="wd-button__text"><slot /></view>
</view>
<wd-icon v-else-if="icon" custom-class="wd-button__icon" :name="icon" :classPrefix="classPrefix"></wd-icon>
<view class="wd-button__text"><slot /></view>
</button>
</template>