Skip to content

Commit 8289a1e

Browse files
authored
fix: fixCollapseSize for circle combo (#3872)
1 parent 1a52e3d commit 8289a1e

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

packages/core/src/element/combos/circle.ts

+6-4
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ Shape.registerCombo(
6666

6767
// 如果设置了color,则覆盖默认的stroke属性
6868
const style = mix({}, defaultStyle, strokeStyle, cfg.style);
69+
const fixSize = cfg.collapsed && cfg.fixCollapseSize ? cfg.fixCollapseSize : cfg.fixSize;
6970
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];
7273
} else {
7374
const size = (this as ShapeOptions).getSize!(cfg);
7475
if (!isNumber(style.r) || isNaN(style.r)) r = size[0] / 2 || Global.defaultCombo.style.r;
@@ -92,9 +93,10 @@ Shape.registerCombo(
9293
let padding: number | number[] = cfg.padding || this.options.padding;
9394
if (isArray(padding)) padding = padding[0];
9495
const cfgStyle = clone(cfg.style);
96+
const fixSize = cfg.collapsed && cfg.fixCollapseSize ? cfg.fixCollapseSize : cfg.fixSize;
9597
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];
98100
} else {
99101
r = Math.max(cfgStyle.r, size[0] / 2) || size[0] / 2;
100102
}

0 commit comments

Comments
 (0)