hl-core 0.0.8-beta.28 → 0.0.8-beta.29

package/components/Pages/MemberForm.vue

@@ -7,8 +7,8 @@
             v-for="(each, index) of formStore[whichForm as MemberKeys]"
             :key="index"
             class="pl-3 pr-1 py-1 rounded-[8px] cursor-pointer flex items-center"
-            :class="[Number($route.query.i) === index ? `${$libStyles.blueBg} ${$libStyles.whiteText}` : '', $libStyles.textSimple]"
-            @click.self="selectMember(index)"
+            :class="[Number(whichIndex) === index ? `${$libStyles.blueBg} ${$libStyles.whiteText}` : '', $libStyles.textSimple]"
+            @click.self="index !== Number(whichIndex) ? selectMember(index) : null"
           >
             {{ `${$dataStore.menu.selectedItem.title} ${index + 1}` }}
             <v-btn
@@ -16,7 +16,7 @@
               size="x-small"
               :disabled="!memberStore.canMemberDeleted((whichForm as MemberKeys), index) && !memberStore.canMemberCleared((whichForm as MemberKeys), index)"
               variant="plain"
-              :color="Number($route.query.i) === index ? '#FFF' : '#A0B3D8'"
+              :color="Number(whichIndex) === index ? '#FFF' : '#A0B3D8'"
               @click.prevent="
                 memberStore.canMemberDeleted(whichForm as MemberKeys, index) || memberStore.canMemberCleared(whichForm as MemberKeys, index) ? deleteMember(index) : null
               "
@@ -25,7 +25,7 @@
         </div>
         <v-btn class="ml-2" icon="mdi-plus !text-[24px]" @click="memberStore.addMember(whichForm as MemberKeys)" size="small" color="#A0B3D8" variant="tonal"></v-btn>
       </div>
-      <base-form-section :title="$t('form.personalData')" :class="[memberSetting.has === true && memberSetting.isMultiple === true ? 'rounded-t-0 mt-[-5px]' : 'mt-[14px]']">
+      <base-form-section :title="$t('form.personalData')" :class="[memberSetting.has === true && memberSetting.isMultiple === true ? 'rounded-t-0 !mt-[-5px]' : 'mt-[14px]']">
         <base-form-input
           v-model="member.phoneNumber"
           :label="$t('form.phoneNumber')"
@@ -1164,22 +1164,22 @@ export default {
       }
     };
 
-    const selectMember = async (index: number) => {
+    const selectMember = async (index: number, update?: boolean) => {
       dataStore.panel.open = false;
       isButtonLoading.value = true;
       isChangingMember.value = true;
       //@ts-ignore
-      await router.replace({ query: { ...route.query, i: index, id: getMember(route.query.tab, index).id } });
+      await router.replace({ query: { ...route.query, i: index, id: getMember(route.query.tab, index).id, upd: update } });
       isChangingMember.value = false;
+      isButtonLoading.value = false;
     };
 
     const deleteMember = async (index: number) => {
-      const formLength = formStore[whichForm.value as MemberKeys].length;
       await memberStore.deleteMember(route.params.taskId as string, whichForm.value as MemberKeys, index);
-      const currendIndex = Number(whichIndex.value);
-      if (index <= currendIndex) {
-        const newIndex = ref<number>(currendIndex - 1 > 0 ? currendIndex - 1 : 0);
-        await selectMember(newIndex.value);
+      const currentIndex = Number(whichIndex.value);
+      if (index <= currentIndex) {
+        const newIndex = ref<number>(currentIndex - 1 > 0 ? currentIndex - 1 : 0);
+        await selectMember(newIndex.value, index === currentIndex ? true : undefined);
       }
     };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.8-beta.28",
+  "version": "0.0.8-beta.29",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",