n20-common-lib 2.2.27 → 2.2.28

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -23,9 +23,21 @@
             </el-tooltip>
           </label>
           <div class="flex-box">
+            <el-select
+              v-if="preAddTask"
+              v-model="addTaskWay"
+              class="m-r-ss"
+              clearable
+              :placeholder="'请选择加签类型' | $lc"
+              style="width: 10em"
+              @change="() => addTaskWay === '2' && addTaskType === '2' && (addTaskType = '3')"
+            >
+              <el-option :label="'向前加签' | $lc" value="2" />
+              <el-option :label="'向后加签' | $lc" value="1" />
+            </el-select>
             <el-select v-model="addTaskType" clearable :placeholder="'请选择审批方式' | $lc" style="width: 10em">
               <!-- <el-option :label="'普通节点' | $lc" value="1" /> -->
-              <el-option :label="'会签并行' | $lc" value="2" />
+              <el-option :label="'会签并行' | $lc" value="2" :disabled="addTaskWay === '2'" />
               <el-option :label="'普通串行' | $lc" value="3" />
             </el-select>
             <el-input
@@ -199,6 +211,8 @@ export default {
       setAddtaskV: false,
       addTaskList: [],
       addTaskType: undefined,
+      preAddTask: false,
+      addTaskWay: undefined,
       rejectToV: false,
       approvalToV: false,
       showApprovalTo: false,
@@ -226,6 +240,7 @@ export default {
     this.getBtns()
     this.getShowApprovalTo()
     this.getHasQueryAppOpiAndUser()
+    this.getHasPreAddTask()
   },
   methods: {
     // 换回到发起页
@@ -273,6 +288,21 @@ export default {
           })
       }
     },
