แก้ไข loader

src/modules/04_registry/components/Information/OldName.vue

@@ -296,7 +296,7 @@ import { onMounted, ref, watch } from "vue";
 import { useRoute } from "vue-router";
 import { useProfileDataStore } from "@/modules/04_registry/store";
 import { useCounterMixin } from "@/stores/mixin";
-import { useDataStore } from "@/stores/data";
+
 import ProfileTable from "@/modules/04_registry/components/Table.vue";
 import DialogHeader from "@/modules/04_registry/components/DialogHeader.vue";
 import DialogFooter from "@/modules/04_registry/components/DialogFooter.vue";
@@ -341,8 +341,7 @@ const props = defineProps({
 const $q = useQuasar();
 const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
-const dataStore = useDataStore();
-const { loaderPage } = dataStore;
+
 const mixin = useCounterMixin();
 const {
   date2Thai,
@@ -351,6 +350,8 @@ const {
   messageError,
   typeChangeName,
   dialogMessage,
+  showLoader,
+  hideLoader,
 } = mixin;
 const route = useRoute();
 const id = ref<string>("");
@@ -550,7 +551,7 @@ onMounted(async () => {
 });
 
 const fetchData = async () => {
-  loaderPage(true);
+  showLoader();
   await http
     .get(config.API.profileChangeNameId(profileId.value))
     .then((res) => {
@@ -574,7 +575,7 @@ const fetchData = async () => {
       messageError($q, e);
     })
     .finally(() => {
-      loaderPage(false);
+      hideLoader();
     });
 };
 
@@ -582,7 +583,7 @@ const fetchData = async () => {
  * get รายการ ข้อมูลเกี่ยวกับบุคคล
  */
 const fetchPerson = async () => {
-  loaderPage(true);
+  showLoader();
   await http
     .get(config.API.person)
     .then((res) => {
@@ -599,7 +600,7 @@ const fetchPerson = async () => {
     })
     .catch((e: any) => {})
     .finally(() => {
-      loaderPage(false);
+      hideLoader();
     });
 };
 
@@ -701,7 +702,7 @@ const saveData = async () => {
     if (lastName.value != undefined)
       formData.append("lastName", lastName.value);
     if (status.value != undefined) formData.append("status", status.value);
-    loaderPage(true);
+    showLoader();
     await http
       .post(config.API.profileChangeNameId(profileId.value), formData)
       .then((res) => {
@@ -747,7 +748,7 @@ const editData = async () => {
     formData.append("firstName", firstName.value);
   if (lastName.value != undefined) formData.append("lastName", lastName.value);
   if (status.value != undefined) formData.append("status", status.value);
-  loaderPage(true);
+  showLoader();
   await http
     .put(config.API.profileChangeNameId(id.value), formData)
     .then((res) => {
@@ -775,7 +776,7 @@ const clickDelete = async () => {
     persistent: true,
   })
     .onOk(async () => {
-      loaderPage(true);
+      showLoader();
       await http
         .delete(config.API.profileChangeNameId(id.value))
         .then((res) => {
@@ -885,7 +886,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
-  loaderPage(true);
+  showLoader();
   await http
     .get(config.API.profileChangeNameHisId(row.id))
     .then((res) => {
@@ -909,7 +910,7 @@ const clickHistory = async (row: RequestItemsObject) => {
       messageError($q, e);
     })
     .finally(() => {
-      loaderPage(false);
+      hideLoader();
     });
 };