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
+ }}
+
+
独立
关联
- 刷新
- 分发文件
- 编辑
- 编辑
+ 分发文件
+ 刷新
+
+ 编辑
+ 编辑
+
e.preventDefault()">
更多
@@ -105,8 +131,8 @@
- 文件
- 控制台
+ 文件
+ 控制台
@@ -529,7 +555,7 @@ export default {
accessList: [],
nodeList: [],
projectList: [],
- afterOptList: afterOptList,
+ afterOptList,
targetKeys: [],
// reqId: "",
temp: {},
@@ -549,8 +575,12 @@ export default {
columns: [
{ title: "分发 ID", dataIndex: "id", ellipsis: true, scopedSlots: { customRender: "id" } },
{ title: "分发名称", dataIndex: "name", ellipsis: true, scopedSlots: { customRender: "name" } },
- { title: "类型", dataIndex: "outGivingProject", ellipsis: true, scopedSlots: { customRender: "outGivingProject" } },
- { title: "状态", dataIndex: "status", ellipsis: true, scopedSlots: { customRender: "status" } },
+ { title: "类型", dataIndex: "outGivingProject", width: 90, ellipsis: true, scopedSlots: { customRender: "outGivingProject" } },
+ { title: "分发后", dataIndex: "afterOpt", ellipsis: true, width: 100, scopedSlots: { customRender: "afterOpt" } },
+ { title: "清空发布", dataIndex: "clearOld", align: "center", ellipsis: true, width: 100, scopedSlots: { customRender: "clearOld" } },
+ { title: "间隔时间", dataIndex: "intervalTime", width: 90, ellipsis: true, scopedSlots: { customRender: "intervalTime" } },
+
+ { title: "状态", dataIndex: "status", ellipsis: true, width: 110, scopedSlots: { customRender: "status" } },
{
title: "修改时间",
dataIndex: "modifyTimeMillis",
@@ -561,7 +591,7 @@ export default {
},
width: 170,
},
- { title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, width: 250, align: "left" },
+ { title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, width: 210, align: "center" },
],
childColumns: [
{ title: "节点名称", dataIndex: "nodeId", width: 100, ellipsis: true, scopedSlots: { customRender: "nodeId" } },
@@ -570,7 +600,7 @@ export default {
{ title: "分发状态", dataIndex: "outGivingStatus", width: 120 },
{ title: "分发结果", dataIndex: "outGivingResult", width: 180, ellipsis: true, scopedSlots: { customRender: "outGivingResult" } },
{ title: "最后分发时间", dataIndex: "lastTime", width: 180, ellipsis: true, scopedSlots: { customRender: "lastTime" } },
- { title: "操作", dataIndex: "child-operation", scopedSlots: { customRender: "child-operation" }, width: 200, align: "left" },
+ { title: "操作", dataIndex: "child-operation", scopedSlots: { customRender: "child-operation" }, width: 120, align: "center" },
],
rules: {
id: [{ required: true, message: "请输入项目ID", trigger: "blur" }],
diff --git a/web-vue/src/pages/user/index.vue b/web-vue/src/pages/user/index.vue
index fb8128665..85a6d8930 100644
--- a/web-vue/src/pages/user/index.vue
+++ b/web-vue/src/pages/user/index.vue
@@ -22,28 +22,28 @@
>
- 编辑
+ 编辑
e.preventDefault()"> 更多
- 删除
+ 删除
- 解锁
+ 解锁
- 关闭MFA
+ 关闭MFA
-
+
-
+
@@ -55,7 +55,7 @@
-
+
@@ -67,7 +67,7 @@
-
+
{
- this.introGuide();
- }, 500);
+ // setTimeout(() => {
+ // this.introGuide();
+ // }, 500);
this.temp = { systemUser: 0 };
this.createOption = true;