diff --git a/src/assets/images/debugBtn.png b/src/assets/images/debugBtn.png deleted file mode 100644 index cd9e7e5e8578dc8370129bbf7d57f92f9df21e19..0000000000000000000000000000000000000000 Binary files a/src/assets/images/debugBtn.png and /dev/null differ diff --git a/src/assets/images/debugBtnDis.png b/src/assets/images/debugBtnDis.png deleted file mode 100644 index b92a4232f10a32a0e6c0af1c9f9b10ad5b80c595..0000000000000000000000000000000000000000 Binary files a/src/assets/images/debugBtnDis.png and /dev/null differ diff --git a/src/assets/styles/theme.scss b/src/assets/styles/theme.scss index f800d6ae0aa34fa2e7e226c088f68a6d37431ab2..af0a702526504e64cd16f76fbe90c554f2f8fa3c 100644 --- a/src/assets/styles/theme.scss +++ b/src/assets/styles/theme.scss @@ -43,6 +43,15 @@ body[theme='dark'] { --el-collapse-content-bg: rgb(42,47,55,0.5); --applist-hover:#313741; --flow-running-bg:linear-gradient(127.95deg, rgb(39, 39, 76) -1.967%, rgba(28, 57, 81, 0.929) 98.202%); + // 这里是不同种类的debug图标 + --flow-debug-default: url('../../assets/svgs/dark_debug.svg'); + --flow-debug-hover: url('../../assets/svgs/dark_debug_hover.svg'); + --flow-debug-active: url('../../assets/svgs/dark_debug_active.svg'); + --flow-debug-dis: url('../../assets/svgs/dark_debug_dis.svg'); + // 这里是不同种类的展开收起图标 + --expand-fold-default: url('../../assets/svgs/dark_expand_fold.svg'); + --expand-fold-hover: url('../../assets/svgs/dark_expand_fold_hover.svg'); + --expand-fold-active: url('../../assets/svgs/dark_expand_fold_active.svg'); } body[theme='light'] { @@ -88,6 +97,15 @@ body[theme='light'] { --question-shadow: rgba(221, 225, 240, 0.5); --applist-hover:#f3f4f6; --flow-running-bg:linear-gradient(127.95deg, rgba(109, 117, 250, 0.2) -1.967%, rgba(90, 179, 255, 0.2) 98.202%); + // 这里是不同种类的debug图标 + --flow-debug-default: url('../../assets/svgs/light_debug.svg'); + --flow-debug-hover: url('../../assets/svgs/light_debug_hover.svg'); + --flow-debug-active: url('../../assets/svgs/light_debug_active.svg'); + --flow-debug-dis: url('../../assets/svgs/light_debug_dis.svg'); + // 这里是不同种类的展开收起图标 + --expand-fold-default: url('../../assets/svgs/light_expand_fold.svg'); + --expand-fold-hover: url('../../assets/svgs/light_expand_fold_hover.svg'); + --expand-fold-active: url('../../assets/svgs/light_expand_fold_active.svg'); } body { diff --git a/src/assets/svgs/dark_debug.svg b/src/assets/svgs/dark_debug.svg new file mode 100644 index 0000000000000000000000000000000000000000..e79dd3137b4d03098e83841bd833717769432811 --- /dev/null +++ b/src/assets/svgs/dark_debug.svg @@ -0,0 +1,29 @@ + + + Created with Pixso. + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/svgs/dark_debug_active.svg b/src/assets/svgs/dark_debug_active.svg new file mode 100644 index 0000000000000000000000000000000000000000..a40989e722bb8af7a5cd4429d4f9d2ac21e646de --- /dev/null +++ b/src/assets/svgs/dark_debug_active.svg @@ -0,0 +1,29 @@ + + + Created with Pixso. + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/svgs/dark_debug_dis.svg b/src/assets/svgs/dark_debug_dis.svg new file mode 100644 index 0000000000000000000000000000000000000000..b6e7a3a93eb10f2d15335cae11f8e2209909b0b1 --- /dev/null +++ b/src/assets/svgs/dark_debug_dis.svg @@ -0,0 +1,30 @@ + + + Created with Pixso. + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/svgs/dark_debug_hover.svg b/src/assets/svgs/dark_debug_hover.svg new file mode 100644 index 0000000000000000000000000000000000000000..2f164b039cac6ed6f7f204e2120062da9473227b --- /dev/null +++ b/src/assets/svgs/dark_debug_hover.svg @@ -0,0 +1,29 @@ + + + Created with Pixso. + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/svgs/dark_expand_fold.svg b/src/assets/svgs/dark_expand_fold.svg new file mode 100644 index 0000000000000000000000000000000000000000..ebbaade56119fcc2cf8820e146a7c093dfc5bc10 --- /dev/null +++ b/src/assets/svgs/dark_expand_fold.svg @@ -0,0 +1,8 @@ + + + Created with Pixso. + + + + + diff --git a/src/assets/svgs/dark_expand_fold_active.svg b/src/assets/svgs/dark_expand_fold_active.svg new file mode 100644 index 0000000000000000000000000000000000000000..01a864530b7a7a7f2ff7033541b4e8d7c4ebd219 --- /dev/null +++ b/src/assets/svgs/dark_expand_fold_active.svg @@ -0,0 +1,8 @@ + + + Created with Pixso. + + + + + diff --git a/src/assets/svgs/dark_expand_fold_hover.svg b/src/assets/svgs/dark_expand_fold_hover.svg new file mode 100644 index 0000000000000000000000000000000000000000..cff7499aeb91158fb6a6caee506053606e189698 --- /dev/null +++ b/src/assets/svgs/dark_expand_fold_hover.svg @@ -0,0 +1,8 @@ + + + Created with Pixso. + + + + + diff --git a/src/assets/svgs/light_debug.svg b/src/assets/svgs/light_debug.svg new file mode 100644 index 0000000000000000000000000000000000000000..53f530d8b145f5cc178cf8fa3edfc330d5b2b36b --- /dev/null +++ b/src/assets/svgs/light_debug.svg @@ -0,0 +1,29 @@ + + + Created with Pixso. + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/svgs/light_debug_active.svg b/src/assets/svgs/light_debug_active.svg new file mode 100644 index 0000000000000000000000000000000000000000..850e0315edf43eecbbd488a5f14a46b1baf47569 --- /dev/null +++ b/src/assets/svgs/light_debug_active.svg @@ -0,0 +1,29 @@ + + + Created with Pixso. + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/svgs/light_debug_dis.svg b/src/assets/svgs/light_debug_dis.svg new file mode 100644 index 0000000000000000000000000000000000000000..98448a0dcede128342fd8613ff31248dfd00585e --- /dev/null +++ b/src/assets/svgs/light_debug_dis.svg @@ -0,0 +1,29 @@ + + + Created with Pixso. + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/svgs/light_debug_hover.svg b/src/assets/svgs/light_debug_hover.svg new file mode 100644 index 0000000000000000000000000000000000000000..e420a6469b1a19f2a593506bc1c9f849c21d4648 --- /dev/null +++ b/src/assets/svgs/light_debug_hover.svg @@ -0,0 +1,29 @@ + + + Created with Pixso. + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/svgs/light_expand_fold.svg b/src/assets/svgs/light_expand_fold.svg new file mode 100644 index 0000000000000000000000000000000000000000..534f865de0446ba9b4da26fde4dc33a506f0e415 --- /dev/null +++ b/src/assets/svgs/light_expand_fold.svg @@ -0,0 +1,8 @@ + + + Created with Pixso. + + + + + diff --git a/src/assets/svgs/light_expand_fold_active.svg b/src/assets/svgs/light_expand_fold_active.svg new file mode 100644 index 0000000000000000000000000000000000000000..19f3b0d5d890171f2d2faecd75f79cfab7cb12b3 --- /dev/null +++ b/src/assets/svgs/light_expand_fold_active.svg @@ -0,0 +1,8 @@ + + + Created with Pixso. + + + + + diff --git a/src/assets/svgs/light_expand_fold_hover.svg b/src/assets/svgs/light_expand_fold_hover.svg new file mode 100644 index 0000000000000000000000000000000000000000..0e826f3af7785f70864f81a83750e2679b689347 --- /dev/null +++ b/src/assets/svgs/light_expand_fold_hover.svg @@ -0,0 +1,8 @@ + + + Created with Pixso. + + + + + diff --git a/src/components/dialoguePanel/DialoguePanel.vue b/src/components/dialoguePanel/DialoguePanel.vue index 06c253a147d8e1eed38300de97a455cd1cc8895d..6c6f074dd1d45a47d591ac19d31d57e01d094d92 100644 --- a/src/components/dialoguePanel/DialoguePanel.vue +++ b/src/components/dialoguePanel/DialoguePanel.vue @@ -657,16 +657,6 @@ const handleSendMessage = async (question, user_selected_flow, user_selected_app } } -.el-popper[role="tooltip"].is-dark, -.el-popper[role="tooltip"].is-light { - background-color: var(--o-bg-color-base); -} - -.el-popper .el-popper__arrow::before { - right: 0; - visibility: hidden; -} - .el-popper[role="tooltip"] { max-width: 500px; } diff --git a/src/views/app/style.scss b/src/views/app/style.scss index 68be5b4af2c819b8208a435e9e63e3ad126a734b..8fdc2f7dc8da4afcaa98f212ea50b5ad3d7aea05 100644 --- a/src/views/app/style.scss +++ b/src/views/app/style.scss @@ -28,6 +28,11 @@ border-radius: 4px 0px 0px 4px; } } + .el-input { + > .el-input__wrapper { + padding: 0 8px; + } + } .createApp { margin-left: 16px; @@ -59,10 +64,9 @@ .appCenterCardContainer { margin-top: 12px ; padding-top: 4px; - max-width: 1336px; + width: 1340px; max-height: calc(100vh - 370px); min-height: calc(100vh - 370px); - min-width: 1336px; overflow-y: auto; .appCenterCardBox { width: fit-content; @@ -193,7 +197,7 @@ } @media screen and (width <= 1400px) { .appCenterCardContainer { - width: 1000px; + width: 1004px; } } diff --git a/src/views/createapp/components/appConfig.vue b/src/views/createapp/components/appConfig.vue index f22d5cb12b858aa1e7e26ac90303bc0ac7d587c0..f734699f6a7b6fa6bdf41b5217f498512267a85a 100644 --- a/src/views/createapp/components/appConfig.vue +++ b/src/views/createapp/components/appConfig.vue @@ -60,7 +60,6 @@ const checkLinks = (rule, value, callback) => { result = false; } }) - console.log('这里的校验') if (!result) { callback(new Error('填写的url不合法')) } else { diff --git a/src/views/createapp/components/workFlow.vue b/src/views/createapp/components/workFlow.vue index 32d3e2703a0aa880e42923ac3e8c30c33cb9d36b..03d52cc10e881f9591647a940a05062a4e80f178 100644 --- a/src/views/createapp/components/workFlow.vue +++ b/src/views/createapp/components/workFlow.vue @@ -83,33 +83,6 @@ const { const { layout } = useLayout(); const { onDragOver, onDrop, onDragLeave, onDragStart } = useDragAndDrop(); -// 这里是初始化的开始结束的节点 -const initNodes = ref([ - { - id: 'start', - type: 'start', - data: { - name: '开始', - description: '', - nodePosition: 'Right', - target: 'source', - }, - deletable: false, - position: { x: 100, y: 160 }, - }, - { - id: 'end', - type: 'end', - data: { - name: '结束', - description: '', - nodePosition: 'Left', - target: 'target', - }, - deletable: false, - position: { x: 600, y: 160 }, - }, -]); // 开始的边默认为空数组【当然回显时应该有值】 const edges = ref([]); @@ -135,7 +108,6 @@ watch( // 获取当前工作流 workFlowList.value = [...props.flowList]; if (workFlowList.value.length) { - nodes.value = initNodes.value; // 默认选中第一个 choiceFlowId(workFlowList.value?.[0]); } @@ -627,7 +599,7 @@ defineExpose({