Browse Source

Enhance user experience, add close button, return to the previous page (#4006)

Co-authored-by: zhanglong <zhanglong@ysstech.com>
pull/3/MERGE
BoYiZhang 4 years ago committed by GitHub
parent
commit
f047f51731
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue
  2. 10
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue
  3. 1
      dolphinscheduler-ui/src/js/module/components/listConstruction/listConstruction.vue

8
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue

@ -16,6 +16,11 @@
*/ */
<template> <template>
<m-list-construction :title="$t('TreeView')"> <m-list-construction :title="$t('TreeView')">
<template slot="operation">
<span style=" float: right; padding-right:50px">
<em class="ans-icon-fail-empty" style="font-size:20px " data-container="body" data-toggle="tooltip" :title="$t('Return')" @click="_close()"></em>
</span>
</template>
<template slot="conditions"></template> <template slot="conditions"></template>
<template slot="content"> <template slot="content">
<div class="tree-view-index-model"> <div class="tree-view-index-model">
@ -101,6 +106,9 @@
props: {}, props: {},
methods: { methods: {
...mapActions('dag', ['getViewTree']), ...mapActions('dag', ['getViewTree']),
_close(){
this.$router.go(-1)
},
/** /**
* get tree data * get tree data
*/ */

10
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue

@ -16,6 +16,11 @@
*/ */
<template> <template>
<m-list-construction :title="$t('Cron Manage')"> <m-list-construction :title="$t('Cron Manage')">
<template slot="operation">
<span style=" float: right; padding-right:50px">
<em class="ans-icon-fail-empty" style="font-size:20px " data-container="body" data-toggle="tooltip" :title="$t('Return')" @click="_close()"></em>
</span>
</template>
<template slot="content"> <template slot="content">
<m-list></m-list> <m-list></m-list>
</template> </template>
@ -27,6 +32,11 @@
import mListConstruction from '@/module/components/listConstruction/listConstruction' import mListConstruction from '@/module/components/listConstruction/listConstruction'
export default { export default {
name: 'definition-timing-index', name: 'definition-timing-index',
methods :{
_close(){
this.$router.go(-1)
}
},
components: { mList, mListConstruction, mSecondaryMenu } components: { mList, mListConstruction, mSecondaryMenu }
} }
</script> </script>

1
dolphinscheduler-ui/src/js/module/components/listConstruction/listConstruction.vue

@ -18,6 +18,7 @@
<div class="home-main list-construction-model"> <div class="home-main list-construction-model">
<div class="content-title"> <div class="content-title">
<span>{{title}}</span> <span>{{title}}</span>
<slot name="operation"></slot>
</div> </div>
<div class="conditions-box"> <div class="conditions-box">
<slot name="conditions"> <slot name="conditions">

Loading…
Cancel
Save