n20-common-lib 1.3.22 → 1.3.25

package/src/components/LoginTemporary/form.vue

@@ -394,18 +394,16 @@ export default {
         let certDn = undefined
         if (checkCert) {
           if (supplier === 'bjca') {
-            let { getSign } = await import('../../plugins/Sign/bjca/index')
-            sign = await getSign(username, userDn)
-            certDn = userDn
+            // 北京CA
+            window.sessionStorage.setItem('signType', 'bjcaSign')
           } else {
-            let { getSign } = await import('../../plugins/Sign/index')
-            sign = getSign(username, userDn)
-            certDn = userDn
+            // 信安CA
+            window.sessionStorage.setItem('signType', 'inetSign')
           }
-          window.localStorage.setItem(
-            'signType',
-            supplier === 'bjca' ? 'bjcaSign' : 'nstcSign'
-          )
+
+          let { getSign } = await import('../../plugins/Sign')
+          sign = await getSign(username, userDn)
+          certDn = userDn
         }
 
         await this.authorizationCode(username, password, code) // authorizationValue 使用一次后就失效了

package/src/components/Statis/index.vue

@@ -1,8 +1,18 @@
 <template>
   <div>
     <div v-if="size !== 'mini'" class="flex-box p-t-s p-b-s">
-      <statisItem type="当页合计" :list="pageList" :show-w="showW" />
-      <statisItem type="全部合计" :list="totalList" :show-w="showW" />
+      <statisItem
+        type="当页合计"
+        :list="pageList"
+        :show-w="showW"
+        :count-label="countLabel"
+      />
+      <statisItem
+        type="全部合计"
+        :list="totalList"
+        :show-w="showW"
+        :count-label="countLabel"
+      />
     </div>
     <div v-else class="n20-statis p-t-s p-b-s">
       <span class="m-r">
@@ -49,6 +59,10 @@ export default {
       type: [Boolean, String],
       default: false
     },
+    countLabel: {
+      type: Array,
+      default: undefined
+    },
     size: {
       type: String,
       default: undefined

package/src/components/Statis/statisItem.vue

@@ -4,7 +4,11 @@
     ><span class="stati-type stati-item-cell">{{ type }}</span
     ><span class="n20-statis-division p-l-s p-r-s stati-item-cell">|</span
     ><span v-for="(item, i) in list" :key="i" class="p-r stati-item-cell"
-      >{{ item.label }}:<span class="n20-primary">{{
+      >{{ item.label }}:<span
+        v-if="countLabel.includes(item.label)"
+        class="n20-primary"
+        >{{ item.value }}</span
+      ><span v-else class="n20-primary">{{
         item | numerify('0,0.00', showW)
       }}</span></span
     >
@@ -19,9 +23,7 @@ export default {
   name: 'StatisItem',
   filters: {
     numerify({ label, value, unit = '' }, f, w) {
-      if (label === '笔数') {
-        return value
-      } else if (!w) {
+      if (!w) {
         return numerify(value, f) + unit
       } else {
         if (value > n) {
@@ -48,6 +50,10 @@ export default {
     showW: {
       type: Boolean,
       default: false
+    },
+    countLabel: {
+      type: Array,
+      default: () => ['笔数']
     }
   }
 }

package/src/components/Statis/statisPopover.vue

@@ -6,6 +6,7 @@
       :title="i === 0 ? lists[0].title : undefined"
       :type="item.type"
       :list="item.list"
+      :count-label="countLabel"
     />
   </div>
 
@@ -23,6 +24,7 @@
         :title="i === 0 ? lists[0].title : undefined"
         :type="item.type"
         :list="item.list"
+        :count-label="countLabel"
       />
       <i class="rotating-icon n20-icon-nianfenqiehuan-youce"></i>
     </div>
@@ -35,6 +37,7 @@
           :title="i === 0 ? group.title : undefined"
           :type="item.type"
           :list="item.list"
+          :count-label="countLabel"
         />
       </div>
     </div>
@@ -50,6 +53,10 @@ export default {
     lists: {
       type: Array,
       default: () => []
+    },
+    countLabel: {
+      type: Array,
+      default: undefined
     }
   }
 }

package/src/components/Upload/index.vue

@@ -5,8 +5,8 @@
     :headers="headers"
     :accept="accept"
     :multiple="multiple"
-    :file-list="fileList || list"
-    :show-file-list="false"
+    :file-list="fileList"
+    :show-file-list="multiple ? true : showFileList"
     v-bind="$attrs"
     :on-success="successFn"
     :on-error="errorFn"
@@ -95,6 +95,10 @@ export default {
       type: [String, Number],
       default: undefined
     },
+    showFileList: {
+      type: Boolean,
+      default: false
+    },
     accept: {
       type: String,
       default: undefined
@@ -216,9 +220,9 @@ export default {
       if (this.onSuccess) {
         this.onSuccess(response, file, fileList)
       } else {
-        this.fileNameC = file.name
+        this.fileNameC = this.multiple ? '' : file.name
         this.fileUrlC = response.data
-        this.fileList = [file]
+        this.fileList = fileList
       }
 
       if (this.msgType === 'dialog') {

package/src/directives/VTitle/index.js

@@ -7,7 +7,7 @@ function tipShow(el, tip) {
   if (el.$tooltipTitle) {
     let _el = _input || el
     if (!el.$tooltipTitleOverflow || _el.clientWidth < _el.scrollWidth) {
-      tip.title = el.$tooltipTitle
+      document.querySelector('.' + popClass).innerText = el.$tooltipTitle
 
       tip.$refs['title-pop'].referenceElm = el
       tip.$refs['title-pop'].doDestroy()
@@ -33,27 +33,29 @@ TitleDirective.install = (Vue) => {
     el: document.createElement('div'),
     data() {
       return {
-        title: '',
         visible: false
       }
     },
     render(_h) {
       var _vm = this
-      return _h('el-popover', {
-        ref: 'title-pop',
-        attrs: {
-          value: _vm.visible,
-          content: _vm.title,
-          trigger: 'manual',
-          'popper-class': 'n20-title-pop ' + popClass,
-          placement: 'top'
-        },
-        on: {
-          input(v) {
-            _vm.visible = v
+      return _h(
+        'el-popover',
+        {
+          ref: 'title-pop',
+          attrs: {
+            value: _vm.visible,
+            trigger: 'manual',
+            'popper-class': 'n20-title-pop',
+            placement: 'top'
+          },
+          on: {
+            input(v) {
+              _vm.visible = v
+            }
           }
-        }
-      })
+        },
+        [_h('span', { staticClass: popClass })]
+      )
     }
   })
   document.querySelector('body').appendChild(tooltip.$el)

package/src/index.js

@@ -50,8 +50,7 @@ import FlowDialog from './components/ApprovalRecord/flowDialog.vue'
 import ChildRange from './components/ChildRange/index'
 import FileImport from './components/FileImport/index'
 import PageHeader from './components/PageHeader/index'
-import PlainText from './components/PlainText/index'
-import PlainTextItem from './components/PlainText/PlainTextItem'
+import Descriptions from './components/Descriptions'
 // ECharts 不要打包进来
 // import Search from './components/Search/index.vue'
 import Stamp from './components/Stamp/index.vue'
@@ -140,8 +139,7 @@ const components = [
   ChildRange,
   FileImport,
   PageHeader,
-  PlainText,
-  PlainTextItem,
+  Descriptions,
   // Search,
   approvalImg,
   Stamp,
@@ -249,8 +247,7 @@ export {
   ChildRange,
   FileImport,
   PageHeader,
-  PlainText,
-  PlainTextItem,
+  Descriptions,
   // Search,
   approvalImg,
   Stamp

package/src/plugins/Sign/index.js

@@ -1,64 +1,28 @@
-// Attached方式签名
-import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
-const { IWSASetTimeOut, IWSAAttachedSign, IWSAAttachedVerify, IWSASendAvailable, IWSAGetAvailable } = new IWSAgent()
-IWSASetTimeOut(6000)
-
-let _dn
-function getDN() {
-  if (!_dn) {
-    let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
-    if (userInfo?.dn) {
-      _dn = userInfo.dn
-    }
-  }
-  return _dn
-}
-
-/* 检测本地签名端口是否可用 */
-export function availableSign(fn) {
-  IWSASendAvailable() // 异步请求,需等待
-  setTimeout(() => {
-    let available = IWSAGetAvailable()
-    fn && fn(available)
-  }, 300)
-}
-
-/* 签名解签 */
-export function verifySign(signedMsg) {
-  let plainText
-  IWSAAttachedVerify('1', signedMsg, (errorCode, PlainText, SigncertDN) => {
-    if (errorCode === 0 || errorCode === '0') {
-      plainText = PlainText
-    } else {
-      alert('签名解签失败!')
-    }
-  })
-  return plainText
-}
-
-/* 给对象或字符串签名 */
-export function getSign(plain, dn) {
-  if (dn === undefined) {
-    dn = getDN()
+export async function getSign(p1, p2, p3) {
+  let signType = window.sessionStorage.getItem('signType')
+  let CaMap = {
+    inetSign: '信安CA',
+    bjcaSign: '北京CA'
   }
-  if (!dn) {
-    alert('签名参数DN错误!')
-    return false
+  if (!signType || !CaMap[signType]) {
+    console.error('请设置签名服务公司sessionStorage.signType,公司字段映射:', CaMap)
+    signType = 'inetSign'
   }
-  let plainText = ''
-  if (typeof plain === 'object') {
-    plainText = JSON.stringify(plain)
-  } else {
-    plainText = plain
-  }
-
-  let answer = undefined
-  IWSAAttachedSign('1', plainText, '0', 'SHA1', (errorCode, signedData) => {
-    if (errorCode === 0 || errorCode === '0') {
-      answer = signedData
-    } else {
-      alert('签名失败!')
+  const por = new Promise((resolve) => {
+    if (signType === 'inetSign' /* 信安CA */) {
+      import('./sign.js').then(({ getSign }) => {
+        const sign = getSign(p1, p2, p3)
+        resolve(sign)
+      })
+    } else if (signType === 'bjcaSign' /* 北京CA */) {
+      import('./bjca/index.js').then(({ getSign }) => {
+        getSign(p1, p2, p3).then((sign) => {
+          resolve(sign)
+        })
+      })
     }
   })
-  return answer
+  return por
 }
+
+export { availableSign, verifySign } from './sign.js'

package/src/plugins/Sign/sign.js

@@ -1 +1,64 @@
-export { availableSign, verifySign, getSign } from './index.js'
+// Attached方式签名
+import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
+const { IWSASetTimeOut, IWSAAttachedSign, IWSAAttachedVerify, IWSASendAvailable, IWSAGetAvailable } = new IWSAgent()
+IWSASetTimeOut(6000)
+
+let _dn
+function getDN() {
+  if (!_dn) {
+    let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
+    if (userInfo?.dn) {
+      _dn = userInfo.dn
+    }
+  }
+  return _dn
+}
+
+/* 检测本地签名端口是否可用 */
+export function availableSign(fn) {
+  IWSASendAvailable() // 异步请求,需等待
+  setTimeout(() => {
+    let available = IWSAGetAvailable()
+    fn && fn(available)
+  }, 300)
+}
+
+/* 签名解签 */
+export function verifySign(signedMsg) {
+  let plainText
+  IWSAAttachedVerify('1', signedMsg, (errorCode, PlainText, SigncertDN) => {
+    if (errorCode === 0 || errorCode === '0') {
+      plainText = PlainText
+    } else {
+      alert('签名解签失败!')
+    }
+  })
+  return plainText
+}
+
+/* 给对象或字符串签名 */
+export function getSign(plain, dn) {
+  if (dn === undefined) {
+    dn = getDN()
+  }
+  if (!dn) {
+    alert('签名参数DN错误!')
+    return false
+  }
+  let plainText = ''
+  if (typeof plain === 'object') {
+    plainText = JSON.stringify(plain)
+  } else {
+    plainText = plain
+  }
+
+  let answer = undefined
+  IWSAAttachedSign('1', plainText, '0', 'SHA1', (errorCode, signedData) => {
+    if (errorCode === 0 || errorCode === '0') {
+      answer = signedData
+    } else {
+      alert('签名失败!')
+    }
+  })
+  return answer
+}

package/src/utils/theme.config.js

@@ -0,0 +1,22 @@
+const themeList = [
+  { label: '科技蓝', value: 'blue', color: '#007aff', aD: `$--color-primary: #007aff;` },
+  { label: '中国红', value: 'red', color: '#f5222d', aD: `$--color-primary: #f5222d;` },
+  { label: '阳光橘', value: 'orange', color: '#fa541c', aD: `$--color-primary: #fa541c;` },
+  { label: '金融金', value: 'yellow', color: '#fadb14', aD: `$--color-primary: #fadb14;` },
+  { label: '青春绿', value: 'green', color: '#3eaf7c', aD: `$--color-primary: #3eaf7c;` },
+  { label: '天空蓝', value: 'lightBlue', color: '#1890ff', aD: `$--color-primary: #1890ff;` },
+  { label: '优雅紫', value: 'purple', color: '#722ed1', aD: `$--color-primary: #722ed1;` }
+]
+
+// 菜单颜色（仅支持 hex 格式)
+const asideMenu = {
+  backgroundColor: '#3d4b6a',
+  textColor: '#fefefea6',
+  activeTextColor: '#ffffff'
+}
+
+if (typeof exports === 'object' && typeof module === 'object') {
+  module.exports = { themeList, asideMenu }
+} else if (typeof exports === 'object') {
+  exports = { themeList, asideMenu }
+}

package/src/utils/theme.js

@@ -4,7 +4,7 @@ export function setTheme(val) {
   var links = document.querySelectorAll('link[rel="stylesheet"]')
   var link, newLink, nextEl, pEl
   links.forEach(function (el) {
-    if (el.href && el.href.indexOf('/treme/') !== -1) {
+    if (el.href && el.href.indexOf('/theme/') !== -1) {
       link = el
     }
   })