fix: report and report_dealt message display

package.json

@@ -1,7 +1,7 @@
 {
   "name": "treehole-frontend-next",
   "private": true,
-  "version": "1.1.0",
+  "version": "1.1.0-qf1",
   "scripts": {
     "dev": "vite --port 8080",
     "build": "vue-tsc --noEmit && vite build",

src/components/MessageMenu.vue

@@ -98,6 +98,16 @@
               <FloorBlockHeader :floor="message.data"></FloorBlockHeader>
               <FloorBlockContent :floor="message.data"></FloorBlockContent>
             </v-card>
+            <v-card
+              v-if="message.data instanceof Report"
+              width="400"
+              class="relative right-1 pl-4 pr-2 py-2"
+            >
+              <ReportBlock
+                :report="message.data"
+                no-action
+              ></ReportBlock>
+            </v-card>
           </v-menu>
 
           <template v-if="messages.length === 0">
@@ -125,7 +135,8 @@ import FloorBlockContent from './floor/FloorBlockContent.vue'
 import { useFloorPortal } from '@/composables/floor'
 import { useUserStore } from '@/store'
 import { computed, reactive, ref } from 'vue'
-import { Message, Floor } from '@/types'
+import { Message, Floor, Report } from '@/types'
+import ReportBlock from './floor/ReportBlock.vue'
 
 const userStore = useUserStore()
 

src/components/floor/ReportBlock.vue

@@ -3,6 +3,10 @@
     <p class="flex pt-2">
       <span class="font-bold min-w-max">举报理由：</span>
       <span> {{ report.reason }} </span>
+      <template v-if="report.result">
+        <span class="font-bold min-w-max ml-3">处理结果：</span>
+        <span> {{ report.result }} </span>
+      </template>
       <span class="grow"></span>
       <IconBtn @click="showContent = !showContent">
         {{ showContent ? 'mdi-chevron-down' : 'mdi-chevron-up' }}
@@ -24,6 +28,7 @@
       />
     </div>
     <ReportBlockAction
+      v-if="!props.noAction"
       v-model:report="report"
       @deal="emit('deal')"
     />
@@ -39,7 +44,7 @@ import ReportBlockAction from '@/components/floor/ReportBlockAction.vue'
 import IconBtn from '../button/IconBtn.vue'
 import { computed, ref } from 'vue'
 
-const props = defineProps<{ report: Report }>()
+const props = defineProps<{ report: Report; noAction?: boolean }>()
 const emit = defineEmits<{
   (e: 'update:report', report: Report): void
   (e: 'deal'): void

src/types/index.ts

@@ -300,9 +300,10 @@ const messageDataFactory = (data: any, parent: any) => {
     case 'mention':
     case 'modify':
     case 'permission':
+      return factory(Floor, data)
     case 'report':
     case 'report_dealt':
-      return factory(Floor, data)
+      return factory(Report, data)
     case 'mail':
       return null
   }