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

Merge branch 'master' of https://github.com/metersphere/metersphere 

# Conflicts:
#	frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
This commit is contained in:
fit2-zhao 2021-02-07 09:47:16 +08:00
parent dcb0714601
commit 4e14835474
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
View File

@ -46,17 +46,11 @@
</template> </template>
<script> <script>
import SelectMenu from "../../../track/common/SelectMenu"; import {getCurrentProjectID} from "@/common/js/utils";
import MsAddBasisScenario from "@/business/components/api/automation/scenario/AddBasisScenario"; import {buildNodePath} from "../../definition/model/NodeTree";
import {getCurrentProjectID} from "@/common/js/utils";
import MsNodeTree from "../../../track/common/NodeTree";
import {buildNodePath} from "../../definition/model/NodeTree";
import ModuleTrashButton from "../../definition/components/module/ModuleTrashButton";
import SelectMenu from "../../../track/common/SelectMenu"; import SelectMenu from "../../../track/common/SelectMenu";
import MsAddBasisScenario from "@/business/components/api/automation/scenario/AddBasisScenario"; import MsAddBasisScenario from "@/business/components/api/automation/scenario/AddBasisScenario";
import {getCurrentProjectID} from "@/common/js/utils";
import MsNodeTree from "../../../track/common/NodeTree"; import MsNodeTree from "../../../track/common/NodeTree";
import {buildNodePath} from "../../definition/model/NodeTree";
import ModuleTrashButton from "../../definition/components/module/ModuleTrashButton"; import ModuleTrashButton from "../../definition/components/module/ModuleTrashButton";
import ApiImport from "./common/ScenarioImport"; import ApiImport from "./common/ScenarioImport";