From bc2ce0ab0d1524b81ca89c3dcef84ec5a4f5c882 Mon Sep 17 00:00:00 2001
From: cc500 <2014434568@qq.com>
Date: Wed, 26 Mar 2025 15:36:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=AD=E4=B9=89=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/styles/theme.scss | 21 ++++++++++++++-------
src/components/Upload/index.vue | 9 ++++++---
src/views/api/index.vue | 13 ++++++-------
src/views/api/style.scss | 19 +++++++++++++------
src/views/app/style.scss | 7 +++++++
5 files changed, 46 insertions(+), 23 deletions(-)
diff --git a/src/assets/styles/theme.scss b/src/assets/styles/theme.scss
index a4785ce..c1b484c 100644
--- a/src/assets/styles/theme.scss
+++ b/src/assets/styles/theme.scss
@@ -55,9 +55,13 @@ body[theme='dark'] {
--el-collapse-border: rgb(62, 69, 81, 0.5);
--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%);
+ --flow-running-bg: linear-gradient(
+ 127.95deg,
+ rgb(39, 39, 76) -1.967%,
+ rgba(28, 57, 81, 0.929) 98.202%
+ );
+ --o-api-description: rgb(211, 220, 233);
+ --el-drawer-padding-primary: 24px;
// 这里是不同种类的debug图标
--flow-debug-default: url('../../assets/svgs/dark_debug.svg');
--flow-debug-hover: url('../../assets/svgs/dark_debug_hover.svg');
@@ -123,9 +127,12 @@ body[theme='light'] {
--question-bg: linear-gradient(177.93deg, rgba(255, 255, 255, 0) -40.031%, rgba(255, 255, 255, 0.35) 1.263%, rgba(255, 255, 255)36.178%), linear-gradient(270deg, rgb(227, 242, 255, 0.5), rgb(195, 227, 255, 0.5) 33.232%, rgb(197, 203, 249, 0.5) 85.699%);
--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%);
+ --flow-running-bg: linear-gradient(
+ 127.95deg,
+ rgba(109, 117, 250, 0.2) -1.967%,
+ rgba(90, 179, 255, 0.2) 98.202%
+ );
+ --o-api-description: rgb(78, 88, 101);
// 这里是不同种类的debug图标
--flow-debug-default: url('../../assets/svgs/light_debug.svg');
--flow-debug-hover: url('../../assets/svgs/light_debug_hover.svg');
@@ -146,7 +153,7 @@ body {
background-color: #6395fd !important;
font-weight: normal !important;
}
-
+ --el-drawer-padding-primary: 24px;
// 悬浮优先级高于选中
.el-select-dropdown__item:hover {
background-color: #7aa5ff !important;
diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue
index a292715..3a993d0 100644
--- a/src/components/Upload/index.vue
+++ b/src/components/Upload/index.vue
@@ -34,6 +34,7 @@ const handleCreateapi = async () => {
if (res.code === 200) {
getServiceJson.value = res?.result?.apis;
getServiceName.value = res?.result?.name;
+ activeServiceNameList.value = getServiceJson.value.map((item) => item.name);
uploadtype.value = 'get';
successMsg('创建成功');
} else {
@@ -196,7 +197,7 @@ watch(
getServiceYaml.value = props.getServiceYaml;
getServiceName.value = props.getServiceName;
if (getServiceJson.value?.length) {
- activeServiceNameList.value = [getServiceJson.value?.[0]?.name];
+ activeServiceNameList.value = getServiceJson.value.map((item) => item.name);
}
if (props.type === 'edit' && props) {
getServiceYamlFun(props.serviceId);
@@ -289,7 +290,7 @@ onMounted(() => {
- {{ getServiceName }}
+ {{ getServiceName }}
{
display: block;
font-size: 14px;
color: var(--o-text-color-primary);
- height: 22px;
+ line-height: 22px;
margin-bottom: 8px;
}
.json-container {
@@ -514,7 +515,9 @@ onMounted(() => {
.o-collapse-content {
padding-left: 18px;
.subName {
+ margin-top: 8px;
width: 100%;
+ line-height: 16px;
display: flex;
align-items: flex-start;
div:first-child {
diff --git a/src/views/api/index.vue b/src/views/api/index.vue
index 8eaab39..fc33f74 100644
--- a/src/views/api/index.vue
+++ b/src/views/api/index.vue
@@ -30,7 +30,7 @@
{{ $t('semantic.interface_upload') }}
@@ -385,10 +385,7 @@ onMounted(() => {
padding: 0px;
&::v-deep(.el-drawer__header) {
margin-bottom: 0px !important;
- }
- .el-drawer__header {
- color: pink;
- margin-bottom: 0px !important;
+ color: var(--o-text-color-primary) !important;
}
}
.apiCenterCardSingle {
@@ -443,8 +440,8 @@ img {
white-space: nowrap;
}
}
-.el-drawer__body {
- padding: 0px 24px 16px;
+:deep(.el-drawer__body) {
+ padding: 8px 24px 16px !important;
.drawerBody {
height: 100%;
textarea {
@@ -454,6 +451,8 @@ img {
}
}
:deep(.el-drawer__header) {
+ color: var(--o-text-color-primary) !important;
+ padding: 24px 0px 0px 24px !important;
margin-bottom: 0px !important;
}
diff --git a/src/views/api/style.scss b/src/views/api/style.scss
index cf0aeac..12a4673 100644
--- a/src/views/api/style.scss
+++ b/src/views/api/style.scss
@@ -17,21 +17,21 @@
margin-bottom: 16px;
}
.apiCenterSearch {
- display: flex;
margin-bottom: 32px;
- :first-of-type .el-input__wrapier {
+ :first-of-type .el-input__wrapper {
width: 280px;
border-radius: 0px 4px 4px 0px;
}
.el-input-group__prepend {
border-radius: 4px 0px 0px 4px;
- .el-input__wrapier {
+ .el-input__wrapper {
border-radius: 4px 0px 0px 4px;
}
}
- .createapi {
+ .createApi {
margin-left: 16px;
+ border-radius: 4px;
}
}
@@ -85,14 +85,16 @@
.apiCenterCardTop {
display: flex;
.apiCenterCardIcon {
- width: 80px;
+ margin-right: 18px;
display: flex;
align-items: center;
.menu-icon {
- width: 40px;
+ width: 48px;
+ height: 48px;
}
}
.apiCenterCardContent {
+ cursor: pointer;
flex: 1;
display: flex;
flex-direction: column;
@@ -132,6 +134,10 @@
}
}
.apiCenterCardContentDes {
+ .vue-text{
+ cursor: pointer !important;
+ color: var(--o-api-description);
+ }
font-size: 14px;
line-height: 22px;
}
@@ -156,6 +162,7 @@
.apiCenterCardSingle:hover {
box-sizing: border-box;
border: 1px solid #7aa5ff;
+ box-shadow: 0px 3px 9px 0px rgba(0, 0, 0, 0.2) !important;
background: linear-gradient(
127deg,
rgba(109, 117, 250, 0.07) 1.003%,
diff --git a/src/views/app/style.scss b/src/views/app/style.scss
index 99c54ef..01c0848 100644
--- a/src/views/app/style.scss
+++ b/src/views/app/style.scss
@@ -87,6 +87,7 @@
padding: 16px;
background-color: var(--o-bg-color-base);
.appCenterCardTop {
+ cursor: pointer;
display: flex;
max-height: 66px;
.appCenterCardIcon {
@@ -140,12 +141,17 @@
}
}
.appCenterCardContentDes {
+ .vue-text{
+ cursor: pointer !important;
+ color: var(--o-api-description);
+ }
font-size: 14px;
line-height: 22px;
}
}
}
.appCenterCardBottom {
+ cursor: pointer;
margin-top: 16px;
display: flex;
justify-content: space-between;
@@ -164,6 +170,7 @@
.appCenterCardSingle:hover {
box-sizing: border-box;
border: 1px solid #7aa5ff;
+ box-shadow: 0px 3px 9px 0px rgba(0, 0, 0, 0.2) !important;
background: linear-gradient(
127deg,
rgba(109, 117, 250, 0.07) 1.003%,
--
Gitee
From 2e2acfa59d41e1ff91573b501fec5643f1668233 Mon Sep 17 00:00:00 2001
From: cc500 <2014434568@qq.com>
Date: Thu, 27 Mar 2025 11:36:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E8=BF=94=E5=9B=9E?=
=?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=BC=96=E6=8E=92=E5=9B=BE=E6=98=AF?=
=?UTF-8?q?=E5=90=A6=E5=8F=AF=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/createapp/components/workFlow.vue | 10 +++++++---
.../components/workFlowConfig/workFlowDialog.vue | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/views/createapp/components/workFlow.vue b/src/views/createapp/components/workFlow.vue
index 7c1564d..cb9cd08 100644
--- a/src/views/createapp/components/workFlow.vue
+++ b/src/views/createapp/components/workFlow.vue
@@ -65,6 +65,7 @@ const debugStatus = ref('');
const debugTime = ref('');
const totalTime = ref(0);
const isNodeAndLineConnect = ref(false);
+const isNodeConnect = ref(false);
const loading = ref(false);
const apiLoading = ref(false);
const themeStore = useChangeThemeStore();
@@ -654,11 +655,11 @@ const saveFlow = (updateNodeParameter?) => {
...flowObj.value,
nodes: updateNodes,
edges: updateEdges,
- },
- focusPoint: {
+ focusPoint: {
x: 800,
y: 800,
},
+ },
},
)
.then((res) => {
@@ -666,6 +667,9 @@ const saveFlow = (updateNodeParameter?) => {
ElMessage.success('工作流更新成功');
queryFlow('update');
const updatedCurFlow = res[1].result.flow;
+ console.log(res[1].result);
+ isNodeConnect.value = res[1].result.connectivity;
+ console.log(isNodeConnect.value);
redrageFlow(updatedCurFlow?.nodes, updatedCurFlow?.edges);
}
loading.value = false;
@@ -891,7 +895,7 @@ defineExpose({
{
],
// 初始创建的工作流边为空
edges: [],
- },
- focusPoint: {
+ focusPoint: {
x: 800,
y: 800,
},
+ },
},
)
.then((res) => {
--
Gitee