+    // 刺探是否具有向前加签功能
+    getHasPreAddTask() {
+      if (this.showBtn && window._approvalExtend['appOpi.addTaskWay.exist'] === undefined) {
+        axios
+          .get('/bems/activiti/online/addTaskWay', null, { loading: false, noMsg: true })
+          .then(() => {
+            this.preAddTask = window._approvalExtend['appOpi.addTaskWay.exist'] = true
+          })
+          .catch(() => {
+            window._approvalExtend['appOpi.addTaskWay.exist'] = false
+          })
+      } else {
+        this.preAddTask = window._approvalExtend['appOpi.addTaskWay.exist']
+      }
+    },
     // 刺探审批意见接口是否存在
     getHasQueryAppOpiAndUser() {
       if (this.showBtn && window._approvalExtend['appOpi.queryAppOpiAndUser.exist'] === undefined) {
@@ -304,6 +334,7 @@ export default {
           carbonCopyUserDtoList: this.carbonCopyList.map((c) => ({ userNo: c.uno, userName: c.uname })),
           addTaskList: this.addTaskList.map((c) => ({ userNo: c.uno, userName: c.uname })),
           addTaskType: this.addTaskType,
+          addTaskWay: this.addTaskWay,
           ...this.otherAtt
         }
       ]
@@ -434,7 +465,13 @@ export default {
     },
     setAddtaskOk(list) {
       this.addTaskList = list
-      if (this.addTaskList.length > 0 && !this.addTaskType) this.addTaskType = '2'
+      if (this.addTaskList.length > 0 && !this.addTaskType) {
+        if (this.addTaskWay === '2') {
+          this.addTaskType = '3'
+        } else {
+          this.addTaskType = '2'
+        }
+      }
 
       this.setAddtaskV = false
     }

package/src/components/ApprovalButtons/setCarboncopyProp.vue

@@ -147,7 +147,12 @@ export default {
     },
     closeFn(item) {
       this.selectArr = this.selectArr.filter((d) => d.uno !== item.uno)
-      this.$refs.elTable.toggleRowSelection(item, false)
+
+      this.$refs.elTable.clearSelection()
+      this.selectArr.forEach((row) => {
+        this.$refs.elTable.toggleRowSelection(row)
+      })
+      this.nodeTable = [...this.nodeTable]
     },
     confirmFn() {
       this.$emit('confirm', this.selectArr)

package/src/components/ApprovalRecord/approvalImg.vue

@@ -64,6 +64,20 @@ export default {
           { noMsg: true, loading: !this.hideLoading }
         )
         .then((res) => {
+          // 区分后加签还是前加签(addTaskPreItem)
+          if (res.data && res.data.addTask) {
+            let addTaskPre = {}
+            for (let k in res.data.addTask) {
+              let item = res.data.addTask[k]
+              let addTaskPreItem = item.filter((c) => /@addTaskType$/.test(c.addTaskDefId))
+
+              if (addTaskPreItem.length) {
+                addTaskPre[k] = addTaskPreItem
+                delete res.data.addTask[k]
+              }
+            }
+            res.data['addTaskPre'] = addTaskPre
+          }
           this.dataPro = res.data
         })
         .catch((err) => {

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

@@ -169,7 +169,8 @@ export default {
       taskDefIdMap = {},
       currAssMap = {},
       currentActivityIdList = [],
-      addTask = {}
+      addTask = {},
+      addTaskPre = {}
     } = this.dataPro
     let flowSvg = flowString
     if (flowString.includes('bpmn2:definitions')) {
@@ -186,6 +187,12 @@ export default {
           this.addNode(k, line, addTask[k])
         }
       }
+      for (let k in addTaskPre) {
+        let g = this.svgW.querySelector(`[data-element-id="${k}"]`)
+        if (g) {
+          this.addNode(k, g, addTaskPre[k], 'addTaskPre')
+        }
+      }
 
       seqRecords.forEach((obj) => {
         this.setTaskRecord(obj)
@@ -415,21 +422,35 @@ export default {
       }
       return rect
     },
-    addNode(id, line, list) {
-      let D = line.getAttribute('d')
-      let Ds = D.replace(/\s+/g, '')
-        .split(/[A-z]/)
-        .filter((d) => !!d)
-
+    addNode(id, line, list, addType) {
       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 (addType === 'addTaskPre') {
+        let matrix = line.getAttribute('transform')
+        if (matrix) {
+          matrix = matrix.replace(/matrix\(|\)/g, '')
+          matrix = matrix.split(' ')
+          let left = Number(matrix[4])
+          let top = Number(matrix[5])
+          centreD = [left + 100, top]
+        }
+      } else {
+        let D = line.getAttribute('d')
+        let Ds = D.replace(/\s+/g, '')
+          .split(/[A-z]/)
+          .filter((d) => !!d)
+
+        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')

package/src/components/ApprovalRecord/index.vue

@@ -16,7 +16,7 @@
       append-to-body
       top="10vh"
     >
-      <approvalCard class="p-a" :proc-inst-id="$route.query.processInstanceId" style="height: 70vh; overflow: auto" />
+      <approvalCard class="p-a" :proc-inst-id="procInstIdC" style="height: 70vh; overflow: auto" />
     </el-dialog>
     <el-dialog
       v-drag
@@ -27,11 +27,7 @@
       append-to-body
       top="10vh"
     >
-      <approvalImg
-        class="text-c p-a"
-        :proc-inst-id="$route.query.processInstanceId"
-        style="height: 70vh; overflow: auto"
-      />
+      <approvalImg class="text-c p-a" :proc-inst-id="procInstIdC" style="height: 70vh; overflow: auto" />
     </el-dialog>
   </div>
 </template>
@@ -47,11 +43,22 @@ export default {
     approvalCard,
     approvalImg
   },
+  props: {
+    procInstId: {
+      type: String,
+      default: undefined
+    }
+  },
   data() {
     return {
       cardV: false,
       imgV: false
     }
+  },
+  computed: {
+    procInstIdC() {
+      return this.procInstId || this.$route.query.processInstanceId
+    }
   }
 }
 </script>

package/src/components/TableOperateColumn/OperateBtns.vue

@@ -30,6 +30,7 @@
 <script>
 import { $lc } from '../../utils/i18n/index'
 export default {
+  name: 'TableOperate',
   filters: {
     dbdBtn(dbd, row) {
       if (dbd === undefined || dbd === null) {

package/src/index.js

@@ -37,6 +37,7 @@ import FileUploadTable from './components/FileUploadTable/index.vue'
 import FooterBox from './components/FooterBox/index.vue'
 import Filters from './components/Filters/index.vue'
 import Table from './components/Table/index.vue'
+import TableOperate from './components/TableOperateColumn/OperateBtns.vue'
 import TableOperateColumn from './components/TableOperateColumn/index.vue'
 import TableSetSize from './components/TableSetSize'
 import Button from './components/Button/index.vue'
@@ -152,6 +153,7 @@ const components = [
   FooterBox,
   Filters,
   Table,
+  TableOperate,
   TableOperateColumn,
   TableSetSize,
   Button,
@@ -289,6 +291,7 @@ export {
   FooterBox,
   Filters,
   Table,
+  TableOperate,
   TableOperateColumn,
   TableSetSize,
   Button,