From 93ad2823f4adfbf7b2a17bb80351b9e9b001a843 Mon Sep 17 00:00:00 2001 From: Yanbin Lin <35388422+linyanbin666@users.noreply.github.com> Date: Sat, 6 Nov 2021 10:12:01 +0800 Subject: [PATCH] [Fix-6649][UI] Get project according to code (#6649) (#6650) Co-authored-by: linyanbin --- dolphinscheduler-ui/src/js/conf/home/router/index.js | 7 +++---- .../src/js/conf/home/store/projects/actions.js | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/router/index.js b/dolphinscheduler-ui/src/js/conf/home/router/index.js index d2aed56d08..9c93560743 100644 --- a/dolphinscheduler-ui/src/js/conf/home/router/index.js +++ b/dolphinscheduler-ui/src/js/conf/home/router/index.js @@ -54,10 +54,9 @@ const router = new Router({ }, beforeEnter: (to, from, next) => { const blacklist = ['projects', 'projects-list'] - if (!blacklist.includes(to.name) && to.params.projectId && to.params.projectId !== localStore.getItem('projectId')) { - store.dispatch('projects/getProjectById', { - projectId: to.params.projectId - }).then(res => { + const { projectCode } = to.params || {} + if (!blacklist.includes(to.name) && projectCode && projectCode !== localStore.getItem('projectCode')) { + store.dispatch('projects/getProjectByCode', projectCode).then(res => { store.commit('dag/setProjectId', res.id) store.commit('dag/setProjectCode', res.code) store.commit('dag/setProjectName', res.name) diff --git a/dolphinscheduler-ui/src/js/conf/home/store/projects/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/projects/actions.js index d8927c1adf..22416096a6 100644 --- a/dolphinscheduler-ui/src/js/conf/home/store/projects/actions.js +++ b/dolphinscheduler-ui/src/js/conf/home/store/projects/actions.js @@ -31,9 +31,9 @@ export default { }) }, /** - * Get project by id + * Get project by code */ - getProjectById ({ state }, payload) { + getProjectByCode ({ state }, payload) { return new Promise((resolve, reject) => { io.get(`projects/${payload}`, {}, res => { resolve(res.data)