From d631ff2b5e119a5af5de6a32bc18ca7276c67e92 Mon Sep 17 00:00:00 2001 From: xlsea Date: Sat, 25 May 2024 16:20:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85=E6=8A=BD=E5=B1=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 4 ++ .env.test | 2 +- packages/work-flow/src/api/index.ts | 7 ++ .../work-flow/src/components/start-node.vue | 20 +++--- .../work-flow/src/components/task-node.vue | 54 +++++++-------- packages/work-flow/src/constants/business.ts | 8 +-- .../work-flow/src/detail/start-detail.vue | 7 +- packages/work-flow/src/detail/task-detail.vue | 66 +++++++++++++++++++ packages/work-flow/src/stores/index.ts | 2 + packages/work-flow/src/styles/index.scss | 9 +-- pnpm-lock.yaml | 11 +--- src/views/workflow/form/add/index.vue | 8 +-- src/views/workflow/form/batch/index.vue | 36 +++++++--- src/views/workflow/form/copy/index.vue | 56 +++++++++++++--- src/views/workflow/form/detail/index.vue | 37 ++++++++--- src/views/workflow/form/edit/index.vue | 6 +- 16 files changed, 239 insertions(+), 94 deletions(-) create mode 100644 packages/work-flow/src/detail/task-detail.vue diff --git a/.env b/.env index e1dbf3f..1ba6444 100644 --- a/.env +++ b/.env @@ -4,6 +4,8 @@ VITE_APP_DESC=A flexible, reliable, and fast platform for distributed task retry VITE_APP_VERSION=1.0.0-beta2 +VITE_APP_DEFAULT_TOKEN=SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj + # the prefix of the icon name VITE_ICON_PREFIX=icon @@ -46,3 +48,5 @@ VITE_SOURCE_MAP=N # Used to differentiate storage across different domains VITE_STORAGE_PREFIX= + + diff --git a/.env.test b/.env.test index 7a00a24..351dec4 100644 --- a/.env.test +++ b/.env.test @@ -1,7 +1,7 @@ VITE_BASE_URL=/ # backend service base url, test environment -VITE_SERVICE_BASE_URL=http://localhost:8080/snail-job +VITE_SERVICE_BASE_URL=http://preview.easyretry.com/snail-job # other backend service base url, test environment VITE_OTHER_SERVICE_BASE_URL= `{ diff --git a/packages/work-flow/src/api/index.ts b/packages/work-flow/src/api/index.ts index 639d8a5..4e8fbb1 100644 --- a/packages/work-flow/src/api/index.ts +++ b/packages/work-flow/src/api/index.ts @@ -53,3 +53,10 @@ export function fetchWorkflowInfo(id: string) { method: 'get' }); } + +export function fetchWorkflowBatchInfo(id: string) { + return request({ + url: `/workflow/batch/${id}`, + method: 'get' + }); +} diff --git a/packages/work-flow/src/components/start-node.vue b/packages/work-flow/src/components/start-node.vue index 3ad6545..51b2816 100644 --- a/packages/work-flow/src/components/start-node.vue +++ b/packages/work-flow/src/components/start-node.vue @@ -76,8 +76,8 @@ const show = () => { + + + {{ taskBatchStatusEnum[item.taskBatchStatus!].title }} + @@ -259,13 +258,8 @@ const isStop = (taskBatchStatus: number) => {
- + + @@ -282,6 +276,14 @@ const isStop = (taskBatchStatus: number) => { diff --git a/packages/work-flow/src/stores/index.ts b/packages/work-flow/src/stores/index.ts index b500180..b42e7c0 100644 --- a/packages/work-flow/src/stores/index.ts +++ b/packages/work-flow/src/stores/index.ts @@ -34,7 +34,9 @@ export const useFlowStore = defineStore('workflow', () => { if (!error) { jobList.value = data; } + const workflow = localStg.get('workflow'); localStg.set('workflow', { + ...workflow, groupName: value, jobList: data! }); diff --git a/packages/work-flow/src/styles/index.scss b/packages/work-flow/src/styles/index.scss index 78ff0ac..f57ec68 100644 --- a/packages/work-flow/src/styles/index.scss +++ b/packages/work-flow/src/styles/index.scss @@ -53,10 +53,11 @@ border-color: rgb(202, 202, 202) transparent transparent; } + .node-error, .start-node-disabled { // cursor: default; - border: 1px solid #00000036; - box-shadow: 0 2px 5px #00000036; + border: 1px solid #00000036 !important; + box-shadow: 0 2px 5px #00000036 !important; } .node-wrap-box.start-node:before { @@ -521,8 +522,8 @@ cursor: default; position: absolute; top: 0; - right: 0; - transform: translate(150%); + left: 0; + transform: translate(960%); font-size: 24px; } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bc1313c..f4d6872 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -41,9 +41,6 @@ importers: '@sa/utils': specifier: workspace:* version: link:packages/utils - '@sa/workflow': - specifier: workspace:* - version: link:packages/work-flow '@vueuse/core': specifier: 10.9.0 version: 10.9.0(vue@3.4.26(typescript@5.4.5)) @@ -158,7 +155,7 @@ importers: version: 5.4.5 unplugin-icons: specifier: 0.19.0 - version: 0.19.0(@vue/compiler-sfc@3.4.26)(vue-template-compiler@2.7.16) + version: 0.19.0(@vue/compiler-sfc@3.4.25)(vue-template-compiler@2.7.16) unplugin-vue-components: specifier: 0.27.0 version: 0.27.0(@babel/parser@7.24.4)(rollup@4.17.0)(vue@3.4.26(typescript@5.4.5)) @@ -294,8 +291,6 @@ importers: specifier: 4.2.2 version: 4.2.2 - packages/work-flow: {} - packages: '@ampproject/remapping@2.3.0': @@ -9770,7 +9765,7 @@ snapshots: universalify@2.0.1: {} - unplugin-icons@0.19.0(@vue/compiler-sfc@3.4.26)(vue-template-compiler@2.7.16): + unplugin-icons@0.19.0(@vue/compiler-sfc@3.4.25)(vue-template-compiler@2.7.16): dependencies: '@antfu/install-pkg': 0.3.3 '@antfu/utils': 0.7.7 @@ -9780,7 +9775,7 @@ snapshots: local-pkg: 0.5.0 unplugin: 1.10.1 optionalDependencies: - '@vue/compiler-sfc': 3.4.26 + '@vue/compiler-sfc': 3.4.25 vue-template-compiler: 2.7.16 transitivePeerDependencies: - supports-color diff --git a/src/views/workflow/form/add/index.vue b/src/views/workflow/form/add/index.vue index f5a8ff2..dde80b6 100644 --- a/src/views/workflow/form/add/index.vue +++ b/src/views/workflow/form/add/index.vue @@ -1,19 +1,15 @@ diff --git a/src/views/workflow/form/batch/index.vue b/src/views/workflow/form/batch/index.vue index b74b61a..7f1165c 100644 --- a/src/views/workflow/form/batch/index.vue +++ b/src/views/workflow/form/batch/index.vue @@ -1,17 +1,35 @@ - + diff --git a/src/views/workflow/form/copy/index.vue b/src/views/workflow/form/copy/index.vue index d0f1b22..b734b73 100644 --- a/src/views/workflow/form/copy/index.vue +++ b/src/views/workflow/form/copy/index.vue @@ -1,17 +1,55 @@ - + diff --git a/src/views/workflow/form/detail/index.vue b/src/views/workflow/form/detail/index.vue index 96a7e4d..2907177 100644 --- a/src/views/workflow/form/detail/index.vue +++ b/src/views/workflow/form/detail/index.vue @@ -1,17 +1,36 @@ - + diff --git a/src/views/workflow/form/edit/index.vue b/src/views/workflow/form/edit/index.vue index ebb8e10..fe998f2 100644 --- a/src/views/workflow/form/edit/index.vue +++ b/src/views/workflow/form/edit/index.vue @@ -1,7 +1,7 @@