Skip to content

fix(input):Fix the saas theme #3499

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 13, 2025
Merged

fix(input):Fix the saas theme #3499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/theme-saas/src/button/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
@apply rounded;
@apply bg-color-bg-1;
@apply py-0;
@apply px-3;
@apply px-2;
@apply overflow-hidden;
transition: border 0.3s ease 0s, color 0.3s ease 0s, background 0.3s ease 0s;
@apply outline-0;
Expand Down
2 changes: 1 addition & 1 deletion packages/theme-saas/src/grid/checkbox.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
@apply ~'top-1/2';
@apply ~'left-1/2';
@apply ~'-translate-x-2/4' ~'-translate-y-2/4';
@apply fill-color-icon-secondary;
@apply fill-color-text-secondary;

&:hover {
@apply fill-color-icon-hover;
Expand Down
2 changes: 1 addition & 1 deletion packages/theme-saas/src/grid/header.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
@apply bottom-0;
@apply top-0;
@apply m-auto;
@apply w-4;
@apply w-8;
@apply h-9;
@apply text-center;
// 因为与AUI冻结实现方式不一样，此处不要同步 @apply ~'z-[1]'
Expand Down
6 changes: 4 additions & 2 deletions packages/theme-saas/src/grid/table-global.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@
@apply text-left;

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

&.col__current {
Expand Down Expand Up @@ -511,7 +511,9 @@
word-break: break-word;

.@{grid-prefix-cls}-checkbox {
@apply align-bottom;
@apply flex;
@apply items-center;
@apply justify-center;
}

.@{grid-prefix-cls}__data-boole,
Expand Down
9 changes: 5 additions & 4 deletions packages/theme-saas/src/grid/table.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@
@apply text-left;

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

&.col__current {
Expand All @@ -601,7 +601,9 @@
word-break: break-word;

.@{grid-prefix-cls}-checkbox {
@apply align-bottom;
@apply flex;
@apply items-center;
@apply justify-center;
}

.@{grid-prefix-cls}__data-boole,
Expand Down Expand Up @@ -696,9 +698,8 @@

// 排序
& &-sort-wrapper {
padding-left: 4px;
position: absolute;
right: 6px;
right: 16px;

.@{grid-prefix-cls}-sort__btn {
@apply ~'h-3.5';
Expand Down
3 changes: 1 addition & 2 deletions packages/theme-saas/src/grid/toolbar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,11 @@
.@{grid-refresh-prefix-cls}__wrapper,
.@{grid-custom-prefix-cls}__wrapper {
float: right;
@apply w-7;
@apply h-7;
@apply leading-7;
@apply rounded-sm;
@apply text-center;
@apply my-0 mx-1;
@apply my-0 mx-2;
@apply flex;
@apply items-center;
@apply justify-center;
Expand Down
10 changes: 5 additions & 5 deletions packages/vue/src/input/src/mobile-first.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
v-if="state.isWordLimitVisible"
class="h-full inline-flex items-center text-xs sm:text-sm text-color-text-placeholder"
>
<span class="bg-color-bg-1 leading-none inline-block">{{
<span class="bg-color-bg-1 leading-none inline-block text-xs">{{
state.showWordLimit ? `${state.textLength}/${state.upperLimit}` : state.textLength
}}</span>
</span>
Expand Down Expand Up @@ -290,9 +290,9 @@
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"
:class="[
state.inputSizeMf !== 'mini' ? 'sm:text-sm' : 'sm:text-xs',
hoverExpand && 'relative left-0 max-w-full leading-normal line-clamp-1',
hoverExpand && 'relative left-0 max-w-full leading-5 line-clamp-1',
autosize
? 'left-0 max-w-full break-words whitespace-pre-line leading-normal'
? 'left-0 max-w-full break-words whitespace-pre-line leading-5'
: 'left-0 max-w-full text-ellipsis overflow-hidden break-words whitespace-pre-wrap line-clamp-5'
]"
@click="state.showDisplayOnlyBox = true"
Expand Down Expand Up @@ -329,7 +329,7 @@
state.isDisplayOnly ? 'hidden' : '',
state.inputSizeMf !== 'mini' ? 'sm:placeholder:text-sm sm:text-sm' : 'sm:placeholder:text-xs sm:text-xs',
hoverExpand && 'min-w-40 absolute h-7 z-[2000] top-0 left-0',
hoverExpand && state.enteredTextarea ? 'py-2 leading-normal' : 'py-0 leading-[1.625rem]',
hoverExpand && state.enteredTextarea ? 'py-2 leading-normal' : 'py-0 leading-5.5',
hoverExpand && !state.enteredTextarea && 'min-h-7 px-2 leading-7 overflow-hidden'
]"
@compositionstart="handleCompositionStart"
Expand All @@ -353,7 +353,7 @@
<span
data-tag="tiny-input-limit"
v-if="state.isWordLimitVisible && type === 'textarea'"
class="bg-color-bg-1 text-color-text-placeholder text-xs sm:text-sm absolute bottom-1 right-3"
class="text-color-text-placeholder text-xs leading-5 absolute bottom-0 right-3"
>{{ state.showWordLimit ? `${state.textLength}/${state.upperLimit}` : state.textLength }}</span
>
<slot></slot>
Expand Down
Loading