{{ state.displayOnlyText }}
From 269a67e473ed3f224b7fff7ad8ec68d6592ff53c Mon Sep 17 00:00:00 2001
From: Gimmy <975402925@qq.com>
Date: Sat, 22 Feb 2025 17:54:10 +0800
Subject: [PATCH 2/4] fix: fix form item not align when set display-only
---
packages/vue/src/form-item/src/mobile-first.vue | 15 ++++++++-------
packages/vue/src/numeric/src/mobile-first.vue | 2 +-
packages/vue/src/radio/src/token.ts | 9 ++++-----
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/packages/vue/src/form-item/src/mobile-first.vue b/packages/vue/src/form-item/src/mobile-first.vue
index 69536e7b08..490cee24ab 100644
--- a/packages/vue/src/form-item/src/mobile-first.vue
+++ b/packages/vue/src/form-item/src/mobile-first.vue
@@ -26,7 +26,7 @@
v-if="slots.label || label"
:class="
m(
- 'py-3 sm:py-0 sm:min-h-[theme(spacing.5)] relative align-bottom float-left text-sm pr-3 sm:pr-4 box-border leading-5',
+ 'py-3 sm:py-0 sm:min-h-[theme(spacing.5)] relative align-bottom float-left text-sm pr-3 sm:pr-4 box-border',
'overflow-hidden text-ellipsis',
state.labelPosition === 'top'
? 'float-none inline-block text-left sm:text-left leading-none px-0 pt-0 pb-1.5 h-auto min-h-0 sm:py-0 sm:pb-1 sm:min-h-[theme(spacing.0)]'
@@ -34,7 +34,7 @@
state.labelPosition === 'right' ? 'text-right sm:text-right' : '',
state.labelPosition === 'left' ? 'text-left sm:text-left' : '',
state.formInline && state.labelPosition === 'top' ? 'block' : '',
- state.isDisplayOnly ? 'leading-none h-auto align-[inherit] pr-4' : '',
+ state.isDisplayOnly ? 'h-auto align-[inherit] pr-4' : '',
tipContent ? 'pr-5 sm:pr-7' : '',
state.labelPosition === 'top' && !state.hideRequiredAsterisk
? 'overflow-visible relative before:absolute before:-left-2.5'
@@ -49,11 +49,11 @@
@@ -73,10 +73,11 @@
data-tag="tiny-form-item-inline"
:class="
m(
- `flex-1 m-0 relative sm:pt-0 sm:top-auto text-sm after:content-[''] after:table after:clear-both before:content-[''] before:table [&_button:not(:last-child)]:mr-2 [&_[data-tag=tiny-rate]]:h-6`,
+ `flex-1 m-0 relative sm:pt-0 sm:top-auto text-sm after:content-[''] after:table after:clear-both before:content-[''] before:table [&_button:not(:last-child)]:mr-2`,
'[&_[data-tag=tiny-checkbox]]:py-0 [&_[data-tag=tiny-input]]:w-full [&_[data-tag=tiny-input]]:block [&_[data-tag=tiny-input-inner]]:block [&_[data-tag=tiny-input-inner]]:leading-5',
'[&_[data-tag=tiny-input]_textarea]:px-0 sm:[&_[data-tag=tiny-input]_textarea]:px-3 [&_[data-tag=tiny-input]_textarea]:w-full [&_[data-tag=tiny-input]_textarea]:pt-1 sm:[&_[data-tag=tiny-input]_textarea]:pt-2',
state.formInline ? 'align-sub leading-none' : '',
+ state.isDisplayOnly ? '[&_[data-tag=tiny-rate]]:h-[22px]' : '[&_[data-tag=tiny-rate]]:h-7',
state.labelPosition === 'top' && !state.hideRequiredAsterisk
? state.isDisplayOnly
? 'pl-0'
@@ -108,8 +109,8 @@
'[&_[class^=tiny-autocomplete]]:w-full',
'[&_[class^=tiny-cascader]]:w-full',
state.isDisplayOnly
- ? '[&_>*:not([data-tag^=tiny-],[class^=tiny-])]:leading-8 [&_>*:not([data-tag^=tiny-],[class^=tiny-])]:sm:leading-normal'
- : ''
+ ? 'sm:leading-5.5 [&_>*:not([data-tag^=tiny-],[class^=tiny-])]:leading-8 [&_>*:not([data-tag^=tiny-],[class^=tiny-])]:sm:leading-normal'
+ : '[&_[data-tag=tiny-checkbox]]:h-7 [&_[data-tag=tiny-radio]]:h-7'
]"
>
diff --git a/packages/vue/src/numeric/src/mobile-first.vue b/packages/vue/src/numeric/src/mobile-first.vue
index ec089906f9..58581f1600 100644
--- a/packages/vue/src/numeric/src/mobile-first.vue
+++ b/packages/vue/src/numeric/src/mobile-first.vue
@@ -103,7 +103,7 @@
{{ state.displayOnlyText }}
Date: Tue, 25 Feb 2025 17:14:06 +0800
Subject: [PATCH 3/4] fix: fix mobile first input prepend content wrap
---
packages/vue/src/form-item/src/mobile-first.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/packages/vue/src/form-item/src/mobile-first.vue b/packages/vue/src/form-item/src/mobile-first.vue
index 490cee24ab..f8a17c1f0e 100644
--- a/packages/vue/src/form-item/src/mobile-first.vue
+++ b/packages/vue/src/form-item/src/mobile-first.vue
@@ -74,10 +74,12 @@
:class="
m(
`flex-1 m-0 relative sm:pt-0 sm:top-auto text-sm after:content-[''] after:table after:clear-both before:content-[''] before:table [&_button:not(:last-child)]:mr-2`,
- '[&_[data-tag=tiny-checkbox]]:py-0 [&_[data-tag=tiny-input]]:w-full [&_[data-tag=tiny-input]]:block [&_[data-tag=tiny-input-inner]]:block [&_[data-tag=tiny-input-inner]]:leading-5',
+ '[&_[data-tag=tiny-checkbox]]:py-0 [&_[data-tag=tiny-input]]:w-full',
'[&_[data-tag=tiny-input]_textarea]:px-0 sm:[&_[data-tag=tiny-input]_textarea]:px-3 [&_[data-tag=tiny-input]_textarea]:w-full [&_[data-tag=tiny-input]_textarea]:pt-1 sm:[&_[data-tag=tiny-input]_textarea]:pt-2',
state.formInline ? 'align-sub leading-none' : '',
- state.isDisplayOnly ? '[&_[data-tag=tiny-rate]]:h-[22px]' : '[&_[data-tag=tiny-rate]]:h-7',
+ state.isDisplayOnly
+ ? '[&_[data-tag=tiny-input]]:block [&_[data-tag=tiny-input-inner]]:block [&_[data-tag=tiny-input-inner]]:leading-5 [&_[data-tag=tiny-rate]]:h-[22px]'
+ : '[&_[data-tag=tiny-rate]]:h-7',
state.labelPosition === 'top' && !state.hideRequiredAsterisk
? state.isDisplayOnly
? 'pl-0'
From 8884f7f79807e6bb8ec343096d496833750c99c6 Mon Sep 17 00:00:00 2001
From: Gimmy <975402925@qq.com>
Date: Thu, 27 Mar 2025 14:33:27 +0800
Subject: [PATCH 4/4] fix: fix form item not align when set display-only
---
packages/theme-saas/src/form/index.less | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/packages/theme-saas/src/form/index.less b/packages/theme-saas/src/form/index.less
index 34724073a7..3f74e69c98 100644
--- a/packages/theme-saas/src/form/index.less
+++ b/packages/theme-saas/src/form/index.less
@@ -155,7 +155,8 @@
}
.@{input-prefix-cls} {
&.@{range-editor-prefix-cls}.@{input-prefix-cls}__inner {
- @apply h-4;
+ @apply h-auto;
+ @apply ~"leading-5.5";
}
}
.@{textarea-prefix-cls}__inner {