Merge branch 'phatt' into development

Services/client/src/components/FileItem.vue

@@ -173,6 +173,13 @@ async function submitFileForm(
       },
       value.file,
     )
+    setTimeout(() => {
+      refaceFile(currentPath.value)
+    }, 3000)
+
+    setTimeout(() => {
+      refaceFile(currentPath.value)
+    }, 10000)
   }
   fileFormData.value = {}
   fileFormState.value = false
@@ -340,8 +347,8 @@ async function submitFileForm(
         <div class="q-px-md flex items-center justify-center">
           <file-icon
             size="preview"
-            :fileMimeType="value.fileType ? value.fileType : undefined"
-            :fileName="value.fileName ? value.fileName : undefined"
+            :fileMimeType="value.fileType ? value.fileType : 'unknow'"
+            :fileName="value.fileName ? value.fileName : 'unknow'"
           />
         </div>
         <div

Services/client/src/components/FileSearched.vue

@@ -116,7 +116,7 @@ async function submitFileForm(
     )
     setTimeout(() => {
       isActFoundFile.value = true
-    }, 300)
+    }, 400)
   }
 
   fileFormData.value = {}
@@ -252,8 +252,8 @@ onMounted(() => {
           <div class="q-px-md flex items-center justify-center">
             <file-icon
               size="preview"
-              :fileName="value?.fileName ? value.fileType : undefined"
-              :fileMimeType="value?.fileType ? value.fileType : undefined"
+              :fileName="value?.fileName ? value.fileType : 'unknow'"
+              :fileMimeType="value?.fileType ? value.fileType : 'unknow'"
             />
           </div>
           <div
@@ -308,8 +308,10 @@ onMounted(() => {
         <q-td style="width: 50%" @click="() => getFileInfo(nameData.row)">
           <file-icon
             size="list"
-            :fileMimeType="nameData.row.fileType"
-            :fileName="nameData.row.fileName"
+            :fileMimeType="
+              nameData.row.fileType ? nameData.row.fileType : 'unknow'
+            "
+            :fileName="nameData.row.fileName ? nameData.row.fileName : 'unknow'"
           />
           {{ nameData.row.fileName }}
         </q-td>

Services/client/src/components/ListView.vue

@@ -22,6 +22,7 @@ const {
   updateFile,
   deleteFile,
   checkFile,
+  refaceFile,
 } = useTreeDataStore()
 
 const DEPT_NAME = ['ตู้เอกสาร', 'ลิ้นชัก', 'แฟ้ม', 'แฟ้มย่อย'] as const
@@ -162,6 +163,14 @@ async function submitFileForm(
       keyword: value.keyword,
       category: value.category,
     })
+
+    setTimeout(() => {
+      refaceFile(currentPath.value)
+    }, 3000)
+
+    setTimeout(() => {
+      refaceFile(currentPath.value)
+    }, 10000)
   } else {
     await updateFile(
       fileFormPath.value,
@@ -173,6 +182,14 @@ async function submitFileForm(
       },
       value.file,
     )
+
+    setTimeout(() => {
+      refaceFile(currentPath.value)
+    }, 3000)
+
+    setTimeout(() => {
+      refaceFile(currentPath.value)
+    }, 10000)
   }
   fileFormData.value = {}
   fileFormState.value = false
@@ -259,6 +276,7 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
 </script>
 
 <template>
+  <q-btn @click="refaceFile(currentPath)">Test</q-btn>
   <div class="q-mt-md">
     <div class="q-gutter-sm">
       <div
@@ -411,7 +429,15 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
             "
             id="listViewGetFileInfo"
           >
-            <file-icon size="list" :fileMimeType="nameRow.row.fileType" :fileName="nameRow.row.fileName" />
+            <file-icon
+              size="list"
+              :fileMimeType="
+                nameRow.row.fileType ? nameRow.row.fileType : 'unknown'
+              "
+              :fileName="
+                nameRow.row.fileName ? nameRow.row.fileName : 'unknown'
+              "
+            />
             {{ nameRow.row.fileName }}
           </q-td>
         </template>

Services/client/src/components/PageLayout.vue

@@ -83,6 +83,7 @@ onMounted(async () => {
               () => {
                 currentPath = ''
                 getFolder(currentPath)
+                isSearch = false
               }
             "
             >ตู้จัดเก็บเอกสาร</span

Services/client/src/modules/01_user/components/FileDownload.vue

@@ -91,9 +91,9 @@ async function downloadSubmit(path: string | undefined) {
               <div class="q-px-md flex items-center justify-center">
                 <file-icon
                   size="preview"
-                  :fileName="fileInfo?.fileName ? fileInfo.fileName : undefined"
+                  :fileName="fileInfo?.fileName ? fileInfo.fileName : 'unknown'"
                   :fileMimeType="
-                    fileInfo?.fileType ? fileInfo.fileType : undefined
+                    fileInfo?.fileType ? fileInfo.fileType : 'unknown'
                   "
                 />
               </div>

Services/client/src/views/MainLayout.vue

@@ -3,7 +3,9 @@ import { useLoader } from '@/stores/loader'
 import { storeToRefs } from 'pinia'
 import profile from '@/components/Profile.vue'
 import { useTreeDataStore } from '@/stores/tree-data'
+import { useSearchDataStore } from '@/stores/searched-data';
 const { currentPath } = storeToRefs(useTreeDataStore())
+const { isSearch } = storeToRefs(useSearchDataStore())
 const { getFolder } = useTreeDataStore()
 const loaderStore = useLoader()
 const { loader } = storeToRefs(loaderStore)
@@ -32,6 +34,7 @@ const { loader } = storeToRefs(loaderStore)
             () => {
               currentPath = ''
               getFolder(currentPath)
+              isSearch = false
             }
           "
         >