@anweb/nuxt-ancore 1.4.5 → 1.4.6

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "AnCore",
   "configKey": "ancore",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "builder": {
     "@nuxt/module-builder": "1.0.1",
     "unbuild": "3.5.0"

package/dist/runtime/composables/useAnData.js

@@ -4,22 +4,27 @@ import { userApi } from "../utils/index.js";
 export const useAnData = (config) => {
   const request = ref(config.request);
   const loading = computed(() => {
-    return AData.status.value === "pending";
+    return status.value === "pending";
   });
   const key = computed(() => {
     return request.value.toString();
   });
-  const AData = useAsyncData(
+  const {
+    data,
+    error,
+    execute,
+    status
+  } = useAsyncData(
     key,
     () => userApi(request.value, { method: "GET" }),
     { immediate: false }
   );
   return {
-    init: AData.execute,
+    init: execute,
     loading,
     request,
-    data: AData.data,
-    error: AData.error,
-    status: AData.status
+    data,
+    error,
+    status
   };
 };

package/dist/runtime/composables/useAnList.js

@@ -14,12 +14,12 @@ export default (config) => {
     } else if (config.filter) {
       filter.value = { ...config.filter };
     }
-    await AData.execute();
+    await execute();
     refresh();
     if (config.events) {
       for (const event of config.events) {
-        event.bus.on((data) => {
-          const newCount = event.callback(items, count.value || 0, data);
+        event.bus.on((data2) => {
+          const newCount = event.callback(items, count.value || 0, data2);
           if (newCount || newCount === 0) {
             count.value = newCount;
           }
@@ -27,10 +27,10 @@ export default (config) => {
       }
     }
     if (config.ws) {
-      busWS.on((data) => {
-        const event = config.ws?.find((item) => item.type === data.type);
+      busWS.on((data2) => {
+        const event = config.ws?.find((item) => item.type === data2.type);
         if (event) {
-          const newCount = event.callback(items, count.value || 0, data.data);
+          const newCount = event.callback(items, count.value || 0, data2.data);
           if (newCount || newCount === 0) {
             count.value = newCount;
           }
@@ -40,30 +40,35 @@ export default (config) => {
     inited.value = true;
   };
   const refresh = () => {
-    if (!AData.data.value) return;
+    if (!data.value) return;
     if (!filter.value.skip) {
       count.value = null;
       items.length = 0;
     }
     if (config.reverse) {
-      items.unshift(...AData.data.value.items);
+      items.unshift(...data.value.items);
     } else {
-      items.push(...AData.data.value.items);
+      items.push(...data.value.items);
     }
-    count.value = AData.data.value.count;
+    count.value = data.value.count;
   };
   const key = computed(() => {
     return config.request + "?" + toQuery(filter.value);
   });
   const loading = computed(() => {
-    return AData.status.value === "pending";
+    return status.value === "pending";
   });
-  const AData = useAsyncData(
+  const {
+    data,
+    error,
+    execute,
+    status
+  } = useAsyncData(
     key,
     () => userApi(config.request, { method: "GET", query: filter.value }),
     { immediate: false }
   );
-  watch(AData, refresh);
+  watch(data, refresh);
   return {
     init,
     inited,
@@ -71,7 +76,7 @@ export default (config) => {
     loading,
     items,
     count,
-    error: AData.error,
-    status: AData.status
+    error,
+    status
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@anweb/nuxt-ancore",
-	"version": "1.4.5",
+	"version": "1.4.6",
 	"description": "AnCore Nuxt module",
 	"repository": "https://github.com/ANLTD/ancore",
 	"license": "MIT",