n20-common-lib 2.5.0-beta.5 → 2.5.0-beta.6

package/package.json

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

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

@@ -53,6 +53,12 @@
           </table>
         </div>
         <div v-if="assignee" :class="{ 'm-t-s': assigneeEnd }">{{ assignee }}</div>
+
+        <div v-if="taskCandidate" class="m-t-ss m-b-ss">
+          <div v-if="taskCandidate.cltNames.length">待审批单位：{{ taskCandidate.cltNames.join('、') }}</div>
+          <div v-if="taskCandidate.roleNames.length">待审批角色：{{ taskCandidate.roleNames.join('、') }}</div>
+          <div v-if="taskCandidate.unames.length">待审批人：{{ taskCandidate.unames.join('、') }}</div>
+        </div>
       </div>
     </el-popover>
     <el-popover ref="addTask-pop" v-model="addTaskV" trigger="manual" placement="bottom">
@@ -145,6 +151,7 @@ export default {
     return {
       assignee: undefined,
       assigneeEnd: undefined,
+      taskCandidate: undefined,
       min: 0.4,
       max: 2,
       step: 0.1,
@@ -162,7 +169,6 @@ export default {
   },
   async mounted() {
     this.svgW = this.$refs['activiti-svg-wrap']
-
     let {
       flowString,
       seqRecords,
@@ -170,7 +176,8 @@ export default {
       currAssMap = {},
       currentActivityIdList = [],
       addTask = {},
-      addTaskPre = {}
+      addTaskPre = {},
+      unApplayUserTaskCandidate = {}
     } = this.dataPro
     let flowSvg = flowString
     if (flowString.includes('bpmn2:definitions')) {
@@ -180,6 +187,7 @@ export default {
       flowSvg = await bpmn2svg(flowString)
     }
     this.setSvgAttrs(flowSvg)
+    this.setPendingUserInfo(unApplayUserTaskCandidate)
     try {
       for (let k in addTask) {
         let line = this.svgW.querySelector(`[data-element-id="${k}"] path`)
@@ -242,6 +250,7 @@ export default {
 
     document.body.addEventListener('click', this.addTaskFn)
   },
+
   deactivated() {
     this.msgV = false
     this.addTaskV = false
@@ -249,13 +258,21 @@ export default {
   beforeDestroy() {
     this.msgV = false
     this.svgPanzoom && this.svgPanzoom.dispose()
-
     document.body.removeEventListener('click', this.addTaskFn)
   },
   methods: {
     addTaskFn() {
       this.addTaskV = false
     },
+    setPendingUserInfo(data) {
+      Object.keys(data).forEach((id) => {
+        let task = this.svgW.querySelector(`[data-element-id="${id}"]`)
+        if (task) {
+          console.log('setPendingUserInfo:', data[id])
+          this.addEvent(task, { taskCandidate: data[id] }, 'unApply')
+        }
+      })
+    },
     setSvgAttrs(str) {
       this.svgW.innerHTML = str
       this.svgC = this.svgW.querySelector('svg')
@@ -520,6 +537,11 @@ export default {
         if (type === 'pending') {
           this.assignee = list.assignee
           this.assigneeEnd = list.assigneeEnd
+          this.taskCandidate = undefined
+        } else if (type === 'unApply') {
+          this.assignee = undefined
+          this.assigneeEnd = undefined
+          this.taskCandidate = list.taskCandidate
         } else {
           this.assignee = undefined
           this.assigneeEnd = list

package/src/components/SelectTree/index.vue

@@ -39,7 +39,15 @@
       v-bind="$attrs"
       @node-click="nodeClick"
       @check="checkChange"
-    />
+    >
+      <div
+        slot-scope="{ node, data }"
+        :class="data[props.disabled] ? 'cursor-not' : ''"
+        :style="{ color: data[props.disabled] ? 'var(--color-text-placeholder) ' : '' }"
+      >
+        {{ data[props.label] }}
+      </div></el-tree
+    >
   </el-select>
 </template>
 
@@ -204,7 +212,7 @@ export default {
       this.filterMethod && this.filterMethod(val)
     },
     nodeClick(data) {
-      if (!this.multiple) {
+      if (!this.multiple && !data.disabled) {
         this.lazy && (this.tCdList = [data])
 
         let vK = this.props.value

package/src/components/Tree/index.vue

@@ -47,6 +47,7 @@
         v-else-if="
           showCheckbox &&
           !node.checked &&
+          !node.disabled &&
           node.data[nodeKey] === (checkFlag && checkFlag.data && checkFlag.data[nodeKey])
         "
         type="text"