Merge branch 'develop' into dev

* develop:
  fix: rootId to orgRootDnaId

src/modules/03_logs/components/LogTable.vue

@@ -235,7 +235,7 @@ async function selectedOrg(id: string) {
       endDate: new Date(endDate.value) ?? undefined,
       searchStatus: searchStatus.value ?? undefined,
     },
-    true
+    true,
   );
 }
 
@@ -272,7 +272,7 @@ async function fatchOrg(id: string) {
       nodeTree.value = data;
       searchAfter.value = undefined;
       if (data.length === 1) {
-        selectedOrg(data[0].orgTreeId);
+        selectedOrg(data[0].orgRootDnaId);
       } else {
         await storeData.fetchLog({
           size: size.value,
@@ -298,7 +298,7 @@ function handleScroll() {
 
     if (
       Math.abs(
-        element.scrollHeight - element.clientHeight - element.scrollTop
+        element.scrollHeight - element.clientHeight - element.scrollTop,
       ) <= 1
     ) {
       scrollFlag = true;
@@ -314,7 +314,7 @@ function handleScroll() {
           endDate: new Date(endDate.value) ?? undefined,
           searchStatus: searchStatus.value ?? undefined,
         },
-        true
+        true,
       );
       await new Promise((resolve) => setTimeout(resolve, 1000));
       scrollFlag = false;
@@ -350,7 +350,7 @@ function selectedDate() {
       startDate: new Date(startDate.value),
       endDate: new Date(endDate.value),
     },
-    true
+    true,
   );
 }
 
@@ -395,7 +395,7 @@ function onItemClick(labal: string, type: string) {
       endOfDay ? 23 : 0,
       endOfDay ? 59 : 0,
       endOfDay ? 59 : 0,
-      endOfDay ? 999 : 0
+      endOfDay ? 999 : 0,
     );
     return date.toISOString();
   };
@@ -474,7 +474,7 @@ async function downloadTxt() {
   if (currentlogData.value?.id) {
     await generateTxt(
       currentlogData.value?.id,
-      `LOG_${date2Thai(new Date(startDate.value))}`
+      `LOG_${date2Thai(new Date(startDate.value))}`,
     );
   }
 }
@@ -520,9 +520,9 @@ onMounted(async () => {
               <q-item
                 clickable
                 class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
-                :active="qureyBody.rootId == prop.node.orgTreeId"
+                :active="qureyBody.rootId == prop.node.orgRootDnaId"
                 active-class="my-list-link text-primary text-weight-medium"
-                @click.stop="selectedOrg(prop.node.orgTreeId)"
+                @click.stop="selectedOrg(prop.node.orgRootDnaId)"
               >
                 <div>
                   <div class="text-weight-medium">
@@ -560,7 +560,7 @@ onMounted(async () => {
                 <q-list>
                   <q-item
                     dense
-                    v-for="(item, index) in itemsDropdown"
+                    v-for="item in itemsDropdown"
                     clickable
                     v-close-popup
                     @click="onItemClick(item.labal, item.val)"
@@ -928,7 +928,7 @@ onMounted(async () => {
     style="max-width: 100%"
   >
     <div style="border: #f0ecec 1px solid; border-radius: 7px">
-      <template :key="key" v-for="(item, key, index) in currentlogData">
+      <template :key="key" v-for="(item, key) in currentlogData">
         <div
           class="col row row-color"
           style="border-bottom: #f0ecec 1px solid"
@@ -994,7 +994,7 @@ onMounted(async () => {
           <div class="col q-pr-md" v-else-if="key === 'sequence'">
             <div v-for="(row, index) in item">
               <div class="text-subtitle1 text-bold">
-                ลำดับที่ {{ index + 1 }}
+                ลำดับที่ {{ Number(index) + 1 }}
               </div>
               <div
                 class="q-pa-md q-mb-md"