Skip to content

Commit 8fdbfa3

Browse files
fix: 🐛 修复Picker和SelectPicker清空按钮颜色与Input不统一的问题 (#700)
1 parent 0dd34d0 commit 8fdbfa3

File tree

5 files changed

+17
-6
lines changed

5 files changed

+17
-6
lines changed

src/uni_modules/wot-design-uni/components/common/abstracts/variable.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ $-cell-value-fs: var(--wot-cell-value-fs, 14px) !default; // 右侧内容字号
209209
$-cell-value-color: var(--wot-cell-value-color, rgba(0, 0, 0, 0.85)) !default; // 右侧内容文字颜色
210210
$-cell-arrow-size: var(--wot-cell-arrow-size, 18px) !default; // 右箭头大小
211211
$-cell-arrow-color: var(--wot-cell-arrow-color, rgba(0, 0, 0, 0.25)) !default; // 右箭头颜色
212+
$-cell-clear-color: var(--wot-cell-clear-color, #585858) !default; // 清空按钮颜色
212213
$-cell-tap-bg: var(--wot-cell-tap-bg, rgba(0, 0, 0, 0.06)) !default; // 点击态背景色
213214

214215
$-cell-title-fs-large: var(--wot-cell-title-fs-large, 16px) !default; // 大尺寸标题字号

src/uni_modules/wot-design-uni/components/wd-picker/index.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@
8686
}
8787
@include when(error) {
8888
.wd-picker__value,
89-
:deep(.wd-picker__arrow),
90-
:deep(.wd-picker__clear) {
89+
:deep(.wd-picker__arrow) {
9190
color: $-input-error-color;
9291
}
9392
}
@@ -180,6 +179,10 @@
180179
line-height: $-cell-line-height;
181180
}
182181

182+
@include edeep(clear){
183+
color: $-cell-clear-color;
184+
}
185+
183186
@include e(wraper) {
184187
padding-bottom: var(--window-bottom);
185188
}

src/uni_modules/wot-design-uni/components/wd-picker/wd-picker.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
{{ showValue ? showValue : placeholder || translate('placeholder') }}
2323
</view>
2424
<wd-icon v-if="showArrow" custom-class="wd-picker__arrow" name="arrow-right" />
25-
<wd-icon v-else-if="showClear" custom-class="wd-picker__clear" name="error-fill" @click.stop="handleClear" />
25+
<view v-else-if="showClear" @click.stop="handleClear">
26+
<wd-icon custom-class="wd-picker__clear" name="error-fill" />
27+
</view>
2628
</view>
2729
<view v-if="errorMessage" class="wd-picker__error-message">{{ errorMessage }}</view>
2830
</view>

src/uni_modules/wot-design-uni/components/wd-select-picker/index.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@
7272
.wd-select-picker__value {
7373
color: $-input-error-color;
7474
}
75-
:deep(.wd-select-picker__arrow),
76-
:deep(.wd-select-picker__clear) {
75+
:deep(.wd-select-picker__arrow) {
7776
color: $-input-error-color;
7877
}
7978
}
@@ -138,6 +137,10 @@
138137
color: $-cell-arrow-color;
139138
line-height: $-cell-line-height;
140139
}
140+
141+
@include edeep(clear) {
142+
color: $-cell-clear-color;
143+
}
141144

142145
@include e(loading) {
143146
position: absolute;

src/uni_modules/wot-design-uni/components/wd-select-picker/wd-select-picker.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
{{ showValue || placeholder || translate('placeholder') }}
2727
</view>
2828
<wd-icon v-if="showArrow" custom-class="wd-select-picker__arrow" name="arrow-right" />
29-
<wd-icon v-else-if="showClear" custom-class="wd-select-picker__clear" name="error-fill" @click.stop="handleClear" />
29+
<view v-else-if="showClear" @click.stop="handleClear">
30+
<wd-icon custom-class="wd-select-picker__clear" name="error-fill" />
31+
</view>
3032
</view>
3133

3234
<view v-if="errorMessage" class="wd-select-picker__error-message">{{ errorMessage }}</view>

0 commit comments

Comments
 (0)