Skip to content

Commit db1be9e

Browse files
authored
fix: 修复search组件mobile-first模式下四种尺寸清空和搜索两个按钮不对齐的问题 (#3378)
1 parent dc699b6 commit db1be9e

File tree

3 files changed

+9
-35
lines changed

3 files changed

+9
-35
lines changed

examples/sites/demos/mobile-first/app/search/size.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<template>
22
<div>
3-
<tiny-search class="demo-search" v-model="value1" size="medium" placeholder="请输入关键词" clearable></tiny-search>
4-
<tiny-search class="demo-search" v-model="value2" size="mini" placeholder="请输入关键词" clearable></tiny-search>
3+
<tiny-search class="demo-search" v-model="value1" size="medium" placeholder="medium" clearable></tiny-search>
4+
<tiny-search class="demo-search" v-model="value2" placeholder="small" clearable></tiny-search>
5+
<tiny-search class="demo-search" v-model="value3" size="mini" placeholder="mini" clearable></tiny-search>
56
</div>
67
</template>
78

@@ -15,7 +16,8 @@ export default {
1516
data() {
1617
return {
1718
value1: '',
18-
value2: ''
19+
value2: '',
20+
value3: ''
1921
}
2022
}
2123
}

packages/vue/src/search/src/mobile-first.vue

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,7 @@
9191
"
9292
v-if="state.showClear && !state.collapse"
9393
>
94-
<a
95-
:class="
96-
m(
97-
gcls('pc-search-input-btn-transtion-a'),
98-
gcls({ 'pc-search-input-btn-transtion-a-big': big }),
99-
gcls(`pc-search-input-btn-transtion-a-${size}`),
100-
gcls({ 'pc-search-input-btn-transtion-a-unbig': size === 'small' && !big })
101-
)
102-
"
103-
@click="clear"
104-
>
94+
<a :class="m(gcls('pc-search-input-btn-transtion-a'))" @click="clear">
10595
<icon-close
10696
@mousedown.prevent
10797
data-tag="tiny-svg-size"
@@ -121,17 +111,7 @@
121111
)
122112
"
123113
>
124-
<a
125-
:class="
126-
m(
127-
gcls('pc-search-input-btn-a'),
128-
gcls({ 'pc-search-input-btn-a-big': big }),
129-
gcls(`pc-search-input-btn-a-${size}`),
130-
gcls({ 'pc-search-input-btn-a-unbig': size === 'small' && !big })
131-
)
132-
"
133-
@click="searchClick"
134-
>
114+
<a :class="m(gcls('pc-search-input-btn-a'))" @click="searchClick">
135115
<icon-search
136116
:class="
137117
m(

packages/vue/src/search/src/token.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,14 @@ export const classes = {
4141
'pc-search-input-btn-transtion-mini': 'h-[calc(theme(spacing.6)-2*theme(borderWidth.DEFAULT))] translate-x-4',
4242
'pc-search-input-btn-transtion-unbig': 'h-[calc(theme(spacing.7)-2*theme(borderWidth.DEFAULT))] translate-x-3.5',
4343

44-
'pc-search-input-btn-transtion-a': 'no-underline block w-8',
45-
'pc-search-input-btn-transtion-a-big': 'leading-[calc(theme(spacing.7)-2*theme(borderWidth.DEFAULT))]',
46-
'pc-search-input-btn-transtion-a-medium': 'leading-[calc(theme(spacing.8)-2*theme(borderWidth.DEFAULT))]',
47-
'pc-search-input-btn-transtion-a-mini': 'leading-[calc(theme(spacing.6)-2*theme(borderWidth.DEFAULT))]',
48-
'pc-search-input-btn-transtion-a-unbig': 'leading-[calc(theme(spacing.7)-2*theme(borderWidth.DEFAULT))]',
44+
'pc-search-input-btn-transtion-a': 'no-underline block w-8 leading-none',
4945
'pc-search-input-btn-transtion-svg-size': 'text-base fill-color-icon-primary hover:fill-color-icon-hover',
5046
'pc-search-input-btn': 'table-cell relative align-middle right-0 text-center',
5147
'pc-search-input-btn-big': 'h-[calc(theme(spacing.7)-2*theme(borderWidth.DEFAULT))] w-11',
5248
'pc-search-input-btn-medium': 'h-[calc(theme(spacing.8)-2*theme(borderWidth.DEFAULT))] w-11',
5349
'pc-search-input-btn-mini': 'h-[calc(theme(spacing.6)-2*theme(borderWidth.DEFAULT))] w-11',
5450
'pc-search-input-btn-unbig': 'h-[calc(theme(spacing.7)-2*theme(borderWidth.DEFAULT))] w-10',
55-
'pc-search-input-btn-a': 'no-underline block',
56-
'pc-search-input-btn-a-big': 'w-11 leading-[calc(theme(spacing.7)-2*theme(borderWidth.DEFAULT))]',
57-
'pc-search-input-btn-a-medium': 'w-11 leading-[calc(theme(spacing.8)-2*theme(borderWidth.DEFAULT))]',
58-
'pc-search-input-btn-a-mini': 'w-11 leading-[calc(theme(spacing.6)-2*theme(borderWidth.DEFAULT))]',
59-
'pc-search-input-btn-a-unbig': 'w-10 leading-[calc(theme(spacing.7)-2*theme(borderWidth.DEFAULT))]',
51+
'pc-search-input-btn-a': 'no-underline block w-11 leading-none',
6052
'pc-search-input-btn-icon-search-transparent': 'fill-color-bg-1',
6153
'pc-search-input-btn-icon-search': 'text-base fill-color-none align-text-bottom',
6254
'search-selector':

0 commit comments

Comments
 (0)