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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oinone/kunlun-vue-admin-base",
-  "version": "6.2.4",
+  "version": "6.2.5",
   "main": "index.ts",
   "scripts": {
     "prebuild": "rimraf dist",
@@ -14,13 +14,13 @@
     "doc": "typedoc --out docs src/index.ts"
   },
   "dependencies": {
-    "@oinone/kunlun-vue-admin-layout": "6.2.4",
-    "@oinone/kunlun-vue-router": "6.2.4",
-    "@oinone/kunlun-vue-ui": "6.2.4",
-    "@oinone/kunlun-vue-ui-antd": "6.2.4",
-    "@oinone/kunlun-vue-ui-common": "6.2.4",
-    "@oinone/kunlun-vue-ui-el": "6.2.4",
-    "@oinone/kunlun-vue-widget": "6.2.4",
+    "@oinone/kunlun-vue-admin-layout": "6.2.5",
+    "@oinone/kunlun-vue-router": "6.2.5",
+    "@oinone/kunlun-vue-ui": "6.2.5",
+    "@oinone/kunlun-vue-ui-antd": "6.2.5",
+    "@oinone/kunlun-vue-ui-common": "6.2.5",
+    "@oinone/kunlun-vue-ui-el": "6.2.5",
+    "@oinone/kunlun-vue-widget": "6.2.5",
     "@wangeditor/editor": "5.1.23",
     "@wangeditor/editor-for-vue": "5.1.11",
     "@wangeditor/plugin-upload-attachment": "1.1.0",

package/src/field/form/m2o/address/FormM2OAddressFieldWidget.ts

@@ -119,7 +119,7 @@ export class FormM2OAddressFieldWidget extends FormM2OCascaderFieldWidget {
   }
 
   protected $onSelectedChangeNext(currentValue: ResourceAddress, selectedNode: OioTreeNode<TreeData> | undefined) {
-    let nextAddressType: AddressTypeEnum | null | undefined;
+    let nextAddressType: AddressTypeEnum | null | undefined = AddressTypeEnum.Street;
     while (selectedNode) {
       const targetValue = selectedNode.value.data as ResourceRegion | undefined;
       if (!targetValue) {
@@ -166,16 +166,41 @@ export class FormM2OAddressFieldWidget extends FormM2OCascaderFieldWidget {
       }
     | undefined {
     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;