From 3c345a90da1952349638bfdf4423542db55a1bdd Mon Sep 17 00:00:00 2001 From: discreted66 <953831480@qq.com> Date: Thu, 12 Jun 2025 19:22:21 -0700 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DSaaS=E9=A3=8E=E6=A0=BC?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/theme-saas/src/button/index.less | 2 +- packages/theme-saas/src/grid/checkbox.less | 2 +- packages/theme-saas/src/grid/header.less | 2 +- packages/theme-saas/src/grid/table-global.less | 6 ++++-- packages/theme-saas/src/grid/table.less | 9 +++++---- packages/theme-saas/src/grid/toolbar.less | 3 +-- packages/vue/src/input/src/mobile-first.vue | 10 +++++----- 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/packages/theme-saas/src/button/index.less b/packages/theme-saas/src/button/index.less index ddf5fc7efc..d67f3c646a 100644 --- a/packages/theme-saas/src/button/index.less +++ b/packages/theme-saas/src/button/index.less @@ -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; diff --git a/packages/theme-saas/src/grid/checkbox.less b/packages/theme-saas/src/grid/checkbox.less index 892159c9b3..b903bea76e 100644 --- a/packages/theme-saas/src/grid/checkbox.less +++ b/packages/theme-saas/src/grid/checkbox.less @@ -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; diff --git a/packages/theme-saas/src/grid/header.less b/packages/theme-saas/src/grid/header.less index 122bf63bd9..11c4876262 100644 --- a/packages/theme-saas/src/grid/header.less +++ b/packages/theme-saas/src/grid/header.less @@ -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]' diff --git a/packages/theme-saas/src/grid/table-global.less b/packages/theme-saas/src/grid/table-global.less index 41c4212dc0..f4273aecef 100644 --- a/packages/theme-saas/src/grid/table-global.less +++ b/packages/theme-saas/src/grid/table-global.less @@ -477,7 +477,7 @@ @apply text-left; &:not(.col__ellipsis) { - @apply ~'py-0.5' px-2; + @apply ~'py-0.5' px-4; } &.col__current { @@ -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, diff --git a/packages/theme-saas/src/grid/table.less b/packages/theme-saas/src/grid/table.less index ac25886971..17bcedd741 100644 --- a/packages/theme-saas/src/grid/table.less +++ b/packages/theme-saas/src/grid/table.less @@ -574,7 +574,7 @@ @apply text-left; &:not(.col__ellipsis) { - @apply ~'py-0.5' px-2; + @apply ~'py-0.5' px-4; } &.col__current { @@ -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, @@ -696,9 +698,8 @@ // 排序 & &-sort-wrapper { - padding-left: 4px; position: absolute; - right: 6px; + right: 16px; .@{grid-prefix-cls}-sort__btn { @apply ~'h-3.5'; diff --git a/packages/theme-saas/src/grid/toolbar.less b/packages/theme-saas/src/grid/toolbar.less index 63d98ed9f0..ec4b8c461c 100644 --- a/packages/theme-saas/src/grid/toolbar.less +++ b/packages/theme-saas/src/grid/toolbar.less @@ -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; diff --git a/packages/vue/src/input/src/mobile-first.vue b/packages/vue/src/input/src/mobile-first.vue index 9dd473ce8f..289c50c174 100644 --- a/packages/vue/src/input/src/mobile-first.vue +++ b/packages/vue/src/input/src/mobile-first.vue @@ -237,7 +237,7 @@ v-if="state.isWordLimitVisible" class="h-full inline-flex items-center text-xs sm:text-sm text-color-text-placeholder" > - {{ + {{ state.showWordLimit ? `${state.textLength}/${state.upperLimit}` : state.textLength }} @@ -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" @@ -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" @@ -353,7 +353,7 @@ {{ state.showWordLimit ? `${state.textLength}/${state.upperLimit}` : state.textLength }}