Skip to content

Commit ea343ce

Browse files
authored
fix:修复SaaS风格样式 (#3499)
1 parent 1490dcd commit ea343ce

File tree

7 files changed

+18
-16
lines changed

7 files changed

+18
-16
lines changed

packages/theme-saas/src/button/index.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
@apply rounded;
2828
@apply bg-color-bg-1;
2929
@apply py-0;
30-
@apply px-3;
30+
@apply px-2;
3131
@apply overflow-hidden;
3232
transition: border 0.3s ease 0s, color 0.3s ease 0s, background 0.3s ease 0s;
3333
@apply outline-0;

packages/theme-saas/src/grid/checkbox.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
@apply ~'top-1/2';
4848
@apply ~'left-1/2';
4949
@apply ~'-translate-x-2/4' ~'-translate-y-2/4';
50-
@apply fill-color-icon-secondary;
50+
@apply fill-color-text-secondary;
5151

5252
&:hover {
5353
@apply fill-color-icon-hover;

packages/theme-saas/src/grid/header.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
@apply bottom-0;
100100
@apply top-0;
101101
@apply m-auto;
102-
@apply w-4;
102+
@apply w-8;
103103
@apply h-9;
104104
@apply text-center;
105105
// 因为与AUI冻结实现方式不一样,此处不要同步 @apply ~'z-[1]'

packages/theme-saas/src/grid/table-global.less

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@
477477
@apply text-left;
478478

479479
&:not(.col__ellipsis) {
480-
@apply ~'py-0.5' px-2;
480+
@apply ~'py-0.5' px-4;
481481
}
482482

483483
&.col__current {
@@ -511,7 +511,9 @@
511511
word-break: break-word;
512512

513513
.@{grid-prefix-cls}-checkbox {
514-
@apply align-bottom;
514+
@apply flex;
515+
@apply items-center;
516+
@apply justify-center;
515517
}
516518

517519
.@{grid-prefix-cls}__data-boole,

packages/theme-saas/src/grid/table.less

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@
574574
@apply text-left;
575575

576576
&:not(.col__ellipsis) {
577-
@apply ~'py-0.5' px-2;
577+
@apply ~'py-0.5' px-4;
578578
}
579579

580580
&.col__current {
@@ -601,7 +601,9 @@
601601
word-break: break-word;
602602

603603
.@{grid-prefix-cls}-checkbox {
604-
@apply align-bottom;
604+
@apply flex;
605+
@apply items-center;
606+
@apply justify-center;
605607
}
606608

607609
.@{grid-prefix-cls}__data-boole,
@@ -696,9 +698,8 @@
696698

697699
// 排序
698700
& &-sort-wrapper {
699-
padding-left: 4px;
700701
position: absolute;
701-
right: 6px;
702+
right: 16px;
702703

703704
.@{grid-prefix-cls}-sort__btn {
704705
@apply ~'h-3.5';

packages/theme-saas/src/grid/toolbar.less

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,11 @@
7373
.@{grid-refresh-prefix-cls}__wrapper,
7474
.@{grid-custom-prefix-cls}__wrapper {
7575
float: right;
76-
@apply w-7;
7776
@apply h-7;
7877
@apply leading-7;
7978
@apply rounded-sm;
8079
@apply text-center;
81-
@apply my-0 mx-1;
80+
@apply my-0 mx-2;
8281
@apply flex;
8382
@apply items-center;
8483
@apply justify-center;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
v-if="state.isWordLimitVisible"
238238
class="h-full inline-flex items-center text-xs sm:text-sm text-color-text-placeholder"
239239
>
240-
<span class="bg-color-bg-1 leading-none inline-block">{{
240+
<span class="bg-color-bg-1 leading-none inline-block text-xs">{{
241241
state.showWordLimit ? `${state.textLength}/${state.upperLimit}` : state.textLength
242242
}}</span>
243243
</span>
@@ -290,9 +290,9 @@
290290
class="text-box max-w-full break-words line-clamp-5 text-sm text-color-text-primary before:content-[''] before:float-right before:h-full before:-mb-4"
291291
:class="[
292292
state.inputSizeMf !== 'mini' ? 'sm:text-sm' : 'sm:text-xs',
293-
hoverExpand && 'relative left-0 max-w-full leading-normal line-clamp-1',
293+
hoverExpand && 'relative left-0 max-w-full leading-5 line-clamp-1',
294294
autosize
295-
? 'left-0 max-w-full break-words whitespace-pre-line leading-normal'
295+
? 'left-0 max-w-full break-words whitespace-pre-line leading-5'
296296
: 'left-0 max-w-full text-ellipsis overflow-hidden break-words whitespace-pre-wrap line-clamp-5'
297297
]"
298298
@click="state.showDisplayOnlyBox = true"
@@ -329,7 +329,7 @@
329329
state.isDisplayOnly ? 'hidden' : '',
330330
state.inputSizeMf !== 'mini' ? 'sm:placeholder:text-sm sm:text-sm' : 'sm:placeholder:text-xs sm:text-xs',
331331
hoverExpand && 'min-w-40 absolute h-7 z-[2000] top-0 left-0',
332-
hoverExpand && state.enteredTextarea ? 'py-2 leading-normal' : 'py-0 leading-[1.625rem]',
332+
hoverExpand && state.enteredTextarea ? 'py-2 leading-normal' : 'py-0 leading-5.5',
333333
hoverExpand && !state.enteredTextarea && 'min-h-7 px-2 leading-7 overflow-hidden'
334334
]"
335335
@compositionstart="handleCompositionStart"
@@ -353,7 +353,7 @@
353353
<span
354354
data-tag="tiny-input-limit"
355355
v-if="state.isWordLimitVisible && type === 'textarea'"
356-
class="bg-color-bg-1 text-color-text-placeholder text-xs sm:text-sm absolute bottom-1 right-3"
356+
class="text-color-text-placeholder text-xs leading-5 absolute bottom-0 right-3"
357357
>{{ state.showWordLimit ? `${state.textLength}/${state.upperLimit}` : state.textLength }}</span
358358
>
359359
<slot></slot>

0 commit comments

Comments
 (0)