Merge branch 'methapon' into development

Services/client/src/components/DialogDelete.vue

@@ -21,15 +21,22 @@ const props = withDefaults(
   >
     <q-card style="width: 400px">
       <q-card-section>
-        <span class="text-h6">
+        <div class="flex items-center">
-          <q-icon name="error" color="negative" size="2.5rem" />แจ้งเตือนการลบ
+          <div class="q-pa-sm">
-        </span>
+            <div style="border-radius: 50%" class="bg-secondary q-pa-sm">
+              <q-icon
+                name="mdi-trash-can-outline"
+                color="negative"
+                size="2.5rem"
+              />
+            </div>
+          </div>
+          <div>
+            <h6 class="q-my-none">ยืนยันการลบข้อมูล</h6>
+            <p class="q-my-none">ต้องการยืนยันการลบข้อมูลนี้หรือไม่</p>
+          </div>
+        </div>
       </q-card-section>
-
-      <q-card-section class="q-pt-none">
-        ถ้าดำเนินการต่อจะทำการลบ
-      </q-card-section>
-
       <q-card-actions align="right" class="bg-white text-primary">
         <q-space />
         <q-btn
@@ -41,10 +48,9 @@ const props = withDefaults(
         />
 
         <q-btn
-          flat
+          color="negative"
           v-close-popup
           label="ลบ"
-          class="text-red"
           @click="() => $emit('confirm')"
           id="dialogDeleteConfirm"
         />

Services/client/src/components/FileForm.vue

@@ -34,6 +34,7 @@ const emit = defineEmits([
   'update:keyword',
   'update:category',
   'filechange',
+  'reset',
   'submit',
 ])
 
@@ -50,6 +51,7 @@ function reset() {
   emit('update:description', '')
   emit('update:keyword', '')
   emit('update:category', '')
+  emit('reset')
 }
 
 function submit() {
@@ -111,7 +113,7 @@ const file = ref<File | undefined>()
     :model-value="open"
     @update:model-value="(v) => $emit('update:open', v)"
   >
-    <q-form @submit.prevent="submit">
+    <q-form @submit.prevent="submit" v-if="open">
       <q-toolbar class="q-mb-md q-pa-none">
         <q-toolbar-title>
           <span class="text-weight-bold" v-if="mode === 'create'">

Services/client/src/components/FileItem.vue

@@ -183,10 +183,7 @@ async function submitFileForm(
     {{ DEPT_NAME[currentDept] }}
   </div>
   <div class="grid q-mt-md">
-    <div
+    <div v-for="value in currentFolder" :data-pathname="value.pathname">
-      v-for="(value) in currentFolder"
-      :data-pathname="value.pathname"
-    >
       <div
         :style="{
           position: 'relative',
@@ -388,6 +385,7 @@ async function submitFileForm(
     v-model:description="fileFormData.description"
     v-model:keyword="fileFormData.keyword"
     v-model:category="fileFormData.category"
+    @reset="() => (fileFormError = {})"
     @filechange="(name: string) => (fileFormError.fileExist = checkFile(name))"
     @submit="submitFileForm"
   />

Services/client/src/components/ListView.vue

@@ -471,6 +471,7 @@ const onRowClick = (evt: Event, row: TreeDataFolder, index: number) => {
     v-model:description="fileFormData.description"
     v-model:keyword="fileFormData.keyword"
     v-model:category="fileFormData.category"
+    @reset="() => (fileFormError = {})"
     @filechange="(name: string) => (fileFormError.fileExist = checkFile(name))"
     @submit="submitFileForm"
   />

Services/client/src/components/PageLayout.vue

@@ -118,20 +118,20 @@ onMounted(getCabinet)
                     label="ตู้เอกสารทั้งหมด"
                   />
                   <q-btn
-                v-if="
+                    v-if="
-                  mode === 'admin' &&
+                      mode === 'admin' &&
-                  viewMode === 'view_module' &&
+                      viewMode === 'view_module' &&
-                  currentDept === 0
+                      currentDept === 0
-                "
+                    "
-                class="q-px-md q-ml-md al"
+                    class="q-px-md q-ml-md al"
-                label="สร้างตู้เก็บเอกสาร"
+                    label="สร้างตู้เก็บเอกสาร"
-                type="submit"
+                    type="submit"
-                color="primary"
+                    color="primary"
-                dense
+                    dense
-                icon="add"
+                    icon="add"
-                @click="() => triggerFolderCreate()"
+                    @click="() => triggerFolderCreate()"
-                id="createFolder"
+                    id="createFolder"
-              />
+                  />
                   <q-breadcrumbs-el
                     class="text-primary pointer"
                     v-for="(fragments, index) in currentPath
@@ -153,8 +153,6 @@ onMounted(getCabinet)
                   />
                 </q-breadcrumbs>
               </div>
-
-  
             </span>
             <div>
               <q-btn