diff --git a/frontend/src/business/components/project/MsProject.vue b/frontend/src/business/components/project/MsProject.vue index e06457a990b4fd765571aa81947892c1ccb56321..260003c692cd1a12d5b9b06e7014f6e0e848246a 100644 --- a/frontend/src/business/components/project/MsProject.vue +++ b/frontend/src/business/components/project/MsProject.vue @@ -46,7 +46,7 @@ - + diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue index 24a1b69c946ae46b495e85a8b79aac965e3462c9..8f9121ba330a8d49637e6dda58d7d2e464dd5a4f 100644 --- a/frontend/src/business/components/settings/organization/OrganizationMember.vue +++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue @@ -51,7 +51,7 @@ - + - + diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue index 42334fbfc60ba4134cf1441d1c8b92a5bf041ade..7bed5e31f1887bcb8036957fb9cf309fa6908819 100644 --- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue +++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue @@ -48,7 +48,7 @@ - + @@ -114,7 +114,7 @@ - + - + diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue index 07e71f552583db57ceeb5d2c1bd1fd11f46e877a..092459f8ecc57046034d9633bf6cac41e743a26f 100644 --- a/frontend/src/business/components/settings/personal/PersonSetting.vue +++ b/frontend/src/business/components/settings/personal/PersonSetting.vue @@ -26,7 +26,7 @@ - + diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue index c075b88ba2aea89d5556da62c50f828c56c6fd89..59e418897a9a87cf871d6ec202c107d9f56ff8b7 100644 --- a/frontend/src/business/components/settings/system/Organization.vue +++ b/frontend/src/business/components/settings/system/Organization.vue @@ -101,7 +101,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -131,7 +131,7 @@ - + - + diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue index 1a4765517c3e49390deed0554848fb00d8e90f15..1759e0ab048d32b3f21d1331af453dbc9aee0b33 100644 --- a/frontend/src/business/components/settings/system/SystemWorkspace.vue +++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue @@ -53,7 +53,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -154,7 +154,7 @@ - + - + diff --git a/frontend/src/business/components/settings/system/TestResourcePool.vue b/frontend/src/business/components/settings/system/TestResourcePool.vue index d2c8b659f575999597c3e1225eca72eac6a90ca8..a5bd6ab57437248881e3a7ed918751e61dd30479 100644 --- a/frontend/src/business/components/settings/system/TestResourcePool.vue +++ b/frontend/src/business/components/settings/system/TestResourcePool.vue @@ -70,7 +70,7 @@ - @@ -85,46 +85,41 @@
-
-
- -
- -
+
+
+ + + + + +
-
- -
- -
+
+ + +
- -
- -
+ + +
-
-
- -
- -
+
+
+ + +
-
- -
- -
+
+ + +
-
- -
- -
+
+ + +
@@ -149,7 +144,7 @@ - @@ -158,52 +153,44 @@ - + Kubernetes 独立节点
-
-
- -
- -
+
+
+ + +
-
- -
- -
+
+ + +
- -
- -
+ + +
-
-
- -
- -
+
+
+ + +
-
- -
- -
+
+ + +
-
- -
- -
+
+ + +
@@ -264,6 +251,9 @@ ], description: [ {max: 60, message: '最大长度 60 个字符', trigger: 'blur'} + ], + type: [ + {required: true, message: '请选择资源类型', trigger: 'blur'} ] } } @@ -303,6 +293,28 @@ }); } }, + validateResourceInfo() { + if (this.infoList.length <= 0) { + return {validate: false, msg: "资源池不能为空"} + } + + let resultValidate = {validate: true, msg: "请完善数据"} + this.infoList.forEach(function (info) { + for (let key in info) { + if (info[key] != '0' && !info[key]) { + resultValidate.validate = false + return false; + } + } + + if (!info.maxConcurrency) { + resultValidate.validate = false + return false; + } + }); + + return resultValidate; + }, buildPagePath(path) { return path + "/" + this.currentPage + "/" + this.pageSize; }, @@ -349,16 +361,26 @@ createTestResourcePool(createTestResourcePoolForm) { this.$refs[createTestResourcePoolForm].validate(valide => { if (valide) { - this.form.info = JSON.stringify(this.infoList); - this.$post("/testresourcepool/add", this.form) - .then(() => { - this.$message({ - type: 'success', - message: '添加成功!' - }, - this.createVisible = false, - this.initTableData()) + let vri = this.validateResourceInfo(); + if (vri.validate) { + this.form.info = JSON.stringify(this.infoList); + this.$post("/testresourcepool/add", this.form) + .then(() => { + this.$message({ + type: 'success', + message: '添加成功!' + }, + this.createVisible = false, + this.initTableData()) + }); + } else { + this.$message({ + type: 'warning', + message: vri.msg }); + return false; + } + } else { return false; } @@ -367,17 +389,26 @@ updateTestResourcePool(updateTestResourcePoolForm) { this.$refs[updateTestResourcePoolForm].validate(valide => { if (valide) { - this.form.info = JSON.stringify(this.infoList); - this.$post("/testresourcepool/update", this.form) - .then(() => { - this.$message({ - type: 'success', - message: this.$t('commons.modify_success') - }, - this.updateVisible = false, - this.initTableData(), - self.loading = false) + let vri = this.validateResourceInfo(); + if (vri.validate) { + this.form.info = JSON.stringify(this.infoList); + this.$post("/testresourcepool/update", this.form) + .then(() => { + this.$message({ + type: 'success', + message: this.$t('commons.modify_success') + }, + this.updateVisible = false, + this.initTableData(), + self.loading = false) + }); + } else { + this.$message({ + type: 'warning', + message: vri.msg }); + return false; + } } else { return false; } @@ -414,12 +445,29 @@ } .op { - line-height: 40px; float: left; - width: 16%; + width: 10%; } .box { padding-left: 5px; } + + .k8s-master { + width: 34%; + float: left + } + + .k8s-token { + width: 36%; + float: left + } + + .k8s-token .el-form-item__label { + padding-left: 20px; + } + + .node-line { + clear: both; + } diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue index f1d5b92060967b4825af6b8692748ff566684450..18c7461a35e1ccad123dd0753b9561ae7977430c 100644 --- a/frontend/src/business/components/settings/system/User.vue +++ b/frontend/src/business/components/settings/system/User.vue @@ -65,7 +65,7 @@ - + @@ -85,7 +85,7 @@ - + diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue index 9c6cd7c4e4ec5f793c7b20e45f3580595cb17e01..2edf45f73f1a7a81bb37111bd1d57e1f0c7316fd 100644 --- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue +++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue @@ -50,7 +50,7 @@ - + - +