fix loading Skeleton

src/modules/10_registry/05_Other/01_Other.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useQuasar, type QTableProps } from "quasar";
+import { is, useQuasar, type QTableProps } from "quasar";
 import { ref, onMounted } from "vue";
 
 import http from "@/plugins/http";
@@ -9,16 +9,16 @@ import { useDataStore } from "@/stores/data";
 
 import type { OtherFormType } from "@/modules/10_registry/interface/index/Main";
 
-//history dialog
 import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
+import SkeletonTable from "@/components/SkeletonTable.vue";
+
+const $q = useQuasar();
+const dataPerson = useDataStore();
+const { messageError, date2Thai, onSearchDataTable } = useCounterMixin();
 
 const link = ref<string>("");
-const $q = useQuasar();
-const mixin = useCounterMixin();
-const dataPerson = useDataStore();
-const { showLoader, hideLoader, messageError, date2Thai, onSearchDataTable } =
-  mixin;
-
+const isLoading = ref<boolean>(false);
+const isLoadingHistory = ref<boolean>(false);
 const idByRow = ref<string>("");
 const rows = ref<OtherFormType[]>([]);
 const rowsData = ref<OtherFormType[]>([]);
@@ -26,10 +26,7 @@ const filter = ref<string>("");
 const rowsHistory = ref<OtherFormType[]>([]);
 const rowsHistoryData = ref<OtherFormType[]>([]);
 const mode = ref<boolean>($q.screen.gt.xs);
-
 const modalHistory = ref<boolean>(false);
-/** ตัวแปรข้อมูล */
-
 const visibleColumns = ref<string[]>([
   "date",
   "detail",
@@ -85,7 +82,6 @@ const columns = ref<QTableProps["columns"]>([
 const pagination = ref({
   sortBy: "lastUpdatedAt",
 });
-
 const visibleColumnsHistory = ref<string[]>([
   "date",
   "detail",
@@ -139,15 +135,10 @@ const columnsHistory = ref<QTableProps["columns"]>([
   },
 ]);
 
-function onHistory(id: string) {
-  modalHistory.value = true;
-  idByRow.value = id;
-}
-
-/** get data */
-function getData() {
-  showLoader();
-  http
+/** ฟังก์ชันดึงข้อมูล */
+async function getData() {
+  isLoading.value = true;
+  await http
     .get(config.API.dataUserOtherByType(link.value))
     .then((res) => {
       const data = res.data.result;
@@ -156,14 +147,27 @@ function getData() {
     })
     .catch((e) => {
       messageError($q, e);
-      hideLoader();
+    })
+    .finally(() => {
+      isLoading.value = false;
     });
 }
 
-/** get history */
-function getHistory() {
-  showLoader();
-  http
+/**
+ * ฟังก์ชันเปิดโมดัลดูประวัติ
+ * @param id ID ของแถวที่ต้องการดูประวัติ
+ */
+function onHistory(id: string) {
+  modalHistory.value = true;
+  idByRow.value = id;
+}
+
+/** ฟังก์ชันดึงประวัติการแก้ไขข้อมูลอื่นๆ */
+async function getHistory() {
+  isLoadingHistory.value = true;
+  rowsHistory.value = [];
+  rowsHistoryData.value = [];
+  await http
     .get(config.API.dataUserOtherHistoryByType(link.value, idByRow.value))
     .then((res) => {
       const data = res.data.result;
@@ -174,10 +178,11 @@ function getHistory() {
       messageError($q, e);
     })
     .finally(() => {
-      hideLoader();
+      isLoadingHistory.value = false;
     });
 }
 
+/** ฟังก์ชันค้นหาข้อมูลในตาราง */
 function onSearch() {
   rows.value = onSearchDataTable(
     filter.value,
@@ -188,11 +193,10 @@ function onSearch() {
 
 onMounted(async () => {
   link.value = await dataPerson.getProFileType();
-  getData();
+  await getData();
 });
 </script>
 <template>
-  <!-- v-if="mode" -->
   <div class="col-12">
     <q-toolbar class="q-px-none">
       <span class="text-blue-6 text-weight-bold text-body1">ข้อมูลอื่นๆ</span>
@@ -227,7 +231,10 @@ onMounted(async () => {
         :display-value="$q.lang.table.columns"
       />
     </q-toolbar>
+
+    <SkeletonTable v-if="isLoading" :columns="columns" />
     <d-table
+      v-else
       flat
       dense
       bordered
@@ -310,6 +317,7 @@ onMounted(async () => {
       </template>
     </d-table>
   </div>
+
   <DialogHistory
     v-model:modal="modalHistory"
     :title="'ประวัติแก้ไขข้อมูลอื่นๆ'"
@@ -318,6 +326,7 @@ onMounted(async () => {
     :rows-data="rowsHistoryData"
     :visibleColumns="visibleColumnsHistory"
     :columns="columnsHistory"
+    :is-loading="isLoadingHistory"
   />
 </template>
 <style scoped>