Merge branch 'oat' into development

Services/client/src/components/FileItem.vue

@@ -15,13 +15,12 @@ const props = withDefaults(
   defineProps<{ action: boolean; viewMode: 'view_list' | 'view_module' }>(),
   {
     action: false,
-  }
+  },
 )
 const DEPT_NAME = ['ตู้เอกสาร', 'ลิ้นชัก', 'แฟ้ม', 'แฟ้มย่อย'] as const
 const { getFileInfo, getFileNameFormat } = useFileInfoStore()
-const { currentFolder, currentFile, currentDept, currentPath } = storeToRefs(
-  useTreeDataStore()
-)
+const { currentFolder, currentFile, currentDept, currentPath } =
+  storeToRefs(useTreeDataStore())
 const {
   createFolder,
   editFolder,
@@ -37,8 +36,8 @@ const currentIcon = computed(() =>
   currentDept.value === 0
     ? 'mdi-file-cabinet'
     : currentDept.value === 1
-    ? 'inbox'
-    : 'o_folder_open'
+      ? 'inbox'
+      : 'o_folder_open',
 )
 
 const dialogDeleteState = ref<boolean>(false)
@@ -113,7 +112,7 @@ function triggerFileEdit(
     keyword: string[]
     category: string[]
   },
-  pathname: string
+  pathname: string,
 ) {
   fileFormState.value = true
   fileFormType.value = 'edit'
@@ -137,7 +136,7 @@ async function submitFileForm(
     keyword: string[]
     category: string[]
   },
-  force = false
+  force = false,
 ) {
   currentParam.value = value
 
@@ -162,7 +161,7 @@ async function submitFileForm(
         keyword: value.keyword,
         category: value.category,
       },
-      value.file
+      value.file,
     )
   }
   fileFormData.value = {}
@@ -187,7 +186,11 @@ async function submitFileForm(
           padding: currentDept > 2 ? '.5rem 0' : '.5rem',
         }"
         class="box"
-        @click="() => getFolder(value.pathname)"
+        @click="
+          () => {
+            ;(folderFormState = false), getFolder(value.pathname)
+          }
+        "
       >
         <div class="q-px-md flex items-center justify-center">
           <q-icon
@@ -310,7 +313,7 @@ async function submitFileForm(
                     keyword: value.keyword,
                     category: value.category,
                   },
-                  value.pathname
+                  value.pathname,
                 )
             "
             @delete="() => triggerFileDelete(value.pathname)"
@@ -421,7 +424,7 @@ async function submitFileForm(
 .add-button {
   position: absolute;
   top: 50%;
-  right: 40%;
+  right: 30%;
   background-color: white;
 }
 

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

@@ -151,7 +151,7 @@ async function downloadSubmit(path: any) {
                 class="text-grey"
                 v-for="keyword in fileInfo?.keyword"
                 :key="keyword"
-                >{{ keyword }}</span
+                >{{ keyword }}&nbsp;</span
               >
             </div>
           </div>