diff --git a/src/views/device/apdevice/index.vue b/src/views/device/apdevice/index.vue index 1400307..a0ac103 100644 --- a/src/views/device/apdevice/index.vue +++ b/src/views/device/apdevice/index.vue @@ -85,7 +85,6 @@ const { getData, mobilePagination, searchParams, - resetSearchParams } = useTable({ apiFn: async (params: Api.Device.ApDeviceParams) => { try { @@ -179,9 +178,18 @@ const handleSearch = () => { getData(); }; -// 添加重置处理函数 +// 修改重置处理函数 const handleReset = () => { - resetSearchParams(); + // 保存当前的 pageSize + const currentPageSize = searchParams.pageSize; + + // 重置搜索参数 + searchParams.name = ''; + searchParams.mac = ''; + searchParams.pageNum = 1; + searchParams.pageSize = currentPageSize; + + // 重新获取数据 getData(); }; diff --git a/src/views/device/apdevice/modules/device-search.vue b/src/views/device/apdevice/modules/device-search.vue index df8475e..8c4d5e2 100644 --- a/src/views/device/apdevice/modules/device-search.vue +++ b/src/views/device/apdevice/modules/device-search.vue @@ -3,7 +3,7 @@ import { Form as AForm, FormItem as AFormItem, Input as AInput, Button as AButton, Space as ASpace, Card as ACard } from 'ant-design-vue'; import { useI18n } from 'vue-i18n'; +import { computed } from 'vue'; + const { t } = useI18n(); + interface Props { model: { name?: string; @@ -59,17 +62,18 @@ const props = withDefaults(defineProps(), { const emit = defineEmits(['update:model', 'search', 'reset']); +// 使用计算属性来处理双向绑定 +const formModel = computed({ + get: () => props.model, + set: (val) => emit('update:model', val) +}); + const search = () => { emit('search'); }; const reset = () => { - emit('update:model', { - ...props.model, - name: '', - mac: '', - pageNum: 1 - }); + // 触发重置事件 emit('reset'); };