Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(sheets-formula-ui): use theme color for stroke in genFormulaRefSelectionStyle (#5144)

白熱42be3853fc62
diff --git a/packages/engine-render/src/services/canvas-color.service.ts b/packages/engine-render/src/services/canvas-color.service.ts
index a9d90cafd1..80b8d3368a 100644
--- a/packages/engine-render/src/services/canvas-color.service.ts
+++ b/packages/engine-render/src/services/canvas-color.service.ts
@@ -15,7 +15,7 @@
*/
import type { RGBColor } from './utils';
-import { createIdentifier, Disposable, Inject, ThemeService } from '@univerjs/core';
+import { createIdentifier, Disposable, get, Inject, ThemeService } from '@univerjs/core';
// import { invertColorByHSL } from './invert-hsl';
import { invertColorByMatrix } from './invert-rgb';
@@ -83,6 +83,9 @@ export class CanvasColorService extends Disposable implements ICanvasColorServic
const stripped = color.slice(4, -1).split(',');
const invertedColor = this._invertAlgo(stripped.map(Number) as RGBColor);
cachedColor = `rgb(${invertedColor[0]},${invertedColor[1]},${invertedColor[2]})`;
+ } else if (color.includes('.')) {
+ const theme = this._themeService.getCurrentTheme();
+ cachedColor = get(theme, color);
} else {
throw new Error(`[CanvasColorService]: illegal color ${color}`);
}
diff --git a/packages/sheets-formula-ui/src/common/selection.ts b/packages/sheets-formula-ui/src/common/selection.ts
index d340c26e4d..da97ccb9ca 100644
--- a/packages/sheets-formula-ui/src/common/selection.ts
+++ b/packages/sheets-formula-ui/src/common/selection.ts
@@ -26,7 +26,7 @@ export function genFormulaRefSelectionStyle(themeService: ThemeService, refColor
return {
id,
strokeWidth: 1,
- stroke: refColor,
+ stroke: get(theme, refColor),
fill,
widgets: { tl: true, tc: true, tr: true, ml: true, mr: true, bl: true, bc: true, br: true },
widgetSize: 6,
diff --git a/packages/themes/src/default.ts b/packages/themes/src/default.ts
index f653cfb6c8..8fb237ab75 100644
--- a/packages/themes/src/default.ts
+++ b/packages/themes/src/default.ts
@@ -151,7 +151,7 @@ const defaultTheme = {
},
'loop-color': {
1: 'purple.400',
- 2: 'green.600',
+ 2: 'green.500',
3: 'blue.500',
4: 'gold.400',
5: 'magenta.300',
diff --git a/packages/themes/src/green.ts b/packages/themes/src/green.ts
index 36e5d7c03f..7634d038e5 100644
--- a/packages/themes/src/green.ts
+++ b/packages/themes/src/green.ts
@@ -153,7 +153,7 @@ const greenTheme: Theme = {
},
'loop-color': {
1: 'purple.400',
- 2: 'green.600',
+ 2: 'green.500',
3: 'blue.500',
4: 'gold.400',
5: 'magenta.300',