n20-common-lib 2.8.10 → 2.8.12

package/package.json

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

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/plugins/Sign/Itrus/index.js

@@ -1563,7 +1563,11 @@ try {
   Notification({
     title: '提示',
     dangerouslyUseHTMLString: true,
-    message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="/portal/天诚安信数字证书助手-3.7.7.0.exe" download>下载安装</a>天诚安信数字证书助手</div>`,
+    message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="/portal/${
+      process.env.VUE_APP_NetSign_ARG_SignName ||
+      window.VUE_APP_NetSign_ARG_SignName ||
+      '天诚安信数字证书助手-3.7.7.0.exe'
+    }" download>下载安装</a>天诚安信数字证书助手</div>`,
     duration: 5000
   })
 }

package/src/plugins/Sign/index.js

@@ -10,6 +10,7 @@ export async function getSign(p1, p2, p3) {
     console.error('请设置签名服务公司sessionStorage.signType,公司字段映射:', CaMap)
     signType = CaMap['null'] ? CaMap['null'].type : ''
   }
+  let url = window.NetSignName
 
   const por = new Promise((resolve, reject) => {
     if (signType === 'inetSign' /* 信安CA */) {
@@ -22,7 +23,7 @@ export async function getSign(p1, p2, p3) {
             } else {
               reject()
             }
-          })
+          }, url)
         }
       )
     } else if (signType === 'bjcaSign' /* 北京CA */) {
@@ -67,7 +68,7 @@ export async function getSign(p1, p2, p3) {
             } else {
               reject()
             }
-          })
+          }, url)
         }
       )
     } else if (signType === 'netcaSign' /* 网证通 */) {
@@ -90,7 +91,7 @@ export async function getSign(p1, p2, p3) {
             } else {
               reject()
             }
-          })
+          }, url)
         }
       )
     } else if (signType === 'cfcaSign' /* CFCA */) {