n20-common-lib 3.3.18 → 3.3.20

package/package.json

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

package/src/components/CascaderArea/index.vue

@@ -34,6 +34,10 @@ export default {
       type: Boolean,
       default: false
     },
+    selectAnyLevel: {
+      type: Boolean,
+      default: false
+    },
     isStreet: {
       type: Boolean,
       default: false
@@ -56,20 +60,29 @@ export default {
       areaTree: []
     }
   },
+  watch: {
+    selectAnyLevel() {
+      // 开关运行中切换时复用对应缓存，否则按新模式重新请求地区树。
+      if (window[this.cacheKey]) {
+        this.areaTree = window[this.cacheKey]
+      } else {
+        this.getAreaTree()
+      }
+    }
+  },
   computed: {
-    isChinaUrban() {
-      return this.isUrban && this.countryId === 'CHN'
-    },
     propsAs() {
       let _prop = {
         value: 'regionNo',
         label: 'regionName',
         children: 'children',
         expandTrigger: 'hover',
-        // 保留二级城市的子节点后，允许独立选择二级城市和三级地区。
-        checkStrictly: this.isChinaUrban || !this.isUrban
+        checkStrictly: !this.isUrban
       }
-      return Object.assign(_prop, this.props)
+      const props = Object.assign(_prop, this.props)
+      // 任意级模式必须允许非叶子节点被选中，避免调用方覆盖后出现不可选层级。
+      if (this.selectAnyLevel) props.checkStrictly = true
+      return props
     },
     areaKey() {
       return this.countryId === 'CHN' ? '_china_area_tree_' : `_${this.countryId}_area_tree_`
@@ -81,8 +94,9 @@ export default {
       return this.countryId === 'CHN' ? '_china_street_tree_' : `_${this.countryId}_street_tree_`
     },
     cacheKey() {
-      // 按当前模式检查缓存，避免普通地区缓存存在时误用尚未加载的城市缓存。
-      return this.isUrban ? this.urbanKey : this.isStreet ? this.streetKey : this.areaKey
+      const modeKey = this.isUrban ? this.urbanKey : this.isStreet ? this.streetKey : this.areaKey
+      // 两种模式的 disabled 标记及树深度不同，不能共享已处理的选项树。
+      return this.selectAnyLevel ? `${modeKey}_select_any_level_` : modeKey
     }
   },
   mounted() {
@@ -94,25 +108,28 @@ export default {
   },
   methods: {
     getAreaTree() {
+      const cacheKey = this.cacheKey
+      const isUrban = this.isUrban
+      const isStreet = this.isStreet
+      const selectAnyLevel = this.selectAnyLevel
       this.$axios
         .get(
           `/bems/1.0/area?t=${Math.random()}`,
-          { countryId: this.countryId, isEnable: '1', resultType: 2, queryLeave4: this.isStreet },
+          // 任意级模式需要请求下级地区；默认模式保持原先的请求范围。
+          { countryId: this.countryId, isEnable: '1', resultType: 2, queryLeave4: isStreet || selectAnyLevel },
           { loading: false, noMsg: true }
         )
         .then(({ data }) => {
           if (data) {
             let result = JSON.parse(JSON.stringify(data))
-            if (this.isUrban) {
-              window[this.urbanKey] = isUrbanFn(result, this.isChinaUrban)
-              this.areaTree = window[this.urbanKey]
-            } else if (this.isStreet) {
-              window[this.streetKey] = treeFn(result)
-              this.areaTree = window[this.streetKey]
-            } else {
-              window[this.areaKey] = treeFn(result)
-              this.areaTree = window[this.areaKey]
-            }
+            // 旧城市模式仍在二级截断；任意级模式统一保留接口返回的完整树。
+            window[cacheKey] = selectAnyLevel
+              ? treeFn(result, true)
+              : isUrban
+              ? isUrbanFn(result)
+              : treeFn(result)
+            // 若请求期间切换了模式，不用旧请求覆盖当前显示。
+            if (cacheKey === this.cacheKey) this.areaTree = window[cacheKey]
           }
         })
     },
@@ -122,36 +139,28 @@ export default {
   }
 }
 
-const treeFn = (data) => {
+const treeFn = (data, selectAnyLevel = false) => {
   return data?.map((res) => {
-    if (!['3', '4', '5'].includes(res.regionLevel) && res.hasChildren) {
+    // 默认仍只开放原先可选的层级；开关开启时保留接口已有的禁用状态。
+    if (!selectAnyLevel && !['3', '4', '5'].includes(res.regionLevel) && res.hasChildren) {
       res.disabled = true
     }
 
     if (!res.children?.length) {
       res.children = null
     } else {
-      res.children = treeFn(res.children)
+      res.children = treeFn(res.children, selectAnyLevel)
     }
     return res
   })
 }
 
-const isUrbanFn = (data, isChinaUrban = false) => {
+const isUrbanFn = (data) => {
   return data?.map((res) => {
-    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) {
+    if (res.regionLevel === '2' || !res.children?.length) {
       res.children = null
     } else {
-      // 保留省代管县级市等三级节点，解除原先在二级统一截断的限制。
-      res.children = isUrbanFn(res.children, isChinaUrban)
+      res.children = isUrbanFn(res.children)
     }
     return res
   })