n20-common-lib 2.8.11 → 2.8.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.8.11",
+  "version": "2.8.13",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -9,6 +9,7 @@
     "lint": "vue-cli-service lint",
     "build:Jenkins_1": "vue-cli-service build --serverConfig ./server-config-jenkins.jsonc",
     "build:css": "node build_css",
+    "build:dev": "vue-cli-service build",
     "build:doc": "node versionInfo.js && vue-cli-service build --testTheme",
     "build:gzip": "vue-cli-service build --gzip",
     "build:js": "vue-cli-service build --formats umd-min --target lib src/index.js --name index --dest lib  --analy",

package/src/components/CascaderArea/index.vue

@@ -13,8 +13,6 @@
 
 <script>
 import axios from '../../utils/axios'
-import list2tree from '../../utils/list2tree'
-
 window._china_area_tree_ = undefined
 
 export default {
@@ -32,10 +30,15 @@ export default {
       type: Boolean,
       default: true
     },
+
     isUrban: {
       type: Boolean,
       default: false
     },
+    isStreet: {
+      type: Boolean,
+      default: false
+    },
     labelSort: {
       type: Boolean,
       default: false
@@ -60,7 +63,8 @@ export default {
         value: 'regionNo',
         label: 'regionName',
         children: 'children',
-        expandTrigger: 'hover'
+        expandTrigger: 'hover',
+        checkStrictly: this.isUrban ? false : true
       }
       return Object.assign(_prop, this.props)
     },
@@ -69,46 +73,40 @@ export default {
     },
     urbanKey() {
       return this.countryId === 'CHN' ? '_china_urban_tree_' : `_${this.countryId}_urban_tree_`
+    },
+    streetKey() {
+      return this.countryId === 'CHN' ? '_china_street_tree_' : `_${this.countryId}_street_tree_`
     }
   },
   mounted() {
     if (!window[this.areaKey]) {
       this.getAreaTree()
     } else {
-      this.areaTree = this.isUrban ? window[this.urbanKey] : window[this.areaKey]
+      this.areaTree = this.isUrban
+        ? window[this.urbanKey]
+        : this.isStreet
+        ? window[this.streetKey]
+        : window[this.areaKey]
     }
   },
   methods: {
     getAreaTree() {
       axios
-        .get('/bems/1.0/area', { countryId: this.countryId, isEnable: '1' }, { loading: false, noMsg: true })
+        .get(
+          `/bems/1.0/area?t=${Math.random()}`,
+          { countryId: this.countryId, isEnable: '1', resultType: 2, queryLeave4: this.isStreet },
+          { loading: false, noMsg: true }
+        )
         .then(({ data }) => {
-          let dataAr = JSON.parse(JSON.stringify(data))
-          let dataUb = JSON.parse(JSON.stringify(data))
-
-          let areaTree = list2tree(
-            dataAr,
-            'regionNo',
-            'fatherNo',
-            'children',
-            this.labelSort ? 'regionName' : 'regionNo'
-          )
-          let noAreaTree = areaTree.filter((a) => a.regionLevel !== '1')
-          if (noAreaTree.length > 0) {
-            console.warn('这些区域找不到父级节点：', noAreaTree)
-          }
-          window[this.areaKey] = areaTree.filter((a) => a.regionLevel === '1')
+          window[this.urbanKey] = isUrbanFn(JSON.parse(JSON.stringify(data)))
+          window[this.streetKey] = treeFn(JSON.parse(JSON.stringify(data)))
+          window[this.areaKey] = treeFn(JSON.parse(JSON.stringify(data)))
 
-          let urbanTree = list2tree(
-            dataUb.filter((d) => d.regionLevel !== '3'),
-            'regionNo',
-            'fatherNo',
-            'children',
-            this.labelSort ? 'regionName' : 'regionNo'
-          )
-
-          window[this.urbanKey] = urbanTree.filter((a) => a.regionLevel === '1')
-          this.areaTree = this.isUrban ? window[this.urbanKey] : window[this.areaKey]
+          this.areaTree = this.isUrban
+            ? window[this.urbanKey]
+            : this.isStreet
+            ? window[this.streetKey]
+            : window[this.areaKey]
         })
     },
     updateArea() {
@@ -116,4 +114,30 @@ export default {
     }
   }
 }
+
+const treeFn = (data) => {
+  return data?.map((res) => {
+    if (!['3', '4', '5'].includes(res.regionLevel)) {
+      res.disabled = true
+    }
+
+    if (!res.children?.length) {
+      res.children = null
+    } else {
+      res.children = treeFn(res.children)
+    }
+    return res
+  })
+}
+
+const isUrbanFn = (data) => {
+  return data?.map((res) => {
+    if (res.regionLevel === '2') {
+      res.children = null
+    } else {
+      res.children = isUrbanFn(res.children)
+    }
+    return res
+  })
+}
 </script>

package/src/components/DynamicField/DynamicField.vue

@@ -41,7 +41,7 @@
                     class="input-w"
                     :placeholder="formItem.placeholder || formItem.label"
                     :clearable="formItem.clearable === false ? false : true"
-                    :maxlength="formItem.maxlength||'100'"
+                    :maxlength="formItem.maxlength||inputMaxLength"
                     v-bind="formItem"
                     @change="value => $emit('valueChange', value, key)"
                   />
@@ -335,6 +335,10 @@ export default {
     }
   },
   props: {
+    inputMaxLength:{
+      type:String,
+      default:'100'
+    },
     value: {
       type: Object
     },