n20-common-lib 1.3.71 → 1.3.73

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -4,7 +4,7 @@
     <el-form label-position="right" label-width="5em">
       <div v-if="taskId && showBtn" class="flex-box">
         <div v-if="authList.includes('isCarboncopy')" class="flex-1">
-          <el-form-item label="抄送">
+          <el-form-item label="抄送" class="m-b">
             <el-input
               :value="carbonCopyList.map((c) => c.uname).join(', ')"
               type="textarea"
@@ -13,9 +13,14 @@
             />
           </el-form-item>
         </div>
-        <div v-if="authList.includes('加签')" class="flex-1">
-          <el-form-item label="加签">
-            <el-input type="textarea" :autosize="{ minRows: 1 }" />
+        <div v-if="authList.includes('isAddtask')" class="flex-1">
+          <el-form-item label="加签" class="m-b">
+            <el-input
+              type="textarea"
+              :value="addTaskList.map((c) => c.uname).join(', ')"
+              :autosize="{ minRows: 1 }"
+              @focus="setAddtaskV = true"
+            />
           </el-form-item>
         </div>
       </div>
@@ -42,6 +47,9 @@
     <cl-dialog v-drag :visible.sync="setCarboncopyV" title="设置抄送用户" width="900px" append-to-body top="7.5vh">
       <carboncopy-prop :carbon-copy-list="carbonCopyList" @close="setCarboncopyV = false" @confirm="setCarboncopyOk" />
     </cl-dialog>
+    <cl-dialog v-drag :visible.sync="setAddtaskV" title="设置抄送用户" width="900px" append-to-body top="7.5vh">
+      <carboncopy-prop :carbon-copy-list="addTaskList" @close="setAddtaskV = false" @confirm="setAddtaskOk" />
+    </cl-dialog>
   </div>
 </template>
 
@@ -88,7 +96,9 @@ export default {
       authList: [],
       showBtn: true,
       setCarboncopyV: false,
-      carbonCopyList: []
+      carbonCopyList: [],
+      setAddtaskV: false,
+      addTaskList: []
     }
   },
   computed: {
@@ -156,7 +166,8 @@ export default {
           formData: JSON.stringify(this.formData),
           signText: this.signText,
           isAgentcy: isAgentcy,
-          carbonCopyUserDtoList: this.carbonCopyList.map((c) => ({ userNo: c.uno, userName: c.uname }))
+          carbonCopyUserDtoList: this.carbonCopyList.map((c) => ({ userNo: c.uno, userName: c.uname })),
+          addTaskList: this.addTaskList.map((c) => ({ userNo: c.uno, userName: c.uname }))
         }
       ]
     },
@@ -244,6 +255,11 @@ export default {
       this.carbonCopyList = list
 
       this.setCarboncopyV = false
+    },
+    setAddtaskOk(list) {
+      this.addTaskList = list
+
+      this.setAddtaskV = false
     }
   }
 }

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

@@ -55,6 +55,68 @@
         <div v-if="assignee" :class="{ 'm-t-s': assigneeEnd }">{{ assignee }}</div>
       </div>
     </el-popover>
+    <el-popover ref="addTask-pop" v-model="addTaskV" trigger="manual" placement="bottom">
+      <div @click.stop>
+        <div class="m-b el-dialog__title">加签流程</div>
+        <div class="p-a" style="text-align: center">
+          <svg v-if="addTaskList.length" :width="addTaskList.length * 160 - 50" height="82">
+            <template v-for="(item, i) in addTaskList">
+              <g
+                v-if="i > 0"
+                :key="i + '-flow'"
+                class="djs-element djs-connection activiti-line-achieve"
+                :data-element-id="item.addTaskDefId + '-flow'"
+                transform="matrix(1 0 0 1 100 1)"
+              >
+                <path
+                  d="m0,40L60,40"
+                  style="fill: none; stroke-width: 1px; stroke: black; stroke-linejoin: round"
+                  :style="{
+                    'marker-end': `url(#${markerId})`
+                  }"
+                />
+              </g>
+              <g
+                :key="i"
+                class="djs-element djs-shape activiti-node-achieve"
+                :class="{
+                  'activiti-node-at': dataPro.currentActivityIdList.includes(item.addTaskDefId)
+                }"
+                :data-element-id="item.addTaskDefId"
+                :transform="`matrix(1 0 0 1 ${1 + i * 160} 1)`"
+                @mouseenter="(ev) => addElIn(item.addTaskDefId, ev)"
+                @mouseleave="msgV = false"
+              >
+                <rect
+                  x="0"
+                  y="0"
+                  width="100"
+                  height="80"
+                  rx="10"
+                  ry="10"
+                  style="stroke: black; stroke-width: 1px; fill: white; fill-opacity: 0.95"
+                />
+                <text
+                  lineheight="1.2"
+                  class="djs-label"
+                  style="
+                    font-family: Arial, sans-serif;
+                    font-size: 12px;
+                    font-weight: normal;
+                    text-anchor: middle;
+                    fill: black;
+                  "
+                >
+                  <tspan x="50" y="43.6">{{ item.taskName.slice(0, 7) }}</tspan>
+                  <tspan x="50" y="58">{{ item.taskName.slice(7) }}</tspan>
+                </text>
+                <use xlink:href="#symbol_node_User" style="fill: rgb(102, 102, 102)" />
+              </g>
+            </template>
+          </svg>
+        </div>
+      </div>
+    </el-popover>
   </div>
 </template>
 
