fix(用例管理): 修复用例评审不能按照tag搜索问题
--bug=1036195 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001036195
This commit is contained in:
parent
10fbb605f2
commit
0fd92306a4
|
@ -116,6 +116,7 @@
|
||||||
and (
|
and (
|
||||||
case_review.name like concat('%', #{request.keyword},'%')
|
case_review.name like concat('%', #{request.keyword},'%')
|
||||||
or case_review.num like concat('%', #{request.keyword},'%')
|
or case_review.num like concat('%', #{request.keyword},'%')
|
||||||
|
or case_review.tags like concat('%', #{request.keyword},'%')
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
<if test="request.createByMe != null">
|
<if test="request.createByMe != null">
|
||||||
|
|
|
@ -669,6 +669,17 @@
|
||||||
WHERE deleted = #{deleted}
|
WHERE deleted = #{deleted}
|
||||||
AND project_id = #{request.projectId}
|
AND project_id = #{request.projectId}
|
||||||
<include refid="queryWhereCondition"/>
|
<include refid="queryWhereCondition"/>
|
||||||
|
<if test="request.reviewId != null and request.reviewId != ''">
|
||||||
|
AND functional_case.id not in (
|
||||||
|
select case_id from case_review_functional_case where review_id = #{request.reviewId}
|
||||||
|
)
|
||||||
|
</if>
|
||||||
|
<if test="request.excludeIds != null and request.excludeIds.size() > 0">
|
||||||
|
AND functional_case.id not in
|
||||||
|
<foreach collection="request.excludeIds" item="excludeId" separator="," open="(" close=")">
|
||||||
|
#{excludeId}
|
||||||
|
</foreach>
|
||||||
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -374,21 +374,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getModulesCount() {
|
|
||||||
try {
|
|
||||||
const emitTableParams: CaseModuleQueryParams = {
|
|
||||||
keyword: keyword.value,
|
|
||||||
moduleIds: [],
|
|
||||||
projectId: currentProjectId.value,
|
|
||||||
current: propsRes.value.msPagination?.current,
|
|
||||||
pageSize: propsRes.value.msPagination?.pageSize,
|
|
||||||
};
|
|
||||||
modulesCount.value = await getCaseModulesCounts(emitTableParams);
|
|
||||||
} catch (error) {
|
|
||||||
console.log(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const searchParams = ref<TableQueryParams>({
|
const searchParams = ref<TableQueryParams>({
|
||||||
projectId: currentProjectId.value,
|
projectId: currentProjectId.value,
|
||||||
moduleIds: [],
|
moduleIds: [],
|
||||||
|
@ -418,6 +403,23 @@
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function getModulesCount() {
|
||||||
|
const { excludeIds } = searchParams.value;
|
||||||
|
try {
|
||||||
|
const emitTableParams: CaseModuleQueryParams = {
|
||||||
|
keyword: keyword.value,
|
||||||
|
moduleIds: [],
|
||||||
|
projectId: currentProjectId.value,
|
||||||
|
current: propsRes.value.msPagination?.current,
|
||||||
|
pageSize: propsRes.value.msPagination?.pageSize,
|
||||||
|
excludeIds,
|
||||||
|
};
|
||||||
|
modulesCount.value = await getCaseModulesCounts(emitTableParams);
|
||||||
|
} catch (error) {
|
||||||
|
console.log(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const setFocusKey = (node: MsTreeNodeData) => {
|
const setFocusKey = (node: MsTreeNodeData) => {
|
||||||
focusNodeKey.value = node.id || '';
|
focusNodeKey.value = node.id || '';
|
||||||
};
|
};
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
v-model:keyword="keyword"
|
v-model:keyword="keyword"
|
||||||
:filter-config-list="filterConfigList"
|
:filter-config-list="filterConfigList"
|
||||||
:row-count="filterRowCount"
|
:row-count="filterRowCount"
|
||||||
:search-placeholder="t('caseManagement.caseReview.searchPlaceholder')"
|
:search-placeholder="t('caseManagement.caseReview.list.searchPlaceholder')"
|
||||||
@keyword-search="(val, filter) => searchReview(filter)"
|
@keyword-search="(val, filter) => searchReview(filter)"
|
||||||
@adv-search="searchReview"
|
@adv-search="searchReview"
|
||||||
@refresh="searchReview"
|
@refresh="searchReview"
|
||||||
|
|
|
@ -3,6 +3,7 @@ export default {
|
||||||
'caseManagement.caseReview.waitMyReview': 'I reviewed',
|
'caseManagement.caseReview.waitMyReview': 'I reviewed',
|
||||||
'caseManagement.caseReview.myCreate': 'I created',
|
'caseManagement.caseReview.myCreate': 'I created',
|
||||||
'caseManagement.caseReview.searchPlaceholder': 'Search by ID or name',
|
'caseManagement.caseReview.searchPlaceholder': 'Search by ID or name',
|
||||||
|
'caseManagement.caseReview.list.searchPlaceholder': 'Search by ID, name, or tag',
|
||||||
'caseManagement.caseReview.archive': 'Archive',
|
'caseManagement.caseReview.archive': 'Archive',
|
||||||
'caseManagement.caseReview.tableNoData': 'No data yet, please',
|
'caseManagement.caseReview.tableNoData': 'No data yet, please',
|
||||||
'caseManagement.caseReview.name': 'Review name',
|
'caseManagement.caseReview.name': 'Review name',
|
||||||
|
|
|
@ -3,6 +3,7 @@ export default {
|
||||||
'caseManagement.caseReview.waitMyReview': '我评审的',
|
'caseManagement.caseReview.waitMyReview': '我评审的',
|
||||||
'caseManagement.caseReview.myCreate': '我创建的',
|
'caseManagement.caseReview.myCreate': '我创建的',
|
||||||
'caseManagement.caseReview.searchPlaceholder': '通过 ID 或名称搜索',
|
'caseManagement.caseReview.searchPlaceholder': '通过 ID 或名称搜索',
|
||||||
|
'caseManagement.caseReview.list.searchPlaceholder': '通过ID、名称或标签搜索',
|
||||||
'caseManagement.caseReview.archive': '归档',
|
'caseManagement.caseReview.archive': '归档',
|
||||||
'caseManagement.caseReview.tableNoData': '暂无数据,请',
|
'caseManagement.caseReview.tableNoData': '暂无数据,请',
|
||||||
'caseManagement.caseReview.name': '评审名称',
|
'caseManagement.caseReview.name': '评审名称',
|
||||||
|
|
Loading…
Reference in New Issue