diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java b/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java index 9cb1e08033..6365e40d43 100644 --- a/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java +++ b/backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java @@ -18,6 +18,8 @@ public class KeyValue { private boolean enable = true; private boolean encode = true; private boolean required; + private Integer min; + private Integer max; public KeyValue() { this(null, null); diff --git a/backend/src/main/java/io/metersphere/service/ProjectService.java b/backend/src/main/java/io/metersphere/service/ProjectService.java index 777790a5fb..141ae1d1e7 100644 --- a/backend/src/main/java/io/metersphere/service/ProjectService.java +++ b/backend/src/main/java/io/metersphere/service/ProjectService.java @@ -105,9 +105,6 @@ public class ProjectService { long createTime = System.currentTimeMillis(); project.setCreateTime(createTime); project.setUpdateTime(createTime); - // set workspace id - project.setWorkspaceId(project.getWorkspaceId()); - project.setCreateUser(project.getCreateUser()); project.setSystemId(systemId); projectMapper.insertSelective(project); diff --git a/frontend/src/business/components/api/definition/components/ApiVariable.vue b/frontend/src/business/components/api/definition/components/ApiVariable.vue index b4b0ae0db0..cf314bffba 100644 --- a/frontend/src/business/components/api/definition/components/ApiVariable.vue +++ b/frontend/src/business/components/api/definition/components/ApiVariable.vue @@ -74,17 +74,26 @@ + + + + + + - + + + @@ -95,10 +104,11 @@ import MsApiBodyFileUpload from "./body/ApiBodyFileUpload"; import {REQUIRED} from "../model/JsonData"; import Vue from 'vue'; + import ApiVariableSetting from "@/business/components/api/definition/components/ApiVariableSetting"; export default { name: "MsApiVariable", - components: {MsApiBodyFileUpload, MsApiVariableAdvance}, + components: {ApiVariableSetting, MsApiBodyFileUpload, MsApiVariableAdvance}, props: { keyPlaceholder: String, valuePlaceholder: String, @@ -119,7 +129,8 @@ type: Boolean, default: true }, - suggestions: Array + suggestions: Array, + withMorSetting: Boolean }, data() { return { @@ -249,6 +260,9 @@ this.$nextTick(() => { this.isActive = true; }); + }, + openApiVariableSetting(item) { + this.$refs.apiVariableSetting.open(item); } }, created() { @@ -307,4 +321,9 @@ cursor: pointer; color: #1E90FF; } + + .kv-setting { + width: 40px; + padding: 0px !important; + } diff --git a/frontend/src/business/components/api/definition/components/ApiVariableSetting.vue b/frontend/src/business/components/api/definition/components/ApiVariableSetting.vue new file mode 100644 index 0000000000..ada7419ec3 --- /dev/null +++ b/frontend/src/business/components/api/definition/components/ApiVariableSetting.vue @@ -0,0 +1,49 @@ + + + + + diff --git a/frontend/src/business/components/api/definition/components/body/ApiBody.vue b/frontend/src/business/components/api/definition/components/body/ApiBody.vue index 19bc17c538..b5408cab8e 100644 --- a/frontend/src/business/components/api/definition/components/body/ApiBody.vue +++ b/frontend/src/business/components/api/definition/components/body/ApiBody.vue @@ -29,7 +29,7 @@ {{$t("commons.batch_add")}} - diff --git a/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue b/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue index f6da672adc..b2859986f0 100644 --- a/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue +++ b/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue @@ -31,7 +31,7 @@ {{$t("commons.batch_add")}} - + @@ -47,7 +47,7 @@ {{$t("commons.batch_add")}} - + diff --git a/frontend/src/business/components/common/components/MsEditDialog.vue b/frontend/src/business/components/common/components/MsEditDialog.vue index 92352bd461..4951080172 100644 --- a/frontend/src/business/components/common/components/MsEditDialog.vue +++ b/frontend/src/business/components/common/components/MsEditDialog.vue @@ -1,5 +1,5 @@