Merge branch 'v1.8'

This commit is contained in:
Captain.B 2021-03-30 19:22:50 +08:00
commit 5cc4e709fe
5 changed files with 734 additions and 718 deletions

View File

@ -446,7 +446,9 @@ export default {
} }
this.$nextTick(function () { this.$nextTick(function () {
if (this.$refs.scenarioTable) {
this.$refs.scenarioTable.doLayout(); this.$refs.scenarioTable.doLayout();
}
this.checkTableRowIsSelect(); this.checkTableRowIsSelect();
}) })
}); });

View File

@ -353,7 +353,9 @@ export default {
}) })
this.$nextTick(function () { this.$nextTick(function () {
if (this.$refs.caseTable) {
this.$refs.caseTable.doLayout(); this.$refs.caseTable.doLayout();
}
this.checkTableRowIsSelect(); this.checkTableRowIsSelect();
}) })
}); });

View File

@ -116,7 +116,8 @@
min-width="120px" min-width="120px"
:key="index"> :key="index">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-tag v-for="(itemName,index) in scope.row.tags" :key="index" type="success" effect="plain" :show-tooltip="true" :content="itemName" style="margin-left: 0px; margin-right: 2px"/> <ms-tag v-for="(itemName,index) in scope.row.tags" :key="index" type="success" effect="plain" :show-tooltip="true" :content="itemName"
style="margin-left: 0px; margin-right: 2px"/>
</template> </template>
</el-table-column> </el-table-column>
@ -223,9 +224,8 @@
import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn"; import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
import MsBatchEdit from "../basis/BatchEdit"; import MsBatchEdit from "../basis/BatchEdit";
import {API_METHOD_COLOUR, API_STATUS, DUBBO_METHOD, REQ_METHOD, SQL_METHOD, TCP_METHOD} from "../../model/JsonData"; import {API_METHOD_COLOUR, API_STATUS, DUBBO_METHOD, REQ_METHOD, SQL_METHOD, TCP_METHOD} from "../../model/JsonData";
import {checkoutTestManagerOrTestUser, downloadFile, getUUID} from "@/common/js/utils"; import {downloadFile} from "@/common/js/utils";
import {PROJECT_NAME} from '@/common/js/constants'; import {API_LIST, PROJECT_NAME, WORKSPACE_ID} from '@/common/js/constants';
import {API_LIST, TEST_CASE_LIST, WORKSPACE_ID} from '@/common/js/constants';
import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover"; import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus"; import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus";
import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar"; import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
@ -233,12 +233,17 @@
import MsTipButton from "@/business/components/common/components/MsTipButton"; import MsTipButton from "@/business/components/common/components/MsTipButton";
import CaseBatchMove from "@/business/components/api/definition/components/basis/BatchMove"; import CaseBatchMove from "@/business/components/api/definition/components/basis/BatchMove";
import { import {
_filter,
_handleSelect, _handleSelect,
_handleSelectAll, buildBatchParam, getLabel, _handleSelectAll,
getSelectDataCounts, initCondition, _sort,
setUnSelectIds, toggleAllSelection buildBatchParam,
getLabel,
getSelectDataCounts,
initCondition,
setUnSelectIds,
toggleAllSelection
} from "@/common/js/tableUtils"; } from "@/common/js/tableUtils";
import {_filter, _sort} from "@/common/js/tableUtils";
import {Api_List} from "@/business/components/common/model/JsonData"; import {Api_List} from "@/business/components/common/model/JsonData";
import HeaderCustom from "@/business/components/common/head/HeaderCustom"; import HeaderCustom from "@/business/components/common/head/HeaderCustom";
import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate"; import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
@ -457,7 +462,9 @@
// nexttick: // nexttick:
this.$nextTick(function () { this.$nextTick(function () {
if (this.$refs.apiDefinitionTable) {
this.$refs.apiDefinitionTable.doLayout(); this.$refs.apiDefinitionTable.doLayout();
}
this.checkTableRowIsSelect(); this.checkTableRowIsSelect();
}) })
}); });
@ -755,8 +762,7 @@
obj.protocol = this.currentProtocol; obj.protocol = this.currentProtocol;
this.buildApiPath(obj.data); this.buildApiPath(obj.data);
downloadFile("Metersphere_Api_" + localStorage.getItem(PROJECT_NAME) + ".json", JSON.stringify(obj)); downloadFile("Metersphere_Api_" + localStorage.getItem(PROJECT_NAME) + ".json", JSON.stringify(obj));
} } else {
else {
downloadFile("Swagger_Api_" + localStorage.getItem(PROJECT_NAME) + ".json", JSON.stringify(obj)); downloadFile("Swagger_Api_" + localStorage.getItem(PROJECT_NAME) + ".json", JSON.stringify(obj));
} }
}); });

View File

@ -160,15 +160,17 @@ import {
_filter, _filter,
_handleSelect, _handleSelect,
_handleSelectAll, _handleSelectAll,
_sort, buildBatchParam, getLabel, _sort,
getSelectDataCounts, initCondition, buildBatchParam,
getLabel,
getSelectDataCounts,
initCondition,
setUnSelectIds, setUnSelectIds,
toggleAllSelection toggleAllSelection
} from "@/common/js/tableUtils"; } from "@/common/js/tableUtils";
import BatchMove from "./BatchMove"; import BatchMove from "./BatchMove";
import {Track_Test_Case} from "@/business/components/common/model/JsonData"; import {Track_Test_Case} from "@/business/components/common/model/JsonData";
import HeaderCustom from "@/business/components/common/head/HeaderCustom"; import HeaderCustom from "@/business/components/common/head/HeaderCustom";
import i18n from "@/i18n/i18n";
import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate"; import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
import PlanStatusTableItem from "@/business/components/track/common/tableItems/plan/PlanStatusTableItem"; import PlanStatusTableItem from "@/business/components/track/common/tableItems/plan/PlanStatusTableItem";
@ -393,8 +395,10 @@ export default {
item.tags = JSON.parse(item.tags); item.tags = JSON.parse(item.tags);
}) })
this.$nextTick(function(){ this.$nextTick(() => {
if (this.$refs.table) {
this.$refs.table.doLayout(); this.$refs.table.doLayout();
}
this.checkTableRowIsSelect(); this.checkTableRowIsSelect();
}) })
}); });

View File

@ -472,7 +472,9 @@ export default {
} }
} }
this.selectRows.clear(); this.selectRows.clear();
if (this.$refs.table) {
this.$refs.table.doLayout(); this.$refs.table.doLayout();
}
}); });
} }
getLabel(this, TEST_PLAN_FUNCTION_TEST_CASE); getLabel(this, TEST_PLAN_FUNCTION_TEST_CASE);