@@ -75,7 +137,6 @@ export default {
   data() {
     this.svgW = undefined
     this.svgC = undefined
-    this.markerId = ''
     return {
       assignee: undefined,
       assigneeEnd: undefined,
@@ -83,7 +144,10 @@ export default {
       max: 2,
       step: 0.1,
       zoomValue: 1,
-      msgV: false
+      markerId: '',
+      msgV: false,
+      addTaskV: false,
+      addTaskList: []
     }
   },
   watch: {
@@ -94,7 +158,14 @@ export default {
   async mounted() {
     this.svgW = this.$refs['activiti-svg-wrap']
 
-    let { flowString, seqRecords, taskDefIdMap = {}, currAssMap = {}, currentActivityIdList = [] } = this.dataPro
+    let {
+      flowString,
+      seqRecords,
+      taskDefIdMap = {},
+      currAssMap = {},
+      currentActivityIdList = [],
+      addTask = {}
+    } = this.dataPro
     let flowSvg = flowString
     if (flowString.includes('bpmn2:definitions')) {
       let { default: bpmn2svg } = await importG('bpmn2svg', () =>
@@ -104,23 +175,40 @@ export default {
     }
     this.setSvgAttrs(flowSvg)
     try {
+      for (let k in addTask) {
+        let line = this.svgW.querySelector(`[data-element-id="${k}"] path`)
+        if (line) {
+          this.addNode(k, line, addTask[k])
+        }
+      }
+
       seqRecords.forEach((obj) => {
         this.setTaskRecord(obj)
       })
+
       currentActivityIdList.forEach((currentActivityId) => {
         let assignee = currAssMap[currentActivityId]
         let assigneeEnd = taskDefIdMap[currentActivityId]
         taskDefIdMap[currentActivityId] = undefined
 
-        this.addEvent(currentActivityId, { assignee, assigneeEnd }, 'pending')
-
-        this.svgW.querySelector(`[data-element-id="${currentActivityId}"]`).classList.add('activiti-node-at')
+        let task = this.svgW.querySelector(`[data-element-id="${currentActivityId}"]`)
+        if (task) {
+          task.classList.add('activiti-node-at')
+          !currentActivityId.includes('@addTaskType') && this.addEvent(task, { assignee, assigneeEnd }, 'pending')
+          // this.addEvent(task, { assignee, assigneeEnd }, 'pending')
+        }
       })
       for (let k in taskDefIdMap) {
-        taskDefIdMap[k] && this.addEvent(k, taskDefIdMap[k])
+        if (taskDefIdMap[k]) {
+          let taskK = this.svgW.querySelector(`[data-element-id="${k}"]`)
+          if (taskK) {
+            !k.includes('@addTaskType') && this.addEvent(taskK, taskDefIdMap[k])
+            // this.addEvent(taskK, taskDefIdMap[k])
+          }
+        }
       }
     } catch (error) {
-      console.log('setTaskErr:', error)
+      console.warn('setTaskErr:', error)
     }
 
     let { default: panzoom } = await importG('panzoom', () => import(/*webpackChunkName: "panzoom"*/ 'panzoom'))
@@ -138,15 +226,23 @@ export default {
       let { scale } = e.getTransform()
       this.zoomValue = scale
     })
+
+    document.body.addEventListener('click', this.addTaskFn)
   },
   deactivated() {
     this.msgV = false
+    this.addTaskV = false
   },
   beforeDestroy() {
     this.msgV = false
     this.svgPanzoom && this.svgPanzoom.dispose()
+
+    document.body.removeEventListener('click', this.addTaskFn)
   },
   methods: {
+    addTaskFn() {
+      this.addTaskV = false
+    },
     setSvgAttrs(str) {
       this.svgW.innerHTML = str
       this.svgC = this.svgW.querySelector('svg')
@@ -219,6 +315,15 @@ export default {
         left: undefined,
         top: undefined
       }
+      if (id.includes('@addTaskType')) {
+        rect = {
+          with: 20,
+          height: 20,
+          left: Number(g.getAttribute('data-element-left')),
+          top: Number(g.getAttribute('data-element-top'))
+        }
+        return rect
+      }
 
       if (g.querySelector('circle')) {
         rect.with = 36
@@ -233,8 +338,72 @@ export default {
       }
       return rect
     },
-    addEvent(id, list, type) {
-      let task = this.svgW.querySelector(`[data-element-id="${id}"]`)
+    addNode(id, line, list) {
+      let D = line.getAttribute('d')
+      let Ds = D.replace(/\s+/g, '')
+        .split(/[A-z]/)
+        .filter((d) => !!d)
+
+      let centreD
+      if (Ds.length === 2) {
+        let Ds1 = Ds[0].split(',')
+        let Ds2 = Ds[1].split(',')
+        centreD = [(Number(Ds1[0]) + Number(Ds2[0])) / 2, (Number(Ds1[1]) + Number(Ds2[1])) / 2]
+      } else if (Ds.length > 2) {
+        let Ds2 = Ds[1].split(',')
+        centreD = [Number(Ds2[0]), Number(Ds2[1])]
+      }
+      if (centreD) {
+        let circleG = document.createElementNS('http://www.w3.org/2000/svg', 'g')
+        circleG.classList.add('activiti-node-achieve')
+        circleG.setAttribute('data-element-left', centreD[0] - 10)
+        circleG.setAttribute('data-element-top', centreD[1] - 10)
+
+        circleG.setAttribute('data-element-id', list?.[0]?.addTaskDefId || '')
+        let cEl = `<circle r="10" cx="${centreD[0]}"  cy="${
+          centreD[1]
+        }" stroke-width="1" stroke="#666" fill="#fff"></circle>
+<line class="add-and" x1="${centreD[0] - 7}" y1="${centreD[1]}" x2="${centreD[0] + 7}" y2="${
+          centreD[1]
+        }" stroke-width="1" stroke="#666" fill="none"></line>
+<line class="add-and" x1="${centreD[0]}" y1="${centreD[1] - 7}" x2="${centreD[0]}" y2="${
+          centreD[1] + 7
+        }" stroke-width="1" stroke="#666" fill="none"></line>
+ `
+        circleG.innerHTML = cEl
+        this.svgC.appendChild(circleG)
+
+        circleG.addEventListener('click', (el) => {
+          this.addTaskList = list
+          this.$nextTick(() => {
+            this.$refs['addTask-pop'].doDestroy()
+            this.$refs['addTask-pop'].referenceElm = circleG
+            this.addTaskV = true
+          })
+          el.stopPropagation()
+        })
+      }
+    },
+    addElIn(id, ev) {
+      if (this.dataPro.currentActivityIdList.some((cId) => cId === id) /*待审批*/) {
+        this.assignee = this.dataPro.currAssMap[id]
+        this.assigneeEnd = this.dataPro.taskDefIdMap[id]
+
+        this.$nextTick(() => {
+          this.$refs['title-pop'].doDestroy()
+          this.$refs['title-pop'].referenceElm = ev.target
+          this.msgV = true
+        })
+      } else if (this.dataPro.taskDefIdMap[id] /*已审批*/) {
+        this.assigneeEnd = this.dataPro.taskDefIdMap[id]
+        this.$nextTick(() => {
+          this.$refs['title-pop'].doDestroy()
+          this.$refs['title-pop'].referenceElm = ev.target
+          this.msgV = true
+        })
+      }
+    },
+    addEvent(task, list, type) {
       task.addEventListener('mouseenter', () => {
         if (type === 'pending') {
           this.assignee = list.assignee
@@ -397,6 +566,7 @@ setRejectLink(from, to) {
   bottom: 0;
 }
 
+.n20-approval-img-por .djs-hit,
 .n20-approval-img-por .djs-hit-all,
 .n20-approval-img-por .djs-outline {
   display: none !important;
@@ -407,6 +577,7 @@ setRejectLink(from, to) {
 .activiti-node-achieve circle,
 .activiti-node-achieve rect,
 .activiti-node-achieve polygon,
+.activiti-node-achieve .add-and,
 .activiti-line-achieve path {
   stroke: #3cb495 !important;
 }
@@ -414,13 +585,15 @@ setRejectLink(from, to) {
   fill: #3cb495 !important;
 }
 .activiti-node-reject circle,
-.activiti-node-reject rect {
+.activiti-node-reject rect,
+.activiti-node-reject .add-and {
   stroke: #ea5454 !important;
 }
 .activiti-node-reject use {
   fill: #ea5454 !important;
 }
-.activiti-node-at rect {
+.activiti-node-at rect,
+.activiti-node-at .add-and {
   stroke: #fe943c !important;
 }
 .activiti-node-at use {

package/src/components/LoginTemporary/form.vue

@@ -337,6 +337,9 @@ export default {
           if (supplier === 'bjca') {
             // 北京CA
             window.sessionStorage.setItem('signType', 'bjcaSign')
+          } else if (supplier === 'Itrus') {
+             // 天威CA
+            window.sessionStorage.setItem('signType', 'ItrusSign')
           } else {
             // 信安CA
             window.sessionStorage.setItem('signType', 'inetSign')