bl-common-vue3 3.8.77 → 3.8.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bl-common-vue3",
-  "version": "3.8.77",
+  "version": "3.8.79",
   "main": "index.js",
   "module": "index.js",
   "description": "bailing vue3 common components lib",

package/src/components/BlPhoneInput/index.vue

@@ -174,7 +174,7 @@ export default defineComponent({
           {
             nation_code: phoneCountry.toString(),
             nation_name: '',
-            phone_match_rule: '^\d+$', // 默认为仅数字的正则。
+            phone_match_rule: '^\\d+$', // 默认为仅数字的正则。
             id: -1
           }
         ]
@@ -193,7 +193,9 @@ export default defineComponent({
 				},
 				success: (res) => {
 					state.phoneCountryList = res.list || [];
-          handleNotInPhoneCountryList(props?.data?.phone_country)
+					formState.value.phone_country = props?.data?.phone_country && props?.data?.phone_country != '0' ? props?.data?.phone_country.toString() : undefined;
+					formState.value.phone = props?.data?.phone || "";
+					handleNotInPhoneCountryList(props?.data?.phone_country)
 					phoneCountryHandleInit()
 				},
 				fail: () => {},
@@ -202,18 +204,23 @@ export default defineComponent({
 
 		getPhoneCountryList();
 
-		watch(
-			() => props.data,
-			(val) => {
-        handleNotInPhoneCountryList(val?.phone_country)
+		const dataStr = computed(() => {
+		return JSON.stringify(props.data)
+		})
 
-				if ((val.phone_country || val.phone) && (formState.value.phone_country !== val.phone_country || formState.value.phone !== val.phone)) {
-					formState.value.phone_country = val && val.phone_country && val.phone_country != '0' ? val.phone_country.toString() : undefined;
-					formState.value.phone = val.phone || "";
-					phoneCountryHandleInit()
-				}
+		watch(
+			() => dataStr.value,
+			(newVal, oldVal) => {
+			if(newVal && newVal != oldVal) {
+        const val = props.data
+        if ((val.phone_country || val.phone) && (formState.value.phone_country !== val.phone_country || formState.value.phone !== val.phone)) {
+          formState.value.phone_country = val && val.phone_country && val.phone_country != '0' ? val.phone_country.toString() : undefined;
+          formState.value.phone = val.phone || "";
+          handleNotInPhoneCountryList(formState.value.phone_country)
+          phoneCountryHandleInit()
+        }
+			}
 			},
-			{ deep: true, immediate: true }
 		);
 
 		// 获取手机号校验结果

package/src/components/ChooseHousingResources/index.vue

@@ -397,6 +397,12 @@ export default defineComponent({
     isVisit:{
       type: Boolean,
       default: false
+    },
+    roomParams: {
+      type: Object,
+      default: () => {
+        return {};
+      },
     }
   },
   setup(props, { emit }) {
@@ -1611,6 +1617,7 @@ export default defineComponent({
         let paramsObj = {
           village_id: layOrBuild.extra.village_id,
           layer_id: layOrBuild.id,
+          ...props.roomParams,
         };
         if (noLayer.value) {
           delete paramsObj.layer_id;
@@ -1737,6 +1744,7 @@ export default defineComponent({
           layer_id: room?.extra?.layer_id,
           parent_room_id: room.id,
           build_id: room?.extra?.build_id,
+          ...props.roomParams,
         };
         if (props.roomType?.length) {
           paramsObj.room_type = props.roomType.join(',');