style: 高级筛选-时间选择器缺少秒&优化代码
--bug=1046867 --user=吕梦园 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001046867
This commit is contained in:
parent
30b29ca6cb
commit
2375894ae1
|
@ -135,14 +135,14 @@
|
||||||
v-else-if="item.type === FilterType.DATE_PICKER && item.operator !== OperatorEnum.BETWEEN"
|
v-else-if="item.type === FilterType.DATE_PICKER && item.operator !== OperatorEnum.BETWEEN"
|
||||||
v-model:model-value="item.value"
|
v-model:model-value="item.value"
|
||||||
show-time
|
show-time
|
||||||
format="YYYY-MM-DD HH:mm"
|
value-format="timestamp"
|
||||||
:disabled="isValueDisabled(item)"
|
:disabled="isValueDisabled(item)"
|
||||||
/>
|
/>
|
||||||
<a-range-picker
|
<a-range-picker
|
||||||
v-else-if="item.type === FilterType.DATE_PICKER && item.operator === OperatorEnum.BETWEEN"
|
v-else-if="item.type === FilterType.DATE_PICKER && item.operator === OperatorEnum.BETWEEN"
|
||||||
v-model:model-value="item.value"
|
v-model:model-value="item.value"
|
||||||
show-time
|
show-time
|
||||||
format="YYYY-MM-DD HH:mm"
|
value-format="timestamp"
|
||||||
:separator="t('common.to')"
|
:separator="t('common.to')"
|
||||||
:disabled="isValueDisabled(item)"
|
:disabled="isValueDisabled(item)"
|
||||||
/>
|
/>
|
||||||
|
@ -377,25 +377,15 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
function getParams() {
|
function getParams() {
|
||||||
const conditions = formModel.value.list.map(
|
const conditions = formModel.value.list.map(({ customFieldType, value, operator, customField, dataIndex }) => {
|
||||||
({ 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 {
|
return {
|
||||||
value: timeValue ?? value,
|
value,
|
||||||
operator,
|
operator,
|
||||||
customField: customField ?? false,
|
customField: customField ?? false,
|
||||||
name: dataIndex,
|
name: dataIndex,
|
||||||
customFieldType: customFieldType ?? '',
|
customFieldType: customFieldType ?? '',
|
||||||
};
|
};
|
||||||
}
|
});
|
||||||
);
|
|
||||||
return { searchMode: formModel.value.searchMode, conditions };
|
return { searchMode: formModel.value.searchMode, conditions };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue