All: {{this.endpointList.length}}
@@ -214,10 +234,13 @@
{required: true, message: this.$t('validate.required'), trigger: 'change'}
],
},
- endpointForm: {projectId: '', moduleId: '', endpointList:[]},
+ paramBorderColor: '#dcdfe6',
+ endpointTouch: false,
+ endpointForm: {projectId: '', moduleId: '', endpointList: []},
currentModuleCopy: {},
tempParamObj: [],
tempEndpoint: {},
+ tempEndpoint2: {},
rightBox: {show: false, title: this.$t('project.endpoint.createEndpoint'),isEdit: false},
editParamBox: {show: false, top: 0, left: 0, type: 0}, //param编辑弹框
moduleParamShow: false, //module默认参数param悬浮窗
@@ -247,12 +270,12 @@
},{
label: this.$t("project.endpoint.param"),
prop: 'param',
- width: 93,
+ width: 90,
show: true,
},{
label: this.$t("project.endpoint.path"),
prop: 'path',
- width: 63,
+ width: 66,
show: true,
}
],
@@ -282,14 +305,15 @@
this.tempParamObj = JSON.parse(JSON.stringify(obj.paramObj));
}
} else {
- if (this.endpointList.length > 0) {
- for (let i = 0; i < this.endpointList.length; i++) {
- this.endpointList[i].isEdit = false;
- }
- }
if (!this.editParamBox.show) {
return;
}
+ for (let i = 0; i < this.tempParamObj.length; i++) {
+ if (!this.tempParamObj[i].key || !this.tempParamObj[i].value) {
+ this.tempParamObj.splice(i, 1);
+ i--;
+ }
+ }
if (this.editParamBox.type == 1) {
this.currentModuleCopy.paramObj = this.tempParamObj;
this.currentModuleCopy.param = this.paramToJson(this.tempParamObj);
@@ -311,6 +335,7 @@
esc() {
this.rightBox.show = false;
this.editParamBox.show = false;
+ this.endpointTouch = false;
},
// 新增param
@@ -325,12 +350,26 @@
//编辑endpoint
toEditEndpoint(endpoint) {
- console.info(1)
+ for (let i = 0; i < this.endpointList.length; i++) {
+ if (this.endpointList[i].isEdit) {
+ this.endpointList.splice(i, 1, JSON.parse(JSON.stringify(this.tempEndpoint2)));
+ this.endpointList[i].isEdit = false;
+ break;
+ }
+ }
endpoint.isEdit = true;
+ this.tempEndpoint2 = JSON.parse(JSON.stringify(endpoint));
},
editEndpoint(endpoint) {
- console.info(2)
- endpoint.isEdit = false;
+ this.$refs.addEndpointForm.validate((valid) => {
+ if (valid) {
+ endpoint.isEdit = false;
+ this.tempEndpoint2 = {};
+ } else {
+ return false;
+ }
+ });
+
},
//移除endpoint
@@ -431,6 +470,9 @@
moduleId: this.currentModuleCopy.id
});
this.assetList.splice(index, 1);
+ this.endpointTouch = true;
+ this.endpointForm.projectId = this.currentProject.id;
+ this.endpointForm.moduleId = this.currentModuleCopy.id;
},
//将param转为json字符串格式
@@ -471,6 +513,11 @@
save() {
this.endpointForm.projectId = this.currentProject.id;
this.endpointForm.moduleId = this.currentModuleCopy.id;
+ if (this.endpointList.length == 0) {
+ this.endpointTouch = true;
+ this.$refs.addEndpointForm.validate();
+ return false;
+ }
this.$refs.addEndpointForm.validate((valid) => {
if (valid) {
this.$post('endpoint', this.endpointList).then(response => {
@@ -528,6 +575,10 @@
clearEndpoints() {
this.getAssetList();
this.endpointList = [];
+ },
+
+ setRowIndex({row, rowIndex}) {
+ row.index = rowIndex;
}
},
computed: {
@@ -543,12 +594,23 @@
this.getAssetList();
},
watch: {
+ endpointList(n, o) {
+ this.endpointForm.endpointList = n;
+ if (n.length > 0) {
+ this.paramBorderColor = '#dcdfe6';
+ } else {
+ this.paramBorderColor = '#F56C6C';
+ }
+
+ },
currentProject(n, o) {
+ this.endpointForm.projectId = n.id;
this.getModuleList(n.id);
},
currentModule: {
immediate: true,
handler(n, o) {
+ this.endpointForm.moduleId = n.id;
this.currentModuleCopy = JSON.parse(JSON.stringify(n));
}
},
@@ -616,7 +678,7 @@
/* begin--小盒子*/
.right-child-boxes {
- height: calc(100% - 196px);
+ height: calc(100% - 216px);
position: relative;
}
.endpoint-to-right-symbol {
@@ -695,6 +757,7 @@
border: 1px solid #dcdfe6;
height: calc(100% - 39px);
margin-top: 6px;
+ transition: border-color .2s cubic-bezier(.645,.045,.355,1);
}
.endpoint-param-pop{
max-height: 200px;
@@ -840,4 +903,11 @@
.endpoint-info-param.el-input.is-disabled .el-input__inner:hover, .endpoint-info-param.el-input.is-disabled .el-input__inner:hover {
border-color: #c0c4cc;
}
+
+ .endpoints-box-endpoints .el-form-item {
+ margin-bottom: 0;
+ }
+ .endpoints-box-endpoints .el-form-item.is-error {
+ margin-bottom: 22px;
+ }
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
index 767e158eb..07a6bfd91 100644
--- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
@@ -41,7 +41,7 @@
-
+
@@ -187,7 +187,7 @@
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
],
project: [
- {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+ {required: true, message: this.$t('validate.required'), trigger: 'change'}
],
port: [
{type: 'number', message: this.$t('validate.number'), trigger: 'blur'}
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 9b29fb811..6ddee876a 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -1,570 +1,561 @@
-