File tree Expand file tree Collapse file tree 3 files changed +9
-5
lines changed Expand file tree Collapse file tree 3 files changed +9
-5
lines changed Original file line number Diff line number Diff line change 1
- import { iconChevronUp , iconChevronDown } from '@opentiny/vue-icon'
1
+ import { IconTriangleUp , IconTriangleDown } from '@opentiny/vue-icon'
2
2
3
3
export default {
4
4
validConfig : {
@@ -11,8 +11,8 @@ export default {
11
11
icons : {
12
12
// aurora不需要默认排序图标
13
13
sortDefault : null ,
14
- sortAsc : iconChevronUp ( ) ,
15
- sortDesc : iconChevronDown ( )
14
+ sortAsc : IconTriangleUp ( ) ,
15
+ sortDesc : IconTriangleDown ( )
16
16
} ,
17
17
stripe : true
18
18
}
Original file line number Diff line number Diff line change @@ -161,7 +161,11 @@ export const calcTextareaHeight =
161
161
minHeight = props . height
162
162
}
163
163
if ( ! state . isDisplayOnly ) {
164
- height = Math . max ( minHeight , height )
164
+ if ( props . autosize ) {
165
+ height = Math . max ( minHeight , height )
166
+ } else {
167
+ height = Math . min ( minHeight , height )
168
+ }
165
169
textareaStyle . minHeight = `${ Math . floor ( minHeight ) } px`
166
170
} else {
167
171
textareaStyle . minHeight = `0px`
Original file line number Diff line number Diff line change @@ -48,7 +48,7 @@ export const classes = {
48
48
'no-round' : 'rounded' ,
49
49
'is-round' : 'rounded-full' ,
50
50
'is-border' : 'border-0.5 sm:border' ,
51
- 'no-circle' : 'sm:min-w-[theme(spacing.18)] pl-2 pr-2 leading-5' ,
51
+ 'no-circle' : 'sm:min-w-[theme(spacing.18)] pl-2 pr-2 py-1 leading-5. 5' ,
52
52
'is-circle' : 'sm:min-w-[theme(spacing.18)] sm:rounded-full sm:pl-2 sm:pr-2' ,
53
53
'button-icon' : '-mt-0.5 sm:text-base fill-current' ,
54
54
'button-icon-default' : 'text-color-icon-primary hover:text-color-icon-hover active:text-color-icon-active' ,
You can’t perform that action at this time.
0 commit comments