chore: 修复日期选择器无法清除问题,其他模块添加日期筛选

This commit is contained in:
AN
2025-05-14 14:42:43 +08:00
parent d293682d4e
commit 74f2191aae
12 changed files with 80 additions and 22 deletions

View File

@ -1,5 +1,6 @@
<script setup lang="ts">
import { ref } from 'vue';
import { NDatePicker } from 'naive-ui';
import { useNaiveForm } from '@/hooks/common/form';
import { $t } from '@/locales';
@ -16,12 +17,14 @@ const emit = defineEmits<Emits>();
const { formRef, validate, restoreValidation } = useNaiveForm();
const dateRangeCreateTime = ref<[string, string]>();
const dateRangeCreateTime = ref<[string, string] | null>(null);
const datePickerRef = ref<InstanceType<typeof NDatePicker>>();
const model = defineModel<Api.System.UserSearchParams>('model', { required: true });
async function reset() {
dateRangeCreateTime.value = undefined;
dateRangeCreateTime.value = null;
await restoreValidation();
emit('reset');
}
@ -29,8 +32,8 @@ async function reset() {
async function search() {
await validate();
if (dateRangeCreateTime.value?.length) {
model.value.params!.beginCreateTime = dateRangeCreateTime.value[0];
model.value.params!.endCreateTime = dateRangeCreateTime.value[0];
model.value.params!.beginTime = dateRangeCreateTime.value[0];
model.value.params!.endTime = dateRangeCreateTime.value[1];
}
emit('search');
}
@ -74,6 +77,7 @@ async function search() {
class="pr-24px"
>
<NDatePicker
ref="datePickerRef"
v-model:formatted-value="dateRangeCreateTime"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"