Merge branch 'net' into development

Services/client/src/components/FileItem.vue

@@ -18,9 +18,10 @@ const props = withDefaults(
   },
 )
 const DEPT_NAME = ['ตู้เอกสาร', 'ลิ้นชัก', 'แฟ้ม', 'แฟ้มย่อย'] as const
-const { getFileInfo, getFileNameFormat } = useFileInfoStore()
-const { currentFolder, currentFile, currentDept, currentPath } =
-  storeToRefs(useTreeDataStore())
+const { getFileInfo } = useFileInfoStore()
+const { currentFolder, currentFile, currentDept, currentPath } = storeToRefs(
+  useTreeDataStore()
+)
 const {
   createFolder,
   editFolder,
@@ -37,8 +38,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)

Services/client/src/components/PageLayout.vue

@@ -95,14 +95,14 @@ onMounted(getCabinet)
                   flat
                   dense
                   class="q-mr-sm q-px-sm"
-                  v-if="currentDept > 0 && isSearch === false"
+                  v-if="isSearch == true || currentDept > 0"
                   @click="
                     () => {
-                      folderFormState = false
-                      gotoParent()
+                      isSearch
+                        ? (isSearch = false)
+                        : ((folderFormState = false), gotoParent())
                     }
                   "
-                  id="btnGoback"
                 >
                   <q-icon name="arrow_back" size="1rem" color="primary" />
                 </q-btn>