@7365admin1/layer-common 1.11.41 → 1.11.43

package/components/Layout/NavigationDrawer.vue

@@ -1,11 +1,6 @@
 <!-- LayoutNavigationDrawer.vue -->
 <template>
-  <v-navigation-drawer
-    v-model="drawer"
-    permanent
-    floating
-    class="bg-primary"
-  >
+  <v-navigation-drawer v-model="drawer" permanent floating class="bg-primary">
     <v-list>
       <v-list-item>
         <v-list-item-title class="text-h6 text-white">
@@ -24,11 +19,17 @@
       >
         <template #activator="{ props: tooltipProps }">
           <div v-bind="tooltipProps">
-            <NavigationItem :title="item.title" :icon="item.icon" :route="item.route" :link="item.link"
-              :children="item.children" :class="{
-                'opacity-50 pointer-events-none': item.disabled
-              }" @click="() => handleClick(item)" />
-
+            <NavigationItem
+              :title="item.title"
+              :icon="item.icon"
+              :route="item.route"
+              :children="item.children"
+              :link="item.link"
+              :class="{
+                'opacity-50 pointer-events-none': item.disabled,
+              }"
+              @click="() => handleClick(item)"
+            />
           </div>
         </template>
 
@@ -44,16 +45,16 @@
 <script setup lang="ts">
 const props = defineProps({
   navigationItems: { type: Array, required: true },
-  title: { type: String, default: "" }
-})
+  title: { type: String, default: "" },
+});
 
-const emit = defineEmits(['navigate'])
+const emit = defineEmits(["navigate"]);
 
-const { drawer } = useLocal()
-const { APP_NAME } = useRuntimeConfig().public
+const { drawer } = useLocal();
+const { APP_NAME } = useRuntimeConfig().public;
 
 const handleClick = (item: any) => {
-  if (item.disabled) return
-  emit('navigate', item)
-}
+  if (item.disabled) return;
+  emit("navigate", item);
+};
 </script>

package/components/MemberMain.vue

@@ -49,9 +49,9 @@
               class="w-100"
             >
               <v-tab
-                v-for="tab in tabOptions"
+                v-for="(tab, i) in tabOptions"
                 :value="tab.status"
-                :key="tab.status"
+                :key="i"
                 class="text-capitalize"
               >
                 {{ tab.name }}
@@ -356,7 +356,7 @@ function toRoute(status: any) {
   page.value = 1;
   navigateTo({
     name: routeName,
-    params: setRouteParams(normalizedRouteParams.value, { status: obj.status }),
+    params: setRouteParams(normalizedRouteParams.value, { status }),
   });
 }
 
@@ -366,25 +366,26 @@ watch(
     if (status && status !== selectedStatus.value) {
       selectedStatus.value = status;
     }
-  }
+  },
+  { immediate: true }
 );
 
 const {
   data: getAllReq,
   refresh: getAll,
   status: getAllReqStatus,
-} = useLazyAsyncData(
-  "get-all-members",
+} = useAsyncData(
+  () => `get-all-members-${props.status}-${props.orgId}`,
   () =>
     _getAll({
-      status: currentStatus.value,
+      status: props.status,
       org: props.orgId,
       search: headerSearch.value,
       page: page.value,
       type: props.type,
     }),
   {
-    watch: [page, currentStatus],
+    watch: [() => props.status, headerSearch],
   }
 );
 
@@ -398,10 +399,6 @@ watchEffect(() => {
   }
 });
 
-watch(headerSearch, () => {
-  getAll();
-});
-
 const confirmDialog = ref(false);
 const selectedMemberId = ref<string | null>(null);
 const updateLoading = ref(false);

package/components/TableMain.vue

@@ -5,7 +5,7 @@
       <v-row no-gutters>
         <slot name="actions">
           <v-col cols="12">
-            <v-row no-gutters>
+            <v-row no-gutters class="ga-2">
               <v-btn
                 v-if="canCreate"
                 class="text-none"