@7365admin1/layer-common 3.0.31-staging.21 → 3.0.31-staging.23

package/components/VisitorForm.vue

@@ -136,7 +136,7 @@
             <v-col cols="12">
               <InputLabel class="text-capitalize" title="Company Name" />
               <v-combobox v-model="visitor.company" v-model:search="companyNameInput" ref="companyCombo"
-                autocomplete="off" :hide-no-data="false" :items="companyNames" item-value="value"
+                autocomplete="off" :hide-no-data="true" :items="companyNames" item-value="value"
                 @update:model-value="handleSelectCompanyName" variant="outlined" density="comfortable" persistent-hint
                 small-chips>
                 <!-- <template v-slot:no-data>
@@ -346,7 +346,7 @@
           </p>
 
           <div class="text-subtitle-1 mb-8">
-            <div>NRIC: {{ visitor.nric || "N/A" }}</div>
+            <div v-if="!skipNonCheckedOutNric">NRIC: {{ visitor.nric || "N/A" }}</div>
             <div>Phone Number: {{ visitor.contact || "N/A" }}</div>
           </div>
 
@@ -871,8 +871,10 @@ watch(fetchPersonByNRICReq, (obj) => {
 
 watch(
   () => visitor.nric,
-  (value) => {
-    skipNonCheckedOutNric.value = false;
+  (value, oldValue) => {
+    if (skipNonCheckedOutNric.value && value !== oldValue) {
+      skipNonCheckedOutNric.value = false;
+    }
     if (!value || value.length < 4) {
       nricSearchMenu.value = false;
       nricSearchResults.value = [];
@@ -883,7 +885,6 @@ watch(
 watch(
   () => visitor.contact,
   (value) => {
-    skipNonCheckedOutNric.value = false;
     if (!value || value.length < 4) {
       phoneSearchMenu.value = false;
       phoneSearchResults.value = [];
@@ -1134,11 +1135,12 @@ async function checkNonCheckedOutVisitorsBeforeSubmit(
 }
 
 async function handleSkipNricNonCheckedOut() {
+  skipNonCheckedOutNric.value = true;
+
   const canSubmit = await checkNonCheckedOutVisitorsBeforeSubmit({
     skipNric: true,
   });
   if (!canSubmit) return;
-  skipNonCheckedOutNric.value = true;
   dialog.showNonCheckedOutDialog = false;
 }
 

package/composables/useLocalAuth.ts

@@ -183,4 +183,4 @@ export default function useLocalAuth() {
     updateVerificationStatus,
     signUp,
   };
-}
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.0.31-staging.21",
+  "version": "3.0.31-staging.23",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {