@oinone/kunlun-vue-admin-base 6.2.4 → 6.2.5

package/dist/oinone-kunlun-vue-admin-base.esm.js

@@ -54758,7 +54758,7 @@ let FormM2OAddressFieldWidget = FormM2OAddressFieldWidget_1 = class FormM2OAddre
         this.change(currentValue);
     }
     $onSelectedChangeNext(currentValue, selectedNode) {
-        let nextAddressType;
+        let nextAddressType = AddressTypeEnum.Street;
         while (selectedNode) {
             const targetValue = selectedNode.value.data;
             if (!targetValue) {
@@ -54797,16 +54797,41 @@ let FormM2OAddressFieldWidget = FormM2OAddressFieldWidget_1 = class FormM2OAddre
     }
     getResourceAddressValue(currentValue, type) {
         switch (type) {
-            case AddressTypeEnum.Country:
-                return { code: currentValue.countryCode, name: currentValue.countryName };
-            case AddressTypeEnum.Province:
-                return { code: currentValue.provinceCode, name: currentValue.provinceName };
-            case AddressTypeEnum.City:
-                return { code: currentValue.cityCode, name: currentValue.cityName };
-            case AddressTypeEnum.District:
-                return { code: currentValue.districtCode, name: currentValue.districtName };
-            case AddressTypeEnum.Street:
-                return { code: currentValue.streetCode, name: currentValue.streetName };
+            case AddressTypeEnum.Country: {
+                const { countryCode, countryName } = currentValue;
+                if (countryCode && countryName) {
+                    return { code: countryCode, name: countryName };
+                }
+                return undefined;
+            }
+            case AddressTypeEnum.Province: {
+                const { provinceCode, provinceName } = currentValue;
+                if (provinceCode && provinceName) {
+                    return { code: provinceCode, name: provinceName };
+                }
+                return undefined;
+            }
+            case AddressTypeEnum.City: {
+                const { cityCode, cityName } = currentValue;
+                if (cityCode && cityName) {
+                    return { code: cityCode, name: cityName };
+                }
+                return undefined;
+            }
+            case AddressTypeEnum.District: {
+                const { districtCode, districtName } = currentValue;
+                if (districtCode && districtName) {
+                    return { code: districtCode, name: districtName };
+                }
+                return undefined;
+            }
+            case AddressTypeEnum.Street: {
+                const { streetCode, streetName } = currentValue;
+                if (streetCode && streetName) {
+                    return { code: streetCode, name: streetName };
+                }
+                return undefined;
+            }
             default:
                 console.error('Invalid region type.', type);
                 return undefined;