From 8c1ea0be773345717d5703c18af98a6283a956f7 Mon Sep 17 00:00:00 2001 From: BoBoooooo <17746714@qq.com> Date: Fri, 6 Sep 2024 15:58:23 +0800 Subject: [PATCH 1/3] fix: service support set description field --- apps/playground/src/helpers/mock-files.ts | 3 +++ packages/context/src/context.ts | 4 ++-- .../designer/src/components/variable-tree/add-service.tsx | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/playground/src/helpers/mock-files.ts b/apps/playground/src/helpers/mock-files.ts index 9d6ecc4a..437fae63 100644 --- a/apps/playground/src/helpers/mock-files.ts +++ b/apps/playground/src/helpers/mock-files.ts @@ -377,13 +377,16 @@ export default defineServices({ add: { url: 'https://nei.hz.netease.com/api/apimock-v2/c45109399a1d33d83e32a59984b25b00/api/users', method: 'post', + description: '新增用户' }, update: { url: 'https://nei.hz.netease.com/api/apimock-v2/c45109399a1d33d83e32a59984b25b00/api/users', method: 'post', + description: '更新用户' }, delete: { url: 'https://nei.hz.netease.com/api/apimock-v2/c45109399a1d33d83e32a59984b25b00/api/users?id=1', + description: '删除用户' }, }); `; diff --git a/packages/context/src/context.ts b/packages/context/src/context.ts index e8cb8f21..63ac946d 100644 --- a/packages/context/src/context.ts +++ b/packages/context/src/context.ts @@ -90,8 +90,8 @@ export const useWorkspaceData = () => { key: prefix, selectable: false, showAddButton: true, - children: Object.keys(file.serviceFunctions || {}).map((key) => ({ - title: key, + children: Object.entries(file.serviceFunctions || {}).map(([key, value]) => ({ + title: value?.description ?? key, key: [prefix, key].join('.'), type: 'function', showRemoveButton: true, diff --git a/packages/designer/src/components/variable-tree/add-service.tsx b/packages/designer/src/components/variable-tree/add-service.tsx index 2f83b0a3..6c125d34 100644 --- a/packages/designer/src/components/variable-tree/add-service.tsx +++ b/packages/designer/src/components/variable-tree/add-service.tsx @@ -88,6 +88,10 @@ export function AddServiceForm({ > + {/* 备注 */} + + + From 6790af98a0879dfc0ec68c2326e0106116015f75 Mon Sep 17 00:00:00 2001 From: BoBoooooo <17746714@qq.com> Date: Fri, 6 Sep 2024 16:13:13 +0800 Subject: [PATCH 2/3] fix: undefined string bug --- packages/context/src/context.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/context/src/context.ts b/packages/context/src/context.ts index 63ac946d..857eaf3f 100644 --- a/packages/context/src/context.ts +++ b/packages/context/src/context.ts @@ -91,7 +91,7 @@ export const useWorkspaceData = () => { selectable: false, showAddButton: true, children: Object.entries(file.serviceFunctions || {}).map(([key, value]) => ({ - title: value?.description ?? key, + title: value.description || key, key: [prefix, key].join('.'), type: 'function', showRemoveButton: true, From adbe59a5eddb00d7bff725e3721fb564ddb65909 Mon Sep 17 00:00:00 2001 From: BoBoooooo <17746714@qq.com> Date: Fri, 6 Sep 2024 16:45:17 +0800 Subject: [PATCH 3/3] fix: update title display --- packages/context/src/context.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/context/src/context.ts b/packages/context/src/context.ts index 857eaf3f..a01a0262 100644 --- a/packages/context/src/context.ts +++ b/packages/context/src/context.ts @@ -90,12 +90,15 @@ export const useWorkspaceData = () => { key: prefix, selectable: false, showAddButton: true, - children: Object.entries(file.serviceFunctions || {}).map(([key, value]) => ({ - title: value.description || key, - key: [prefix, key].join('.'), - type: 'function', - showRemoveButton: true, - })), + children: Object.entries(file.serviceFunctions || {}).map(([key, value]) => { + const title = value.description ? `${key}(${value.description})` : key; + return { + title, + key: [prefix, key].join('.'), + type: 'function', + showRemoveButton: true, + }; + }), }); });