diff --git a/CHANGELOG.md b/CHANGELOG.md index a232365eb..62407d8a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ 2. 【server】 在线构建-构建列表中,选择构建命令时新增多环境下打包的命令 3. 【server】 在线构建-构建列表中,选择构建命令时提供不同的跳过执行测试类的方式 4. 【server】 编辑用户工作空间权限判断没有选择父级的空权限 +5. 【server】 修改后分发后 **并发重启** 描述改为 **并发执行** ------ diff --git a/web-vue/src/api/dispatch.js b/web-vue/src/api/dispatch.js index 048d163a6..2df30c2b0 100644 --- a/web-vue/src/api/dispatch.js +++ b/web-vue/src/api/dispatch.js @@ -196,9 +196,9 @@ export function editDispatchWhiteList(params) { export const afterOptList = [ { title: "不做任何操作", value: 0 }, - { title: "并发重启", value: 1 }, - { title: "完整顺序重启(有重启失败将结束本次)", value: 2 }, - { title: "顺序重启(有重启失败将继续)", value: 3 }, + { title: "并发执行", value: 1 }, + { title: "完整顺序执行(有执行失败将结束本次)", value: 2 }, + { title: "顺序执行(有执行失败将继续)", value: 3 }, ]; export const dispatchStatusMap = { diff --git a/web-vue/src/pages/build/list-info.vue b/web-vue/src/pages/build/list-info.vue index f5918d11f..2d3397bf9 100644 --- a/web-vue/src/pages/build/list-info.vue +++ b/web-vue/src/pages/build/list-info.vue @@ -659,7 +659,7 @@ export default { editBuildVisible: false, triggerVisible: false, buildLogVisible: false, - afterOptList: afterOptList, + afterOptList, buildConfirmVisible: false, columns: [ { title: "名称", dataIndex: "name", sorter: true, ellipsis: true, scopedSlots: { customRender: "name" } }, diff --git a/web-vue/src/pages/dispatch/list.vue b/web-vue/src/pages/dispatch/list.vue index 097b6d29a..ed424951d 100644 --- a/web-vue/src/pages/dispatch/list.vue +++ b/web-vue/src/pages/dispatch/list.vue @@ -47,20 +47,46 @@ {{ text }} - + {{ statusMap[text] }} + + + + {{ + afterOptList.filter((item) => { + return item.value === text; + }).length && + afterOptList.filter((item) => { + return item.value === text; + })[0].title + }} + +