From bce4ff63896547344c032b15cdbe6ef2122d4f93 Mon Sep 17 00:00:00 2001
From: shadowcz007 <chizhiwei007@163.com>
Date: Mon, 3 Jul 2023 16:31:44 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

promptJson.model
promptJson.temperature
---
 src/components/ChatbotMain.tsx | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/components/ChatbotMain.tsx b/src/components/ChatbotMain.tsx
index e526d4f..3ce3c54 100644
--- a/src/components/ChatbotMain.tsx
+++ b/src/components/ChatbotMain.tsx
@@ -1565,15 +1565,26 @@ class Main extends React.Component<{
                     if (this.state.chatBotStyle && this.state.chatBotStyle.value) promptJson.temperature = this.state.chatBotStyle.value;
                 }
 
-                // role 给调试用
+
                 if ([
                     'prompt',
-                    'promptCustom',
+                    'promptCustom'
+                ].includes(promptJson.type)) {
+
+                    if (!promptJson.model) promptJson.model = this.state.chatBotType;
+                    if (!promptJson.temperature && this.state.chatBotStyle && this.state.chatBotStyle.value) promptJson.temperature = this.state.chatBotStyle.value;
+
+                    this._llmRun(promptJson, newTalk);
+
+                };
+
+                // role 给调试用
+                if ([
                     'role',
                 ].includes(promptJson.type)) {
 
-                    if (!promptJson.prompt.model) promptJson.prompt.model = this.state.chatBotType;
-                    if (!promptJson.prompt.temperature && this.state.chatBotStyle && this.state.chatBotStyle.value) promptJson.prompt.temperature = this.state.chatBotStyle.value;
+                    promptJson.model = this.state.chatBotType;
+                    if (this.state.chatBotStyle && this.state.chatBotStyle.value) promptJson.temperature = this.state.chatBotStyle.value;
 
                     this._llmRun(promptJson, newTalk);
 

From f49688371f256205fb00ae26f74687a78259a938 Mon Sep 17 00:00:00 2001
From: shadowcz007 <chizhiwei007@163.com>
Date: Mon, 3 Jul 2023 16:32:03 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/flow/Sidebar/index.tsx         |   5 +-
 src/components/flow/Workflow.tsx              |   2 +-
 .../flow/nodeComponents/APINode.tsx           |  17 ++-
 src/components/flow/nodeComponents/Base.tsx   | 106 ++++++++------
 .../flow/nodeComponents/CustomPromptNode.tsx  |  12 +-
 .../flow/nodeComponents/FilePPTCreateNode.tsx |   4 +-
 .../flow/nodeComponents/PromptNode.tsx        |  24 ++--
 .../flow/nodeComponents/QueryClickNode.tsx    |  98 ++++++-------
 .../flow/nodeComponents/QueryDefaultNode.tsx  | 136 +++++++++++-------
 .../flow/nodeComponents/QueryInputNode.tsx    | 114 ++++++++-------
 .../flow/nodeComponents/QueryReadNode.tsx     | 100 ++++++-------
 .../flow/nodeComponents/UserInputTextNode.tsx |  45 ++----
 src/components/flow/nodeComponents/index.tsx  |   1 -
 src/config/app.json                           |   2 +-
 src/locales/en.json                           |  13 +-
 src/locales/zh.json                           |  12 +-
 16 files changed, 378 insertions(+), 313 deletions(-)

diff --git a/src/components/flow/Sidebar/index.tsx b/src/components/flow/Sidebar/index.tsx
index b0cd72e..63ec643 100644
--- a/src/components/flow/Sidebar/index.tsx
+++ b/src/components/flow/Sidebar/index.tsx
@@ -30,7 +30,7 @@ export default (props: any) => {
             onChange={onChange}
             style={{
                 width: 180, userSelect: 'none',
-                background: 'white'
+                background: 'white', 
             }}>
             <p style={{ paddingLeft: '24px' }}>{i18n.t('component')}</p>
             {
@@ -39,8 +39,9 @@ export default (props: any) => {
                         <aside>
                             {
                                 Array.from(node.children,
-                                    (child: any) => {
+                                    (child: any,i) => {
                                         return <div
+                                            key={i}
                                             style={{
                                                 outline: '1px solid #ddd',
                                                 borderRadius: '5px',
diff --git a/src/components/flow/Workflow.tsx b/src/components/flow/Workflow.tsx
index 61551bd..eb0191c 100644
--- a/src/components/flow/Workflow.tsx
+++ b/src/components/flow/Workflow.tsx
@@ -321,7 +321,7 @@ const defaultNode = () => ({
     temperature: 0.6,
     model: 'ChatGPT',
     input: 'nodeInput',// nodeInput、userInput
-    userInput: '',
+    userInput: '', // 用户输入节点-提示文案
     translate: 'default',
     output: 'default',
     type: 'prompt',//运行时使用
diff --git a/src/components/flow/nodeComponents/APINode.tsx b/src/components/flow/nodeComponents/APINode.tsx
index 3274c8c..8aa5889 100644
--- a/src/components/flow/nodeComponents/APINode.tsx
+++ b/src/components/flow/nodeComponents/APINode.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { Handle, NodeProps, Position } from 'reactflow';
 import { Card, Dropdown, Button, Popconfirm } from 'antd';
 
-import { createCardTitle, createDebug, selectNodeInput, createURL, createSelect, createTextArea, nodeStyle, getI18n } from './Base';
+import { createCardTitle, createDebug, SelectNodeInput, createURL, createSelect, createTextArea, nodeStyle, getI18n } from './Base';
 
 import i18n from "i18next";
 // import { i18nInit } from '../../locales/i18nConfig';
@@ -198,10 +198,13 @@ function Main({ id, data, selected }: any) {
                         }
 
 
-                        {
-                            selectNodeInput(i18n.t('getFromBefore'), nodeInputId, nodeOpts, updateData)
-                        }
-
+                        <SelectNodeInput 
+                        title={i18n.t('getFromBefore')} 
+                        nodeInputId={nodeInputId}
+                        nodeOpts={nodeOpts}
+                        onChange={updateData}
+                        />
+                      
                         {
                             createSelect(i18n.t('responseType'), responseType, [
                                 { value: 'text', label: i18n.t('text') },
@@ -282,7 +285,7 @@ function Main({ id, data, selected }: any) {
                         }
 
 
-                        {
+                        {/* {
                             createDebug(debugMenu, id,
                                 debugInput,
                                 data.debugOutput,
@@ -331,7 +334,7 @@ function Main({ id, data, selected }: any) {
                                     statusInput: statusInputForDebug,
                                     statusOutput: ""
                                 })
-                        }
+                        } */}
 
                     </div>
                 </Card>
diff --git a/src/components/flow/nodeComponents/Base.tsx b/src/components/flow/nodeComponents/Base.tsx
index 0839e2a..6304789 100644
--- a/src/components/flow/nodeComponents/Base.tsx
+++ b/src/components/flow/nodeComponents/Base.tsx
@@ -22,16 +22,16 @@ export const createCardTitle = (title: string, id: string, data: any) => {
             alignItems: 'center'
         }}>
             <p style={{ marginBottom: 0 }}>{title}</p>
-            <Tooltip title={<TextArea 
-            style={{
-                color:'white',
-                background:'none',
-                width:'480px',
-                fontSize:'12px'
-            }}
-            autoSize
-            value={JSON.stringify(parsePrompt({ ...data, id }), null, 2)} />} placement="rightBottom">
-                <InfoCircleOutlined style={{ marginBottom: 0 }} />
+            <Tooltip title={<TextArea
+                style={{
+                    color: 'white',
+                    background: 'none',
+                    width: '480px',
+                    fontSize: '12px'
+                }}
+                autoSize
+                value={JSON.stringify(parsePrompt({ ...data, id }), null, 2)} />} placement="rightBottom">
+                <InfoCircleOutlined style={{ marginBottom: 0 }} rev={undefined} />
             </Tooltip>
         </div>
         <p style={{
@@ -95,7 +95,7 @@ export const createURL = (urlTitle: string, urlPlaceholder: string, protocol: st
                     </Select>
                 }
                 placeholder={urlPlaceholder}
-                value={displayedUrl}
+                defaultValue={displayedUrl}
                 onChange={handleUrlChange}
             />
         </>
@@ -157,7 +157,7 @@ export const createTextArea = (title: string, value: string, placeholder: string
                 })}
             onOpenChange={() => console.log('open change')}
         >
-            <QuestionCircleOutlined style={{ fontSize: 20, color: '#cd201f', marginLeft: '8px' }} />
+            <QuestionCircleOutlined style={{ fontSize: 20, color: '#cd201f', marginLeft: '8px' }} rev={undefined} />
         </Popconfirm> : ""}
 
     </div>
@@ -237,12 +237,18 @@ export const selectNodeInputBase = (nodeInputId: string, nodeOpts: any, onChange
 
 
 // 从上一节点获取文本
-export const selectNodeInput = (title: string, nodeInputId: string, nodeOpts: any, onChange: any) => {
-    // console.log(nodeInputId,nodeOpts)
+export const SelectNodeInput: any = (props: any) => {
+
+    let { title,
+        nodeInputId,
+        nodeOpts,
+        onChange } = props;
+
+    // console.log('selectNodeInput:', nodeOpts)
+    const [checked, setChecked] = React.useState(nodeOpts && nodeOpts[0] ?
+        nodeOpts.filter((n: any) => n.value === nodeInputId).length > 0 : false)
 
-    const [checked, setChecked] = React.useState(nodeOpts.filter((n: any) => n.value === nodeInputId).length > 0)
 
-    // console.log('selectNodeInput:', nodeOpts, nodeInputId, checked)
     return <div
         onMouseOver={() => {
             onChange({
@@ -264,7 +270,7 @@ export const selectNodeInput = (title: string, nodeInputId: string, nodeOpts: an
             // checked={input == "nodeInput"}
             onChange={(e) => {
                 setChecked(e.target.checked)
-                if (!nodeInputId && nodeOpts[0] && nodeOpts[0].index === 1) nodeInputId = nodeOpts[0].value;
+                if (!nodeInputId && nodeOpts && nodeOpts[0] && nodeOpts[0].index === 1) nodeInputId = nodeOpts[0].value;
                 console.log("Checkbox ", nodeInputId, nodeOpts)
                 onChange({
                     key: 'nodeInput',
@@ -285,7 +291,7 @@ export const selectNodeInput = (title: string, nodeInputId: string, nodeOpts: an
                                 data: e
                             })
                         }}
-                        options={nodeOpts}
+                        options={nodeOpts || []}
                     />
                     <p style={{ marginTop: 0, color: "red", fontSize: 12 }}>{i18n.t('getFromBeforeTips')}</p>
                 </>
@@ -295,17 +301,17 @@ export const selectNodeInput = (title: string, nodeInputId: string, nodeOpts: an
 }
 
 // 选择输入，从用户输入 or 从节点
-export const selectInput = (
-    nodeInputLabel: string,
-    userInputLabel: string,
-    nodeInputId: string,
-    userInput: string,
-    nodeOpts: any,
-    onChange: any) => {
-
-    // const [inp, setInp] = React.useState(nodeInputId ? 'nodeInput' : "userInput");
-    // console.log(inp)
-    const [uinp, setUserInput] = React.useState(userInput);
+
+export const SelectInput: any = (props: any) => {
+
+    let { nodeInputLabel,
+        userInputLabel,
+        nodeInputId,
+        userInput,
+        nodeOpts,
+        onChange } = props;
+
+    const [uinp, setUserInput] = React.useState(userInput || '');
     return <>
         <Select
             defaultValue={nodeInputId ? 'nodeInput' : "userInput"}
@@ -438,7 +444,7 @@ export const createDebug = (
 
         <Collapse bordered={false}
             size="small"
-            expandIcon={({ isActive }) => <CaretRightOutlined rotate={isActive ? 90 : 0} />}
+            expandIcon={({ isActive }) => <CaretRightOutlined rotate={isActive ? 90 : 0} rev={undefined} />}
             style={{ background: '#eee', marginTop: '14px' }}
         >
             <Panel header={header} key="1">
@@ -555,7 +561,7 @@ export const createDelay = (title: string, delayFormat: string, delay: string, o
             })
         }}>
             {
-                Array.from(opts, (o: any) => <Option value={o.value}>{o.label}</Option>)
+                Array.from(opts, (o: any, i) => <Option key={i} value={o.value}>{o.label}</Option>)
             }
         </Select>
     }
@@ -644,20 +650,21 @@ export const parsePrompt = (data: any) => {
     }
 
     // 针对prompt的数据进行处理，只保留有用的
-    if ([
-        "queryRead",
-        "queryDefault",
-        "queryClick",
-        "queryInput"
-    ].includes(prompt.type)) {
+    if (prompt.type.match('query') &&
+        prompt.type.startsWith('query')) {
         delete prompt.api;
         delete prompt.file;
         delete prompt.inputs;
+        delete prompt.model;
+        delete prompt.temperature;
+        delete prompt.translate;
+        delete prompt.merged;
+        delete prompt.output;
+        delete prompt.text;
     }
 
-    if ([
-        "prompt", "promptCustom"
-    ].includes(prompt.type)) {
+    if (prompt.type.match('prompt') &&
+        prompt.type.startsWith('prompt')) {
         delete prompt.api;
         delete prompt.queryObj;
         delete prompt.file;
@@ -670,7 +677,8 @@ export const parsePrompt = (data: any) => {
         prompt = {
             id: prompt.id,
             type: prompt.type,
-            inputs: prompt.inputs
+            inputs: prompt.inputs,
+            userInput:prompt.userInput //提示文案
         }
     }
 
@@ -678,12 +686,26 @@ export const parsePrompt = (data: any) => {
         delete prompt.queryObj;
         delete prompt.file;
         delete prompt.inputs;
+        delete prompt.model;
+        delete prompt.temperature;
+        delete prompt.translate;
+        delete prompt.merged;
+        delete prompt.output;
+        delete prompt.text;
     }
 
-    if (prompt.type == "file") {
+
+    if (prompt.type.match('file') &&
+        prompt.type.startsWith('file')) {
         delete prompt.api;
         delete prompt.queryObj;
         delete prompt.inputs;
+        delete prompt.model;
+        delete prompt.temperature;
+        delete prompt.translate;
+        delete prompt.merged;
+        delete prompt.output;
+        delete prompt.text;
     }
 
     if (prompt.type == 'role') {
diff --git a/src/components/flow/nodeComponents/CustomPromptNode.tsx b/src/components/flow/nodeComponents/CustomPromptNode.tsx
index 0819437..1f53fc0 100644
--- a/src/components/flow/nodeComponents/CustomPromptNode.tsx
+++ b/src/components/flow/nodeComponents/CustomPromptNode.tsx
@@ -4,7 +4,7 @@ import { Card, Dropdown } from 'antd';
 
 import i18n from "i18next";
 
-import {createCardTitle, createDebug, selectNodeInput, createText, createSelect, createOutput, createModel, nodeStyle, getI18n } from './Base';
+import {createCardTitle, createDebug, SelectNodeInput, createText, createSelect, createOutput, createModel, nodeStyle, getI18n } from './Base';
 // import { i18nInit } from '../i18nConfig';
 
 
@@ -120,9 +120,17 @@ function Main({ id, data, selected }: any) {
             createText('debugInput', i18n.t('custom'), '', debugInput, statusInputForDebug, updateData)
         )
         node.push(
-            selectNodeInput(i18n.t('getFromBefore'), selectNodeValue, nodeOpts, updateData)
+            <SelectNodeInput 
+            title={i18n.t('getFromBefore')} 
+            nodeInputId={selectNodeValue}
+            nodeOpts={nodeOpts}
+            onChange={updateData}
+            />
         )
 
+       
+
+
         node.push(createModel(model, temperature, models, updateData))
 
         node.push(
diff --git a/src/components/flow/nodeComponents/FilePPTCreateNode.tsx b/src/components/flow/nodeComponents/FilePPTCreateNode.tsx
index d7e4281..f1ef2e6 100644
--- a/src/components/flow/nodeComponents/FilePPTCreateNode.tsx
+++ b/src/components/flow/nodeComponents/FilePPTCreateNode.tsx
@@ -130,7 +130,7 @@ function Main({ id, data, selected }: any) {
                         ) : ''
                 }
             </div>
-            {
+            {/* {
                 createDebug(debugMenu, id,
                     debugInput,
                     data.debugOutput,
@@ -178,7 +178,7 @@ function Main({ id, data, selected }: any) {
                         statusInput: statusInputForDebug,
                         statusOutput: ""
                     })
-            }
+            } */}
         </Card>
     }
 
diff --git a/src/components/flow/nodeComponents/PromptNode.tsx b/src/components/flow/nodeComponents/PromptNode.tsx
index b260f73..2797ba8 100644
--- a/src/components/flow/nodeComponents/PromptNode.tsx
+++ b/src/components/flow/nodeComponents/PromptNode.tsx
@@ -4,7 +4,10 @@ import { Card, Dropdown } from 'antd';
 
 import i18n from "i18next";
 
-import {createCardTitle, createDebug, selectNodeInput, createText, createSelect, createOutput, createModel, nodeStyle, getI18n } from './Base';
+import {
+  createCardTitle, createDebug, SelectNodeInput,
+  createText, createSelect, createOutput, createModel, nodeStyle, getI18n
+} from './Base';
 
 
 function Main({ id, data, selected }: any) {
@@ -52,7 +55,7 @@ function Main({ id, data, selected }: any) {
       // console.log('updateData:',e,shouldRefresh)
     }
 
-    if(e.key=='debugInput'){
+    if (e.key == 'debugInput') {
       data.onChange({
         id, data: {
           debugInput: e.data
@@ -109,14 +112,19 @@ function Main({ id, data, selected }: any) {
     let nodeOpts: any[] = [];
     if (data.getNodes) nodeOpts = [...data.getNodes(id)]
     let selectNodeValue = input === "nodeInput" ? (nodeInputId) : null
-    // console.log('selectNodeValue',selectNodeValue,nodeInputId,nodeOpts[0],data)
+    // console.log('nodeOpts', nodeOpts, data)
     // setNodeInputId(selectNodeValue)
 
     node.push(
       createText('text', i18n.t('userInput'), '', text, '', updateData)
     )
-    node.push(
-      selectNodeInput(i18n.t('getFromBefore'), selectNodeValue, nodeOpts, updateData)
+
+    node.push(<SelectNodeInput
+      title={i18n.t('getFromBefore')}
+      nodeInputId={selectNodeValue}
+      nodeOpts={nodeOpts}
+      onChange={updateData}
+    />
     )
 
     node.push(createModel(model, temperature, models, updateData))
@@ -140,8 +148,8 @@ function Main({ id, data, selected }: any) {
               json = JSON.parse(data);
               setStatusInputForDebug('')
               updateData({
-                key:'debugInput',
-                data:data
+                key: 'debugInput',
+                data: data
               })
             } catch (error) {
               setStatusInputForDebug('error')
@@ -185,7 +193,7 @@ function Main({ id, data, selected }: any) {
 
     return <Card
       key={id}
-      title={createCardTitle(i18n.t('promptNodeTitle'),id, data) }
+      title={createCardTitle(i18n.t('promptNodeTitle'), id, data)}
       bodyStyle={{ paddingTop: 0 }}
       // extra={createType(type, agents, updateType)}
       style={{ width: 300 }}>
diff --git a/src/components/flow/nodeComponents/QueryClickNode.tsx b/src/components/flow/nodeComponents/QueryClickNode.tsx
index f0c790e..f97c937 100644
--- a/src/components/flow/nodeComponents/QueryClickNode.tsx
+++ b/src/components/flow/nodeComponents/QueryClickNode.tsx
@@ -71,55 +71,55 @@ function Main({ id, data, selected }: any) {
       setShouldRefresh(false)
     }
 
-    node.push(
-      createDebug(debugMenu, id,
-        debugInput,
-        data.debugOutput,
-        (event: any) => {
-            if (event.key == 'input') {
-                const { data } = event;
-                setDebugInput(data)
-                let json: any;
-                try {
-                    json = JSON.parse(data);
-                    setStatusInputForDebug('')
-                } catch (error) {
-                    setStatusInputForDebug('error')
-                }
-            };
-            if (event.key == 'draggable') updateData(event)
-        },
-        () => {
-            console.log('debugFun debugInput', debugInput)
-            if (debugInput != "" && debugInput.replace(/\s/ig, "") != "[]" && statusInputForDebug != 'error') {
-                let merged;
-                try {
-                    merged = JSON.parse(debugInput)
-                } catch (error) {
-
-                }
-                console.log('debugFun merged', merged)
-                data.merged = merged;
-                data.debugInput = JSON.stringify(merged, null, 2);
-                if (data.role) data.role.merged = merged.filter((f: any) => f.role == 'system');
-                data.debug && data.debug(data);
-            } else if (debugInput == "" || debugInput.replace(/\s/ig, "") == "[]") {
-                data.merged = null;
-                data.debugInput = "";
-                if (data.role) data.role.merged = null;
-                console.log('debugFun no merged', data)
-                data.debug && data.debug(data)
-                setShouldRefresh(true);
-            }else if (debugInput === undefined) {
-              data.debug && data.debug(data)
-            }
-        },
-        () => data.merge && data.merge(data),
-        {
-            statusInput: statusInputForDebug,
-            statusOutput: ""
-        })
-    )
+    // node.push(
+    //   createDebug(debugMenu, id,
+    //     debugInput,
+    //     data.debugOutput,
+    //     (event: any) => {
+    //         if (event.key == 'input') {
+    //             const { data } = event;
+    //             setDebugInput(data)
+    //             let json: any;
+    //             try {
+    //                 json = JSON.parse(data);
+    //                 setStatusInputForDebug('')
+    //             } catch (error) {
+    //                 setStatusInputForDebug('error')
+    //             }
+    //         };
+    //         if (event.key == 'draggable') updateData(event)
+    //     },
+    //     () => {
+    //         console.log('debugFun debugInput', debugInput)
+    //         if (debugInput != "" && debugInput.replace(/\s/ig, "") != "[]" && statusInputForDebug != 'error') {
+    //             let merged;
+    //             try {
+    //                 merged = JSON.parse(debugInput)
+    //             } catch (error) {
+
+    //             }
+    //             console.log('debugFun merged', merged)
+    //             data.merged = merged;
+    //             data.debugInput = JSON.stringify(merged, null, 2);
+    //             if (data.role) data.role.merged = merged.filter((f: any) => f.role == 'system');
+    //             data.debug && data.debug(data);
+    //         } else if (debugInput == "" || debugInput.replace(/\s/ig, "") == "[]") {
+    //             data.merged = null;
+    //             data.debugInput = "";
+    //             if (data.role) data.role.merged = null;
+    //             console.log('debugFun no merged', data)
+    //             data.debug && data.debug(data)
+    //             setShouldRefresh(true);
+    //         }else if (debugInput === undefined) {
+    //           data.debug && data.debug(data)
+    //         }
+    //     },
+    //     () => data.merge && data.merge(data),
+    //     {
+    //         statusInput: statusInputForDebug,
+    //         statusOutput: ""
+    //     })
+    // )
 
     return <Card
       key={id}
diff --git a/src/components/flow/nodeComponents/QueryDefaultNode.tsx b/src/components/flow/nodeComponents/QueryDefaultNode.tsx
index 773ddcd..af7e179 100644
--- a/src/components/flow/nodeComponents/QueryDefaultNode.tsx
+++ b/src/components/flow/nodeComponents/QueryDefaultNode.tsx
@@ -4,11 +4,11 @@ import { Card, Dropdown } from 'antd';
 
 import i18n from "i18next";
 
-import { createCardTitle, createDebug, createURL, createDelay, getI18n, nodeStyle } from './Base'
+import { createCardTitle, SelectNodeInput, createURL, createDelay, getI18n, nodeStyle } from './Base'
 // import { i18nInit } from '../i18nConfig';
 
 
-const createUI = (json: any, delay: number, delayFormat: string, onChange: any) => {
+const createUI = (json: any, delay: number, delayFormat: string, selectNodeValue: string, nodeOpts: any, onChange: any) => {
   const { protocol, url } = json;
 
   return <div onMouseOver={() => {
@@ -44,6 +44,13 @@ const createUI = (json: any, delay: number, delayFormat: string, onChange: any)
       })
     }
 
+    <SelectNodeInput
+      title={i18n.t('getFromBefore')}
+      nodeInputId={selectNodeValue}
+      nodeOpts={nodeOpts}
+      onChange={onChange}
+    />
+
     {
       createDelay(i18n.t('delay'), delayFormat, delay.toString(), [
         { value: 'ms', label: i18n.t('ms') },
@@ -77,6 +84,10 @@ function Main({ id, data, selected }: any) {
   const [delay, setDelay] = React.useState(queryObj.delay || 1000)
 
 
+  const [input, setInput] = React.useState(data.input)
+  const [nodeInputId, setNodeInputId] = React.useState(data.nodeInputId)
+
+
   const updateData = (e: any) => {
     // console.log(e)
     if (e.key === 'query') {
@@ -84,6 +95,18 @@ function Main({ id, data, selected }: any) {
       data.onChange({ id, data: { queryObj: e.data } })
     }
 
+    if (e.key == "nodeInput") {
+      setNodeInputId(e.data);
+      data.onChange({
+        id,
+        data: {
+          nodeInputId: e.data,
+          input: e.data ? 'nodeInput' : 'default'
+        }
+      })
+    }
+
+
     if (e.key == "debug") data.onChange({ id, data: e.data })
     if (e.key == 'draggable') data.onChange({ id, data: { draggable: e.data } })
 
@@ -118,58 +141,65 @@ function Main({ id, data, selected }: any) {
       setShouldRefresh(false)
     }
 
+
+    let nodeOpts: any[] = [];
+    if (data.getNodes) nodeOpts = [...data.getNodes(id)]
+    let selectNodeValue = input === "nodeInput" ? (nodeInputId) : null
+
     // console.log(delay, delayFormat)
-    const node = [createUI(queryObj, delay, delayFormat, updateData)];
-
-    node.push(
-      createDebug(debugMenu, id,
-        debugInput,
-        data.debugOutput,
-        (event: any) => {
-          if (event.key == 'input') {
-            const { data } = event;
-            setDebugInput(data)
-            let json: any;
-            try {
-              json = JSON.parse(data);
-              setStatusInputForDebug('')
-            } catch (error) {
-              setStatusInputForDebug('error')
-            }
-          };
-          if (event.key == 'draggable') updateData(event)
-        },
-        () => {
-          console.log('debugFun debugInput', debugInput)
-          if (debugInput != "" && debugInput.replace(/\s/ig, "") != "[]" && statusInputForDebug != 'error') {
-            let merged;
-            try {
-              merged = JSON.parse(debugInput)
-            } catch (error) {
-
-            }
-            console.log('debugFun merged', merged)
-            data.merged = merged;
-            data.debugInput = JSON.stringify(merged, null, 2);
-            if (data.role) data.role.merged = merged.filter((f: any) => f.role == 'system');
-            data.debug && data.debug(data);
-          } else if (debugInput == "" || debugInput.replace(/\s/ig, "") == "[]") {
-            data.merged = null;
-            data.debugInput = "";
-            if (data.role) data.role.merged = null;
-            console.log('debugFun no merged', data)
-            data.debug && data.debug(data)
-            setShouldRefresh(true);
-          } else if (debugInput === undefined) {
-            data.debug && data.debug(data)
-          }
-        },
-        () => data.merge && data.merge(data),
-        {
-          statusInput: statusInputForDebug,
-          statusOutput: ""
-        })
-    )
+    const node = [
+      createUI(queryObj, delay, delayFormat, selectNodeValue, nodeOpts, updateData)
+    ];
+
+    // node.push(
+    //   createDebug(debugMenu, id,
+    //     debugInput,
+    //     data.debugOutput,
+    //     (event: any) => {
+    //       if (event.key == 'input') {
+    //         const { data } = event;
+    //         setDebugInput(data)
+    //         let json: any;
+    //         try {
+    //           json = JSON.parse(data);
+    //           setStatusInputForDebug('')
+    //         } catch (error) {
+    //           setStatusInputForDebug('error')
+    //         }
+    //       };
+    //       if (event.key == 'draggable') updateData(event)
+    //     },
+    //     () => {
+    //       console.log('debugFun debugInput', debugInput)
+    //       if (debugInput != "" && debugInput.replace(/\s/ig, "") != "[]" && statusInputForDebug != 'error') {
+    //         let merged;
+    //         try {
+    //           merged = JSON.parse(debugInput)
+    //         } catch (error) {
+
+    //         }
+    //         console.log('debugFun merged', merged)
+    //         data.merged = merged;
+    //         data.debugInput = JSON.stringify(merged, null, 2);
+    //         if (data.role) data.role.merged = merged.filter((f: any) => f.role == 'system');
+    //         data.debug && data.debug(data);
+    //       } else if (debugInput == "" || debugInput.replace(/\s/ig, "") == "[]") {
+    //         data.merged = null;
+    //         data.debugInput = "";
+    //         if (data.role) data.role.merged = null;
+    //         console.log('debugFun no merged', data)
+    //         data.debug && data.debug(data)
+    //         setShouldRefresh(true);
+    //       } else if (debugInput === undefined) {
+    //         data.debug && data.debug(data)
+    //       }
+    //     },
+    //     () => data.merge && data.merge(data),
+    //     {
+    //       statusInput: statusInputForDebug,
+    //       statusOutput: ""
+    //     })
+    // )
 
     return <Card
       key={id}
diff --git a/src/components/flow/nodeComponents/QueryInputNode.tsx b/src/components/flow/nodeComponents/QueryInputNode.tsx
index 650a0d1..f367b4d 100644
--- a/src/components/flow/nodeComponents/QueryInputNode.tsx
+++ b/src/components/flow/nodeComponents/QueryInputNode.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { Handle, NodeProps, Position } from 'reactflow';
 import { Input, Card, Dropdown, Divider } from 'antd';
 
-import { createCardTitle, selectInput, createDebug, createTextArea, nodeStyle, getI18n } from "./Base"
+import { createCardTitle, SelectInput, createDebug, createTextArea, nodeStyle, getI18n } from "./Base"
 
 import i18n from "i18next";
 
@@ -15,7 +15,7 @@ const createUrl = (input: string, json: any, onChange: any) => {
   let nodeOpts: any[] = [];
   if (json.getNodes) nodeOpts = [...json.getNodes(json.id)]
   let selectNodeValue = input === "nodeInput" ? (nodeInputId || nodeOpts[0].value) : null
-  // console.log(input, selectNodeValue)
+  // console.log('createUrl',input, selectNodeValue,nodeOpts)
   return <div onMouseOver={() => {
     onChange({
       key: 'draggable',
@@ -49,9 +49,15 @@ const createUrl = (input: string, json: any, onChange: any) => {
 
     <Divider dashed />
     <p>{i18n.t('queryInputText')}</p>
-    {
-      selectInput(i18n.t('nodeInputLabel'), i18n.t('userInputLabel'), selectNodeValue, userInput, nodeOpts, onChange)
-    }
+    <SelectInput 
+       nodeInputLabel={i18n.t('nodeInputLabel')}
+       userInputLabel={i18n.t('userInputLabel')}
+       nodeInputId={selectNodeValue}
+       userInput={userInput}
+       nodeOpts={nodeOpts}
+       onChange={onChange} 
+    />
+  
 
   </div>
 }
@@ -135,55 +141,55 @@ function Main({ id, data, selected }: any) {
     ];
 
 
-    node.push(
-      createDebug(debugMenu, id,
-        debugInput,
-        data.debugOutput,
-        (event: any) => {
-          if (event.key == 'input') {
-            const { data } = event;
-            setDebugInput(data)
-            let json: any;
-            try {
-              json = JSON.parse(data);
-              setStatusInputForDebug('')
-            } catch (error) {
-              setStatusInputForDebug('error')
-            }
-          };
-          if (event.key == 'draggable') updateData(event)
-        },
-        () => {
-          console.log('debugFun debugInput', debugInput)
-          if (debugInput != "" && debugInput.replace(/\s/ig, "") != "[]" && statusInputForDebug != 'error') {
-            let merged;
-            try {
-              merged = JSON.parse(debugInput)
-            } catch (error) {
-
-            }
-            console.log('debugFun merged', merged)
-            data.merged = merged;
-            data.debugInput = JSON.stringify(merged, null, 2);
-            if (data.role) data.role.merged = merged.filter((f: any) => f.role == 'system');
-            data.debug && data.debug(data);
-          } else if (debugInput == "" || debugInput.replace(/\s/ig, "") == "[]") {
-            data.merged = null;
-            data.debugInput = "";
-            if (data.role) data.role.merged = null;
-            console.log('debugFun no merged', data)
-            data.debug && data.debug(data)
-            setShouldRefresh(true);
-          } else if (debugInput === undefined) {
-            data.debug && data.debug(data)
-          }
-        },
-        () => data.merge && data.merge(data),
-        {
-          statusInput: statusInputForDebug,
-          statusOutput: ""
-        })
-    )
+    // node.push(
+    //   createDebug(debugMenu, id,
+    //     debugInput,
+    //     data.debugOutput,
+    //     (event: any) => {
+    //       if (event.key == 'input') {
+    //         const { data } = event;
+    //         setDebugInput(data)
+    //         let json: any;
+    //         try {
+    //           json = JSON.parse(data);
+    //           setStatusInputForDebug('')
+    //         } catch (error) {
+    //           setStatusInputForDebug('error')
+    //         }
+    //       };
+    //       if (event.key == 'draggable') updateData(event)
+    //     },
+    //     () => {
+    //       console.log('debugFun debugInput', debugInput)
+    //       if (debugInput != "" && debugInput.replace(/\s/ig, "") != "[]" && statusInputForDebug != 'error') {
+    //         let merged;
+    //         try {
+    //           merged = JSON.parse(debugInput)
+    //         } catch (error) {
+
+    //         }
+    //         console.log('debugFun merged', merged)
+    //         data.merged = merged;
+    //         data.debugInput = JSON.stringify(merged, null, 2);
+    //         if (data.role) data.role.merged = merged.filter((f: any) => f.role == 'system');
+    //         data.debug && data.debug(data);
+    //       } else if (debugInput == "" || debugInput.replace(/\s/ig, "") == "[]") {
+    //         data.merged = null;
+    //         data.debugInput = "";
+    //         if (data.role) data.role.merged = null;
+    //         console.log('debugFun no merged', data)
+    //         data.debug && data.debug(data)
+    //         setShouldRefresh(true);
+    //       } else if (debugInput === undefined) {
+    //         data.debug && data.debug(data)
+    //       }
+    //     },
+    //     () => data.merge && data.merge(data),
+    //     {
+    //       statusInput: statusInputForDebug,
+    //       statusOutput: ""
+    //     })
+    // )
 
     return <Card
       key={id}
diff --git a/src/components/flow/nodeComponents/QueryReadNode.tsx b/src/components/flow/nodeComponents/QueryReadNode.tsx
index c3c342d..9d3db63 100644
--- a/src/components/flow/nodeComponents/QueryReadNode.tsx
+++ b/src/components/flow/nodeComponents/QueryReadNode.tsx
@@ -105,56 +105,56 @@ function QueryReadNode({ id, data, selected }: any) {
       createUrl(i18n.t('content'), i18n.t('selectQuery'), i18n.t('queryReadPlaceholder'), queryObj, updateData)
     ];
 
-    node.push(
-      createDebug(debugMenu, id,
-        debugInput,
-        data.debugOutput,
-        (event: any) => {
-          if (event.key == 'input') {
-            const { data } = event;
-            setDebugInput(data)
-            let json: any;
-            try {
-              json = JSON.parse(data);
-              setStatusInputForDebug('')
-            } catch (error) {
-              setStatusInputForDebug('error')
-            }
-          };
-          if (event.key == 'draggable') updateData(event)
-        },
-        () => {
-          console.log('debugFun debugInput', debugInput)
-          if (debugInput != "" && debugInput && debugInput.replace(/\s/ig, "") != "[]" && statusInputForDebug != 'error') {
-            let merged;
-            try {
-              merged = JSON.parse(debugInput)
-            } catch (error) {
-
-            }
-            console.log('debugFun merged', merged)
-            data.merged = merged;
-            data.debugInput = JSON.stringify(merged, null, 2);
-            if (data.role) data.role.merged = merged.filter((f: any) => f.role == 'system');
-            data.debug && data.debug(data);
-          } else if (debugInput == "" || debugInput && debugInput.replace(/\s/ig, "") == "[]") {
-            data.merged = null;
-            data.debugInput = "";
-            if (data.role) data.role.merged = null;
-            console.log('debugFun no merged', data)
-            data.debug && data.debug(data)
-            setShouldRefresh(true);
-          } else if (debugInput === undefined) {
-            data.debug && data.debug(data);
-            setShouldRefresh(true);
-          }
-        },
-        () => data.merge && data.merge(data),
-        {
-          statusInput: statusInputForDebug,
-          statusOutput: ""
-        })
-    )
+    // node.push(
+    //   createDebug(debugMenu, id,
+    //     debugInput,
+    //     data.debugOutput,
+    //     (event: any) => {
+    //       if (event.key == 'input') {
+    //         const { data } = event;
+    //         setDebugInput(data)
+    //         let json: any;
+    //         try {
+    //           json = JSON.parse(data);
+    //           setStatusInputForDebug('')
+    //         } catch (error) {
+    //           setStatusInputForDebug('error')
+    //         }
+    //       };
+    //       if (event.key == 'draggable') updateData(event)
+    //     },
+    //     () => {
+    //       console.log('debugFun debugInput', debugInput)
+    //       if (debugInput != "" && debugInput && debugInput.replace(/\s/ig, "") != "[]" && statusInputForDebug != 'error') {
+    //         let merged;
+    //         try {
+    //           merged = JSON.parse(debugInput)
+    //         } catch (error) {
+
+    //         }
+    //         console.log('debugFun merged', merged)
+    //         data.merged = merged;
+    //         data.debugInput = JSON.stringify(merged, null, 2);
+    //         if (data.role) data.role.merged = merged.filter((f: any) => f.role == 'system');
+    //         data.debug && data.debug(data);
+    //       } else if (debugInput == "" || debugInput && debugInput.replace(/\s/ig, "") == "[]") {
+    //         data.merged = null;
+    //         data.debugInput = "";
+    //         if (data.role) data.role.merged = null;
+    //         console.log('debugFun no merged', data)
+    //         data.debug && data.debug(data)
+    //         setShouldRefresh(true);
+    //       } else if (debugInput === undefined) {
+    //         data.debug && data.debug(data);
+    //         setShouldRefresh(true);
+    //       }
+    //     },
+    //     () => data.merge && data.merge(data),
+    //     {
+    //       statusInput: statusInputForDebug,
+    //       statusOutput: ""
+    //     })
+    // )
 
     return <Card
       key={id}
diff --git a/src/components/flow/nodeComponents/UserInputTextNode.tsx b/src/components/flow/nodeComponents/UserInputTextNode.tsx
index aea93ff..1f0271c 100644
--- a/src/components/flow/nodeComponents/UserInputTextNode.tsx
+++ b/src/components/flow/nodeComponents/UserInputTextNode.tsx
@@ -2,63 +2,38 @@ import React from 'react'
 import { Handle, Position } from 'reactflow';
 import { Card, Dropdown } from 'antd';
 import i18n from "i18next";
-import { createCardTitle, createText, nodeStyle, getI18n } from './Base';
+import { createCardTitle, nodeStyle, getI18n, createText } from './Base';
 
 function Main({ id, data, selected }: any) {
   // i18nInit();
   const { contextMenus } = getI18n();
-  // input
-  const [input, setInput] = React.useState(data.input)
-  const [nodeInputId, setNodeInputId] = React.useState(data.nodeInputId)
-  // text
-  const [text, setText] = React.useState(data.text)
 
+  const [userInput, setUserInput] = React.useState(data.userInput)
 
   const updateData = (e: any) => {
 
-    if (e.key === 'text') {
-      setText(e.data);
-      data.onChange({ id, data: { text: e.data, debugInput: "" } });
-    }
+    if (e.key == 'draggable') data.onChange({ id, data: { draggable: e.data } });
 
-    if (e.key == "nodeInput") {
-      setNodeInputId(e.data);
-      data.onChange({
-        id,
-        data: {
-          nodeInputId: e.data,
-          input: e.data ? 'nodeInput' : 'default'
-        }
-      })
+    if (e.key == 'userInput') {
+      setUserInput(e.data);
+      data.onChange({ id, data: { userInput: e.data } });
     }
-
-    if (e.key == 'draggable') data.onChange({ id, data: { draggable: e.data } })
   }
 
-
   const createNode = () => {
-    const node = [
-      <p>{i18n.t('queryInputNodeTitle')}</p>
-    ];
 
     let nodeOpts: any[] = [];
     if (data.getNodes) nodeOpts = [...data.getNodes(id)]
-    let selectNodeValue = input === "nodeInput" ? (nodeInputId) : null
-
-    // node.push(
-    //   createText('text', i18n.t('queryInputNodeTitle'), '', text, '', updateData)
-    // )
-    // node.push(
-    //   selectNodeInput(i18n.t('getFromBefore'), selectNodeValue, nodeOpts, updateData)
-    // )
 
     return <Card
       key={id}
       title={createCardTitle(i18n.t('userInputNodeTitle'), id, data)}
       bodyStyle={{ paddingTop: 0 }}
-      // extra={createType(type, agents, updateType)}
       style={{ width: 300 }}>
-      {...node}
+      {/* <p >{i18n.t('queryInputNodeTitle')}</p> */}
+      {
+        createText('userInput', i18n.t('userInputTextTip'), '...', userInput, '', updateData)
+      }
     </Card>
   }
 
diff --git a/src/components/flow/nodeComponents/index.tsx b/src/components/flow/nodeComponents/index.tsx
index b6012a5..6488592 100644
--- a/src/components/flow/nodeComponents/index.tsx
+++ b/src/components/flow/nodeComponents/index.tsx
@@ -2,7 +2,6 @@ import QueryDefaultNode from './QueryDefaultNode';
 import QueryClickNode from './QueryClickNode'
 import QueryReadNode from './QueryReadNode';
 import QueryInputNode from './QueryInputNode';
-import QueryScrollNode from "./QueryScrollNode";
 import APINode from './APINode';
 import RoleNode from './RoleNode';
 import PromptNode from './PromptNode';
diff --git a/src/config/app.json b/src/config/app.json
index 2117fa1..5615ca9 100644
--- a/src/config/app.json
+++ b/src/config/app.json
@@ -1 +1 @@
-{"app":"Earth","version":"0.3.7.3","browsers":["chrome"],"discord":"https://discord.gg/SGwA9anUrr","issues":"https://discord.gg/VtRmJCb8wh","chatGPT":{"token":"","apis":[{"value":"https://api.openai.com","label":"openai"}],"api":"https://api.openai.com","displayApiName":"openai","models":["gpt-3.5-turbo"],"model":"gpt-3.5-turbo","canImport":true},"dev":true}
+{"app":"Earth","version":"0.3.7.5","browsers":["chrome"],"discord":"https://discord.gg/SGwA9anUrr","issues":"https://discord.gg/VtRmJCb8wh","chatGPT":{"token":"","apis":[{"value":"https://api.openai.com","label":"openai"}],"api":"https://api.openai.com","displayApiName":"openai","models":["gpt-3.5-turbo"],"model":"gpt-3.5-turbo","canImport":true},"dev":true}
diff --git a/src/locales/en.json b/src/locales/en.json
index 4d0c4fc..388b0ca 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -209,8 +209,13 @@
     "ms": "ms",
     "s": "s",
 
-    "queryClickNodeTitle": "Simulate click event",
+    "queryClickNodeTitle": "Simulate Click Event",
     "selectQuery": "SelectQuery",
+    "queryClickPlaceholder": "#<idName> or.<className>",
+
+    "queryScrollNodeTitle": "Web Scroll Event",
+    "queryScrollPlaceholder": "A positive number to scroll down, a negative number to scroll up",
+    "queryScroll": "Web Scroll",
 
     "queryReadNodeTitle": "Content Reading",
     "queryReadRunResult": "Read result",
@@ -220,7 +225,7 @@
     "queryInputNodeTitle": "Text Input",
     "queryInputText": "Text Source",
     "nodeInputLabel": "From Node",
-    "userInputLabel": "From User Input",
+    "userInputLabel": "Input Text",
 
     "copyText": "Copy plain text",
     "exportPPT": "Export PPT",
@@ -257,9 +262,11 @@
     "inputMenu": "Input",
     "userInputNodeTitle": "User input",
     "userInputText": "Input text",
+    "userInputTextTip": "Prompt Text",
     "inputMerge": "Input merge",
     "inputMergeNodeTitle": "Input merge",
-    "mergeReg": "Merging rules"
+    "mergeReg": "Merging rules",
+    "inputMergePlaceholderTips": "Please enter ${n0},${n1},${n2}..."
 
 
 
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 12c7461..20df7b1 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -174,7 +174,7 @@
     "urlPlaceholder": "请输入www.xxxx.com",
     "method": "方法",
     "paramaBody": "参数(字符串) Body",
-    "getFromBefore": "从前面节点获取文本 ${context} ",
+    "getFromBefore": "从上一节点获取文本 ${context} ",
     "getFromBeforeTips": "*可以在指令任意位置里插入\"${context}\"",
     "responseType": "返回的数据类型",
     "output": "输出",
@@ -218,6 +218,10 @@
     "selectQuery": "SelectQuery",
     "queryClickPlaceholder": "#<idName>或者.<className>",
 
+    "queryScrollNodeTitle": "模拟滚动事件",
+    "queryScrollPlaceholder": "输入正数向下滚动，负数向上滚动",
+    "queryScroll": "页面滚动",
+
     "queryReadNodeTitle": "内容读取",
     "queryReadRunResult": "读取结果",
     "content": "获取网页内容",
@@ -227,7 +231,7 @@
     "queryInputNodeTitle": "文本输入",
     "queryInputText": "文本来源",
     "nodeInputLabel": "从节点",
-    "userInputLabel": "从用户输入",
+    "userInputLabel": "输入",
 
     "copyText": "拷贝纯文本",
     "exportPPT": "导出PPT",
@@ -258,9 +262,11 @@
     "inputMenu": "输入",
     "userInputNodeTitle": "用户输入",
     "userInputText": "输入文本",
+    "userInputTextTip": "提示文案",
     "inputMerge": "合并",
     "inputMergeNodeTitle": "输入合并",
-    "mergeReg": "合并规则"
+    "mergeReg": "合并规则",
+    "inputMergePlaceholderTips": "请输入${n0},${n1},${n2}..."
 
 
 }
\ No newline at end of file

From a7456906cfd75ebb7f387e99ddea194dfab3f95a Mon Sep 17 00:00:00 2001
From: shadowcz007 <chizhiwei007@163.com>
Date: Mon, 3 Jul 2023 16:34:44 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=EF=BC=8C=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=96=87=E6=A1=88=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...205\245-\346\226\207\346\241\210_DG-E7g-s_AMnSkk0W-nHe.json" | 1 +
 src/components/ChatbotMain.tsx                                  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 "examples/combo/test-\347\224\250\346\210\267\350\276\223\345\205\245-\346\226\207\346\241\210_DG-E7g-s_AMnSkk0W-nHe.json"

diff --git "a/examples/combo/test-\347\224\250\346\210\267\350\276\223\345\205\245-\346\226\207\346\241\210_DG-E7g-s_AMnSkk0W-nHe.json" "b/examples/combo/test-\347\224\250\346\210\267\350\276\223\345\205\245-\346\226\207\346\241\210_DG-E7g-s_AMnSkk0W-nHe.json"
new file mode 100644
index 0000000..bf34ae8
--- /dev/null
+++ "b/examples/combo/test-\347\224\250\346\210\267\350\276\223\345\205\245-\346\226\207\346\241\210_DG-E7g-s_AMnSkk0W-nHe.json"
@@ -0,0 +1 @@
+[{"tag":"test-用户输入-文案","role":{"name":"","text":"你是一位古诗词高手，会写诗"},"combo":2,"interfaces":["showInChat"],"isInfinite":false,"owner":"user","prompt":{"id":"USERINPUTTEXT_NVZIEYQ3H-TUWY0DRF9QM","type":"userInputText","inputs":{"nodes":[],"output":""},"userInput":"请输入性别","role":{"name":"","text":"你是一位古诗词高手，会写诗"}},"version":"0.3.0","app":"brainwave","id":"DG-E7g-s_AMnSkk0W-nHe","createDate":1688373247275,"prompt2":{"id":"PROMPT_BFCEJTGXUMV74I8TJCMQR","nextId":"","nodeInputId":"USERINPUTTEXT_NVZIEYQ3H-TUWY0DRF9QM","role":{"name":"","text":"你是一位古诗词高手，会写诗"},"text":"结合```${context}``` 写一个古诗词，并写成笑话","url":"","temperature":0.84,"model":"ChatGPT","input":"nodeInput","userInput":"","translate":"default","output":"default","type":"prompt","merged":null}}]
\ No newline at end of file
diff --git a/src/components/ChatbotMain.tsx b/src/components/ChatbotMain.tsx
index 3ce3c54..848f418 100644
--- a/src/components/ChatbotMain.tsx
+++ b/src/components/ChatbotMain.tsx
@@ -1420,7 +1420,7 @@ class Main extends React.Component<{
                     // 清空type thinking 的状态
                     nTalks = Talks.filter(nTalks)
                     nTalks.push(ChatBotConfig.createTalkData('ask-user-input', {
-                        html: "请输入"
+                        html: prompt.userInput || i18n.t('inputTitle')
                     }));
                     this._userInputTextRun()
                 }

From cb5f9d9f34a7c397fb0f0170ae9bc3de5408c8f3 Mon Sep 17 00:00:00 2001
From: shadowcz007 <chizhiwei007@163.com>
Date: Mon, 3 Jul 2023 16:47:51 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddelay=E6=BC=8F=E4=BC=A0?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/background/Common.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/background/Common.js b/src/components/background/Common.js
index df67bd9..d80f918 100644
--- a/src/components/background/Common.js
+++ b/src/components/background/Common.js
@@ -232,7 +232,8 @@ class Common {
                     Agent.executeScript(data.url, {
                         query: data.query,
                         text: data.text,
-                        type: data.type
+                        type: data.type,
+                        delay: data.delay, //修复delay漏传的bug
                     }, data.combo)
                 } else if (cmd == "api-run") {
                     const { url, init, combo, promptId } = data;

From e5b89cdc4bbd3bafa858379ecb5b9346a20c7982 Mon Sep 17 00:00:00 2001
From: shadowcz007 <chizhiwei007@163.com>
Date: Mon, 3 Jul 2023 16:48:13 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BB=8E=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=8A=82=E7=82=B9=E4=BC=A0=E5=85=A5url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ChatbotMain.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ChatbotMain.tsx b/src/components/ChatbotMain.tsx
index 848f418..4a14504 100644
--- a/src/components/ChatbotMain.tsx
+++ b/src/components/ChatbotMain.tsx
@@ -881,9 +881,9 @@ class Main extends React.Component<{
         })
     }
 
-    _queryDefaultRun(queryObj: any, combo: any) {
-
-        QueryDefaultRun(queryObj, combo).then((res: any) => {
+    _queryDefaultRun(prompt: any, combo: any) {
+        const { queryObj, context } = prompt;
+        QueryDefaultRun(queryObj, context, combo).then((res: any) => {
 
             this.updateChatBotStatus(false);
 
@@ -1602,7 +1602,7 @@ class Main extends React.Component<{
                 };
 
                 // queryDefault 跳转页面
-                if (promptJson.type === 'queryDefault') this._queryDefaultRun(promptJson.queryObj, currentCombo);
+                if (promptJson.type === 'queryDefault') this._queryDefaultRun(promptJson, currentCombo);
 
                 // queryRead 读取
                 if (promptJson.type == "queryRead") this._queryReadRun(promptJson.queryObj);

From b9f91f57832d8ea499f3cbc3b1b8e3233f5ccfb7 Mon Sep 17 00:00:00 2001
From: shadowcz007 <chizhiwei007@163.com>
Date: Mon, 3 Jul 2023 16:48:19 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BB=8E=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=8A=82=E7=82=B9=E4=BC=A0=E5=85=A5url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/runtime/webAgent.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/runtime/webAgent.tsx b/src/components/runtime/webAgent.tsx
index 8ab3011..5088e21 100644
--- a/src/components/runtime/webAgent.tsx
+++ b/src/components/runtime/webAgent.tsx
@@ -43,7 +43,7 @@ function clickByQueryBase(query: string) {
     }
 }
 
-export function QueryDefaultRun(queryObj: any, combo: any) {
+export function QueryDefaultRun(queryObj: any, prePromptText: string, combo: any) {
     return new Promise((res, rej) => {
         let result = {}
 
@@ -57,6 +57,10 @@ export function QueryDefaultRun(queryObj: any, combo: any) {
 
 
             if (url) {
+                // ${context}
+                if (url.match(/\${context}/) && prePromptText) {
+                    url = url.replaceAll('${context}', prePromptText)
+                }
                 // 对url进行处理
                 if (url && !url.match('//')) url = `${protocol}${url}`;
 
@@ -155,7 +159,7 @@ export function QueryReadRun(queryObj: any) {
         <summary>${i18n.t("queryReadRunResult")}</summary>
         <p>${user.content}</p>
     </details>`;
-        
+
         setTimeout(() => res({
             from: '_queryReadRun',
             id: id + 'r',

From b501dd49341ad9a0206862046418afc25049cb9f Mon Sep 17 00:00:00 2001
From: shadowcz007 <chizhiwei007@163.com>
Date: Mon, 3 Jul 2023 16:52:19 +0800
Subject: [PATCH 7/7] 0.3.8

---
 ...\220\216\350\267\263\350\275\254_3T2K8wncaKIuerL5rAxpW.json" | 1 +
 package.json                                                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 "examples/combo/\350\276\223\345\205\245\347\275\221\347\253\231\345\220\216\350\267\263\350\275\254_3T2K8wncaKIuerL5rAxpW.json"

diff --git "a/examples/combo/\350\276\223\345\205\245\347\275\221\347\253\231\345\220\216\350\267\263\350\275\254_3T2K8wncaKIuerL5rAxpW.json" "b/examples/combo/\350\276\223\345\205\245\347\275\221\347\253\231\345\220\216\350\267\263\350\275\254_3T2K8wncaKIuerL5rAxpW.json"
new file mode 100644
index 0000000..23405c7
--- /dev/null
+++ "b/examples/combo/\350\276\223\345\205\245\347\275\221\347\253\231\345\220\216\350\267\263\350\275\254_3T2K8wncaKIuerL5rAxpW.json"
@@ -0,0 +1 @@
+[{"tag":"输入网站后跳转","role":{"merged":[],"name":"","text":""},"combo":2,"interfaces":[],"isInfinite":false,"owner":"user","prompt":{"id":"USERINPUTTEXT_TF0RFB9YPR7HCZMCNWM8C","type":"userInputText","inputs":{"nodes":[],"output":""},"userInput":"请输入网站","role":{"merged":[],"name":"","text":""}},"version":"0.3.0","app":"brainwave","id":"3T2K8wncaKIuerL5rAxpW","createDate":1688374214203,"prompt2":{"id":"QUERYDEFAULT_D0WFIAV6LLXCNRRPLURWI","nextId":"","nodeInputId":"USERINPUTTEXT_TF0RFB9YPR7HCZMCNWM8C","role":{"merged":[],"name":"","text":""},"url":"","queryObj":{"action":"default","content":"bindCurrentPage","delay":1000,"protocol":"https://","query":"","url":"${context}"},"input":"nodeInput","userInput":"","type":"queryDefault"}}]
\ No newline at end of file
diff --git a/package.json b/package.json
index f47780c..dcc5812 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "Earth",
     "displayName": "Earth",
-    "version": "0.3.7.5",
+    "version": "0.3.8.0",
     "description": "AGIUI for Browser Extension",
     "license": "MIT",
     "repository": {