diff --git a/packages/theme-saas/src/grid/filter.less b/packages/theme-saas/src/grid/filter.less index fd21ebcdce..ee755eb2b5 100644 --- a/packages/theme-saas/src/grid/filter.less +++ b/packages/theme-saas/src/grid/filter.less @@ -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; diff --git a/packages/theme-saas/src/grid/header.less b/packages/theme-saas/src/grid/header.less index 64565c86c0..c57fdaee03 100644 --- a/packages/theme-saas/src/grid/header.less +++ b/packages/theme-saas/src/grid/header.less @@ -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) { diff --git a/packages/theme-saas/src/grid/mixins/table.less b/packages/theme-saas/src/grid/mixins/table.less index 8f0da79f48..580ab45aa5 100644 --- a/packages/theme-saas/src/grid/mixins/table.less +++ b/packages/theme-saas/src/grid/mixins/table.less @@ -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; } @@ -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; diff --git a/packages/theme-saas/src/grid/table-global.less b/packages/theme-saas/src/grid/table-global.less index f4273aecef..68f8c48275 100644 --- a/packages/theme-saas/src/grid/table-global.less +++ b/packages/theme-saas/src/grid/table-global.less @@ -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; diff --git a/packages/theme-saas/src/grid/table.less b/packages/theme-saas/src/grid/table.less index 1fa33d9dda..8021684e77 100644 --- a/packages/theme-saas/src/grid/table.less +++ b/packages/theme-saas/src/grid/table.less @@ -682,8 +682,7 @@ // 排序 & &-sort-wrapper { - position: absolute; - right: 16px; + @apply pl-1; .@{grid-prefix-cls}-sort__btn { @apply ~'h-3.5'; diff --git a/packages/theme-saas/src/textarea/index.less b/packages/theme-saas/src/textarea/index.less index 97587e82e5..c7093cd0de 100644 --- a/packages/theme-saas/src/textarea/index.less +++ b/packages/theme-saas/src/textarea/index.less @@ -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 { diff --git a/packages/vue/src/button/src/token.ts b/packages/vue/src/button/src/token.ts index 7d9ea0abab..a98d6ff083 100644 --- a/packages/vue/src/button/src/token.ts +++ b/packages/vue/src/button/src/token.ts @@ -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', diff --git a/packages/vue/src/dropdown-item/src/mobile-first.vue b/packages/vue/src/dropdown-item/src/mobile-first.vue index 14cfbd038e..3d00b7793d 100644 --- a/packages/vue/src/dropdown-item/src/mobile-first.vue +++ b/packages/vue/src/dropdown-item/src/mobile-first.vue @@ -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"