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:
song.tianyang 2021-01-26 13:55:10 +08:00
parent ab08bb0a6f
commit 9d8c0b731e
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
View File

@ -11,7 +11,7 @@
<el-table v-loading="result.loading" <el-table v-loading="result.loading"
ref="caseTable" ref="caseTable"
border border
:data="tableData" row-key="id" class="test-content adjust-table ms-select-all" :data="tableData" row-key="id" class="test-content adjust-table ms-select-all-fixed"
@select-all="handleSelectAll" @select-all="handleSelectAll"
@filter-change="filter" @filter-change="filter"
@sort-change="sort" @sort-change="sort"
@ -19,7 +19,7 @@
<el-table-column type="selection" width="50"/> <el-table-column type="selection" width="50"/>
<ms-table-select-all <ms-table-header-select-popover v-show="total>0"
:page-size="pageSize>total?total:pageSize" :page-size="pageSize>total?total:pageSize"
:total="total" :total="total"
@selectPageAll="isSelectDataAll(false)" @selectPageAll="isSelectDataAll(false)"
@ -74,7 +74,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="!isReadOnly" :label="$t('commons.operating')" min-width="130" align="center"> <el-table-column fixed="right" v-if="!isReadOnly" :label="$t('commons.operating')" min-width="130" align="center">
<template v-slot:default="scope"> <template v-slot:default="scope">
<!--<el-button type="text" @click="reductionApi(scope.row)" v-if="trashEnable">{{$t('commons.reduction')}}</el-button>--> <!--<el-button type="text" @click="reductionApi(scope.row)" v-if="trashEnable">{{$t('commons.reduction')}}</el-button>-->
<!-- <el-button type="text" @click="handleTestCase(scope.row)" v-if="!trashEnable">{{ $t('commons.edit') }}--> <!-- <el-button type="text" @click="handleTestCase(scope.row)" v-if="!trashEnable">{{ $t('commons.edit') }}-->
@ -131,14 +131,15 @@ import MsSetEnvironment from "@/business/components/api/definition/components/ba
import TestPlan from "@/business/components/api/definition/components/jmeter/components/test-plan"; import TestPlan from "@/business/components/api/definition/components/jmeter/components/test-plan";
import ThreadGroup from "@/business/components/api/definition/components/jmeter/components/thread-group"; import ThreadGroup from "@/business/components/api/definition/components/jmeter/components/thread-group";
import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel"; import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll"; // import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll";
import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar"; import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components"; import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components";
export default { export default {
name: "ApiCaseSimpleList", name: "ApiCaseSimpleList",
components: { components: {
MsTableSelectAll, MsTableHeaderSelectPopover,
MsSetEnvironment, MsSetEnvironment,
ApiCaseList, ApiCaseList,
PriorityTableItem, PriorityTableItem,

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

@ -13,12 +13,12 @@
border border
@sort-change="sort" @sort-change="sort"
@filter-change="filter" @filter-change="filter"
:data="tableData" row-key="id" class="test-content adjust-table ms-select-all" :data="tableData" row-key="id" class="test-content adjust-table ms-select-all-fixed"
@select-all="handleSelectAll" @select-all="handleSelectAll"
@select="handleSelect" :height="screenHeight"> @select="handleSelect" :height="screenHeight">
<el-table-column width="50" type="selection"/> <el-table-column width="50" type="selection"/>
<ms-table-select-all <ms-table-header-select-popover v-show="total>0"
:page-size="pageSize>total?total:pageSize" :page-size="pageSize>total?total:pageSize"
:total="total" :total="total"
@selectPageAll="isSelectDataAll(false)" @selectPageAll="isSelectDataAll(false)"
@ -160,7 +160,8 @@
import {_filter, _sort, getCurrentProjectID} from "@/common/js/utils"; import {_filter, _sort, getCurrentProjectID} from "@/common/js/utils";
import {WORKSPACE_ID} from '@/common/js/constants'; import {WORKSPACE_ID} from '@/common/js/constants';
import ApiListContainer from "./ApiListContainer"; import ApiListContainer from "./ApiListContainer";
import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll"; // import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll";
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";
import {API_DEFINITION_CONFIGS} from "@/business/components/common/components/search/search-components"; import {API_DEFINITION_CONFIGS} from "@/business/components/common/components/search/search-components";
@ -170,7 +171,7 @@
name: "ApiList", name: "ApiList",
components: { components: {
ApiStatus, ApiStatus,
MsTableSelectAll, MsTableHeaderSelectPopover,
ApiListContainer, ApiListContainer,
MsTableButton, MsTableButton,
MsTableOperatorButton, MsTableOperatorButton,