-
{{$t('load_test.domain_bind')}}
-
-
- {{$t('commons.add')}}
+ {{$t('commons.add')}}
-
+
+
-
-
-
- {{ row.domain }}
+
+
+ {{row.domain}}
@@ -31,46 +38,36 @@
size="mini"
v-model="row.enable"
active-color="#13ce66"
- inactive-color="#ff4949">
+ inactive-color="#ff4949"
+ @click="confirmEdit(row)"
+ >
-
-
-
- {{ row.ip }}
+
+ {{row.ip}}
-
+
-
-
-
-
-
-
+ icon="el-icon-plus"
+ circle size="mini"
+ @click="add('domains')">
-
+
{{$t('load_test.params')}}
-
-
- {{$t('commons.add')}}
+ {{$t('commons.add')}}
-
+
+
-
-
-
- {{ row.name }}
+
+
+ {{row.name}}
@@ -121,40 +126,32 @@
+ show-overflow-tooltip align="center">
-
+
+
+ {{row.value}}
-
+
-
-
-
-
-
-
+ @click="add(row)">
+
@@ -211,6 +209,12 @@
statusCodeStr: '',
}
},
+ props: {
+ readOnly: {
+ type: Boolean,
+ default: true
+ },
+ },
mounted() {
let testId = this.$route.path.split('/')[4];
if (testId) {
@@ -253,6 +257,7 @@
this.statusCodeStr = this.statusCode.join(',');
this.domains = data.domains || [];
this.params = data.params || [];
+ this.add('domains');
this.domains.forEach(d => d.edit = false);
this.params.forEach(d => d.edit = false);
}
@@ -262,7 +267,7 @@
if (dataName === 'domains') {
this[dataName].push({
domain: 'fit2cloud.com',
- enable: true,
+ enable: false,
ip: '127.0.0.1',
edit: true,
});
@@ -290,6 +295,7 @@
},
confirmEdit(row) {
row.edit = false;
+ row.enable=true,
this.saveOriginObject(row);
},
groupBy(data, key) {
@@ -360,7 +366,22 @@
}
.edit-input {
- padding-right: 100px;
+ padding-right: 0px;
+ }
+ .tb-edit .el-textarea {
+ display: none;
+ }
+ .tb-edit .current-row .el-textarea {
+ display: block;
+ }
+ .tb-edit .current-row .el-textarea+span {
+ display: none;
+ }
+ .el-col{
+ text-align: left;
+ }
+ .el-col .el-table{
+ align:center;
}
diff --git a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
index 68ae48c662..e180eadd16 100644
--- a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
@@ -90,6 +90,7 @@
+ {{$t('load_test.pressure_prediction_chart')}}
@@ -306,9 +307,11 @@
}
+
diff --git a/frontend/src/business/components/project/MsProject.vue b/frontend/src/business/components/project/MsProject.vue
index 540944a9fa..5877d731f5 100644
--- a/frontend/src/business/components/project/MsProject.vue
+++ b/frontend/src/business/components/project/MsProject.vue
@@ -31,9 +31,9 @@
@@ -48,10 +48,11 @@
import MsTablePagination from "../common/pagination/TablePagination";
import MsTableHeader from "../common/components/MsTableHeader";
import MsTableOperator from "../common/components/MsTableOperator";
+ import MsDialogFooter from "../common/components/MsDialogFooter";
export default {
name: "MsProject",
- components: {MsTableOperator, MsCreateBox, MsTablePagination, MsTableHeader},
+ components: {MsTableOperator, MsCreateBox, MsTablePagination, MsTableHeader, MsDialogFooter},
data() {
return {
createVisible: false,
diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue
index c14d93551f..cc2b830134 100644
--- a/frontend/src/business/components/settings/organization/OrganizationMember.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue
@@ -25,7 +25,7 @@
+ @close="handleClose">
-
+
+ @close="handleClose">
@@ -87,11 +85,9 @@
-
+
@@ -104,10 +100,11 @@
import MsTableHeader from "../../common/components/MsTableHeader";
import MsRolesTag from "../../common/components/MsRolesTag";
import MsTableOperator from "../../common/components/MsTableOperator";
+ import MsDialogFooter from "../../common/components/MsDialogFooter";
export default {
name: "MsOrganizationMember",
- components: {MsCreateBox, MsTablePagination, MsTableHeader, MsRolesTag, MsTableOperator},
+ components: {MsCreateBox, MsTablePagination, MsTableHeader, MsRolesTag, MsTableOperator, MsDialogFooter},
created() {
this.initTableData();
},
@@ -161,9 +158,8 @@
buildPagePath(path) {
return path + "/" + this.currentPage + "/" + this.pageSize;
},
- closeFunc() {
+ handleClose() {
this.form = {};
- this.initTableData();
},
edit(row) {
this.updateVisible = true;
diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
index 612d331dbd..24f9d4ca51 100644
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -34,11 +34,9 @@