n20-common-lib 2.8.30 → 2.8.32

package/package.json

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

package/src/assets/css/form-item.scss

@@ -774,4 +774,9 @@ $--input-max: 224px;
   .el-form-item--small .el-form-item__label {
     line-height: 1.5;
   }
+}
+
+/* 文本域 字数提示高度处理 */
+.el-textarea .el-input__count {
+  line-height: 1;
 }

package/src/components/ApprovalRecord/approvalImgPro/index.vue

@@ -138,10 +138,10 @@
 </template>
 
 <script>
-import axios from '../../../utils/axios.js';
-import { $lc } from '../../../utils/i18n/index';
-import importG from '../../../utils/importGlobal.js';
-import child from './child.vue';
+import axios from '../../../utils/axios.js'
+import { $lc } from '../../../utils/i18n/index'
+import importG from '../../../utils/importGlobal.js'
+import child from './child.vue'
 export default {
   components: {
     child

package/src/index.js

@@ -112,6 +112,7 @@ import _numerify from 'numerify'
 import getJsonc from './assets/getJsonc.js'
 import realUrl from './assets/realUrl.js'
 import { has as isHas, hasG as isHasG } from './directives/VHas/index.js'
+import { getAnyLevel, setAnyLevel } from './utils/anyLevel.js'
 import asyncGetRelaNos from './utils/asyncGetRelaNos.js'
 import auth from './utils/auth.js'
 import axios from './utils/axios.js'
@@ -120,6 +121,7 @@ import forEachs from './utils/forEachs'
 import { refreshTab, setTabs } from './utils/handleTab.js'
 import imgLoad from './utils/imgLoad.js'
 import importG from './utils/importGlobal.js' // 联合加载组件保存位置
+import { type } from './utils/judgeType.js'
 import list2tree from './utils/list2tree'
 import { msgPor, msgboxPor } from './utils/msgboxPor.js'
 import N from './utils/numberPor.js' // 扩展Number
@@ -363,6 +365,7 @@ export {
   dayjs,
   downloadBlob,
   forEachs,
+  getAnyLevel,
   getJsonc,
   imgLoad,
   importG,
@@ -381,7 +384,9 @@ export {
   relativeDate,
   relativeNowDate,
   repairEl,
+  setAnyLevel,
   // 页签/路由
   setTabs,
+  type,
   version
 }

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

@@ -2502,13 +2502,14 @@ const config = {
 }
 
 function init() {
+  let url = window.NetSignName || `/portal/天诚安信数字证书助手-3.7.7.0.exe`
   try {
     TCA.config(config)
   } catch (error) {
     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="${url}" download>下载安装</a>天诚安信数字证书助手</div>`,
       duration: 5000
     })
   }
@@ -2562,6 +2563,11 @@ export function getCert(dn) {
 // 签名方法
 export function getSign(plain, dn) {
   init()
+  if (typeof plain === 'object') {
+    plainText = JSON.stringify(plain)
+  } else {
+    plainText = plain
+  }
   try {
     if (dn === undefined) {
       dn = getDN()

package/src/plugins/Sign/Itrus/sign_3720.js

@@ -1804,6 +1804,11 @@ function getDN() {
 
 // 签名方法
 export function getSign(plain, dn) {
+  if (typeof plain === 'object') {
+    plainText = JSON.stringify(plain)
+  } else {
+    plainText = plain
+  }
   try {
     if (dn === undefined) {
       dn = getDN()

package/src/utils/anyLevel.js

@@ -0,0 +1,123 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { type } from './judgeType'
+
+function getDefalutValue(path) {
+  if (path.defalutValue) {
+    return path.defalutValue()
+  }
+  if (path.type === 'array') {
+    return []
+  }
+  if (path.type === 'map') {
+    return new Map()
+  }
+
+  return {}
+}
+
+export function getAnyPath(obj, paths) {
+  if (type(paths) !== 'array' || !paths.length) {
+    return undefined
+  }
+  let parent = obj
+  for (let i = 0; i < paths.length; i++) {
+    const path = paths[i]
+    const t = type(parent)
+    if (t === 'object' || t === 'array') {
+      parent = parent[path.key]
+    } else if (t === 'map') {
+      parent = parent.get(path.key)
+    } else {
+      return undefined
+    }
+  }
+  return parent
+}
+
+export function setAnyPath(obj, paths, value) {
+  if (type(paths) !== 'array' || !paths.length) {
+    return false
+  }
+  let parent = obj
+
+  for (let i = 0; i < paths.length - 1; i++) {
+    const path = paths[i]
+    const t = type(parent)
+    if (t === 'object' || t === 'array') {
+      // undefined | null
+      if (parent[path.key] != null) {
+        parent = parent[path.key]
+      } else {
+        parent[path.key] = getDefalutValue(path)
+        parent = parent[path.key]
+      }
+    } else if (t === 'map') {
+      // undefined | null
+      if (parent.get(path.key) != null) {
+        parent = parent.get(path.key)
+      } else {
+        parent.set(path.key, getDefalutValue(path))
+        parent = parent.get(path.key)
+      }
+    } else {
+      return false
+    }
+  }
+
+  // 目标节点设置值
+  const t = type(parent)
+  const path = paths[paths.length - 1]
+  if (t === 'object' || t === 'array') {
+    parent[path.key] = value
+  } else if (t === 'map') {
+    parent.set(path.key, value)
+  } else {
+    return false
+  }
+
+  return true
+}
+
+function parseKeys(keys) {
+  if (typeof keys !== 'string' && typeof keys !== 'number') {
+    return []
+  }
+  // keys = 'a.0[].c:map.e'
+  const paths = String(keys)
+    .split('.')
+    .map((item) => {
+      if (item.indexOf('[]') !== -1) {
+        // [] 语法
+        return {
+          key: item.replace('[]', ''),
+          type: 'array'
+        }
+      } else if (item.indexOf(':') !== -1) {
+        // : 语法
+        const arr = item.split(':')
+        return {
+          key: arr[0],
+          type: arr[1]
+        }
+      } else {
+        // object
+        return {
+          key: item,
+          type: 'object'
+        }
+      }
+    })
+
+  return paths
+}
+
+export function getAnyLevel(obj, keys) {
+  return getAnyPath(obj, parseKeys(keys))
+}
+export function setAnyLevel(obj, keys, value) {
+  const paths = parseKeys(keys)
+  if (!paths.length) {
+    return false
+  }
+  return setAnyPath(obj, paths, value)
+}

package/src/utils/judgeType.js

@@ -0,0 +1,75 @@
+const toString = Object.prototype.toString
+
+export function type(x, strict = false) {
+  strict = !!strict
+
+  // 修复 typeof null = object 的问题
+  if (x === null) {
+    return 'null'
+  }
+
+  const t = typeof x
+
+  // 严格模式下区分 NaN 和 number
+  if (strict && t === 'number' && isNaN(x)) {
+    return 'nan'
+  }
+
+  // number string boolean undefined symbol
+  if (t !== 'object') {
+    return t
+  }
+
+  let cls
+  let clsLow
+  try {
+    cls = toString.call(x).slice(8, -1)
+    clsLow = cls.toLowerCase()
+  } catch (e) {
+    // 处理 IE 下的 ActiveX 对象
+    return 'object'
+  }
+
+  if (clsLow !== 'object') {
+    if (strict) {
+      // 区分 NaN 和 new Number
+      if (clsLow === 'number' && isNaN(x)) {
+        return 'NaN'
+      }
+      // 区分 String() 和 new String()
+      if (clsLow === 'number' || clsLow === 'boolean' || clsLow === 'string') {
+        return cls
+      }
+    }
+    return clsLow
+  }
+
+  // eslint-disable-next-line eqeqeq
+  if (x.constructor == Object) {
+    return clsLow
+  }
+
+  // 处理 Object.create(null)
+  try {
+    // 处理早期 Firefox 浏览器的 __proto__
+    if (Object.getPrototypeOf(x) === null || x.__proto__ === null) {
+      return 'object'
+    }
+  } catch (e) {
+    // 处理 IE 下无 Object.getPrototypeOf 的情况
+  }
+
+  // 处理 function A() {}; new A
+  try {
+    const cname = x.constructor.name
+
+    if (typeof cname === 'string') {
+      return cname
+    }
+  } catch (e) {
+    // 处理无 constructor 的情况
+  }
+
+  // 处理 function A() {}; A.prototype.constructor = null; new A
+  return 'unknown'
+}