This is an automated email from the ASF dual-hosted git repository. journey pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push: new c7a2f92 [Improvement-3612][ui] Workflow version control ui optimize (#3622) c7a2f92 is described below commit c7a2f9238fa17851ed79b7c2748f8314155b600e Author: Yichao Yang <1048262...@qq.com> AuthorDate: Mon Sep 7 10:46:26 2020 +0800 [Improvement-3612][ui] Workflow version control ui optimize (#3622) * [Improvement][ui] Workflow version control ui optimize * Fix the first line in table i = 0 situation * Add word-break:break-all style for description * Remove span and add left text-align --- .../definition/pages/list/_source/versions.vue | 24 +++++++--------------- .../src/js/module/i18n/locale/en_US.js | 3 ++- .../src/js/module/i18n/locale/zh_CN.js | 3 ++- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue index 1294f48..fcc3410 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue @@ -25,13 +25,10 @@ <table class="fixed"> <caption><!-- placeHolder --></caption> <tr> - <th scope="col"> - <span>#</span> + <th scope="col" style="min-width: 40px;text-align: left"> + <span>{{$t('Version')}}</span> </th> - <th scope="col" style="min-width: 40px"> - <span>Version</span> - </th> - <th scope="col" style="min-width: 200px;max-width: 300px;"> + <th scope="col" style="min-width: 30px"> <span>{{$t('Description')}}</span> </th> <th scope="col" style="min-width: 50px"> @@ -43,16 +40,13 @@ </tr> <tr v-for="(item, $index) in processDefinitionVersions" :key="item.id"> <td> - <span>-</span> - </td> - <td> <span v-if="item.version"> <span v-if="item.version === processDefinition.version" style="color: green"><strong>{{item.version}} {{$t('Current Version')}}</strong></span> <span v-else>{{item.version}}</span> </span> <span v-else>-</span> </td> - <td> + <td style="word-break:break-all;"> <span v-if="item.description">{{item.description}}</span> <span v-else>-</span> </td> @@ -64,7 +58,7 @@ <x-poptip :ref="'poptip-switch-version-' + $index" placement="top-end" - width="90"> + width="260"> <p>{{$t('Confirm Switch To This Version?')}}</p> <div style="text-align: right; margin: 0;padding-top: 4px;"> <x-button type="text" size="xsmall" shape="circle" @click="_closeSwitchVersion($index)"> @@ -195,18 +189,14 @@ * Close the switch version layer */ _closeSwitchVersion (i) { - if (i > 0) { - this.$refs[`poptip-switch-version-${i}`][0].doClose() - } + this.$refs[`poptip-switch-version-${i}`][0].doClose() }, /** * Close the delete layer */ _closeDelete (i) { - if (i > 0) { - this.$refs[`poptip-delete-${i}`][0].doClose() - } + this.$refs[`poptip-delete-${i}`][0].doClose() }, /** diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js index b0f315a..e1ecedc 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js @@ -641,5 +641,6 @@ export default { 'Batch copy': 'Batch copy', 'Related items': 'Related items', 'Project name is required': 'Project name is required', - 'Batch move': 'Batch move' + 'Batch move': 'Batch move', + Version: 'Version' } diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js index 53f0e3e..f69142d 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -641,5 +641,6 @@ export default { 'Batch copy': '批量复制', 'Related items': '关联项目', 'Project name is required': '项目名称必填', - 'Batch move': '批量移动' + 'Batch move': '批量移动', + Version: '版本' }