diff --git a/README.md b/README.md index 6909f35d5f4e171b882f747e71b19ae526ca06f1..4bc151ee83d974ac7538350feadbed877a344d0f 100644 --- a/README.md +++ b/README.md @@ -114,9 +114,7 @@ openssl rand -hex 16 若,使用过程中遇到问题,开issue反馈给我们。 -* 建木:https://gitee.com/jianmu-dev/jianmu/issues -* 建木Worker:https://gitee.com/organizations/jianmu-workers/issues -* 建木节点:https://gitee.com/organizations/jianmu-runners/issues +* 建木:https://gitcode.com/jianmu-dev/jianmu/issues [官方示例](https://ci.jianmu.dev) diff --git a/api/src/main/java/dev/jianmu/api/controller/WorkerApi.java b/api/src/main/java/dev/jianmu/api/controller/WorkerApi.java index db6a76fb6a449a162f6a2d31cd0b70a03998aefa..9fa0a10e46f828a1552f8731f88ed4fea9fdd895 100644 --- a/api/src/main/java/dev/jianmu/api/controller/WorkerApi.java +++ b/api/src/main/java/dev/jianmu/api/controller/WorkerApi.java @@ -74,6 +74,7 @@ public class WorkerApi { .id(workerId) .name(dto.getName()) .type(dto.getType()) + .tags(dto.getTag()) .os(dto.getOs()) .arch(dto.getArch()) .capacity(dto.getCapacity()) diff --git a/ui/src/api/worker.ts b/ui/src/api/worker.ts index 28fcda0702690077ac7d8c0f4b8530347eee8c47..c61a57407d9c5f06a33fadb507183ce8269fe042 100644 --- a/ui/src/api/worker.ts +++ b/ui/src/api/worker.ts @@ -34,4 +34,4 @@ export function deleteWorker(id: string): Promise { method: 'delete', auth: true, }); -} \ No newline at end of file +} diff --git a/ui/src/components/data/json-view/index.vue b/ui/src/components/data/json-view/index.vue index 6ec8caf01aeea2fbcda20f06fa67f57eec9976c9..e5fe2c152dcd9b3078ab5fa031ae1b1ca202c05e 100644 --- a/ui/src/components/data/json-view/index.vue +++ b/ui/src/components/data/json-view/index.vue @@ -42,16 +42,16 @@ export default /* #__PURE__*/ defineComponent({ components: { JsonViewItem }, emits: ['update:selected'], methods: { - convertKey(key: string): string { + convertKey(key: string): [string, boolean] { if (Number.isInteger(key)) { - return `[${key.toString()}]`; + return [`[${key.toString()}]`, true]; } if (/[^A-Za-z0-9_$]/.test(key.toString())) { - return `["${key}"]`; + return [`["${key}"]`, true]; } - return `${key}`; + return [`${key}`, false]; }, build(key: string, val: any, depth: number, path: string, includeKey: boolean): JsonData { const children = []; @@ -84,7 +84,10 @@ export default /* #__PURE__*/ defineComponent({ children: children, }; } else { - let convertedKey = this.convertKey(key); + const [convertedKey, needCutDot] = this.convertKey(key); + if (needCutDot) { + path = path.slice(0, -1); + } // Build Value return { key: key, diff --git a/ui/src/router/modules/platform.ts b/ui/src/router/modules/platform.ts index f8b62fd4bb453f5f045f307f7913775a2c7ee907..411c2b1a85a790c3214e51eff2ff9712437a14e2 100644 --- a/ui/src/router/modules/platform.ts +++ b/ui/src/router/modules/platform.ts @@ -6,9 +6,7 @@ export default [ name: 'index', path: '', component: () => import('@/views/index.vue'), - props: ({ - query: { searchName, projectGroupId }, - }: RouteLocationNormalizedLoaded) => ({ + props: ({ query: { searchName, projectGroupId } }: RouteLocationNormalizedLoaded) => ({ searchName, projectGroupId, }), @@ -53,8 +51,7 @@ export default [ { name: 'project-group-detail', path: 'detail/:id', - component: () => - import('@/views/project-group/project-group-detail.vue'), + component: () => import('@/views/project-group/project-group-detail.vue'), props: ({ params: { id } }: RouteLocationNormalizedLoaded) => ({ id }), meta: { title: '详情', @@ -105,9 +102,7 @@ export default [ name: 'process-template', path: 'process-template', component: () => import('@/views/process-template/manager.vue'), - props: ({ - query: { processTemplatesName }, - }: RouteLocationNormalizedLoaded) => ({ + props: ({ query: { processTemplatesName } }: RouteLocationNormalizedLoaded) => ({ processTemplatesName, }), meta: {