diff --git a/packages/design/aurora/src/grid/index.ts b/packages/design/aurora/src/grid/index.ts index 2092925b71..89ec168e8a 100644 --- a/packages/design/aurora/src/grid/index.ts +++ b/packages/design/aurora/src/grid/index.ts @@ -1,4 +1,4 @@ -import { iconChevronUp, iconChevronDown } from '@opentiny/vue-icon' +import { IconTriangleUp, IconTriangleDown } from '@opentiny/vue-icon' export default { validConfig: { @@ -11,8 +11,8 @@ export default { icons: { // aurora不需要默认排序图标 sortDefault: null, - sortAsc: iconChevronUp(), - sortDesc: iconChevronDown() + sortAsc: IconTriangleUp(), + sortDesc: IconTriangleDown() }, stripe: true } diff --git a/packages/renderless/src/input/index.ts b/packages/renderless/src/input/index.ts index 629456ee04..33a33c8a22 100644 --- a/packages/renderless/src/input/index.ts +++ b/packages/renderless/src/input/index.ts @@ -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` diff --git a/packages/vue/src/button/src/token.ts b/packages/vue/src/button/src/token.ts index a98d6ff083..d8b247cd81 100644 --- a/packages/vue/src/button/src/token.ts +++ b/packages/vue/src/button/src/token.ts @@ -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',