refactor(接口测试): 协议记住方式优化&删除冗余代码

This commit is contained in:
teukkk 2024-09-10 15:14:52 +08:00 committed by Craftsman
parent 40bdb9fe2e
commit 5a0a301fec
12 changed files with 40 additions and 72 deletions

View File

@ -148,7 +148,6 @@
v-model:keyword="keyword" v-model:keyword="keyword"
:filter-config-list="[]" :filter-config-list="[]"
:custom-fields-config-list="[]" :custom-fields-config-list="[]"
:row-count="0"
:search-placeholder="searchPlaceholder" :search-placeholder="searchPlaceholder"
@keyword-search="loadCaseList" @keyword-search="loadCaseList"
@adv-search="loadCaseList" @adv-search="loadCaseList"

View File

@ -106,7 +106,6 @@
v-model:keyword="keyword" v-model:keyword="keyword"
:filter-config-list="filterConfigList" :filter-config-list="filterConfigList"
:custom-fields-config-list="searchCustomFields" :custom-fields-config-list="searchCustomFields"
:row-count="filterRowCount"
:search-placeholder="t('caseManagement.featureCase.searchByNameAndId')" :search-placeholder="t('caseManagement.featureCase.searchByNameAndId')"
@keyword-search="searchCase" @keyword-search="searchCase"
@adv-search="searchCase" @adv-search="searchCase"
@ -280,7 +279,6 @@
const activeFolder = ref('all'); const activeFolder = ref('all');
const activeFolderName = ref(t('ms.case.associate.allCase')); const activeFolderName = ref(t('ms.case.associate.allCase'));
const filterRowCount = ref(0);
const moduleKeyword = ref(''); const moduleKeyword = ref('');
const folderTree = ref<ModuleTreeNode[]>([]); const folderTree = ref<ModuleTreeNode[]>([]);

View File

