n20-common-lib 1.3.53 → 1.3.56

package/src/components/ApprovalRecord/{approvalImgPro.vue → approvalImgPro/index.vue}

@@ -18,12 +18,7 @@
     </svg>
     <div ref="activiti-svg-wrap" class="activiti-svg-wrap"></div>
     <div class="flex-box activiti-svg-zoom">
-      <el-button
-        type="text"
-        icon="el-icon-zoom-out"
-        style="font-size: 18px"
-        @click="scaleMinus"
-      />
+      <el-button type="text" icon="el-icon-zoom-out" style="font-size: 18px" @click="scaleMinus" />
       <el-slider
         v-model="zoomValue"
         class="m-l m-r"
@@ -33,51 +28,39 @@
         :format-tooltip="$options.filters.zoomFormat"
         style="width: 200px"
       />
-      <el-button
-        type="text"
-        icon="el-icon-zoom-in"
-        style="font-size: 18px"
-        @click="scaleAdd"
-      />
-      <span
-        class="m-l-s m-r-s"
-        style="display: inline-block; width: 38px; line-height: 38px"
-        >{{ zoomValue | zoomFormat }}</span
-      >
-      <el-button
-        type="text"
-        icon="el-icon-full-screen"
-        style="font-size: 16px"
-        @click="scaleReset"
-      />
+      <el-button type="text" icon="el-icon-zoom-in" style="font-size: 18px" @click="scaleAdd" />
+      <span class="m-l-s m-r-s" style="display: inline-block; width: 38px; line-height: 38px">{{
+        zoomValue | zoomFormat
+      }}</span>
+      <el-button type="text" icon="el-icon-full-screen" style="font-size: 16px" @click="scaleReset" />
     </div>
 
     <div ref="msgEl" class="activiti-msg">
-      <div>
-        <span class="color-primary">待审批: </span>{{ daishengpi.toString() }}
-      </div>
-      <div>
-        <span class="color-success">已审批: </span>{{ yishengpi.toString() }}
-      </div>
+      <div>{{ assignee }}</div>
     </div>
   </div>
 </template>
 
 <script>
