n20-common-lib 2.8.36 → 2.8.38

package/package.json

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

package/src/components/CascaderArea/index.vue

@@ -13,8 +13,10 @@
 
 <script>
 import axios from '../../utils/axios'
+import list2tree from '../../utils/list2tree'
+
 window._china_area_tree_ = undefined
-import cloneDeep from 'lodash/cloneDeep'
+
 export default {
   name: 'CascaderArea',
   props: {
@@ -30,15 +32,10 @@ export default {
       type: Boolean,
       default: true
     },
-
     isUrban: {
       type: Boolean,
       default: false
     },
-    isStreet: {
-      type: Boolean,
-      default: false
-    },
     labelSort: {
       type: Boolean,
       default: false
@@ -63,8 +60,7 @@ export default {
         value: 'regionNo',
         label: 'regionName',
         children: 'children',
-        expandTrigger: 'hover',
-        checkStrictly: this.isUrban ? false : true
+        expandTrigger: 'hover'
       }
       return Object.assign(_prop, this.props)
     },
@@ -73,44 +69,46 @@ 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]
-        : this.isStreet
-        ? window[this.streetKey]
-        : window[this.areaKey]
+      this.areaTree = this.isUrban ? window[this.urbanKey] : window[this.areaKey]
     }
   },
   methods: {
     getAreaTree() {
       axios
-        .get(
-          `/bems/1.0/area?t=${Math.random()}`,
-          { countryId: this.countryId, isEnable: '1', resultType: 2, queryLeave4: this.isStreet },
-          { loading: false, noMsg: true }
-        )
+        .get('/bems/1.0/area', { countryId: this.countryId, isEnable: '1' }, { loading: false, noMsg: true })
         .then(({ data }) => {
-          if (data) {
-            let result = cloneDeep(data)
-            if (this.isUrban) {
-              window[this.urbanKey] = isUrbanFn(result)
-              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]
-            }
+          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')
+
+          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]
         })
     },
     updateArea() {
@@ -118,30 +116,4 @@ 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

@@ -2503,13 +2503,14 @@ const config = {
 
 function init() {
   let url = window.NetSignName || `/portal/天诚安信数字证书助手-3.7.7.0.exe`
+  let name = window.NetSignDownloadName || '天诚安信数字证书助手'
   try {
     TCA.config(config)
   } catch (error) {
     Notification({
       title: '提示',
       dangerouslyUseHTMLString: true,
-      message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="${url}" download>下载安装</a>天诚安信数字证书助手</div>`,
+      message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="${url}" download>下载安装</a>${name}</div>`,
       duration: 5000
     })
   }

package/src/plugins/Sign/NetSM3/index.js

@@ -41,6 +41,7 @@ export function availableSign(fn, url) {
 }
 
 function checkAvailable(fn, url, count) {
+  let name = window.NetSignDownloadName || 'NetSignCNG签名助手'
   let available = IWSAGetAvailable()
   if (available) {
     fn && fn(available)
@@ -49,7 +50,7 @@ function checkAvailable(fn, url, count) {
     Notification({
       title: '提示',
       dangerouslyUseHTMLString: true,
-      message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="${url}" download>下载安装</a>NetSignCNG签名助手</div>`,
+      message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="${url}" download>下载安装</a>${name}</div>`,
       duration: 5000
     })
   } else {

package/src/plugins/Sign/SkfSign/index.js

@@ -42,6 +42,7 @@ export function availableSign(fn, url) {
 
 function checkAvailable(fn, url, count) {
   available = IWSAGetAvailable()
+  let name = window.NetSignDownloadName || 'NetSignCNG签名助手'
   if (available) {
     fn && fn(available)
   } else if (count == 10) {
@@ -49,7 +50,7 @@ function checkAvailable(fn, url, count) {
     Notification({
       title: '提示',
       dangerouslyUseHTMLString: true,
-      message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="${url}" download>下载安装</a>NetSignCNG签名助手</div>`,
+      message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="${url}" download>下载安装</a>${name}</div>`,
       duration: 5000
     })
   } else {

package/src/plugins/Sign/sign.js

@@ -35,6 +35,7 @@ export function availableSign(fn, url) {
 }
 
 function checkAvailable(fn, url, count) {
+  let name = window.NetSignDownloadName || 'NetSignCNG签名助手'
   let available = IWSAGetAvailable()
   if (available) {
     fn && fn(available)
@@ -43,7 +44,7 @@ function checkAvailable(fn, url, count) {
     Notification({
       title: '提示',
       dangerouslyUseHTMLString: true,
-      message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="${url}" download>下载安装</a>NetSignCNG签名助手</div>`,
+      message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="${url}" download>下载安装</a>${name}</div>`,
       duration: 5000
     })
   } else {