@ -63,7 +63,6 @@
v-model:keyword="keyword" v-model:keyword="keyword"
:filter-config-list="filterConfigList" :filter-config-list="filterConfigList"
:custom-fields-config-list="searchCustomFields" :custom-fields-config-list="searchCustomFields"
:row-count="filterRowCount"
:search-placeholder="t('project.commonScript.searchPlaceholder')" :search-placeholder="t('project.commonScript.searchPlaceholder')"
@keyword-search="searchCase" @keyword-search="searchCase"
@adv-search="searchCase" @adv-search="searchCase"
@ -183,7 +182,6 @@
const filterConfigList = ref<FilterFormItem[]>([]); const filterConfigList = ref<FilterFormItem[]>([]);
const searchCustomFields = ref<FilterFormItem[]>([]); const searchCustomFields = ref<FilterFormItem[]>([]);
const combine = ref<Record<string, any>>({}); const combine = ref<Record<string, any>>({});
const filterRowCount = ref(0);
const columns: MsTableColumn = [ const columns: MsTableColumn = [
{ {
title: 'ID', title: 'ID',

View File

@ -147,7 +147,9 @@
watch( watch(
() => selectedProtocols.value, () => selectedProtocols.value,
(val) => { (val) => {
setLocalStorage(props.protocolKey, val); //
const protocols = allProtocolList.value.filter((item) => !val.includes(item as string));
setLocalStorage(props.protocolKey, protocols);
emit('selectedProtocolsChange'); emit('selectedProtocolsChange');
protocolIsEmptyVisible.value = !val.length; protocolIsEmptyVisible.value = !val.length;
} }
@ -171,7 +173,7 @@
if (!protocols) { if (!protocols) {
selectedProtocols.value = allProtocolList.value; selectedProtocols.value = allProtocolList.value;
} else { } else {
selectedProtocols.value = allProtocolList.value.filter((item) => protocols.includes(item as string)); selectedProtocols.value = allProtocolList.value.filter((item) => !protocols.includes(item as string));
} }
}); });

View File

@ -5,7 +5,6 @@
v-model:keyword="keyword" v-model:keyword="keyword"
:search-placeholder="t('caseManagement.featureCase.searchByNameAndId')" :search-placeholder="t('caseManagement.featureCase.searchByNameAndId')"
:filter-config-list="filterConfigList" :filter-config-list="filterConfigList"
:row-count="filterRowCount"
@keyword-search="fetchData" @keyword-search="fetchData"
@refresh="searchData" @refresh="searchData"
> >
@ -217,7 +216,6 @@
const appStore = useAppStore(); const appStore = useAppStore();
const projectId = computed(() => appStore.currentProjectId); const projectId = computed(() => appStore.currentProjectId);
const filterVisible = ref(false); const filterVisible = ref(false);
const filterRowCount = ref(0);
const syncVisible = ref(false); const syncVisible = ref(false);
const exportVisible = ref(false); const exportVisible = ref(false);
const exportOptionData = ref<MsExportDrawerMap>({}); const exportOptionData = ref<MsExportDrawerMap>({});
@ -271,8 +269,6 @@
}, },
]); ]);
const heightUsed = computed(() => 286 + (filterVisible.value ? 160 + (filterRowCount.value - 1) * 60 : 0));
// //
const getCustomFieldColumns = async () => { const getCustomFieldColumns = async () => {
const res = await getCustomFieldHeader(projectId.value); const res = await getCustomFieldHeader(projectId.value);
@ -431,15 +427,14 @@
}, },
]; ];
const { propsRes, propsEvent, setKeyword, setAdvanceFilter, setLoadListParams, setProps, resetSelector, loadList } = const { propsRes, propsEvent, setKeyword, setAdvanceFilter, setLoadListParams, resetSelector, loadList } = useTable(
useTable(
getBugList, getBugList,
{ {
tableKey: TableKeyEnum.BUG_MANAGEMENT, tableKey: TableKeyEnum.BUG_MANAGEMENT,
selectable: true, selectable: true,
noDisable: false, noDisable: false,
showSetting: true, showSetting: true,
heightUsed: 106, heightUsed: 256,
paginationSize: 'mini', paginationSize: 'mini',
}, },
(record: TableData) => ({ (record: TableData) => ({
@ -749,10 +744,6 @@
sort.value = sortObj; sort.value = sortObj;
} }
watchEffect(() => {
setProps({ heightUsed: heightUsed.value });
});
onBeforeMount(() => { onBeforeMount(() => {
// //
checkSyncStatus(); checkSyncStatus();

View File

@ -5,7 +5,6 @@
v-model:keyword="keyword" v-model:keyword="keyword"
:search-placeholder="t('bugManagement.recycle.searchPlaceholder')" :search-placeholder="t('bugManagement.recycle.searchPlaceholder')"
:filter-config-list="filterConfigList" :filter-config-list="filterConfigList"
:row-count="filterRowCount"
@keyword-search="fetchData" @keyword-search="fetchData"
@refresh="searchData" @refresh="searchData"
> >
@ -90,8 +89,6 @@
const tableStore = useTableStore(); const tableStore = useTableStore();
const appStore = useAppStore(); const appStore = useAppStore();
const projectId = computed(() => appStore.currentProjectId); const projectId = computed(() => appStore.currentProjectId);
const filterVisible = ref(false);
const filterRowCount = ref(0);
const keyword = ref(''); const keyword = ref('');
// //
const customFields = ref<BugEditCustomField[]>([]); const customFields = ref<BugEditCustomField[]>([]);
@ -116,8 +113,6 @@
const severityFilterOptions = ref<BugOptionItem[]>([]); const severityFilterOptions = ref<BugOptionItem[]>([]);
const currentSelectParams = ref<BatchActionQueryParams>({ selectAll: false, currentSelectCount: 0 }); const currentSelectParams = ref<BatchActionQueryParams>({ selectAll: false, currentSelectCount: 0 });
const heightUsed = computed(() => 286 + (filterVisible.value ? 160 + (filterRowCount.value - 1) * 60 : 0));
let columns: MsTableColumn = [ let columns: MsTableColumn = [
{ {
title: 'bugManagement.recycle.deleteTime', title: 'bugManagement.recycle.deleteTime',
@ -283,8 +278,7 @@
return customFieldToColumns(res); return customFieldToColumns(res);
}; };
const { propsRes, propsEvent, loadList, setKeyword, setLoadListParams, setProps, resetSelector, resetFilterParams } = const { propsRes, propsEvent, loadList, setKeyword, setLoadListParams, resetSelector, resetFilterParams } = useTable(
useTable(
getRecycleList, getRecycleList,
{ {
tableKey: TableKeyEnum.BUG_MANAGEMENT_RECYCLE, tableKey: TableKeyEnum.BUG_MANAGEMENT_RECYCLE,
@ -318,10 +312,6 @@
], ],
}; };
watchEffect(() => {
setProps({ heightUsed: heightUsed.value });
});
function initTableParams() { function initTableParams() {
return { return {
keyword: keyword.value, keyword: keyword.value,

View File

@ -63,7 +63,6 @@
v-model:keyword="keyword" v-model:keyword="keyword"
:filter-config-list="filterConfigList" :filter-config-list="filterConfigList"
:custom-fields-config-list="searchCustomFields" :custom-fields-config-list="searchCustomFields"
:row-count="filterRowCount"
:count="recycleModulesCount[activeFolder] || 0" :count="recycleModulesCount[activeFolder] || 0"
:name="moduleNamePath" :name="moduleNamePath"
:search-placeholder="t('caseManagement.featureCase.searchPlaceholder')" :search-placeholder="t('caseManagement.featureCase.searchPlaceholder')"
@ -773,8 +772,6 @@
const filterConfigList = ref<FilterFormItem[]>([]); const filterConfigList = ref<FilterFormItem[]>([]);
const searchCustomFields = ref<FilterFormItem[]>([]); const searchCustomFields = ref<FilterFormItem[]>([]);
const filterRowCount = ref(0);
// //
let customFieldsColumns: Record<string, any>[] = []; let customFieldsColumns: Record<string, any>[] = [];

View File

@ -4,7 +4,6 @@
<MsAdvanceFilter <MsAdvanceFilter
v-model:keyword="keyword" v-model:keyword="keyword"
:filter-config-list="filterConfigList" :filter-config-list="filterConfigList"
:row-count="filterRowCount"
:search-placeholder="t('caseManagement.caseReview.list.searchPlaceholder')" :search-placeholder="t('caseManagement.caseReview.list.searchPlaceholder')"
@keyword-search="searchReview()" @keyword-search="searchReview()"
@adv-search="searchReview" @adv-search="searchReview"
@ -242,7 +241,6 @@
const keyword = ref(''); const keyword = ref('');
const filterRowCount = ref(0);
const filterConfigList = ref<FilterFormItem[]>([]); const filterConfigList = ref<FilterFormItem[]>([]);
const memberOptions = ref<{ label: string; value: string }[]>([]); const memberOptions = ref<{ label: string; value: string }[]>([]);
const reviewersFilters = ref<string[]>([]); const reviewersFilters = ref<string[]>([]);

View File

@ -3,7 +3,6 @@
v-model:keyword="keyword" v-model:keyword="keyword"
:filter-config-list="filterConfigList" :filter-config-list="filterConfigList"
:custom-fields-config-list="searchCustomFields" :custom-fields-config-list="searchCustomFields"
:row-count="filterRowCount"
:search-placeholder="t('common.searchByIDNameTag')" :search-placeholder="t('common.searchByIDNameTag')"
@keyword-search="fetchData" @keyword-search="fetchData"
@adv-search="fetchData" @adv-search="fetchData"
@ -1488,7 +1487,6 @@
*/ */
const filterConfigList = ref<FilterFormItem[]>([]); const filterConfigList = ref<FilterFormItem[]>([]);
const searchCustomFields = ref<FilterFormItem[]>([]); const searchCustomFields = ref<FilterFormItem[]>([]);
const filterRowCount = ref(0);
watch( watch(
() => showType.value, () => showType.value,

View File

@ -4,7 +4,6 @@
v-model:keyword="keyword" v-model:keyword="keyword"
:filter-config-list="[]" :filter-config-list="[]"
:custom-fields-config-list="[]" :custom-fields-config-list="[]"
:row-count="0"
:count="props.modulesCount[props.activeModule] || 0" :count="props.modulesCount[props.activeModule] || 0"
:name="moduleNamePath" :name="moduleNamePath"
:search-placeholder="t('common.searchByIdName')" :search-placeholder="t('common.searchByIdName')"

View File

@ -4,7 +4,6 @@
v-model:keyword="keyword" v-model:keyword="keyword"
:filter-config-list="[]" :filter-config-list="[]"
:custom-fields-config-list="[]" :custom-fields-config-list="[]"
:row-count="0"
:count="props.modulesCount[props.activeModule] || 0" :count="props.modulesCount[props.activeModule] || 0"
:name="moduleNamePath" :name="moduleNamePath"
:search-placeholder="t('common.searchByIdName')" :search-placeholder="t('common.searchByIdName')"

View File

@ -5,7 +5,6 @@
v-model:keyword="keyword" v-model:keyword="keyword"
:filter-config-list="[]" :filter-config-list="[]"
:custom-fields-config-list="[]" :custom-fields-config-list="[]"
:row-count="0"
:count="modulesCount[props.activeModule] || 0" :count="modulesCount[props.activeModule] || 0"
:name="moduleNamePath" :name="moduleNamePath"
:not-show-input-search="showType !== 'list'" :not-show-input-search="showType !== 'list'"