Skip to content

Commit e265872

Browse files
authored
fix:修复saas模式表格css (#3520)
1 parent a33f861 commit e265872

File tree

8 files changed

+10
-13
lines changed

8 files changed

+10
-13
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// 筛选
99
.@{grid-filter-wrapper-prefix-cls} {
10-
@apply py-0 px-1;
10+
@apply pl-1;
1111
@apply pt-px;
1212
@apply align-middle;
1313
@apply inline-block;

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
@apply text-xs;
2323
@apply text-color-text-primary;
2424

25-
&.is__sortable {
26-
.@{grid-cell-prefix-cls} {
27-
@apply pr-5;
28-
}
29-
}
3025

3126
// 在表格个性化场景,动态的设置冻结列,这里需要在非冻结列情况下消除之前设置的left和right样式,并提升权重覆盖style属性
3227
&:not(.fixed__column) {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@apply overflow-hidden;
99
@apply text-ellipsis;
1010
@apply whitespace-nowrap;
11-
@apply pl-2;
11+
@apply pl-4;
1212
@apply box-border;
1313
line-height: 1.375rem;
1414
}
@@ -35,6 +35,8 @@
3535
.@{grid-cell-prefix-cls} {
3636
.TextEllipsis();
3737
line-height: 1.375rem;
38+
@apply pr-4;
39+
3840
// 表头布局从block改为了flex,此处兼容插槽文本溢出不显示省略号问题
3941
&:not(:has(.tiny-grid-cell-text)) > span:only-of-type:not(.@{grid-cell-prefix}__expanded) {
4042
@apply text-ellipsis;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,7 @@
590590
@apply flex-col;
591591
@apply justify-center;
592592
@apply items-center;
593+
@apply pl-1;
593594

594595
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
595596
@apply top-1;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,8 +682,7 @@
682682

683683
// 排序
684684
& &-sort-wrapper {
685-
position: absolute;
686-
right: 16px;
685+
@apply pl-1;
687686

688687
.@{grid-prefix-cls}-sort__btn {
689688
@apply ~'h-3.5';

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646

4747
.@{input-prefix-cls}__count {
4848
@apply text-color-text-placeholder;
49-
@apply bg-color-bg-1;
5049
@apply text-xs;
5150
@apply absolute;
52-
@apply bottom-1;
51+
@apply bottom-0;
5352
@apply right-4;
53+
@apply leading-5;
5454
}
5555

5656
&__inner {

packages/vue/src/button/src/token.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export const classes = {
4848
'no-round': 'rounded',
4949
'is-round': 'rounded-full',
5050
'is-border': 'border-0.5 sm:border',
51-
'no-circle': 'sm:min-w-[theme(spacing.18)] pl-3 pr-3',
51+
'no-circle': 'sm:min-w-[theme(spacing.18)] pl-2 pr-2 leading-5',
5252
'is-circle': 'sm:min-w-[theme(spacing.18)] sm:rounded-full sm:pl-2 sm:pr-2',
5353
'button-icon': '-mt-0.5 sm:text-base fill-current',
5454
'button-icon-default': 'text-color-icon-primary hover:text-color-icon-hover active:text-color-icon-active',

packages/vue/src/dropdown-item/src/mobile-first.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{
1313
'text-color-brand-focus bg-color-fill-6': dataStore.checkedStatus && selected
1414
},
15-
dataStore.multiStage ? '!px-0' : '[&:not(:last-of-type)]:mb-1'
15+
dataStore.multiStage ? '!px-0' : '[&:not(:last-of-type)]:!mb-1'
1616
)
1717
"
1818
@click.stop="handleClick"

0 commit comments

Comments
 (0)