diff --git a/Cargo.toml b/Cargo.toml index 04dd130..15a1362 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "easyflow" version = "1.17.6" edition = "2024" -homepage = "https://dialogflowchatbot.github.io/" +homepage = "https://easyflow-ai.github.io/" authors = ["dialogflowchatbot "] [lib] @@ -79,7 +79,7 @@ lopdf = "0.36.0" # lancedb = "0.13.0" libsqlite3-sys = { version = "0.30", features = ["bundled"] } validator = "0.20" -zip = "2.2.3" +zip = "2.4.1" quick-xml = "0.37.2" # usearch = "2.17" # cxx = "1.0" diff --git a/README.md b/README.md index ad2a178..ca4ef15 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ # Give it a try! * 🐋 **Docker** We provided an image on Docker Hub at [dialogflowchatbot/demo](https://hub.docker.com/repository/docker/dialogflowchatbot/demo) -* 💻 **Binary releases**, please check [here](https://github.com/dialogflowchatbot/dialogflow/releases) +* 💻 **Binary releases**, please check [here](https://github.com/easyflow-ai/easyflow/releases) > By default application will listen to `127.0.0.1:12715`, you can use `-ip` and `-port` specify new value, e.g.: `dialogflow -ip 0.0.0.0 -port 8888` @@ -25,7 +25,7 @@ * 🎨 The **front end** of this application is [here](https://github.com/dialogflowchatbot/dialogflow-frontend) --> # Check out introduction page -[https://dialogflowchatbot.github.io/](https://dialogflowchatbot.github.io/#/) +[https://easyflow-ai.github.io/](https://easyflow-ai.github.io/) # Function nodes |Node|Name| @@ -69,7 +69,7 @@ Using the different nodes above, to arrange and combine, you can get a conversat 3. Open your browser and visit: http://127.0.0.1:12715/ ### Binary release -1. From [Github release page](https://github.com/dialogflowchatbot/dialogflow/releases), depending on the operating system, download the application. +1. From [Github release page](https://github.com/easyflow-ai/easyflow/releases), depending on the operating system, download the application. 1. Run it directly, or use the `-ip` and `-port` parameters to perform the listening IP address and port, e.g.: `dialogflow -ip 0.0.0.0 -port 8888`. 1. Open your browser and visit http://localhost:12715 (by default) or http://`new IP`:`new port` to see the application in action 1. Add a main flow and click its name into it diff --git a/README_zh-CN.md b/README_zh-CN.md index 6149a39..198e6a9 100644 --- a/README_zh-CN.md +++ b/README_zh-CN.md @@ -17,17 +17,17 @@ # 现在就尝试一下! * 🐋 **Docker** 我们提供了一个`Docker`镜像: [dialogflowchatbot/demo](https://hub.docker.com/repository/docker/dialogflowchatbot/demo) -* 💻 **可直接执行的发布版本**, 请通过发布页: [点击这里](https://github.com/dialogflowchatbot/dialogflow/releases) , 根据不同的平台下载（支持：Windows、Linux、macOS） +* 💻 **可直接执行的发布版本**, 请通过发布页: [点击这里](https://github.com/easyflow-ai/easyflow/releases) , 根据不同的平台下载（支持：Windows、Linux、macOS） > 默认情况下, 应用会监听: `127.0.0.1:12715`, 你可以使用 `-ip` 参数和 `-port` 参数, 来指定新的监听地址和端口, 例如: `dialogflow -ip 0.0.0.0 -port 8888` # 查看详细介绍, 了解更多信息 -[https://dialogflowchatbot.github.io/](https://dialogflowchatbot.github.io/#/) +[https://easyflow-ai.github.io/](https://easyflow-ai.github.io/) # 功能节点列表 |节点|名称| @@ -71,7 +71,7 @@ 3. 打开浏览器并访问: http://127.0.0.1:12715/ 打开应用界面 ### 发布版本 -1. 从 [Github release page](https://github.com/dialogflowchatbot/dialogflow/releases), 选择不同系统并下载. +1. 从 [Github release page](https://github.com/easyflow-ai/easyflow/releases), 选择不同系统并下载. 1. 直接执行, 或者使用 `-ip` 和 `-port` 修改监听地址, 如: `dialogflow -ip 0.0.0.0 -port 8888`. 1. 打开浏览器并访问 http://localhost:12715 (默认) 或 http://`新的IP`:`新的端口` 打开应用界面 1. 进入一个机器人 diff --git a/examples/README.md b/examples/README.md index bdce748..863c72a 100644 --- a/examples/README.md +++ b/examples/README.md @@ -4,8 +4,8 @@ Please check [html folder](./html) ### Java You can refer to: [Java SDK](../sdk/java), in the file: `Main.java`. ``` -git clone https://github.com/dialogflowchatbot/dialogflow -cd dialogflow +git clone https://github.com/easyflow-ai/easyflow +cd easyflow cd sdk cd java # It's a Maven project @@ -13,8 +13,8 @@ cd java ### Python ``` -git clone https://github.com/dialogflowchatbot/dialogflow -cd dialogflow +git clone https://github.com/easyflow-ai/easyflow +cd easyflow cd sdk cd python # pip install requests diff --git a/frontend/README.md b/frontend/README.md index 8bd4f26..56124b9 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -10,7 +10,7 @@ Setup a condition branch --- Hi there. -This is a sub-project of [Dialog flow chat bot](https://github.com/dialogflowchatbot/dialogflow) +This is a sub-project of [EasyFlow](https://github.com/easyflow-ai/easyflow) It's built on Vue3 ## Recommended IDE Setup @@ -20,8 +20,8 @@ It's built on Vue3 ## Project Setup ```sh -git clone https://github.com/dialogflowchatbot/dialogflow -cd dialogflow +git clone https://github.com/easyflow-ai/easyflow +cd easyflow cd frontend npm install ``` diff --git a/frontend/src/assets/lang/en.js b/frontend/src/assets/lang/en.js index 54cffad..3f07bf8 100644 --- a/frontend/src/assets/lang/en.js +++ b/frontend/src/assets/lang/en.js @@ -153,7 +153,7 @@ export default { btn3: 'Try demos', dlTitle: 'Download', dl1: 'You can download the latest releases on Github', - dl2: 'If you have any issues or feedback, please email to: dialogflow(AT)yeah.net or create an issue', + dl2: 'If you have any issues or feedback, please email to: dialogflow(AT)yeah.net or create an issue', introTitle: 'What is this?', intro1: 'It\'s similar to Google\'s Dialogflow, but with an additional canvas for editing processes. It\'s also similar to Typebot, but it includes a full answering backend.', intro2: 'It has a feature called flow canvas that allows you to visually edit a conversation flow, test it, and finally publish it to the public.', @@ -169,7 +169,7 @@ export default { demo2: 'Information collection', demo3: 'Notification', demoUnvailableTitle: 'Demos are not available on Github', - demoUnvailableContent: 'Since there is currently no server to host the backend.
But you can download this software and try these 3 demonstration dialog flows', + demoUnvailableContent: 'Since there is currently no server to host the backend.
But you can download this software and try these 3 demonstration dialog flows', adv2Title: 'Tiny fast and portable', adv2: 'Only ONE executable file (database is generated automatically)
pretty easy for deployment
Relying on AoT compilation technology
Program provides high concurrency and blazingly fast responses', adv3Title: 'Deal with various issues', diff --git a/frontend/src/assets/lang/zh.js b/frontend/src/assets/lang/zh.js index 1187e54..3718db0 100644 --- a/frontend/src/assets/lang/zh.js +++ b/frontend/src/assets/lang/zh.js @@ -154,7 +154,7 @@ export default { btn3: '查看演示Demo', dlTitle: '下载', dl1: '您可以从Github上下载到最新版', - dl2: '如果您有任何意见或建议, 请发邮件到: dialogflow(AT)yeah.net 或者创建一个 帖子', + dl2: '如果您有任何意见或建议, 请发邮件到: dialogflow(AT)yeah.net 或者创建一个 帖子', introTitle: '这是什么软件?', intro1: '它类似 Google 的 Dialogflow, 但是多了一个流程画布编辑器，可以更好的设计流程. 它也像 Typebot, 但是多了一个完整的应答后端.', intro2: '它拥有一个可视化的流程编辑器, 编辑完成后，可以测试流程, 并最终发布流程.', @@ -170,7 +170,7 @@ export default { demo2: '用户信息收集', demo3: '一句话通知', demoUnvailableTitle: '演示在Github上不可用Demos are not available on Github', - demoUnvailableContent: '由于目前没有服务器来托管后台.
但是可以下载该软件, 它包含了3个演示对话流程', + demoUnvailableContent: '由于目前没有服务器来托管后台.
但是可以下载该软件, 它包含了3个演示对话流程', adv2Title: '小巧、快速', adv2: '只有两个文件（程序和数据库），部署非常方便。
依托AoT编译技术
可提供超高的并发数和超快的响应', adv3Title: '解决各种问题', diff --git a/frontend/src/assets/tools.js b/frontend/src/assets/tools.js index 303cc74..ec96493 100644 --- a/frontend/src/assets/tools.js +++ b/frontend/src/assets/tools.js @@ -136,7 +136,7 @@ export function l(m) { export function isOnGithub() { const u = window.location.href; - return u.indexOf('dialogflowchatbot.github.io') > -1; + return u.indexOf('easyflow-ai.github.io') > -1; } export function persistRobotDetail(robotDetail) { diff --git a/frontend/src/components/Guide.vue b/frontend/src/components/Guide.vue index 7b424fa..2852f70 100644 --- a/frontend/src/components/Guide.vue +++ b/frontend/src/components/Guide.vue @@ -113,7 +113,7 @@ const toSettings = () => { {{ item }} - Go to download + Go to download { - + {{ $t('lang.guide.nav5') }} diff --git a/frontend/src/components/Home.vue b/frontend/src/components/Home.vue index c9e107f..1df3cbe 100644 --- a/frontend/src/components/Home.vue +++ b/frontend/src/components/Home.vue @@ -203,7 +203,7 @@ const compareDifferentRobotTypeData = [ {{ item }} - Go to download + Go to download - + {{ $t('lang.guide.nav5') }} @@ -295,9 +295,9 @@ const compareDifferentRobotTypeData = [
Version: {{ currentVersion }}
- https://dialogflowchatbot.github.io/
+ https://easyflow-ai.github.io/
If you have any questions or suggestions, please - create a discussion on + create a discussion on Github or email to: dialogflow@yeah.net diff --git a/frontend/src/components/external/HttpApiDetail.vue b/frontend/src/components/external/HttpApiDetail.vue index 3c9aef0..87e53b8 100644 --- a/frontend/src/components/external/HttpApiDetail.vue +++ b/frontend/src/components/external/HttpApiDetail.vue @@ -21,14 +21,14 @@ const httpApiData = reactive({ protocol: 'http://', method: 'GET', address: '', - timeoutMilliseconds: '1500', + // timeoutMilliseconds: '1500', postContentType: 'UrlEncoded', headers: [], queryParams: [], formData: [], requestBody: '', userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/123.0', - asyncReq: false, + // asyncReq: false, }) const param = reactive({ name: '', @@ -197,9 +197,6 @@ const changeTab = (v) => { Advanced - - milliseconds - @@ -273,11 +270,6 @@ const changeTab = (v) => { - - - - Save Test (WIP) diff --git a/frontend/src/components/flow/nodes/ExternalHttpNode.vue b/frontend/src/components/flow/nodes/ExternalHttpNode.vue index f7e577f..cadc29c 100644 --- a/frontend/src/components/flow/nodes/ExternalHttpNode.vue +++ b/frontend/src/components/flow/nodes/ExternalHttpNode.vue @@ -13,10 +13,13 @@ const formLabelWidth = '100px' const apis = reactive([]) const nodeName = ref() const apisRef = ref() +let originAsyncReqSetting = false; const nodeData = reactive({ nodeName: 'ExternalHttpNode', httpApiName: '', httpApiId: '', + timeoutMilliseconds: 1500, + asyncReq: false, valid: false, invalidMessages: [], newNode: true, @@ -33,10 +36,11 @@ const validate = () => { d.valid = m.length == 0; } const saveForm = () => { - const port = getNode().getPortAt(0); - const branch = nodeData.branches[0]; - branch.branchName = 'Next'; - branch.branchId = port.id; + // const port = getNode().getPortAt(0); + // const branch = nodeData.branches[0]; + // branch.branchName = 'Next'; + // branch.branchId = port.id; + addBranches(); validate(); // console.log(this.nodeData); node.removeData({ silent: true }); @@ -56,7 +60,63 @@ const hideForm = () => { } node.on("change:data", ({ current }) => { nodeSetFormVisible.value = true; + originAsyncReqSetting = node.getData().asyncReq; }); +const addBranches = () => { + if (originAsyncReqSetting == nodeData.asyncReq) + return; + node.removePorts(); + nodeData.branches = []; + if (nodeData.asyncReq) { + node.addPort({ + group: 'absolute', + args: { x: nodeName.value.offsetWidth - 15, y: nodeName.value.offsetHeight + 50 }, + attrs: { + text: { + text: 'Next', + fontSize: 12, + }, + }, + + }); + nodeData.branches.push(getDefaultBranch()) + const port = node.getPortAt(0); + const branch = nodeData.branches[0]; + branch.branchName = port.attrs.text.text; + branch.branchId = port.id; + } else { + node.addPort({ + group: 'absolute', + args: { x: nodeName.value.offsetWidth - 15, y: nodeName.value.offsetHeight + 40 }, + attrs: { + text: { + text: 'Success', + fontSize: 12, + }, + }, + }); + node.addPort({ + group: 'absolute', + args: { x: nodeName.value.offsetWidth - 15, y: nodeName.value.offsetHeight + 56 }, + attrs: { + text: { + text: 'Fail', + fontSize: 12, + }, + }, + }); + nodeData.branches.push(getDefaultBranch()) + nodeData.branches.push(getDefaultBranch()) + let port = node.getPortAt(0); + let branch = nodeData.branches[0]; + branch.branchName = port.attrs.text.text; + branch.branchId = port.id; + port = node.getPortAt(1); + branch = nodeData.branches[1]; + branch.branchName = port.attrs.text.text; + branch.branchId = port.id; + } +} onMounted(async () => { // console.log('httpNode') const t = await httpReq('GET', 'external/http', { robotId: robotId }, null, null); @@ -69,18 +129,8 @@ onMounted(async () => { } } } - node.addPort({ - group: 'absolute', - args: { x: nodeName.value.offsetWidth - 15, y: nodeName.value.offsetHeight + 50 }, - attrs: { - text: { - text: 'Next', - fontSize: 12, - }, - }, - - }); - nodeData.branches.push(getDefaultBranch()) + nodeData.newNode = false; + addBranches() })