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/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 { 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..f8a17c1f0e 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', '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,13 @@ data-tag="tiny-form-item-inline" :class=" m( - `flex-1 m-0 sm:m-auto 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`, + `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]_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-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' @@ -108,8 +111,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/input/src/mobile-first.vue b/packages/vue/src/input/src/mobile-first.vue index 06d1f50511..85afc5c7be 100644 --- a/packages/vue/src/input/src/mobile-first.vue +++ b/packages/vue/src/input/src/mobile-first.vue @@ -51,7 +51,7 @@ @mouseenter.native="handleEnterDisplayOnlyContent" > {{ state.hiddenPassword }} @@ -68,7 +68,7 @@ > {{ state.displayOnlyText }} 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 }}