test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(接口自动化): 修复引用场景不能移除问题

This commit is contained in:
fit2-zhao 2021-03-12 10:56:59 +08:00
parent 846345cdd2
commit 7a9bb603e8
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit d2fc4b42117be97c679b4d15d6f979923e598f7f Subproject commit efd6af73b7c5cc53cd4515772000bc1436c49837

4
frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
View File

@ -31,10 +31,10 @@
</el-tooltip> </el-tooltip>
<slot name="button"></slot> <slot name="button"></slot>
<el-tooltip content="Copy" placement="top"> <el-tooltip content="Copy" placement="top">
<el-button size="mini" icon="el-icon-copy-document" circle @click="copyRow" :disabled="data.referenced==='REF' || data.disabled"/> <el-button size="mini" icon="el-icon-copy-document" circle @click="copyRow" :disabled="data && data.disabled"/>
</el-tooltip> </el-tooltip>
<el-tooltip :content="$t('commons.remove')" placement="top"> <el-tooltip :content="$t('commons.remove')" placement="top">
<el-button size="mini" icon="el-icon-delete" type="danger" circle @click="remove" :disabled="data.referenced==='REF' || data.disabled"/> <el-button size="mini" icon="el-icon-delete" type="danger" circle @click="remove" :disabled="data && data.disabled"/>
</el-tooltip> </el-tooltip>
</div> </div>

2
frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
View File

@ -216,7 +216,7 @@
} }
this.request.requestResult = requestResult; this.request.requestResult = requestResult;
this.request.id = response.data.id; this.request.id = response.data.id;
this.request.disabled = true; //this.request.disabled = true;
if (!this.request.projectId) { if (!this.request.projectId) {
this.request.projectId = response.data.projectId; this.request.projectId = response.data.projectId;
} }

2
frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
View File

@ -58,7 +58,7 @@
if (this.scenario.hashTree) { if (this.scenario.hashTree) {
this.setDisabled(this.scenario.hashTree); this.setDisabled(this.scenario.hashTree);
} }
this.scenario.disabled = true; //this.scenario.disabled = true;
this.scenario.name = response.data.name; this.scenario.name = response.data.name;
if (!this.scenario.projectId) { if (!this.scenario.projectId) {
this.scenario.projectId = response.data.projectId; this.scenario.projectId = response.data.projectId;

2
frontend/src/business/components/api/definition/components/list/ApiList.vue
View File

@ -325,7 +325,7 @@ export default {
currentPage: 1, currentPage: 1,
pageSize: 10, pageSize: 10,
total: 0, total: 0,
screenHeight: document.documentElement.clientHeight - 270,//屏幕高度, screenHeight: document.documentElement.clientHeight - 310,//屏幕高度,
environmentId: undefined, environmentId: undefined,
selectDataCounts: 0, selectDataCounts: 0,
} }

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 17404980aab725889843ce8c65f5f5c00113ae21 Subproject commit 4c33b9c3b12a83da6d9bd2740262c6c8baaab819