From b301860d0f3e85ce4f8dab2794b39d2a10fdac3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=A5=E5=BF=97=E5=8B=87?= Date: Thu, 15 Aug 2024 19:41:07 +0800 Subject: [PATCH] fix:Attribute error --- .../flow/node-renderer/codeEditor.tsx | 42 ++---------- .../flow/node-renderer/textarea.tsx | 3 +- .../flow/node-renderer/tree-select.tsx | 66 ++----------------- 3 files changed, 12 insertions(+), 99 deletions(-) diff --git a/web/components/flow/node-renderer/codeEditor.tsx b/web/components/flow/node-renderer/codeEditor.tsx index eed5ec256..3aeeb9b6b 100644 --- a/web/components/flow/node-renderer/codeEditor.tsx +++ b/web/components/flow/node-renderer/codeEditor.tsx @@ -2,9 +2,6 @@ import React, { useState, useMemo } from 'react'; import { Button, Modal } from 'antd'; import Editor from '@monaco-editor/react'; import { IFlowNodeParameter } from '@/types/flow'; -// import { MonacoEditor } from '../../chat/monaco-editor'; -// import { github, githubDark } from './ob-editor/theme'; -import { github, githubDark } from '../../chat/ob-editor/theme'; type Props = { data: IFlowNodeParameter; @@ -14,6 +11,7 @@ type Props = { export const RenderCodeEditor = (params: Props) => { const { data, defaultValue, onChange } = params; + const attr = convertKeysToCamelCase(data.ui?.attr || {}); const [isModalOpen, setIsModalOpen] = useState(false); const showModal = () => { @@ -37,8 +35,10 @@ export const RenderCodeEditor = (params: Props) => { return '80%'; }, [data?.ui?.editor?.width]); + + return ( -
+
@@ -47,7 +47,7 @@ export const RenderCodeEditor = (params: Props) => { {...data?.ui?.attr} width={data?.ui?.editor?.width || '100%'} value={defaultValue} - style={{padding:'10px'}} + style={{ padding: '10px' }} height={data?.ui?.editor?.height || 200} defaultLanguage={data?.ui?.language} onChange={onChange} @@ -59,39 +59,7 @@ export const RenderCodeEditor = (params: Props) => { wordWrap: 'on', }} /> - - {/* { - console.log(value); - onChange(value) - }} - options={{ - theme: {github}, // 编辑器主题颜色 - folding: true, // 是否折叠 - foldingHighlight: true, // 折叠等高线 - foldingStrategy: 'indentation', // 折叠方式 auto | indentation - showFoldingControls: 'always', // 是否一直显示折叠 always | mouseover - disableLayerHinting: true, // 等宽优化 - emptySelectionClipboard: false, // 空选择剪切板 - selectionClipboard: false, // 选择剪切板 - automaticLayout: true, // 自动布局 - codeLens: false, // 代码镜头 - scrollBeyondLastLine: false, // 滚动完最后一行后再滚动一屏幕 - colorDecorators: true, // 颜色装饰器 - accessibilitySupport: 'auto', // 辅助功能支持 "auto" | "off" | "on" - lineNumbers: 'on', // 行号 取值: "on" | "off" | "relative" | "interval" | function - lineNumbersMinChars: 5, // 行号最小字符 number - readOnly: false, //是否只读 取值 true | false - }} - /> */} -
); }; diff --git a/web/components/flow/node-renderer/textarea.tsx b/web/components/flow/node-renderer/textarea.tsx index 5f8c55ac0..a2f0df4aa 100644 --- a/web/components/flow/node-renderer/textarea.tsx +++ b/web/components/flow/node-renderer/textarea.tsx @@ -13,10 +13,11 @@ type TextAreaProps = { export const RenderTextArea = (params: TextAreaProps) => { const { data, defaultValue, onChange } = params; convertKeysToCamelCase(data?.ui?.attr?.autosize || {}); + const attr = convertKeysToCamelCase(data.ui?.attr || {}); return (
-