-import importG from '../../utils/importGlobal.js'
-import { tipShow, tipHide } from '../../directives/VTitle/index.js'
+import importG from '../../../utils/importGlobal.js'
+import { tipShow, tipHide } from '../../../directives/VTitle/index.js'
 export default {
   filters: {
     zoomFormat(val) {
       return parseInt(val * 10) + '0%'
     }
   },
+  props: {
+    dataPro: {
+      type: Object,
+      default: undefined
+    }
+  },
   data() {
     this.svgW = undefined
     this.svgC = undefined
     return {
-      daishengpi: [],
-      yishengpi: [],
+      assignee: '',
       min: 0.4,
       max: 2,
       step: 0.1,
@@ -92,19 +75,31 @@ export default {
   async mounted() {
     this.svgW = this.$refs['activiti-svg-wrap']
 
-    let { flowString, seqRecords, taskDefIdMap } = await this.$axios.get(
-      '/server-assets/approvalImgDate.json'
-    )
-    this.setSvgAttrs(flowString)
-    seqRecords.forEach((obj) => {
-      this.setTaskRecord(obj)
-    })
-    taskDefIdMap.forEach((obj) => {
-      this.addEvent(obj)
-    })
-    let { default: panzoom } = await importG('panzoom', () =>
-      import(/*webpackChunkName: "panzoom"*/ 'panzoom')
-    )
+    let { flowString, seqRecords, taskDefIdMap, currentActivityId, currentAssigneeName } = this.dataPro
+    let flowSvg = flowString
+    if (flowString.includes('bpmn2:definitions')) {
+      let { default: bpmn2svg } = await importG('bpmn2svg', () =>
+        import(/*webpackChunkName: "bpmn2svg"*/ './bpmn2svg/bpmn2svg.umd.js')
+      )
+      flowSvg = await bpmn2svg(flowString)
+    }
+    this.setSvgAttrs(flowSvg)
+    try {
+      seqRecords.forEach((obj) => {
+        this.setTaskRecord(obj)
+      })
+      for (let k in taskDefIdMap) {
+        this.addEvent(k, taskDefIdMap[k])
+      }
+      if (currentActivityId) {
+        this.addEvent(currentActivityId, currentAssigneeName, 'pending')
+        this.svgW.querySelector(`[data-element-id="${currentActivityId}"]`).classList.add('activiti-node-at')
+      }
+    } catch (error) {
+      console.log('setTaskErr:', error)
+    }
+
+    let { default: panzoom } = await importG('panzoom', () => import(/*webpackChunkName: "panzoom"*/ 'panzoom'))
 
     this.svgPanzoom = panzoom(this.svgC, {
       maxZoom: this.max,
@@ -130,12 +125,7 @@ export default {
       let width = this.svgC.getAttribute('width')
       let height = this.svgC.getAttribute('height')
       let viewBox = this.svgC.getAttribute('viewBox').split(' ')
-      viewBox = [
-        Number(viewBox[0]) - 10,
-        Number(viewBox[1]) - 10,
-        Number(viewBox[2]) + 10,
-        Number(viewBox[3]) + 10
-      ]
+      viewBox = [Number(viewBox[0]) - 10, Number(viewBox[1]) - 10, Number(viewBox[2]) + 10, Number(viewBox[3]) + 10]
       viewBox = viewBox.join(' ')
 
       this.svgC.setAttribute('width', Number(width) + 10)
@@ -143,42 +133,28 @@ export default {
       this.svgC.setAttribute('viewBox', viewBox)
     },
     setTaskRecord(obj) {
-      let {
-        resouceTaskDefId: from,
-        targetTaskDefId: to,
-        flowLine: line,
-        type: type,
-        suggestion: msg
-      } = obj
+      let { resouceTaskDefId: from, targetTaskDefId: to, seqDefid: line, type: type } = obj
       if (type === '0') {
-        this.svgW
-          .querySelector(`[data-element-id="${from}"]`)
-          .classList.add('activiti-node-achieve')
-        this.svgW
-          .querySelector(`[data-element-id="${to}"]`)
-          .classList.add('activiti-node-achieve')
-        this.svgW
-          .querySelector(`[data-element-id="${line}"]`)
-          .classList.add('activiti-line-achieve')
+        this.svgW.querySelector(`[data-element-id="${from}"]`).classList.add('activiti-node-achieve')
+        this.svgW.querySelector(`[data-element-id="${to}"]`).classList.add('activiti-node-achieve')
+        this.svgW.querySelector(`[data-element-id="${line}"]`).classList.add('activiti-line-achieve')
       } else {
-        this.svgW
-          .querySelector(`[data-element-id="${from}"]`)
-          .classList.add('activiti-node-reject')
-        this.svgW
-          .querySelector(`[data-element-id="${to}"]`)
-          .classList.add('activiti-node-reject')
-        this.setRejectLink(from, to, msg)
+        this.svgW.querySelector(`[data-element-id="${from}"]`).classList.add('activiti-node-reject')
+        if (type === '1') {
+          this.svgW.querySelector(`[data-element-id="${to}"]`).classList.add('activiti-node-reject')
+          this.setRejectLink(from, to, '驳回至发起人')
+        } else if (type === '2') {
+          this.setRejectLink(from, to, '驳回至上一步')
+        }
       }
     },
     setRejectLink(from, to, msg) {
       const fromO = this.getElRect(from)
       const toO = this.getElRect(to)
       let oTop = Math.min(fromO.top, toO.top) - 12
-      let d = `M${fromO.left + fromO.with / 2},${fromO.top} L${
-        fromO.left + fromO.with / 2
-      },${oTop} L${toO.left + toO.with / 2},${oTop} L${
+      let d = `M${fromO.left + fromO.with / 2},${fromO.top} L${fromO.left + fromO.with / 2},${oTop} L${
         toO.left + toO.with / 2
-      },${toO.top}`
+      },${oTop} L${toO.left + toO.with / 2},${toO.top}`
 
       let path = document.createElementNS('http://www.w3.org/2000/svg', 'path')
       path.setAttribute('class', 'activiti-line-reject')
@@ -186,24 +162,15 @@ export default {
       this.svgC.appendChild(path)
 
       if (msg) {
-        let text = document.createElementNS(
-          'http://www.w3.org/2000/svg',
-          'text'
-        )
+        let text = document.createElementNS('http://www.w3.org/2000/svg', 'text')
         text.setAttribute('class', 'activiti-text-reject')
-        text.setAttribute(
-          'x',
-          (fromO.left + fromO.with / 2 + toO.left + toO.with / 2) / 2
-        )
+        text.setAttribute('x', (fromO.left + fromO.with / 2 + toO.left + toO.with / 2) / 2)
         text.setAttribute('y', oTop + 6)
         text.textContent = msg
         this.svgC.appendChild(text)
 
         let textO = text.getBBox()
-        let rect = document.createElementNS(
-          'http://www.w3.org/2000/svg',
-          'rect'
-        )
+        let rect = document.createElementNS('http://www.w3.org/2000/svg', 'rect')
         rect.setAttribute('class', 'activiti-text-bg-reject')
         rect.setAttribute('x', textO.x)
         rect.setAttribute('y', textO.y)
@@ -234,12 +201,15 @@ export default {
       }
       return rect
     },
-    addEvent(obj) {
-      let { taskDefId, daishengpi, yishengpi } = obj
-      let task = this.svgW.querySelector(`[data-element-id="${taskDefId}"]`)
+    addEvent(id, list = [], type) {
+      let task = this.svgW.querySelector(`[data-element-id="${id}"]`)
       task.addEventListener('mouseenter', () => {
-        this.daishengpi = daishengpi
-        this.yishengpi = yishengpi
+        if (type === 'pending') {
+          this.assignee = list
+        } else {
+          this.assignee = '已审批人：' + list.map((c) => c.assignee).join('，')
+        }
+        console.log(list, 5456)
         this.$nextTick(() => {
           tipShow(task, this.$refs['msgEl'])
         })
@@ -397,19 +367,23 @@ setRejectLink(from, to) {
 }
 .activiti-node-achieve circle,
 .activiti-node-achieve rect,
+.activiti-node-achieve polygon,
 .activiti-line-achieve path {
-  stroke: var(--color-primary) !important;
+  stroke: var(--color-success) !important;
 }
 .activiti-node-reject circle,
 .activiti-node-reject rect {
   stroke: var(--color-danger) !important;
 }
+.activiti-node-at rect {
+  stroke: var(--color-primary-hover) !important;
+}
 .activiti-line-reject {
   fill: none;
   stroke-width: 1px;
   stroke: var(--color-danger) !important;
   stroke-linejoin: round;
-  marker-end: url('#sequenceflow-end-white-black-3aw0mc6w8vg7jarca1qf355gu');
+  /* marker-end: url('#sequenceflow-end-white-black-3aw0mc6w8vg7jarca1qf355gu'); */
 }
 .activiti-text-reject {
   fill: var(--color-danger) !important;

package/src/components/Filters/form-item-input.vue

@@ -5,6 +5,9 @@
     :clearable="item | clearableF"
     style="width: 100%"
     v-bind="item.props"
+    :placeholder="
+      item.props && item.props.placeholder ? item.props.placeholder : '请输入'
+    "
     v-on="item.on"
   />
   <el-input

package/src/components/ShowColumn/index.vue

@@ -19,13 +19,9 @@
               已选
               <span class="color-main">{{ dragList.length }}</span>
             </span>
-            <el-link
-              :underline="false"
-              type="primary"
-              class="m-l-auto"
-              @click="setAll"
-              >{{ setState ? '全部清空' : '全部选中' }}</el-link
-            >
+            <el-link :underline="false" type="primary" class="m-l-auto" @click="setAll">{{
+              setState ? '全部清空' : '全部选中'
+            }}</el-link>
           </div>
           <div class="flex-item p-r" style="height: 50%; overflow: auto">
             <el-checkbox-group :value="dragList.map((d) => d[labelKey])">
@@ -44,16 +40,10 @@
         <div class="right-c flex-column p-t-m">
           <div class="m-b">
             当前选定项
-            <el-link type="primary" style="visibility: hidden"
-              >当前选定项</el-link
-            >
+            <el-link type="primary" style="visibility: hidden">当前选定项</el-link>
           </div>
           <div class="flex-1 overflow-y">
-            <drag-list
-              :list="dragList"
-              :label-key="labelKey"
-              :in-show-column="true"
-            />
+            <drag-list :list="dragList" :label-key="labelKey" :in-show-column="true" />
           </div>
         </div>
       </div>
@@ -144,9 +134,7 @@ export default {
       }
     },
     setState() {
-      return (
-        this.columnsAs.length && this.columnsAs.length === this.dragList.length
-      )
+      return this.columnsAs.length && this.columnsAs.length === this.dragList.length
     },
     columnsAs() {
       return this.columns.filter((col) => !col.static)
@@ -165,32 +153,20 @@ export default {
     },
     checkChange(val, column) {
       if (val === false) {
-        let index = this.dragList.findIndex(
-          (d) => d[this.labelKey] === column[this.labelKey]
-        )
+        let index = this.dragList.findIndex((d) => d[this.labelKey] === column[this.labelKey])
         index !== -1 && this.dragList.splice(index, 1)
       } else {
         this.dragList.push(column)
       }
     },
     reset() {
-      if (this.isFilter) {
-        let dragList = this.columns.filter((col) => col.isDefault)
-        this.dragList = dragList.length ? dragList : this.checkColumns
-        return
-      }
-      this.dragList = this.checkColumns.filter((col) => !col.static)
+      let dragList = this.columns.filter((col) => col.isDefault)
+      this.dragList = dragList.length ? dragList : this.checkColumns.filter((col) => !col.static)
     },
     setChange() {
       if (this.dragList.length < 1) {
         this.$message.error(
-          `至少设置${
-            this.isExport
-              ? '一列导出数据'
-              : this.isFilter
-              ? '一个筛选条件'
-              : '一列显示列'
-          }!`
+          `至少设置${this.isExport ? '一列导出数据' : this.isFilter ? '一个筛选条件' : '一列显示列'}!`
         )
         return
       }
@@ -236,9 +212,7 @@ export default {
                 let columns = []
                 _data.forEach((d) => {
                   if (typeof d === 'string') {
-                    let column = this.columns.find(
-                      (c) => c[this.labelKey] === d
-                    )
+                    let column = this.columns.find((c) => c[this.labelKey] === d)
                     column && columns.push(column)
                   } else if (typeof d === 'object') {
                     columns.push(d)
@@ -247,7 +221,7 @@ export default {
                 return resolve(columns)
               }
             }
-            return resolve(undefined)
+            return resolve(null)
           })
           .catch((err) => {
             reject(err)

package/src/components/Table/index.vue

@@ -8,7 +8,7 @@
     v-on="$listeners"
   >
     <template v-for="(item, i) in columns">
-      <slot v-if="item.slotName" :name="item.slotName"></slot>
+      <slot v-if="item.slotName" :name="item.slotName" :column="item"></slot>
       <el-table-column
         v-else-if="item.render"
         :key="'cl-table-' + i"