n20-common-lib 3.3.13 → 3.3.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.3.13",
+  "version": "3.3.14",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/CascaderArea/index.vue

@@ -57,13 +57,17 @@ export default {
     }
   },
   computed: {
+    isChinaUrban() {
+      return this.isUrban && this.countryId === 'CHN'
+    },
     propsAs() {
       let _prop = {
         value: 'regionNo',
         label: 'regionName',
         children: 'children',
         expandTrigger: 'hover',
-        checkStrictly: !this.isUrban
+        // 保留二级城市的子节点后，允许独立选择二级城市和三级地区。
+        checkStrictly: this.isChinaUrban || !this.isUrban
       }
       return Object.assign(_prop, this.props)
     },
@@ -75,17 +79,17 @@ export default {
     },
     streetKey() {
       return this.countryId === 'CHN' ? '_china_street_tree_' : `_${this.countryId}_street_tree_`
+    },
+    cacheKey() {
+      // 按当前模式检查缓存，避免普通地区缓存存在时误用尚未加载的城市缓存。
+      return this.isUrban ? this.urbanKey : this.isStreet ? this.streetKey : this.areaKey
     }
   },
   mounted() {
-    if (!window[this.areaKey]) {
+    if (!window[this.cacheKey]) {
       this.getAreaTree()
     } else {
-      this.areaTree = this.isUrban
-        ? window[this.urbanKey]
-        : this.isStreet
-        ? window[this.streetKey]
-        : window[this.areaKey]
+      this.areaTree = window[this.cacheKey]
     }
   },
   methods: {
@@ -100,7 +104,7 @@ export default {
           if (data) {
             let result = JSON.parse(JSON.stringify(data))
             if (this.isUrban) {
-              window[this.urbanKey] = isUrbanFn(result)
+              window[this.urbanKey] = isUrbanFn(result, this.isChinaUrban)
               this.areaTree = window[this.urbanKey]
             } else if (this.isStreet) {
               window[this.streetKey] = treeFn(result)
@@ -133,12 +137,21 @@ const treeFn = (data) => {
   })
 }
 
-const isUrbanFn = (data) => {
+const isUrbanFn = (data, isChinaUrban = false) => {
   return data?.map((res) => {
-    if (res.regionLevel === '2' || !res.children?.length) {
+    const regionLevel = String(res.regionLevel)
+    // 直辖市只保留一级节点，直接返回接口原有的两位 regionNo，不伪造下级编码。
+    const isMunicipality =
+      isChinaUrban && regionLevel === '1' && ['11', '12', '31', '50'].includes(String(res.regionNo))
+    if (isChinaUrban && regionLevel === '1' && !isMunicipality) {
+      // 普通省份仅用于展开；checkStrictly 模式下禁用父节点不影响子节点选择。
+      res.disabled = true
+    }
+    if (isMunicipality || (!isChinaUrban && regionLevel === '2') || !res.children?.length) {
       res.children = null
     } else {
-      res.children = isUrbanFn(res.children)
+      // 保留省代管县级市等三级节点，解除原先在二级统一截断的限制。
+      res.children = isUrbanFn(res.children, isChinaUrban)
     }
     return res
   })