Skip to content

fix(input):fix textarea height in saas model #3608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 28, 2025
Merged

fix(input):fix textarea height in saas model #3608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/design/aurora/src/grid/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { iconChevronUp, iconChevronDown } from '@opentiny/vue-icon'
import { IconTriangleUp, IconTriangleDown } from '@opentiny/vue-icon'

export default {
validConfig: {
Expand All @@ -11,8 +11,8 @@ export default {
icons: {
// aurora不需要默认排序图标
sortDefault: null,
sortAsc: iconChevronUp(),
sortDesc: iconChevronDown()
sortAsc: IconTriangleUp(),
sortDesc: IconTriangleDown()
},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里为何会改到表格的图标呢？看标题只是修复input组件的问题

stripe: true
}
6 changes: 5 additions & 1 deletion packages/renderless/src/input/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,11 @@ export const calcTextareaHeight =
minHeight = props.height
}
if (!state.isDisplayOnly) {
height = Math.max(minHeight, height)
if (props.autosize) {
height = Math.max(minHeight, height)
} else {
height = Math.min(minHeight, height)
}
textareaStyle.minHeight = `${Math.floor(minHeight)}px`
} else {
textareaStyle.minHeight = `0px`
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/src/button/src/token.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-2 pr-2 leading-5',
'no-circle': 'sm:min-w-[theme(spacing.18)] pl-2 pr-2 py-1 leading-5.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',
Expand Down
Loading