diff --git a/dolphinscheduler-ui/.babelrc b/dolphinscheduler-ui/.babelrc index 5fe8580fed..613d2cd669 100644 --- a/dolphinscheduler-ui/.babelrc +++ b/dolphinscheduler-ui/.babelrc @@ -8,7 +8,7 @@ "browsers": [ "> 1%", "last 2 versions", - "ie >= 9", + "ie >= 10", "edge >= 12", "firefox >= 28", "chrome >= 29", diff --git a/dolphinscheduler-ui/package.json b/dolphinscheduler-ui/package.json index 417dbad7bb..f1810e6322 100644 --- a/dolphinscheduler-ui/package.json +++ b/dolphinscheduler-ui/package.json @@ -96,7 +96,7 @@ "browserslist": [ "> 1%", "last 2 versions", - "ie >= 9", + "ie >= 10", "edge >= 12", "firefox >= 28", "chrome >= 29", diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue index aa932eb8e5..9a90658fca 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue @@ -488,9 +488,9 @@ this.spinnerLoading = false // Jump process definition if (this.type === 'instance') { - this.$router.push({ path: `/projects/instance/list/${this.urlParam.id}?_t=${new Date().getTime()}` }) + this.$router.push({ path: `/projects/${this.projectId}/instance/list/${this.urlParam.id}` }) } else { - this.$router.push({ path: `/projects/definition/list/${this.urlParam.id}?_t=${new Date().getTime()}` }) + this.$router.push({ path: `/projects/${this.projectId}/definition/list/${this.urlParam.id}` }) } resolve() }).catch(e => { @@ -738,7 +738,7 @@ processDefinitionId: processDefinitionId }).then(res => { this.$message.success($t('Switch Version Successfully')) - this.$router.push({ path: `/projects/definition/list/${processDefinitionId}?_t=${new Date().getTime()}` }) + this.$router.push({ path: `/projects/${this.projectId}/definition/list/${processDefinitionId}` }) }).catch(e => { this.$store.state.dag.isSwitchVersion = false this.$message.error(e.msg || '') @@ -882,7 +882,7 @@ } }, computed: { - ...mapState('dag', ['tasks', 'locations', 'connects', 'isEditDag', 'name']) + ...mapState('dag', ['tasks', 'locations', 'connects', 'isEditDag', 'name', 'projectId']) }, components: { mVersions, mFormModel, mFormLineModel, mUdp, mStart } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue index 11eab51ce0..9f8c481be0 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue @@ -25,7 +25,7 @@

{{ scope.row.name }}

- + {{scope.row.name}}
@@ -153,7 +153,7 @@ import mStart from './start' import mTiming from './timing' import mRelatedItems from './relatedItems' - import { mapActions } from 'vuex' + import { mapActions, mapState } from 'vuex' import { publishStatus } from '@/conf/home/pages/dag/_source/config' import mVersions from './versions' @@ -203,7 +203,7 @@ return _.filter(publishStatus, v => v.code === code)[0].desc }, _treeView (item) { - this.$router.push({ path: `/projects/definition/tree/${item.id}` }) + this.$router.push({ path: `/projects/${this.projectId}/definition/tree/${item.id}` }) }, /** * Start @@ -243,7 +243,7 @@ * Timing manage */ _timingManage (item) { - this.$router.push({ path: `/projects/definition/list/timing/${item.id}` }) + this.$router.push({ path: `/projects/${this.projectId}/definition/list/timing/${item.id}` }) }, /** * delete @@ -268,7 +268,7 @@ * edit */ _edit (item) { - this.$router.push({ path: `/projects/definition/list/${item.id}` }) + this.$router.push({ path: `/projects/${this.projectId}/definition/list/${item.id}` }) }, /** * Offline @@ -343,7 +343,7 @@ processDefinitionId: processDefinitionId }).then(res => { this.$message.success($t('Switch Version Successfully')) - this.$router.push({ path: `/projects/definition/list/${processDefinitionId}` }) + this.$router.push({ path: `/projects/${this.projectId}/definition/list/${processDefinitionId}` }) }).catch(e => { this.$message.error(e.msg || '') }) @@ -519,6 +519,9 @@ }, mounted () { }, + computed: { + ...mapState('dag', ['projectId']) + }, components: { mVersions, mStart, mTiming, mRelatedItems } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue index 033e37e64a..884aeee851 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue @@ -76,7 +76,7 @@ diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue index 661f46ecdd..322f98ad36 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue @@ -15,7 +15,7 @@ * limitations under the License. */ @@ -234,7 +234,7 @@ diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGrid.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGrid.vue index fe685ba8eb..a5cf11c7d4 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGrid.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGrid.vue @@ -44,11 +44,12 @@ graphGrid.setOption(graphGridOption(this.locations, this.connects, this.sourceWorkFlowId, this.isShowLabel), true) graphGrid.on('click', (params) => { // Jump to the definition page - this.$router.push({ path: `/projects/definition/list/${params.data.id}` }) + this.$router.push({ path: `/projects/${this.projectId}/definition/list/${params.data.id}` }) }) }, components: {}, computed: { + ...mapState('dag', ['projectId']), ...mapState('kinship', ['locations', 'connects', 'sourceWorkFlowId']) } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue index 83c8231b33..06ecfb032b 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue @@ -89,12 +89,13 @@ }, methods: { ...mapActions('projects', ['deleteProjects']), - ...mapMutations('dag', ['setProjectName']), + ...mapMutations('dag', ['setProjectId', 'setProjectName']), _switchProjects (item) { + this.setProjectId(item.id) this.setProjectName(item.name) - localStore.setItem('projectName', `${item.name}`) - localStore.setItem('projectId', `${item.id}`) - this.$router.push({ path: '/projects/index' }) + localStore.setItem('projectId', item.id) + localStore.setItem('projectName', item.name) + this.$router.push({ path: `/projects/${item.id}/index` }) }, /** * Delete Project diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue index 0dcf8d43a4..2cbb963d9c 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue @@ -89,10 +89,10 @@ diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue index bb4900ade2..24cb909f55 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue @@ -48,7 +48,7 @@ @@ -140,6 +144,9 @@ display: block; position: relative; padding-left: 10px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; >.icon { vertical-align: middle; font-size: 15px;