gavin/lupin-demo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update at 2026-01-22 20:58:03

Browse Source
This commit is contained in:
douboer@gmail.com
2026-01-22 20:58:03 +08:00
parent e335bf2f87
commit c1ec2c926f
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sectorBuilder.ts
View File

@@ -55,7 +55,10 @@ export class SectorBuilder {
// 颜色优先级：sector > layer pattern > background // 颜色优先级：sector > layer pattern > background
const fillColor = this.colorResolver.resolveSectorColor(layerColorMap, sectorConfig, i); const fillColor = this.colorResolver.resolveSectorColor(layerColorMap, sectorConfig, i);
const textColor = getTextColorForBackground(fillColor); const layerColor = layer.colorRef ? this.colorResolver.resolveColor(layer.colorRef) : undefined;
const sectorColor = sectorConfig?.colorRef
? this.colorResolver.resolveColor(sectorConfig.colorRef)
: undefined;
const innerFill = (sectorConfig?.innerFill ?? layer.innerFill ?? 0) === 1; const innerFill = (sectorConfig?.innerFill ?? layer.innerFill ?? 0) === 1;
const innerFillPath = innerFill const innerFillPath = innerFill
? annularSectorInsetPath( ? annularSectorInsetPath(
@@ -70,6 +73,9 @@ export class SectorBuilder {
innerFillPath && innerFillPath.length > 0 ? innerFillPath : undefined; innerFillPath && innerFillPath.length > 0 ? innerFillPath : undefined;
const hasInnerFillPath = Boolean(normalizedInnerFillPath); const hasInnerFillPath = Boolean(normalizedInnerFillPath);
const baseFillColor = hasInnerFillPath ? '#ffffff' : fillColor; const baseFillColor = hasInnerFillPath ? '#ffffff' : fillColor;
const innerFillColor = hasInnerFillPath ? sectorColor ?? layerColor ?? fillColor : undefined;
const textBaseColor = hasInnerFillPath ? innerFillColor ?? fillColor : fillColor;
const textColor = getTextColorForBackground(textBaseColor);
const sectorKey = `L${layerIndex}-P${i}`; const sectorKey = `L${layerIndex}-P${i}`;
const textPathId = `text-path-${sectorKey}`; const textPathId = `text-path-${sectorKey}`;
@@ -123,7 +129,7 @@ export class SectorBuilder {
label: isMultiText ? '' : rawContent, label: isMultiText ? '' : rawContent,
path: annularSectorPath(layer.rInner, layer.rOuter, aStart, aEnd), path: annularSectorPath(layer.rInner, layer.rOuter, aStart, aEnd),
innerFillPath: normalizedInnerFillPath, innerFillPath: normalizedInnerFillPath,
innerFillColor: hasInnerFillPath ? fillColor : undefined, innerFillColor,
textPath, textPath,
textPathId, textPathId,
isVertical, isVertical,