fix: modify sentence issue

hitokoto-osc · Sep 29, 2023 · 51277c5 · 51277c5
1 parent 6ce072c
commit 51277c5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/components/admin/sentence/ModifySentenceModal.vue b/components/admin/sentence/ModifySentenceModal.vue
@@ -29,6 +29,11 @@ const onOK = async () => {
       delete params[key]
     }
   })
+  if (Object.keys(params).length === 0) {
+    message.info('未修改任何内容！')
+    emit('update:open', false)
+    return
+  }
   const { error } = await doAdminUpdateHitokoto(tmp.uuid, params, {
     immediate: true
   })

diff --git a/composables/api/reviewer/hitokoto.ts b/composables/api/reviewer/hitokoto.ts
@@ -24,9 +24,7 @@ export type GetHitokotoRes = HitokotoWithPoll
 
 export function useHitokotoOne(
   uuid: string | Ref<string>,
-  options: HTTPOption<GetHitokotoRes> = {
-    key: `hitokoto-${toValue(uuid)}-${Date.now()}`
-  }
+  options: HTTPOption<GetHitokotoRes> = {}
 ) {
   return useHTTP.get('/hitokoto/' + toValue(uuid), {}, options)
 }
@@ -47,9 +45,7 @@ export type HitokotoAdminListReq = {
 
 export function useAdminHitokotoList(
   params: HitokotoAdminListReq | Ref<HitokotoAdminListReq>,
-  options: HTTPOption<HitokotoAdminListRes> = {
-    key: `hitokoto-list-${JSON.stringify(toValue(params))}-${Date.now()}`
-  }
+  options: HTTPOption<HitokotoAdminListRes> = {}
 ) {
   return useHTTP.get<HitokotoAdminListRes>('/admin/hitokoto', params, options)
 }
@@ -70,9 +66,7 @@ export type HitokotoAdminUpdateRes = never
 export function doAdminUpdateHitokoto(
   uuid: string | Ref<string>,
   params: HitokotoAdminUpdateReq | Ref<HitokotoAdminUpdateReq>,
-  options: HTTPOption<HitokotoAdminUpdateRes> = {
-    key: `hitokoto-update-${toValue(uuid)}-${Date.now()}`
-  }
+  options: HTTPOption<HitokotoAdminUpdateRes> = {}
 ) {
   return useHTTP.put('/admin/hitokoto/' + toValue(uuid), params, options)
 }
diff --git a/composables/api/reviewer/poll.ts b/composables/api/reviewer/poll.ts
@@ -131,11 +131,11 @@ export type PollReq = {
 export interface PollRes {}
 
 export function doPoll(
-  pollID: number,
+  pollID: number | Ref<number>,
   req: PollReq,
   options: HTTPOption<PollRes> = {}
 ) {
-  return useHTTP.put<PollRes>(`/poll/${pollID}`, req, options)
+  return useHTTP.put<PollRes>(`/poll/${toValue(pollID)}`, req, options)
 }
 
 export interface PollCancelRes {}
@@ -144,7 +144,11 @@ export function doCancelPoll(
   pollID: number,
   options: HTTPOption<PollCancelRes> = {}
 ) {
-  return useHTTP.delete<PollCancelRes>(`/poll/${pollID}/cancel`, {}, options)
+  return useHTTP.delete<PollCancelRes>(
+    `/poll/${toValue(pollID)}/cancel`,
+    {},
+    options
+  )
 }
 
 export type PollDetailReq = {
@@ -159,7 +163,7 @@ export function usePollDetail(
   options: HTTPOption<PollDetailRes> = {}
 ) {
   return useHTTP.get<PollDetailRes>(
-    () => `/poll/${typeof pollID === 'number' ? pollID : pollID.value}`,
+    () => `/poll/${toValue(pollID)}`,
     req,
     options
   )
@@ -184,8 +188,7 @@ export function doUpdateMark(
   options: HTTPOption<UpdateMarkRes> = {}
 ) {
   return useHTTP.put<UpdateMarkRes>(
-    () =>
-      `/admin/poll/mark/${typeof markID === 'number' ? markID : markID.value}`,
+    () => `/admin/poll/mark/${toValue(markID)}`,
     req,
     options
   )