fix: 修改日期格式

src/api/constant.ts

@@ -3,7 +3,7 @@ export enum ResCode {
   SUCCESS = 0
 }
 
-export const all = null as unknown as 'null'
+export const all = '___all___'
 export type All = typeof all
 
 export const ResCodeDesc: { [key in ResCode]: string } = {

src/hook/usePaging.ts

@@ -1,15 +1,14 @@
 import { useRealtime } from './useRealtime'
-import { reactive, watch, isProxy } from 'vue'
+import { reactive, watch, isProxy, Ref, isRef } from 'vue'
 import { useActive } from './useActive'
 
 import type { PageRequest, PageResult } from '@/api'
 
 export function usePaging<P extends {}, A>(
   fetch: (p: PageRequest<P>) => Promise<PageResult<A>>,
-  initial: P,
+  initial: P | Ref<P>,
   setting?: { pageSize?: number; auto?: boolean }
 ) {
-  console.log(setting)
   const pagination = reactive({
     current: 1,
     total: 0,
@@ -23,7 +22,7 @@ export function usePaging<P extends {}, A>(
 
   const [list, updateList] = useRealtime(async () => {
     const result = await fetch({
-      ...initial,
+      ...(isRef(initial) ? initial.value : initial),
       pageNum: pagination.current,
       pageSize: pagination.pageSize
     })
@@ -33,7 +32,9 @@ export function usePaging<P extends {}, A>(
 
   if (!setting || !('auto' in setting) || setting?.auto) {
     const active = useActive()
-    isProxy(initial) && watch(initial, () => active.value && updateList())
+    if (isRef(initial) || isProxy(initial)) {
+      watch(initial, () => active.value && updateList())
+    }
   }
 
   return { list, pagination, updateList }

src/views/project/list.vue

@@ -23,9 +23,9 @@
           allow-clear
         />
       </a-form-item>
-      <a-form-item label="选择日期" name="startTime">
+      <a-form-item label="选择日期" name="day">
         <a-date-picker
-          v-model:value="filterState.startTime"
+          v-model:value="filterState.day"
           style="width: 100%"
           placeholder="选择项目创建日期"
           allow-clear
@@ -72,7 +72,7 @@
 import InsertProject from './edit.vue'
 import { HeadPanl, BodyPanl } from '@/layout/panl'
 import { projectColumns } from './columns'
-import { reactive, ref } from 'vue'
+import { computed, reactive, ref } from 'vue'
 import { usePaging } from '@/hook'
 import { renderModal } from '@/helper'
 import { useProject } from '@/store'
@@ -87,6 +87,7 @@ import {
 
 import type { All, InsertProjectData } from '@/api'
 import type { FormInstance } from 'ant-design-vue'
+import type { Dayjs } from 'dayjs'
 
 const statusOptions = [
   { label: '全部', value: all },
@@ -100,20 +101,28 @@ const statusOptions = [
 type FilterState = {
   projectName: string
   projectCreater: string
-  startTime: string
+  day?: Dayjs
   projectStatus: ProjectStatus | All
 }
 
 const filterState: FilterState = reactive({
   projectName: '',
   projectCreater: '',
-  startTime: '',
   projectStatus: all
 })
 
-const { list, pagination, updateList } = usePaging(fetchProjects, filterState, {
-  auto: false
-})
+const { list, pagination, updateList } = usePaging(
+  fetchProjects,
+  computed(() => ({
+    ...filterState,
+    day: filterState.day?.format('YYYY-MM-DD'),
+    projectStatus:
+      filterState.projectStatus === all ? undefined : filterState.projectStatus
+  })),
+  {
+    auto: false
+  }
+)
 
 const filterFromRef = ref<FormInstance>()
 const resetFilter = () => {