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

fix(测试跟踪): 修复checkbox右边框显示的问题

This commit is contained in:
Captain.B 2021-04-27 17:09:42 +08:00 committed by 刘瑞斌
parent a28ef40419
commit 646a6bc827
3 changed files with 224 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
View File

@ -19,7 +19,7 @@
@filter-change="filter" @filter-change="filter"
@sort-change="sort" @sort-change="sort"
@select="handleSelect" :height="screenHeight"> @select="handleSelect" :height="screenHeight">
<el-table-column type="selection"/> <el-table-column width="50" type="selection"/>
<ms-table-header-select-popover v-show="total>0" <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"

444
frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
View File

@ -1,189 +1,189 @@
<template> <template>
<div class="card-container"> <div class="card-container">
<ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="initTableData" <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="initTableData"
:show-create="false" :tip="$t('commons.search_by_id_name_tag')"> :show-create="false" :tip="$t('commons.search_by_id_name_tag')">
<!-- 不显示 “全部用例” 标题,使标题为空 --> <!-- 不显示 “全部用例” 标题,使标题为空 -->
<template v-slot:title> <template v-slot:title>
<span></span> <span></span>
</template> </template>
<template v-slot:button> <template v-slot:button>
<ms-table-button :is-tester-permission="true" v-if="!showMyTestCase" icon="el-icon-s-custom" <ms-table-button :is-tester-permission="true" v-if="!showMyTestCase" icon="el-icon-s-custom"
:content="$t('test_track.plan_view.my_case')" @click="searchMyTestCase"/> :content="$t('test_track.plan_view.my_case')" @click="searchMyTestCase"/>
<ms-table-button :is-tester-permission="true" v-if="showMyTestCase" icon="el-icon-files" <ms-table-button :is-tester-permission="true" v-if="showMyTestCase" icon="el-icon-files"
:content="$t('test_track.plan_view.all_case')" @click="searchMyTestCase"/> :content="$t('test_track.plan_view.all_case')" @click="searchMyTestCase"/>
<ms-table-button :is-tester-permission="true" icon="el-icon-connection" <ms-table-button :is-tester-permission="true" icon="el-icon-connection"
:content="$t('test_track.plan_view.relevance_test_case')" :content="$t('test_track.plan_view.relevance_test_case')"
@click="$emit('openTestCaseRelevanceDialog')"/> @click="$emit('openTestCaseRelevanceDialog')"/>
</template> </template>
</ms-table-header> </ms-table-header>
<executor-edit ref="executorEdit" :select-ids="new Set(Array.from(this.selectRows).map(row => row.id))" <executor-edit ref="executorEdit" :select-ids="new Set(Array.from(this.selectRows).map(row => row.id))"
@refresh="initTableData"/> @refresh="initTableData"/>
<status-edit ref="statusEdit" :plan-id="planId" <status-edit ref="statusEdit" :plan-id="planId"
:select-ids="new Set(Array.from(this.selectRows).map(row => row.id))" @refresh="initTableData"/> :select-ids="new Set(Array.from(this.selectRows).map(row => row.id))" @refresh="initTableData"/>
<el-table <el-table
ref="table" ref="table"
class="test-content adjust-table ms-select-all-fixed" class="test-content adjust-table ms-select-all-fixed"
border border
@select-all="handleSelectAll" @select-all="handleSelectAll"
@filter-change="filter" @filter-change="filter"
@sort-change="sort" @sort-change="sort"
@select="handleSelectionChange" @select="handleSelectionChange"
:height="screenHeight" :height="screenHeight"
row-key="id" row-key="id"
@row-click="showDetail" @row-click="showDetail"
@header-dragend="headerDragend" @header-dragend="headerDragend"
:data="tableData"> :data="tableData">
<el-table-column width="50" type="selection"/>
<ms-table-header-select-popover v-show="total>0"
:page-size="pageSize > total ? total : pageSize"
:total="total"
@selectPageAll="isSelectDataAll(false)"
@selectAll="isSelectDataAll(true)"/>
<el-table-column width="30" :resizable="false" align="center">
<template v-slot:default="scope">
<show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectDataCounts"/>
</template>
</el-table-column>
<template v-for="(item, index) in tableLabel">
<el-table-column <el-table-column
type="selection"/> v-if="item.id == 'num'"
<ms-table-header-select-popover v-show="total>0" prop="customNum"
:page-size="pageSize > total ? total : pageSize" sortable="custom"
:total="total" :label="$t('commons.id')"
@selectPageAll="isSelectDataAll(false)" min-width="120px"
@selectAll="isSelectDataAll(true)"/> show-overflow-tooltip
<el-table-column width="30" :resizable="false" align="center"> :key="index">
</el-table-column>
<el-table-column
v-if="item.id=='name'"
prop="name"
:label="$t('commons.name')"
min-width="120px"
:key="index"
show-overflow-tooltip>
</el-table-column>
<el-table-column
v-if="item.id=='priority'"
prop="priority"
:filters="priorityFilters"
column-key="priority"
min-width="100px"
:key="index"
:label="$t('test_track.case.priority')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectDataCounts"/> <priority-table-item :value="scope.row.priority" ref="priority"/>
</template> </template>
</el-table-column> </el-table-column>
<template v-for="(item, index) in tableLabel">
<el-table-column
v-if="item.id == 'num'"
prop="customNum"
sortable="custom"
:label="$t('commons.id')"
min-width="120px"
show-overflow-tooltip
:key="index">
</el-table-column>
<el-table-column
v-if="item.id=='name'"
prop="name"
:label="$t('commons.name')"
min-width="120px"
:key="index"
show-overflow-tooltip>
</el-table-column>
<el-table-column
v-if="item.id=='priority'"
prop="priority"
:filters="priorityFilters"
column-key="priority"
min-width="100px"
:key="index"
:label="$t('test_track.case.priority')">
<template v-slot:default="scope">
<priority-table-item :value="scope.row.priority" ref="priority"/>
</template>
</el-table-column>
<el-table-column <el-table-column
v-if="item.id=='type'" v-if="item.id=='type'"
prop="type" prop="type"
:filters="typeFilters" :filters="typeFilters"
column-key="type" column-key="type"
:label="$t('test_track.case.type')" :label="$t('test_track.case.type')"
min-width="80px" min-width="80px"
:key="index" :key="index"
show-overflow-tooltip> show-overflow-tooltip>
<template v-slot:default="scope"> <template v-slot:default="scope">
<type-table-item :value="scope.row.type"/> <type-table-item :value="scope.row.type"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="item.id=='tags'" prop="tags" :label="$t('commons.tag')" min-width="120px" <el-table-column v-if="item.id=='tags'" prop="tags" :label="$t('commons.tag')" min-width="120px"
:key="index" :key="index"
> >
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-tag v-for="(tag, index) in scope.row.showTags" :key="tag + '_' + index" type="success" effect="plain" :content="tag" style="margin-left: 0px; margin-right: 2px"/> <ms-tag v-for="(tag, index) in scope.row.showTags" :key="tag + '_' + index" type="success" effect="plain"
</template> :content="tag" style="margin-left: 0px; margin-right: 2px"/>
</el-table-column> </template>
</el-table-column>
<el-table-column <el-table-column
v-if="item.id=='nodePath'" v-if="item.id=='nodePath'"
prop="nodePath" prop="nodePath"
:label="$t('test_track.case.module')" :label="$t('test_track.case.module')"
min-width="120px" min-width="120px"
:key="index" :key="index"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="item.id=='projectName'" v-if="item.id=='projectName'"
prop="projectName" prop="projectName"
:label="$t('test_track.plan.plan_project')" :label="$t('test_track.plan.plan_project')"
min-width="120px" min-width="120px"
:key="index" :key="index"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="item.id=='issuesContent'" v-if="item.id=='issuesContent'"
:label="$t('test_track.issue.issue')" :label="$t('test_track.issue.issue')"
min-width="80px" min-width="80px"
show-overflow-tooltip show-overflow-tooltip
:key="index"> :key="index">
<template v-slot:default="scope"> <template v-slot:default="scope">
<el-popover <el-popover
placement="right" placement="right"
width="400" width="400"
trigger="hover"> trigger="hover">
<el-table border class="adjust-table" :data="scope.row.issuesContent" style="width: 100%"> <el-table border class="adjust-table" :data="scope.row.issuesContent" style="width: 100%">
<el-table-column prop="title" :label="$t('test_track.issue.title')" show-overflow-tooltip/> <el-table-column prop="title" :label="$t('test_track.issue.title')" show-overflow-tooltip/>
<el-table-column prop="description" :label="$t('test_track.issue.description')"> <el-table-column prop="description" :label="$t('test_track.issue.description')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<el-popover <el-popover
placement="left" placement="left"
width="400" width="400"
trigger="hover" trigger="hover"
> >
<ckeditor :editor="editor" disabled :config="editorConfig" <ckeditor :editor="editor" disabled :config="editorConfig"
v-model="scope.row.description"/> v-model="scope.row.description"/>
<el-button slot="reference" type="text">{{ $t('test_track.issue.preview') }}</el-button> <el-button slot="reference" type="text">{{ $t('test_track.issue.preview') }}</el-button>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="platform" :label="$t('test_track.issue.platform')"/> <el-table-column prop="platform" :label="$t('test_track.issue.platform')"/>
</el-table> </el-table>
<el-button slot="reference" type="text">{{ scope.row.issuesSize }}</el-button> <el-button slot="reference" type="text">{{ scope.row.issuesSize }}</el-button>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="item.id == 'executorName'" v-if="item.id == 'executorName'"
prop="executorName" prop="executorName"
:filters="executorFilters" :filters="executorFilters"
min-width="100px" min-width="100px"
:key="index" :key="index"
column-key="executor" column-key="executor"
:label="$t('test_track.plan_view.executor')"> :label="$t('test_track.plan_view.executor')">
</el-table-column> </el-table-column>
<!-- 责任人(创建该用例时所关联的责任人) --> <!-- 责任人(创建该用例时所关联的责任人) -->
<el-table-column <el-table-column
v-if="item.id == 'maintainer'" v-if="item.id == 'maintainer'"
prop="maintainer" prop="maintainer"
:filters="maintainerFilters" :filters="maintainerFilters"
min-width="100px" min-width="100px"
:key="index" :key="index"
column-key="maintainer" column-key="maintainer"
:label="$t('api_test.definition.request.responsible')"> :label="$t('api_test.definition.request.responsible')">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="item.id == 'status'" v-if="item.id == 'status'"
prop="status" prop="status"
:filters="statusFilters" :filters="statusFilters"
column-key="status" column-key="status"
min-width="100px" min-width="100px"
:key="index" :key="index"
:label="$t('test_track.plan_view.execute_result')"> :label="$t('test_track.plan_view.execute_result')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<span @click.stop="clickt = 'stop'"> <span @click.stop="clickt = 'stop'">
<el-dropdown class="test-case-status" @command="statusChange"> <el-dropdown class="test-case-status" @command="statusChange">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
@ -207,51 +207,51 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</span> </span>
</template>
</el-table-column>
<el-table-column
v-if="item.id == 'updateTime'"
sortable
prop="updateTime"
:label="$t('commons.update_time')"
min-width="120px"
:key="index"
show-overflow-tooltip>
<template v-slot:default="scope">
<span>{{ scope.row.updateTime | timestampFormatDate }}</span>
</template>
</el-table-column>
</template>
<el-table-column
fixed="right"
min-width="100"
:label="$t('commons.operating')">
<template slot="header">
<header-label-operate @exec="customHeader"/>
</template>
<template v-slot:default="scope">
<ms-table-operator-button :is-tester-permission="true" :tip="$t('commons.edit')" icon="el-icon-edit"
@exec="handleEdit(scope.row)"/>
<ms-table-operator-button :is-tester-permission="true" :tip="$t('test_track.plan_view.cancel_relevance')"
icon="el-icon-unlock" type="danger" @exec="handleDelete(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
</el-table>
<header-custom ref="headerCustom" :initTableData="initTableData" :optionalFields=headerItems
:type=type></header-custom>
<ms-table-pagination :change="search" :current-page.sync="currentPage" :page-size.sync="pageSize"
:total="total"/>
<functional-test-case-edit <el-table-column
ref="testPlanTestCaseEdit" v-if="item.id == 'updateTime'"
:search-param.sync="condition"
@refresh="initTableData"
:is-read-only="isReadOnly"
@refreshTable="search"/>
<!-- </el-card>--> sortable
prop="updateTime"
:label="$t('commons.update_time')"
min-width="120px"
:key="index"
show-overflow-tooltip>
<template v-slot:default="scope">
<span>{{ scope.row.updateTime | timestampFormatDate }}</span>
</template>
</el-table-column>
</template>
<el-table-column
fixed="right"
min-width="100"
:label="$t('commons.operating')">
<template slot="header">
<header-label-operate @exec="customHeader"/>
</template>
<template v-slot:default="scope">
<ms-table-operator-button :is-tester-permission="true" :tip="$t('commons.edit')" icon="el-icon-edit"
@exec="handleEdit(scope.row)"/>
<ms-table-operator-button :is-tester-permission="true" :tip="$t('test_track.plan_view.cancel_relevance')"
icon="el-icon-unlock" type="danger" @exec="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
<header-custom ref="headerCustom" :initTableData="initTableData" :optionalFields=headerItems
:type=type></header-custom>
<ms-table-pagination :change="search" :current-page.sync="currentPage" :page-size.sync="pageSize"
:total="total"/>
<functional-test-case-edit
ref="testPlanTestCaseEdit"
:search-param.sync="condition"
@refresh="initTableData"
:is-read-only="isReadOnly"
@refreshTable="search"/>
<!-- </el-card>-->
<batch-edit ref="batchEdit" @batchEdit="batchEdit" <batch-edit ref="batchEdit" @batchEdit="batchEdit"
:type-arr="typeArr" :value-arr="valueArr" :dialog-title="$t('test_track.case.batch_edit_case')"/> :type-arr="typeArr" :value-arr="valueArr" :dialog-title="$t('test_track.case.batch_edit_case')"/>
</div> </div>
@ -270,12 +270,11 @@ import NodeBreadcrumb from '../../../../common/NodeBreadcrumb';
import { import {
ROLE_TEST_MANAGER, ROLE_TEST_MANAGER,
ROLE_TEST_USER, ROLE_TEST_USER,
TEST_CASE_LIST,
TEST_PLAN_FUNCTION_TEST_CASE, TEST_PLAN_FUNCTION_TEST_CASE,
TokenKey, TokenKey,
WORKSPACE_ID WORKSPACE_ID
} from "@/common/js/constants"; } from "@/common/js/constants";
import {checkoutTestManagerOrTestUser, getCurrentUser, hasRoles} from "@/common/js/utils"; import {checkoutTestManagerOrTestUser, hasRoles} from "@/common/js/utils";
import PriorityTableItem from "../../../../common/tableItems/planview/PriorityTableItem"; import PriorityTableItem from "../../../../common/tableItems/planview/PriorityTableItem";
import StatusTableItem from "../../../../common/tableItems/planview/StatusTableItem"; import StatusTableItem from "../../../../common/tableItems/planview/StatusTableItem";
import TypeTableItem from "../../../../common/tableItems/planview/TypeTableItem"; import TypeTableItem from "../../../../common/tableItems/planview/TypeTableItem";
@ -293,7 +292,8 @@ import {
_handleSelect, _handleSelect,
_handleSelectAll, _handleSelectAll,
_sort, _sort,
buildBatchParam, deepClone, buildBatchParam,
deepClone,
getLabel, getLabel,
getSelectDataCounts, getSelectDataCounts,
initCondition, initCondition,
@ -318,7 +318,7 @@ export default {
StatusTableItem, StatusTableItem,
PriorityTableItem, StatusEdit, ExecutorEdit, MsTipButton, MsTablePagination, PriorityTableItem, StatusEdit, ExecutorEdit, MsTipButton, MsTablePagination,
MsTableHeader, NodeBreadcrumb, MsTableButton, ShowMoreBtn, MsTableHeader, NodeBreadcrumb, MsTableButton, ShowMoreBtn,
BatchEdit, MsTag,MsTableHeaderSelectPopover BatchEdit, MsTag, MsTableHeaderSelectPopover
}, },
data() { data() {
return { return {
@ -395,7 +395,7 @@ export default {
}, },
selectDataCounts: 0, selectDataCounts: 0,
selectDataRange: "all" selectDataRange: "all"
} };
}, },
props: { props: {
planId: { planId: {
@ -473,7 +473,7 @@ export default {
description: '获取缺陷失败', description: '获取缺陷失败',
platform: '获取缺陷失败' platform: '获取缺陷失败'
}]); }]);
}) });
} }
} }
this.selectRows.clear(); this.selectRows.clear();
@ -483,7 +483,7 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.checkTableRowIsSelect(); this.checkTableRowIsSelect();
}) });
}); });
} }
getLabel(this, TEST_PLAN_FUNCTION_TEST_CASE); getLabel(this, TEST_PLAN_FUNCTION_TEST_CASE);
@ -553,13 +553,13 @@ export default {
callback: (action) => { callback: (action) => {
if (action === 'confirm') { if (action === 'confirm') {
if (this.selectRows.size > 0) { if (this.selectRows.size > 0) {
if(this.condition.selectAll){ if (this.condition.selectAll) {
let param = buildBatchParam(this); let param = buildBatchParam(this);
this.$post('/test/plan/case/idList/all', param, res => { this.$post('/test/plan/case/idList/all', param, res => {
let ids = res.data; let ids = res.data;
this._handleBatchDelete(ids); this._handleBatchDelete(ids);
}) });
}else { } else {
let ids = Array.from(this.selectRows).map(row => row.id); let ids = Array.from(this.selectRows).map(row => row.id);
this._handleBatchDelete(ids); this._handleBatchDelete(ids);
} }
@ -575,7 +575,7 @@ export default {
let data = res.data; let data = res.data;
let ids = data.map(d => d.id); let ids = data.map(d => d.id);
this._handleBatchDelete(ids); this._handleBatchDelete(ids);
}) });
} }
} }
} }
@ -688,7 +688,7 @@ export default {
this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => { this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
this.valueArr.executor = response.data; this.valueArr.executor = response.data;
this.executorFilters = response.data.map(u => { this.executorFilters = response.data.map(u => {
return {text: u.name, value: u.id} return {text: u.name, value: u.id};
}); });
this.maintainerFilters = response.data.map(u => { this.maintainerFilters = response.data.map(u => {
return {text: u.id + '(' + u.name + ')', value: u.id}; return {text: u.id + '(' + u.name + ')', value: u.id};
@ -715,7 +715,7 @@ export default {
this.selectRows.delete(row); this.selectRows.delete(row);
} }
} }
}) });
} }
}, },
isSelectDataAll(data) { isSelectDataAll(data) {
@ -730,7 +730,7 @@ export default {
this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows); this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows);
}, },
} }
} };
</script> </script>
<style scoped> <style scoped>

2
frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
View File

@ -17,7 +17,7 @@
@filter-change="filter" @filter-change="filter"
@sort-change="sort" @sort-change="sort"
@select="handleSelectionChange" :height="screenHeight"> @select="handleSelectionChange" :height="screenHeight">
<el-table-column type="selection"/> <el-table-column width="50" type="selection"/>
<ms-table-header-select-popover v-show="total>0" <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"