style: 高级筛选-时间选择器缺少秒&优化代码

--bug=1046867 --user=吕梦园
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001046867
This commit is contained in:
teukkk 2024-09-20 17:21:19 +08:00 committed by Craftsman
parent 30b29ca6cb
commit 2375894ae1
1 changed files with 11 additions and 21 deletions

View File

@ -135,14 +135,14 @@
v-else-if="item.type === FilterType.DATE_PICKER && item.operator !== OperatorEnum.BETWEEN"
v-model:model-value="item.value"
show-time
format="YYYY-MM-DD HH:mm"
value-format="timestamp"
:disabled="isValueDisabled(item)"
/>
<a-range-picker
v-else-if="item.type === FilterType.DATE_PICKER && item.operator === OperatorEnum.BETWEEN"
v-model:model-value="item.value"
show-time
format="YYYY-MM-DD HH:mm"
value-format="timestamp"
:separator="t('common.to')"
:disabled="isValueDisabled(item)"
/>
@ -377,25 +377,15 @@
}
function getParams() {
const conditions = formModel.value.list.map(
({ customFieldType, type, value, operator, customField, dataIndex }) => {
let timeValue;
//
if (type === FilterType.DATE_PICKER && value?.[0] && value?.[1]) {
timeValue =
operator === OperatorEnum.BETWEEN
? [new Date(value[0]).getTime(), new Date(value[1]).getTime()]
: new Date(value).getTime();
}
return {
value: timeValue ?? value,
operator,
customField: customField ?? false,
name: dataIndex,
customFieldType: customFieldType ?? '',
};
}
);
const conditions = formModel.value.list.map(({ customFieldType, value, operator, customField, dataIndex }) => {
return {
value,
operator,
customField: customField ?? false,
name: dataIndex,
customFieldType: customFieldType ?? '',
};
});
return { searchMode: formModel.value.searchMode, conditions };
}