File tree 1 file changed +6
-4
lines changed
packages/core/src/element/combos
1 file changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -66,9 +66,10 @@ Shape.registerCombo(
66
66
67
67
// 如果设置了color,则覆盖默认的stroke属性
68
68
const style = mix ( { } , defaultStyle , strokeStyle , cfg . style ) ;
69
+ const fixSize = cfg . collapsed && cfg . fixCollapseSize ? cfg . fixCollapseSize : cfg . fixSize ;
69
70
let r : number ;
70
- if ( cfg . fixSize ) {
71
- r = isNumber ( cfg . fixSize ) ? cfg . fixSize : cfg . fixSize [ 0 ] ;
71
+ if ( fixSize ) {
72
+ r = isNumber ( fixSize ) ? fixSize : fixSize [ 0 ] ;
72
73
} else {
73
74
const size = ( this as ShapeOptions ) . getSize ! ( cfg ) ;
74
75
if ( ! isNumber ( style . r ) || isNaN ( style . r ) ) r = size [ 0 ] / 2 || Global . defaultCombo . style . r ;
@@ -92,9 +93,10 @@ Shape.registerCombo(
92
93
let padding : number | number [ ] = cfg . padding || this . options . padding ;
93
94
if ( isArray ( padding ) ) padding = padding [ 0 ] ;
94
95
const cfgStyle = clone ( cfg . style ) ;
96
+ const fixSize = cfg . collapsed && cfg . fixCollapseSize ? cfg . fixCollapseSize : cfg . fixSize ;
95
97
let r ;
96
- if ( cfg . fixSize ) {
97
- r = isNumber ( cfg . fixSize ) ? cfg . fixSize : cfg . fixSize [ 0 ] ;
98
+ if ( fixSize ) {
99
+ r = isNumber ( fixSize ) ? fixSize : fixSize [ 0 ] ;
98
100
} else {
99
101
r = Math . max ( cfgStyle . r , size [ 0 ] / 2 ) || size [ 0 ] / 2 ;
100
102
}
You can’t perform that action at this time.
0 commit comments