From 34415d19ccc3aadba539ebb33c7a00edaf41d632 Mon Sep 17 00:00:00 2001 From: zxhlyh Date: Wed, 22 Jan 2025 14:15:48 +0800 Subject: [PATCH] feat: workflow note dark theme --- .../workflow/note-node/constants.ts | 48 +++++++++---------- .../components/workflow/note-node/index.tsx | 12 +++-- .../workflow/note-node/note-editor/editor.tsx | 2 +- .../plugins/link-editor-plugin/component.tsx | 16 +++---- .../note-node/note-editor/theme/theme.css | 2 +- .../note-editor/toolbar/color-picker.tsx | 20 +++++--- .../note-node/note-editor/toolbar/command.tsx | 12 ++--- .../note-node/note-editor/toolbar/divider.tsx | 2 +- .../toolbar/font-size-selector.tsx | 10 ++-- .../note-node/note-editor/toolbar/index.tsx | 2 +- .../note-editor/toolbar/operator.tsx | 20 ++++---- 11 files changed, 78 insertions(+), 68 deletions(-) diff --git a/web/app/components/workflow/note-node/constants.ts b/web/app/components/workflow/note-node/constants.ts index efd1e01b3c202a..223ce72e77e3d8 100644 --- a/web/app/components/workflow/note-node/constants.ts +++ b/web/app/components/workflow/note-node/constants.ts @@ -4,39 +4,39 @@ export const CUSTOM_NOTE_NODE = 'custom-note' export const THEME_MAP: Record = { [NoteTheme.blue]: { - outer: '#2E90FA', - title: '#D1E9FF', - bg: '#EFF8FF', - border: '#84CAFF', + outer: 'border-util-colors-blue-blue-500', + title: 'bg-util-colors-blue-blue-100', + bg: 'bg-util-colors-blue-blue-50', + border: 'border-util-colors-blue-blue-300', }, [NoteTheme.cyan]: { - outer: '#06AED4', - title: '#CFF9FE', - bg: '#ECFDFF', - border: '#67E3F9', + outer: 'border-util-colors-cyan-cyan-500', + title: 'bg-util-colors-cyan-cyan-100', + bg: 'bg-util-colors-cyan-cyan-50', + border: 'border-util-colors-cyan-cyan-300', }, [NoteTheme.green]: { - outer: '#16B364', - title: '#D3F8DF', - bg: '#EDFCF2', - border: '#73E2A3', + outer: 'border-util-colors-green-green-500', + title: 'bg-util-colors-green-green-100', + bg: 'bg-util-colors-green-green-50', + border: 'border-util-colors-green-green-300', }, [NoteTheme.yellow]: { - outer: '#EAAA08', - title: '#FEF7C3', - bg: '#FEFBE8', - border: '#FDE272', + outer: 'border-util-colors-yellow-yellow-500', + title: 'bg-util-colors-yellow-yellow-100', + bg: 'bg-util-colors-yellow-yellow-50', + border: 'border-util-colors-yellow-yellow-300', }, [NoteTheme.pink]: { - outer: '#EE46BC', - title: '#FCE7F6', - bg: '#FDF2FA', - border: '#FAA7E0', + outer: 'border-util-colors-pink-pink-500', + title: 'bg-util-colors-pink-pink-100', + bg: 'bg-util-colors-pink-pink-50', + border: 'border-util-colors-pink-pink-300', }, [NoteTheme.violet]: { - outer: '#875BF7', - title: '#ECE9FE', - bg: '#F5F3FF', - border: '#C3B5FD', + outer: 'border-util-colors-violet-violet-500', + title: 'bg-util-colors-violet-violet-100', + bg: 'bg-util-colors-violet-violet-100', + border: 'border-util-colors-violet-violet-300', }, } diff --git a/web/app/components/workflow/note-node/index.tsx b/web/app/components/workflow/note-node/index.tsx index 6d62b452e471d7..e1691bd08c0bf9 100644 --- a/web/app/components/workflow/note-node/index.tsx +++ b/web/app/components/workflow/note-node/index.tsx @@ -62,10 +62,10 @@ const NoteNode = ({
-
+
{ data.selected && (
@@ -112,7 +116,7 @@ const NoteNode = ({
{ data.showAuthor && ( -
+
{data.author}
) diff --git a/web/app/components/workflow/note-node/note-editor/editor.tsx b/web/app/components/workflow/note-node/note-editor/editor.tsx index a065278722496c..2ab133557ebbd6 100644 --- a/web/app/components/workflow/note-node/note-editor/editor.tsx +++ b/web/app/components/workflow/note-node/note-editor/editor.tsx @@ -44,7 +44,7 @@ const Editor = ({ onFocus={() => setShortcutsEnabled(false)} onBlur={() => setShortcutsEnabled(true)} spellCheck={false} - className='w-full h-full outline-none caret-primary-600' + className='w-full h-full outline-none text-text-secondary caret-primary-600' placeholder={placeholder} />
diff --git a/web/app/components/workflow/note-node/note-editor/plugins/link-editor-plugin/component.tsx b/web/app/components/workflow/note-node/note-editor/plugins/link-editor-plugin/component.tsx index c9f456294198ac..1bc8885933c383 100644 --- a/web/app/components/workflow/note-node/note-editor/plugins/link-editor-plugin/component.tsx +++ b/web/app/components/workflow/note-node/note-editor/plugins/link-editor-plugin/component.tsx @@ -69,9 +69,9 @@ const LinkEditorComponent = ({
setUrl(e.target.value)} placeholder={t('workflow.nodes.note.editor.enterUrl') || ''} @@ -101,7 +101,7 @@ const LinkEditorComponent = ({ linkOperatorShow && ( <>
{escape(url)}
-
+
{ e.stopPropagation() setLinkOperatorShow(false) @@ -129,7 +129,7 @@ const LinkEditorComponent = ({ {t('common.operation.edit')}
diff --git a/web/app/components/workflow/note-node/note-editor/theme/theme.css b/web/app/components/workflow/note-node/note-editor/theme/theme.css index a256bc31997e29..25c0cdeaad5f4c 100644 --- a/web/app/components/workflow/note-node/note-editor/theme/theme.css +++ b/web/app/components/workflow/note-node/note-editor/theme/theme.css @@ -16,7 +16,7 @@ .note-editor-theme_link { cursor: pointer; - color: #155eef; + color: var(--text-text-selected); } .note-editor-theme_link:hover { diff --git a/web/app/components/workflow/note-node/note-editor/toolbar/color-picker.tsx b/web/app/components/workflow/note-node/note-editor/toolbar/color-picker.tsx index 75565e7d4fb8b4..8da85ae548debb 100644 --- a/web/app/components/workflow/note-node/note-editor/toolbar/color-picker.tsx +++ b/web/app/components/workflow/note-node/note-editor/toolbar/color-picker.tsx @@ -67,13 +67,15 @@ const ColorPicker = ({ open && 'bg-black/5', )}>
-
+
{ COLOR_LIST.map(color => (
)) diff --git a/web/app/components/workflow/note-node/note-editor/toolbar/command.tsx b/web/app/components/workflow/note-node/note-editor/toolbar/command.tsx index ad9a62a5ec8fa0..43953cfe95d1cd 100644 --- a/web/app/components/workflow/note-node/note-editor/toolbar/command.tsx +++ b/web/app/components/workflow/note-node/note-editor/toolbar/command.tsx @@ -65,12 +65,12 @@ const Command = ({ >
handleCommand(type)} > diff --git a/web/app/components/workflow/note-node/note-editor/toolbar/divider.tsx b/web/app/components/workflow/note-node/note-editor/toolbar/divider.tsx index aefdb46b0aae82..740aa63c48461b 100644 --- a/web/app/components/workflow/note-node/note-editor/toolbar/divider.tsx +++ b/web/app/components/workflow/note-node/note-editor/toolbar/divider.tsx @@ -1,6 +1,6 @@ const Divider = () => { return ( -
+
) } diff --git a/web/app/components/workflow/note-node/note-editor/toolbar/font-size-selector.tsx b/web/app/components/workflow/note-node/note-editor/toolbar/font-size-selector.tsx index 38cff5361f64a1..6ceccdebbe8b9e 100644 --- a/web/app/components/workflow/note-node/note-editor/toolbar/font-size-selector.tsx +++ b/web/app/components/workflow/note-node/note-editor/toolbar/font-size-selector.tsx @@ -42,20 +42,20 @@ const FontSizeSelector = () => { > handleOpenFontSizeSelector(!fontSizeSelectorShow)}>
{FONT_SIZE_LIST.find(font => font.key === fontSize)?.value || t('workflow.nodes.note.editor.small')}
-
+
{ FONT_SIZE_LIST.map(font => (
{ e.stopPropagation() handleFontSize(font.key) @@ -69,7 +69,7 @@ const FontSizeSelector = () => {
{ fontSize === font.key && ( - + ) }
diff --git a/web/app/components/workflow/note-node/note-editor/toolbar/index.tsx b/web/app/components/workflow/note-node/note-editor/toolbar/index.tsx index 98ee0cdf0e5c2e..d9e327ae0cb824 100644 --- a/web/app/components/workflow/note-node/note-editor/toolbar/index.tsx +++ b/web/app/components/workflow/note-node/note-editor/toolbar/index.tsx @@ -18,7 +18,7 @@ const Toolbar = ({ onShowAuthorChange, }: ToolbarProps) => { return ( -
+
setOpen(!open)}>
- +
-
+
{ onCopy() setOpen(false) @@ -61,7 +61,7 @@ const Operator = ({
{ onDuplicate() setOpen(false) @@ -71,10 +71,10 @@ const Operator = ({
-
+
e.stopPropagation()} >
{t('workflow.nodes.note.editor.showAuthor')}
@@ -85,10 +85,10 @@ const Operator = ({ />
-
+
{ onDelete() setOpen(false)