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

fix: 高级筛选-筛选条件过滤掉自定义字段不存在的 

--bug=1046677 --user=吕梦园
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001046677
This commit is contained in:
teukkk 2024-09-19 15:00:45 +08:00 committed by Craftsman
parent dece1a8751
commit a62943c314
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
frontend/src/components/pure/ms-advance-filter/filterDrawer.vue
View File

@ -289,13 +289,16 @@
if (res?.id === 'all_data') { if (res?.id === 'all_data') {
res.conditions = [...getAllDataDefaultConditions(props.viewType)]; res.conditions = [...getAllDataDefaultConditions(props.viewType)];
} }
const list: FilterFormItem[] = (res.conditions ?? [])?.map((item: ConditionsItem) => { const list: FilterFormItem[] = [];
(res.conditions ?? [])?.forEach((item: ConditionsItem) => {
const listItem = getListItemByDataIndex(item.name ?? '') as FilterFormItem; const listItem = getListItemByDataIndex(item.name ?? '') as FilterFormItem;
return { if (listItem) {
...listItem, list.push({
operator: item.operator, ...listItem,
value: item.value, operator: item.operator,
}; value: item.value,
});
}
}); });
formModel.value = { ...res, list }; formModel.value = { ...res, list };
savedFormModel.value = cloneDeep(formModel.value); savedFormModel.value = cloneDeep(formModel.value);
@ -341,6 +344,19 @@
.map((item) => ({ ...item, label: t(item.title as string) })); .map((item) => ({ ...item, label: t(item.title as string) }));
}; };
}); });
// 第二列默认：包含/属于/等于
function getDefaultOperator(list: string[]) {
if (list.includes(OperatorEnum.CONTAINS)) {
return OperatorEnum.CONTAINS;
}
if (list.includes(OperatorEnum.BELONG_TO)) {
return OperatorEnum.BELONG_TO;
}
if (list.includes(OperatorEnum.EQUAL)) {
return OperatorEnum.EQUAL;
}
return OperatorEnum.BETWEEN; // 时间
}
// 改变第一列值 // 改变第一列值
function dataIndexChange(dataIndex: SelectValue, index: number) { function dataIndexChange(dataIndex: SelectValue, index: number) {
const listItem = getListItemByDataIndex(dataIndex as string); const listItem = getListItemByDataIndex(dataIndex as string);
@ -353,15 +369,7 @@
const optionsValueList = operatorOptionsMap[formModel.value.list[index].type].map( const optionsValueList = operatorOptionsMap[formModel.value.list[index].type].map(
(optionItem) => optionItem.value (optionItem) => optionItem.value
); );
if (optionsValueList.includes(OperatorEnum.CONTAINS)) { formModel.value.list[index].operator = getDefaultOperator(optionsValueList);
formModel.value.list[index].operator = OperatorEnum.CONTAINS;
} else if (optionsValueList.includes(OperatorEnum.BELONG_TO)) {
formModel.value.list[index].operator = OperatorEnum.BELONG_TO;
} else if (optionsValueList.includes(OperatorEnum.EQUAL)) {
formModel.value.list[index].operator = OperatorEnum.EQUAL;
} else {
formModel.value.list[index].operator = OperatorEnum.BETWEEN; // 时间
}
} }
} }
// 改变第二列值 // 改变第二列值