Skip to content

fix(grid): Fix the table css in saas mode. #3520

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 23, 2025
Merged

fix(grid): Fix the table css in saas mode. #3520

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/grid/filter.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

// 筛选
.@{grid-filter-wrapper-prefix-cls} {
@apply py-0 px-1;
@apply pl-1;
@apply pt-px;
@apply align-middle;
@apply inline-block;
Expand Down
5 changes: 0 additions & 5 deletions packages/theme-saas/src/grid/header.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@
@apply text-xs;
@apply text-color-text-primary;

&.is__sortable {
.@{grid-cell-prefix-cls} {
@apply pr-5;
}
}

// 在表格个性化场景，动态的设置冻结列，这里需要在非冻结列情况下消除之前设置的left和right样式，并提升权重覆盖style属性
&:not(.fixed__column) {
Expand Down
4 changes: 3 additions & 1 deletion packages/theme-saas/src/grid/mixins/table.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@apply overflow-hidden;
@apply text-ellipsis;
@apply whitespace-nowrap;
@apply pl-2;
@apply pl-4;
@apply box-border;
line-height: 1.375rem;
}
Expand All @@ -35,6 +35,8 @@
.@{grid-cell-prefix-cls} {
.TextEllipsis();
line-height: 1.375rem;
@apply pr-4;

// 表头布局从block改为了flex，此处兼容插槽文本溢出不显示省略号问题
&:not(:has(.tiny-grid-cell-text)) > span:only-of-type:not(.@{grid-cell-prefix}__expanded) {
@apply text-ellipsis;
Expand Down
1 change: 1 addition & 0 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 @@ -590,6 +590,7 @@
@apply flex-col;
@apply justify-center;
@apply items-center;
@apply pl-1;

@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
@apply top-1;
Expand Down
3 changes: 1 addition & 2 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 @@ -682,8 +682,7 @@

// 排序
& &-sort-wrapper {
position: absolute;
right: 16px;
@apply pl-1;

.@{grid-prefix-cls}-sort__btn {
@apply ~'h-3.5';
Expand Down
4 changes: 2 additions & 2 deletions packages/theme-saas/src/textarea/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@

.@{input-prefix-cls}__count {
@apply text-color-text-placeholder;
@apply bg-color-bg-1;
@apply text-xs;
@apply absolute;
@apply bottom-1;
@apply bottom-0;
@apply right-4;
@apply leading-5;
}

&__inner {
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/src/button/src/token.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const classes = {
'no-round': 'rounded',
'is-round': 'rounded-full',
'is-border': 'border-0.5 sm:border',
'no-circle': 'sm:min-w-[theme(spacing.18)] pl-3 pr-3',
'no-circle': 'sm:min-w-[theme(spacing.18)] pl-2 pr-2 leading-5',
'is-circle': 'sm:min-w-[theme(spacing.18)] sm:rounded-full sm:pl-2 sm:pr-2',
'button-icon': '-mt-0.5 sm:text-base fill-current',
'button-icon-default': 'text-color-icon-primary hover:text-color-icon-hover active:text-color-icon-active',
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/src/dropdown-item/src/mobile-first.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{
'text-color-brand-focus bg-color-fill-6': dataStore.checkedStatus && selected
},
dataStore.multiStage ? '!px-0' : '[&:not(:last-of-type)]:mb-1'
dataStore.multiStage ? '!px-0' : '[&:not(:last-of-type)]:!mb-1'
)
"
@click.stop="handleClick"
Expand Down
Loading