diff --git a/packages/theme-saas/src/form-item/index.less b/packages/theme-saas/src/form-item/index.less
index aa3a2cc9f2..d701bd66bf 100644
--- a/packages/theme-saas/src/form-item/index.less
+++ b/packages/theme-saas/src/form-item/index.less
@@ -18,7 +18,7 @@
.@{form-item-prefix-cls} {
@apply relative;
- @apply mb-5;
+ @apply mb-4;
.clearfix();
.@{form-item-prefix-cls}__content-muti-children {
diff --git a/packages/vue/src/checkbox/src/mobile-first.vue b/packages/vue/src/checkbox/src/mobile-first.vue
index 4b4c8c9a65..5f84e66444 100644
--- a/packages/vue/src/checkbox/src/mobile-first.vue
+++ b/packages/vue/src/checkbox/src/mobile-first.vue
@@ -3,7 +3,7 @@
data-tag="tiny-checkbox"
:class="
m(
- 'inline-flex sm:items-center text-sm leading-5 cursor-pointer',
+ 'inline-flex sm:items-center text-sm leading-5.5 cursor-pointer',
state.size !== 'mini' ? 'sm:text-sm' : 'sm:text-xs',
{ 'sm:py-2': state.vertical },
state.isDisplayOnly || state.isGroupDisplayOnly
diff --git a/packages/vue/src/form-item/src/mobile-first.vue b/packages/vue/src/form-item/src/mobile-first.vue
index 799cc26433..69536e7b08 100644
--- a/packages/vue/src/form-item/src/mobile-first.vue
+++ b/packages/vue/src/form-item/src/mobile-first.vue
@@ -3,7 +3,7 @@
data-tag="tiny-form-item"
:class="
m(
- `flex min-h-[theme(spacing.12)] sm:min-h-[theme(spacing.7)] mb-0 p-0 sm:mb-4 box-border after:content-[''] after:table after:clear-both before:content-[''] before:table border-b-0.5 border-color-border-separator sm:border-none`,
+ `flex min-h-[theme(spacing.12)] sm:min-h-[theme(spacing.5)] mb-0 p-0 sm:mb-4 box-border after:content-[''] after:table after:clear-both before:content-[''] before:table border-b-0.5 border-color-border-separator sm:border-none`,
state.validateState === 'error' && state.validateType === 'text' ? 'mb-0 sm:mb-5' : '',
state.formInline ? 'align-sub' : '',
state.labelPosition === 'top' ? 'block mb-4' : '',
@@ -12,7 +12,7 @@
: '',
state.labelPosition === 'top' && !state.hideRequiredAsterisk ? 'pl-0' : '',
!slots.label && !label ? 'border-none' : '',
- state.isDisplayOnly ? 'border-none py-0.5' : ''
+ state.isDisplayOnly ? 'border-none py-0.5 sm:py-0' : ''
)
"
>
@@ -26,7 +26,7 @@
v-if="slots.label || label"
:class="
m(
- 'py-3 sm:py-1.5 sm:min-h-[theme(spacing.7)] 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 leading-5',
'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)]'
@@ -49,7 +49,7 @@
{{ state.hiddenPassword }}
@@ -68,7 +68,7 @@
>
{{ state.displayOnlyText }}
@@ -279,6 +279,7 @@
effect="light"
:content="state.displayOnlyTooltip"
placement="top"
+ pre
:popper-class="state.tooltipConfig.popperClass || ''"
:popper-options="{ bubbling: true }"
@mouseenter.native="handleEnterDisplayOnlyContent($event, 'textarea')"
diff --git a/packages/vue/src/tooltip/src/mobile-first.vue b/packages/vue/src/tooltip/src/mobile-first.vue
index 6b30f7ad33..2c89fde454 100644
--- a/packages/vue/src/tooltip/src/mobile-first.vue
+++ b/packages/vue/src/tooltip/src/mobile-first.vue
@@ -114,7 +114,7 @@ export default defineComponent({
if (vm.renderContent) {
attrContent = vm.renderContent(h, vm.content)
} else if (vm.pre) {
- attrContent = vm.content ? h('pre', { class: 'whitespace-pre-wrap' }, vm.content) : null
+ attrContent = vm.content ? h('pre', { class: 'tiny-tooltip-text-pre whitespace-pre-wrap' }, vm.content) : null
} else {
attrContent = vm.content
}