From 95b90a3bee175fc06bfb6eb17c8f883638037948 Mon Sep 17 00:00:00 2001 From: li-shengren-123456 Date: Wed, 19 Mar 2025 17:05:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AF=B9=E8=B0=83=E8=AF=95=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=92=8C=E5=B1=95=E5=BC=80=E6=94=B6=E8=B5=B7=E7=9A=84?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E8=BF=9B=E8=A1=8C=E6=9B=BF=E6=8D=A2=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=82=AC=E6=B5=AE/=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E7=AD=89=E6=A0=B7=E5=BC=8F=E5=9B=BE=E6=A0=87=EF=BC=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/debugBtn.png | Bin 1279 -> 0 bytes src/assets/images/debugBtnDis.png | Bin 1210 -> 0 bytes src/assets/styles/theme.scss | 18 ++++++ src/assets/svgs/dark_debug.svg | 29 +++++++++ src/assets/svgs/dark_debug_active.svg | 29 +++++++++ src/assets/svgs/dark_debug_dis.svg | 30 +++++++++ src/assets/svgs/dark_debug_hover.svg | 29 +++++++++ src/assets/svgs/dark_expand_fold.svg | 8 +++ src/assets/svgs/dark_expand_fold_active.svg | 8 +++ src/assets/svgs/dark_expand_fold_hover.svg | 8 +++ src/assets/svgs/light_debug.svg | 29 +++++++++ src/assets/svgs/light_debug_active.svg | 29 +++++++++ src/assets/svgs/light_debug_dis.svg | 29 +++++++++ src/assets/svgs/light_debug_hover.svg | 29 +++++++++ src/assets/svgs/light_expand_fold.svg | 8 +++ src/assets/svgs/light_expand_fold_active.svg | 8 +++ src/assets/svgs/light_expand_fold_hover.svg | 8 +++ .../dialoguePanel/DialoguePanel.vue | 10 --- src/views/app/style.scss | 10 ++- src/views/createapp/components/appConfig.vue | 1 - src/views/createapp/components/workFlow.vue | 36 +---------- .../components/workFlowConfig/BranchNode.vue | 2 +- .../components/workFlowConfig/CustomEdge.vue | 1 - .../components/workFlowConfig/CustomNode.vue | 2 +- src/views/styles/createApp.scss | 1 + src/views/styles/workFlowArrange.scss | 61 ++++++++++-------- 26 files changed, 345 insertions(+), 78 deletions(-) delete mode 100644 src/assets/images/debugBtn.png delete mode 100644 src/assets/images/debugBtnDis.png create mode 100644 src/assets/svgs/dark_debug.svg create mode 100644 src/assets/svgs/dark_debug_active.svg create mode 100644 src/assets/svgs/dark_debug_dis.svg create mode 100644 src/assets/svgs/dark_debug_hover.svg create mode 100644 src/assets/svgs/dark_expand_fold.svg create mode 100644 src/assets/svgs/dark_expand_fold_active.svg create mode 100644 src/assets/svgs/dark_expand_fold_hover.svg create mode 100644 src/assets/svgs/light_debug.svg create mode 100644 src/assets/svgs/light_debug_active.svg create mode 100644 src/assets/svgs/light_debug_dis.svg create mode 100644 src/assets/svgs/light_debug_hover.svg create mode 100644 src/assets/svgs/light_expand_fold.svg create mode 100644 src/assets/svgs/light_expand_fold_active.svg create mode 100644 src/assets/svgs/light_expand_fold_hover.svg diff --git a/src/assets/images/debugBtn.png b/src/assets/images/debugBtn.png deleted file mode 100644 index cd9e7e5e8578dc8370129bbf7d57f92f9df21e19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1279 zcmV1uUO@dkoEs+sMMg=uOs(nb4RV6DDihC|nE>tKv z^w2{OoYG%V_yysV1J_DH2riLw%E<@`t=g{Js9INwh)BiCP*#wDA%di2dRWi07z4)a z?u6jyVtdy+e&^kp@03nOU! z9FZ(F2uA%zcm`B-KG)XT{2<=mGSu-|%QfH&D$F_q2;ez_In!EP+j+aY?)A@Sf(H9L z|7mOUQ0i*uZ3K4}2@eG!m@xldTz>Or_b2y&Yl3S)en9|Syx4UA>vZ?`LU2W)*3i&2 zR;~Hv;a8>YN%sKX#AeNf5dZ|E`j_3EA8O|Tgy2f*YUgbr2f#bBF?sURg{C%5X$8Y995@aIl3j5!H`0+B5t#vY(P8>=&ikCvQzR1|?zyrlcF|$Fm}77t8<`1_ z8DQkyVV}`cWc2jDbIGna89j|*S{P;lBX2R-m5oGKBtg(HE$pJ>b@VVYx;y;sqT|Jh zu!+O~8SFAQ4)44qnTR$J1~vuc9jg}2-5^(<2KidsD;yXtcG1DeTO<=lkED|jm;v^Z z<3;mo^Bne!s0SGzAlOl&$%^pJuX;}1*glcIlvZ!Yy?BtfyfzLq_oU4I`2q+y3rJ!9 zl$Pr2A=TGYS9?!#zfpMh0wA&!tO%}NK<9C6#T`QpmK`FeR zAuO*6yD;+JW&wL?1qlD~I9vmS`|@Pw*Arj5QQ88a@a&%;6&)ZH0}Rt*Y<$W~jT@!c zCz=L^X?Y#rC~diIg_H>bH^Bc8qTUzlTvvjo`Sud)#l-imV5ORuDM~`417`jfSZI8VkK3aums~xRUNnuI0wJpK`WmCWePre3=2KN_ zB1bSM-+Cj!S=*dcqb7PxYjF(#!DtM@48VG6dl-#}N|i-`5KQd6-CdWTW5miks32RI zUw))%tg4X~KAOgA-dg-u?vv`*dq-mZ*L!nvZ|$qn_T=w>E&d_|6KbV~fW|{>etCH3 zzukL)x1YHB)>*;mr3+1Mdb+#4yqW6EZk=6ux%t#t+nii4Z4V&;xm7MF%(|)|& pq#uSEIRFGR#K`qu@6Gv7{tu_74x>Zt{j>l8002ovPDHLkV1gjGUQ+-7 diff --git a/src/assets/images/debugBtnDis.png b/src/assets/images/debugBtnDis.png deleted file mode 100644 index b92a4232f10a32a0e6c0af1c9f9b10ad5b80c595..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1210 zcmV;r1V#IaP)h7+UrV@x+0ON5@}N-Tg9qPU6Xhh_?#T5NeDfElEOzqF@_wz zzwi0~vyO%d9zT0g2T%uaKe<(({LVF`2>^}Fjh)F4H1^HoXD@aD{3S(_I-0Bz)PRZL zTgHvt!(zeQDp>iunx?H`!mMjR9LI47y8g7?dF@8SlRnPkqb6v;c<|=U+*a+|%CCsy z2MR=sWcTI4@o_X9{+YaQHa0hQhygJGWHXt+e_H$c_c%sLnM{Fb8k~cp-nRcf+)HjX zR+8GU18DyI!|Hbceo-Y*0>*9YW@I~_1K@iAuXOTBHnUOy@S7@S(um^+#*N&=zTP>p4bo)R?*C|LQs$z`1ykW6(80UN8%-dCVS6*N};yl*W6 zO9NC3P|eZ+)dEzrG(fcg)nrussO@+F0Dlky0L*-D^fGeNwMaF<4?_5ZkQ%_=2LRK^ zp;EM@8X?U9KL~Ny?a}v@k_9tA3Y3`Q2O$oF9%|LHG!vv5V7sGQuaqoQO4itCrjbLX zWWjd4(aZHvGs;qQNf`u5?UF#JQ7Mg@zaMXigs@!?X8!z^bQ!oA;15C?Xj(r9&WxA`GClx&TM0J3V^8y;g z=awk~Ve0^50sv&QEBGpVxu5zN4G~2rv@B6bSqS}D`)02H+i!O{EBTa#-wiIj0bIHO znf64%ZlVah7DHSNU>89m5Lq@C18UWBs>rmOW3e4?rbI~ELW&H`+{P$Xgvh(~|AZ)e;CGklDO0Pxw%=!+0yfbDqLZ+B@e zM$yTox&hfk03##z+g)KZ0e1t~eLK5}AvwWW%K(5|mO;mW!*1`wS!EvhB}7uPz9e|E zPS|gE&)wOvWsI3eatuisJhR4JGeSW6)-^3z!VYfa-q`a2rVNroXA>j5;AQ|3Ijv?U zlO=2*YzBB*?V3goHKR&a9ll5yX&vMV5dhj6W_>hva(k1Ez6h7ecaF z8lYN$YL*757NDA?0jdS4hBY8orb0e6R%$>T#~n3VNnZMBHg(|gzX=xpB`Ja_y4UhpB@#@Rve@uRbZg+4sZk{AJe8D_MSzfS + + 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 00000000..a40989e7 --- /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 00000000..b6e7a3a9 --- /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 00000000..2f164b03 --- /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 00000000..ebbaade5 --- /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 00000000..01a86453 --- /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 00000000..cff7499a --- /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 00000000..53f530d8 --- /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 00000000..850e0315 --- /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 00000000..98448a0d --- /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 00000000..e420a646 --- /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 00000000..534f865d --- /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 00000000..19f3b0d5 --- /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 00000000..0e826f3a --- /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 06c253a1..6c6f074d 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 68be5b4a..8fdc2f7d 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 f22d5cb1..f734699f 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 32d3e270..03d52cc1 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({