n20-common-lib 1.3.25 → 1.3.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.25",
+  "version": "1.3.28",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/assets/css/title-pop.scss

@@ -1,23 +1,23 @@
-
-.el-popover.n20-title-pop{
+.el-popover.n20-title-pop {
   background-color: #303133;
+  border: none;
   min-width: auto;
   color: $--color-white;
-  padding: 6px;
+  padding: 5px 8px;
 }
 
-.n20-title-pop[x-placement^=left] .popper__arrow::after {
+.n20-title-pop[x-placement^='left'] .popper__arrow::after {
   border-left-color: #303133;
 }
 
-.n20-title-pop[x-placement^=right] .popper__arrow::after {
+.n20-title-pop[x-placement^='right'] .popper__arrow::after {
   border-right-color: #303133;
 }
 
-.n20-title-pop[x-placement^=bottom] .popper__arrow::after {
+.n20-title-pop[x-placement^='bottom'] .popper__arrow::after {
   border-bottom-color: #303133;
 }
 
-.n20-title-pop[x-placement^=top] .popper__arrow::after {
+.n20-title-pop[x-placement^='top'] .popper__arrow::after {
   border-top-color: #303133;
 }

package/src/components/FileUploadTable/index.vue

@@ -58,7 +58,7 @@
             <slot name="user" :row="row">{{ row[keys.user] }}</slot>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="80">
+        <el-table-column label="操作" align="center" width="80" fixed="right">
           <template slot="header" slot-scope="scope">
             <slot name="handle-header" :column="scope.column">操作</slot>
           </template>
@@ -91,8 +91,8 @@
                 >新增</el-button
               >
             </slot>
-            <slot name="batch-btn">
-              <el-button size="mini" plain @click="handleUploadDialog"
+            <slot v-if="showBatchUpload" name="batch-btn">
+              <el-button size="mini" plain @click="visibleBatch = true"
                 >批量上传</el-button
               >
             </slot>
@@ -167,6 +167,7 @@
                 :disabled="!row[keys.type]"
                 :accept="row[keys.type] | acceptFilter(typeOptions, fileAccept)"
                 :size="row[keys.type] | sizeFilter(typeOptions, fileSize)"
+                :http-request="uploadHttpRequest"
                 :before-upload="(file) => beforeUploadFn(file, row)"
                 :on-progress="(event) => onProgressFn(event, row)"
                 :on-success="
@@ -235,7 +236,7 @@
             </slot>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="80">
+        <el-table-column label="操作" align="center" width="80" fixed="right">
           <template slot="header" slot-scope="scope">
             <slot name="handle-header" :column="scope.column">操作</slot>
           </template>
@@ -301,20 +302,22 @@
       title="附件批量上传"
       :visible.sync="visibleBatch"
       top="5vh"
-      width="60%"
+      width="692px"
     >
-      <cl-upload
+      <clUpload
+        ref="upload-batch"
         class="n20-upload-drag"
+        :msg-type="null"
+        :show-clear="false"
         :drag="true"
-        action="no"
         :auto-upload="false"
         :multiple="true"
-        :limit="10"
-        :on-remove="onRemove"
-        :on-change="onChange"
-        :on-success="onSuccess"
-        :http-request="customUpload"
-        accept=".rar,.zip,.doc,.docx,.pdf,image/*"
+        :action="action"
+        :headers="headers"
+        :accept="fileAccept"
+        :http-request="uploadHttpRequest"
+        :on-remove="(file) => $emit('on-remove', file)"
+        :on-success="batchSuccess"
       >
         <template slot="trigger">
           <i class="drag-icon n20-icon-shangchuan"></i>
@@ -323,9 +326,9 @@
             <slot>支持扩展名：.rar .zip .doc .docx .pdf .jpg...</slot>
           </span>
         </template>
-      </cl-upload>
+      </clUpload>
       <div class="dialog-footer">
-        <el-button type="primary" @click="customUpload">确认</el-button>
+        <el-button type="primary" @click="batchUploadFn">确认</el-button>
         <el-button plain @click="visibleBatch = false">取消</el-button>
       </div>
     </Dialog>
@@ -367,10 +370,6 @@ export default {
       type: Object,
       default: undefined
     },
-    actionBatch: {
-      type: String,
-      default: '/api/neams/eamsbaserecord/save'
-    },
     seePrefix: {
       type: String,
       default: undefined
@@ -379,10 +378,6 @@ export default {
       type: RegExp,
       default: () => /\.jpg|\.png|\.gif|\.svg|\.pdf$/i
     },
-    uploadParams: {
-      type: Object,
-      default: () => ({})
-    },
     tableData: {
       type: Array,
       default: () => []
@@ -390,6 +385,14 @@ export default {
     dataPorp: {
       type: Object,
       default: () => ({})
+    },
+    showBatchUpload: {
+      type: Boolean,
+      default: false
+    },
+    uploadHttpRequest: {
+      type: Function,
+      default: undefined
     }
   },
   data() {
@@ -412,7 +415,6 @@ export default {
           label: '其他合同'
         }
       ],
-      batchData: {},
       keys: this.dataPorp.keys || {
         rowKey: 'id',
         type: 'type',
@@ -430,86 +432,24 @@ export default {
     }
   },
   methods: {
-    addRow() {
-      this.$emit('add-row')
+    batchUploadFn() {
+      let $uploadwrap = this.$refs['upload-batch']
+      let $upload = $uploadwrap.$refs['upload']
+      $upload.submit()
     },
-    handleUploadDialog() {
-      this.visibleBatch = true
-    },
-    async customUpload() {
-      let { code, data } = await axios({
-        headers: {
-          'Content-Type': 'multipart/form-data'
-        },
-        url: `/api/neams/eamsbaserecord/save`,
-        method: 'POST',
-        data: this.batchData
+    batchSuccess(response, file, fileList) {
+      let row = {}
+      this.tableData.splice(0, 0, row)
+      this.$nextTick(() => {
+        this.onSuccessFn(response, file, fileList, row)
       })
 
-      if (code === 200) {
-        if (data.length > 0) {
-          let flieList = data.map((item) => {
-            var keys = Object.keys(item)[0]
-            let row = JSON.parse(item[keys])
-            var d = new Date(row.uploadtime)
-            return {
-              name: row.recordname,
-              time: this.TimeDate(d),
-              user: row.creator,
-              archiveId: row.beid,
-              type: row.attno
-            }
-          })
-
-          this.tableData = this.tableData.concat(flieList)
-          this.visibleBatch = false
-          this.currFileList = []
-        }
+      if (fileList.every((f) => f.status === 'success')) {
+        this.visibleBatch = false
       }
     },
-    onRemove(file, filelist) {
-      this.currFileList = filelist
-      let params = this.uploadParams
-      let data = new FormData()
-      let dataArray = []
-      console.log(this.currFileList, 999)
-      this.currFileList.forEach((item) => {
-        data.append('file', item.raw)
-        let attno = null
-        dataArray.push({
-          ...params,
-          recordname: item.name,
-          fileSize: item.size,
-          memo: item.name,
-          attno
-        })
-      })
-      data.append('data', JSON.stringify(dataArray))
-      //档案生效时间-截止时间
-      data.append('date', `${this.getFormatDate()},2099-12-31 23:59:59`)
-      this.batchData = data
-    },
-    onChange(file, filelist) {
-      this.currFileList = filelist
-      let params = this.uploadParams
-      let data = new FormData()
-      let dataArray = []
-      console.log(this.currFileList, 999)
-      this.currFileList.forEach((item) => {
-        data.append('file', item.raw)
-        let attno = null
-        dataArray.push({
-          ...params,
-          recordname: item.name,
-          fileSize: item.size,
-          memo: item.name,
-          attno
-        })
-      })
-      data.append('data', JSON.stringify(dataArray))
-      //档案生效时间-截止时间
-      data.append('date', `${this.getFormatDate()},2099-12-31 23:59:59`)
-      this.batchData = data
+    addRow() {
+      this.$emit('add-row')
     },
     downRows() {
       this.$emit('down-rows', this.selectionList)
@@ -535,78 +475,6 @@ export default {
         return {}
       }
     },
-    getFormatDate() {
-      let date = new Date()
-      let month = date.getMonth() + 1
-      let strDate = date.getDate()
-      let getHours = date.getHours()
-      let getMinutes = date.getMinutes()
-      let getSeconds = date.getSeconds()
-      if (month >= 1 && month <= 9) {
-        month = '0' + month
-      }
-      if (strDate >= 0 && strDate <= 9) {
-        strDate = '0' + strDate
-      }
-      if (getHours >= 0 && getHours <= 9) {
-        getHours = '0' + getHours
-      }
-      if (getMinutes >= 0 && getMinutes <= 9) {
-        getMinutes = '0' + getMinutes
-      }
-      if (getSeconds >= 0 && getSeconds <= 9) {
-        getSeconds = '0' + getSeconds
-      }
-      return (
-        date.getFullYear() +
-        '-' +
-        month +
-        '-' +
-        strDate +
-        ' ' +
-        getHours +
-        ':' +
-        getMinutes +
-        ':' +
-        getSeconds
-      )
-    },
-    TimeDate(now) {
-      var year = now.getFullYear()
-      var month = now.getMonth() + 1
-      var date = now.getDate()
-      var hour = now.getHours()
-      var minute = now.getMinutes()
-      var second = now.getSeconds()
-      if (month < 10) {
-        month = '0' + month
-      }
-      if (date < 10) {
-        date = '0' + date
-      }
-      if (hour < 10) {
-        hour = '0' + hour
-      }
-      if (minute < 10) {
-        minute = '0' + minute
-      }
-      if (second < 10) {
-        second = '0' + second
-      }
-      return (
-        year +
-        '-' +
-        month +
-        '-' +
-        date +
-        ' ' +
-        hour +
-        ':' +
-        minute +
-        ':' +
-        second
-      )
-    },
     async downFile(row) {
       let { url, name } = await this.getFileInfo(row)
       if (url) {

package/src/components/LoginTemporary/form.vue

@@ -405,7 +405,6 @@ export default {
           sign = await getSign(username, userDn)
           certDn = userDn
         }
-
         await this.authorizationCode(username, password, code) // authorizationValue 使用一次后就失效了
         axios
           .post(
@@ -425,6 +424,8 @@ export default {
           .then((res) => {
             this.loginAfter(res.data)
           })
+        this.loadingV = false
+
         return
       }
 

package/src/components/Upload/index.vue

@@ -11,6 +11,7 @@
     :on-success="successFn"
     :on-error="errorFn"
     :on-progress="progressFn"
+    :on-remove="removeFn"
     :before-upload="beforeUploadFn"
     v-on="$listeners"
   >
@@ -256,6 +257,11 @@ export default {
           })
         }
       }
+    },
+    removeFn(file, fileList) {
+      if (this.onRemove) {
+        this.onRemove(file, fileList)
+      }
     }
   }
 }

package/src/directives/VTitle/index.js

@@ -2,16 +2,28 @@ let timer = undefined
 const popClass = 'at-title-pop-' + Date.now()
 
 function tipShow(el, tip) {
-  let _input = el.querySelector('.el-input__inner')
-  if (_input && !el.$tooltipTitle) el.$tooltipTitle = _input.value
   if (el.$tooltipTitle) {
-    let _el = _input || el
-    if (!el.$tooltipTitleOverflow || _el.clientWidth < _el.scrollWidth) {
+    if (!el.$tooltipTitleOverflow || el.clientWidth < el.scrollWidth) {
       document.querySelector('.' + popClass).innerText = el.$tooltipTitle
 
       tip.$refs['title-pop'].referenceElm = el
       tip.$refs['title-pop'].doDestroy()
 
+      tip.$nextTick(() => {
+        tip.visible = true
+        timer = setInterval(() => {
+          if (tip.visible && !el.scrollWidth) tipHide(el, tip)
+        }, 1000)
+      })
+    }
+  } else {
+    let _input = el.querySelector('.el-input__inner')
+    if (_input && _input.clientWidth < _input.scrollWidth) {
+      document.querySelector('.' + popClass).innerText = _input.value
+
+      tip.$refs['title-pop'].referenceElm = el
+      tip.$refs['title-pop'].doDestroy()
+
       tip.$nextTick(() => {
         tip.visible = true
         timer = setInterval(() => {
@@ -21,6 +33,7 @@ function tipShow(el, tip) {
     }
   }
 }
+
 function tipHide(el, tip) {
   tip.visible = false
   clearInterval(timer)

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

@@ -1,5 +1,5 @@
 import './XTXSAB.js'
-
+import { Message } from 'element-ui'
 let _dn
 function getDN() {
   if (!_dn) {
@@ -20,7 +20,7 @@ export async function getSign(plain, dn) {
       () => resolve(),
       () => {
         errMsg = '没有检测到签名驱动!'
-        alert(errMsg)
+        Message.error(errMsg)
         reject(errMsg)
       }
     )
@@ -31,7 +31,7 @@ export async function getSign(plain, dn) {
   }
   if (!dn) {
     errMsg = '签名参数DN错误!'
-    alert(errMsg)
+    Message.error(errMsg)
     return Promise.reject(errMsg)
   }
 
@@ -41,33 +41,84 @@ export async function getSign(plain, dn) {
     plainText = plain
   }
 
-  let r_retVal
+  /**
+   * 获取证书列表
+   */
+  let CertIdList = []
   await new Promise((resolve, reject) => {
-    window.SOF_ExportUserCert(dn, (r) => {
-      if (r.retVal) {
-        r_retVal = r.retVal
+    window.SOF_GetUserList((l) => {
+      if (l.retVal) {
+        CertIdList = l.retVal
+          .replace(/&&&$/, '')
+          .split('&&&')
+          .map((s) => s.split('||')[1])
         resolve()
       } else {
-        errMsg = '证书获取失败!'
-        alert(errMsg)
-        reject(errMsg)
+        Message.error('证书获取失败')
+        resolve()
       }
     })
   })
 
+  /**
+   * 获取证书
+   */
+
+  let r_retVal = []
+  await new Promise((resolve, reject) => {
+    for (let i = 0; i < CertIdList.length; i++) {
+      const item = CertIdList[i]
+      window.SOF_ExportUserCert(item, (r) => {
+        if (r.retVal) {
+          r_retVal.push({ certId: CertIdList[i], retVal: r.retVal })
+          resolve()
+        } else {
+          errMsg = '证书获取失败!'
+          Message.error(errMsg)
+          reject(errMsg)
+        }
+      })
+    }
+  })
+
+  /**
+   * 根据OID获取证书信息
+   */
+  let s_retVal = []
+  await new Promise((resolve, reject) => {
+    for (let i = 0; i < r_retVal.length; i++) {
+      const val = r_retVal[i].retVal
+      window.SOF_GetCertInfoByOid(val, '1.2.156.112562.2.1.1.23', (s) => {
+        if (s.retVal) {
+          s_retVal.push({ certId: r_retVal[i].certId, retVal: s.retVal })
+          resolve()
+        } else {
+          errMsg = '证书信息获取失败!'
+          Message.error(errMsg)
+          reject(errMsg)
+        }
+      })
+    }
+  })
+
+  /**
+   * 签名
+   */
   let v_retVal
+  let val = s_retVal.filter((v) => v.retVal === dn)
+  let cert = r_retVal.filter((s) => s.certId === val[0].certId)
   await new Promise((resolve, reject) => {
-    window.SOF_SignData(dn, plainText + '' + dn, (v) => {
+    window.SOF_SignData(val[0].certId, plainText + '' + dn, (v) => {
       if (v.retVal) {
-        v_retVal = v.retVal + '@@@' + r_retVal
+        v_retVal = v.retVal
         resolve()
       } else {
         errMsg = '签名失败!'
-        alert(errMsg)
+        Message.error(errMsg)
         reject(errMsg)
       }
     })
   })
 
-  return Promise.resolve(v_retVal + '@@@' + r_retVal)
+  return Promise.resolve(v_retVal + '@@@' + cert[0].retVal)
 }