n20-common-lib 1.3.86 → 1.3.88

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -29,7 +29,7 @@
               <el-select v-model="addTaskType" :placeholder="'请选择审批方式' | $lc" style="width: 10em">
                 <!-- <el-option :label="'普通节点' | $lc" value="1" /> -->
                 <el-option :label="'会签并行' | $lc" value="2" />
-                <el-option :label="'会签串行' | $lc" value="3" />
+                <el-option :label="'普通串行' | $lc" value="3" />
               </el-select>
               <el-input
                 class="flex-item"

package/src/components/ApprovalCard/index.vue

@@ -13,18 +13,13 @@
               <span class="worker-icon n20-icon-user"></span>
               <span>{{ item.assignee }}</span>
             </div>
-            <div class="n20-approval m-r-s">
+            <div class="n20-approval m-r-s" style="width: auto; min-width: 100px">
               <template v-if="item.result == status.submit">{{ '提交' | $lc }}</template>
               <template v-else-if="item.result == status.end">{{ '结束' | $lc }}</template>
-              <template v-else-if="item.result == status.approval">
-                {{ '审批意见：' | $lc }}<span class="color-primary">{{ '批准' | $lc }}</span>
+              <template v-else>
+                <span>{{ '审批意见：' | $lc }}</span>
+                <span :class="item | typeF(status, 'color-')">{{ $lc(item.resultName || '驳回') }}</span>
               </template>
-              <template v-else-if="item.result == status.reject">
-                {{ '审批意见：' | $lc }}<span class="n20-approval-reject">{{ '驳回' | $lc }}</span></template
-              >
-              <template v-else-if="item.result == status.invalid">
-                {{ '审批意见：' | $lc }}<span class="n20-approval-reject">{{ '作废' | $lc }}</span></template
-              >
             </div>
           </div>
           <div v-if="item.suggestion" class="n20-description-c m-t">
@@ -43,15 +38,19 @@ import axios from '../../utils/axios'
 export default {
   name: 'ApprovalCard',
   filters: {
-    typeF(item, status) {
+    typeF(item, status, prefix = '') {
       let result = item.result
       switch (result) {
         case status.submit:
-          return 'primary'
+          return prefix + 'primary'
         case status.approval:
-          return 'primary'
+          return prefix + 'primary'
         case status.reject:
-          return 'danger'
+          return prefix + 'danger'
+        case status.invalid:
+          return prefix + 'danger'
+        case status.end:
+          return prefix + 'primary'
         default:
           return undefined
       }
@@ -107,9 +106,17 @@ export default {
               suggestion: item.suggestion,
               ccUserName: item.ccUserName // 抄送人
             }
+            let resultName = item.optResult || ''
+            resultName = resultName.split('-')
+            resultName = resultName[resultName.length - 1]
+            _item.resultName = resultName === '推进' ? '批准' : resultName
 
             if (item.taskName === $lc('开始')) {
               _item.result = 1
+            } else if (_item.resultName === $lc('加签推进')) {
+              _item.result = 2
+            } else if (_item.resultName === $lc('作废')) {
+              _item.result = 4
             } else if (item.taskName === $lc('结束')) {
               _item.result = 5
             } else if ('approvalState' in item) {

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

@@ -65,6 +65,9 @@
                 v-if="i > 0"
                 :key="i + '-flow'"
                 class="djs-element djs-connection activiti-line-achieve"
+                :class="{
+                  'activiti-line-reject': item.examineType === 'reject'
+                }"
                 :data-element-id="item.addTaskDefId + '-flow'"
                 :transform="`matrix(1 0 0 1 ${i * 160 - 60} 1)`"
               >
@@ -80,7 +83,8 @@
                 :key="i"
                 class="djs-element djs-shape activiti-node-achieve"
                 :class="{
-                  'activiti-node-at': dataPro.currentActivityIdList.includes(item.addTaskDefId)
+                  'activiti-node-at': dataPro.currentActivityIdList.includes(item.addTaskDefId),
+                  'activiti-node-reject': item.examineType === 'reject'
                 }"
                 :data-element-id="item.addTaskDefId"
                 :transform="`matrix(1 0 0 1 ${1 + i * 160} 1)`"
@@ -250,10 +254,10 @@ 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]), Number(viewBox[1]) - 10, Number(viewBox[2]) + 20, Number(viewBox[3])]
       viewBox = viewBox.join(' ')
 
-      this.svgC.setAttribute('width', Number(width) + 10)
+      this.svgC.setAttribute('width', Number(width) + 20)
       this.svgC.setAttribute('height', Number(height) + 10)
       this.svgC.setAttribute('viewBox', viewBox)
 
@@ -280,9 +284,21 @@ export default {
       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${toO.left + toO.with / 2},${toO.top}`
+      let fromLC = fromO.left + fromO.with / 2
+      let toLC = toO.left + toO.with / 2
+
+      let oRight = Math.max(fromO.left + fromO.with, toO.left + toO.with) + 12
+      let fromTC = fromO.top + fromO.height / 2
+      let toTC = toO.top + toO.height / 2
+
+      let d
+      if (fromLC !== toLC) {
+        d = `M${fromLC},${fromO.top} L${fromLC},${oTop} L${toLC},${oTop} L${toLC},${toO.top}`
+      } else {
+        d = `M${fromO.left + fromO.with},${fromTC} L${oRight},${fromTC} L${oRight},${toTC} L${
+          toO.left + toO.with
+        },${toTC}`
+      }
 
       let path = document.createElementNS('http://www.w3.org/2000/svg', 'path')
       path.setAttribute('class', 'activiti-line-reject')
@@ -293,8 +309,14 @@ export default {
       if (msg) {
         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('y', oTop + 6)
+        if (fromLC !== toLC) {
+          text.setAttribute('x', (fromLC + toLC) / 2)
+          text.setAttribute('y', oTop + 6)
+        } else {
+          text.setAttribute('y', (fromTC + toTC) / 2)
+          text.setAttribute('x', oRight + 8)
+          text.setAttribute('writing-mode', 'tb')
+        }
         text.textContent = msg
         this.svgC.appendChild(text)
 
@@ -361,7 +383,7 @@ export default {
         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="${
+        let cEl = `<circle class="add-and" 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="${
@@ -375,7 +397,11 @@ export default {
         this.svgC.appendChild(circleG)
 
         circleG.addEventListener('click', (el) => {
+          if (el.currentTarget.getAttribute('class').includes('activiti-node-reject')) {
+            list.forEach((c) => (c.examineType = 'reject'))
+          }
           this.addTaskList = list
+          this.addTaskV = false
           this.$nextTick(() => {
             this.$refs['addTask-pop'].doDestroy()
             this.$refs['addTask-pop'].referenceElm = circleG
@@ -392,14 +418,14 @@ export default {
 
         this.$nextTick(() => {
           this.$refs['title-pop'].doDestroy()
-          this.$refs['title-pop'].referenceElm = ev.target
+          this.$refs['title-pop'].referenceElm = ev.currentTarget
           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.$refs['title-pop'].referenceElm = ev.currentTarget
           this.msgV = true
         })
       }
@@ -600,7 +626,8 @@ setRejectLink(from, to) {
 .activiti-node-at use {
   fill: #fe943c !important;
 }
-.activiti-line-reject {
+.activiti-line-reject,
+.activiti-line-reject path {
   fill: none;
   stroke-width: 1px;
   stroke: #ea5454 !important;

package/src/components/Layout/HeaderWrap/index.vue

@@ -151,6 +151,10 @@ export default {
     beforeLogout: {
       type: Function,
       default: undefined
+    },
+    afterLogout: {
+      type: Function,
+      default: undefined
     }
   },
   inject: {
@@ -327,7 +331,12 @@ export default {
     },
     logoutA() {
       axios.delete('/bems/prod_1.0/uas/api/authorization/logout').then(() => {
-        auth.removeToken()
+        if (this.afterLogout) {
+          let After = this.afterLogout(auth.removeToken)
+          After.then && After.then(auth.removeToken)
+        } else {
+          auth.removeToken()
+        }
       })
     },
     // 检查是否代理中

package/src/components/Layout/index.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="layout-wrap">
-    <headerWrap class="header-wrap" :before-logout="beforeLogout" @custom-event="(par) => $emit('custom-event', par)" />
+    <headerWrap
+      class="header-wrap"
+      :before-logout="beforeLogout"
+      :after-logout="afterLogout"
+      @custom-event="(par) => $emit('custom-event', par)"
+    />
     <asideNav :menus="menusC" :active-nav="activeNavC" :collapse.sync="collapse" @menu-click="menuClick" />
     <tabsNav
       class="tabs-nav-wrap"
@@ -57,6 +62,10 @@ export default {
     beforeLogout: {
       type: Function,
       default: undefined
+    },
+    afterLogout: {
+      type: Function,
+      default: undefined
     }
   },
   data() {

package/src/components/ShowColumn/index.vue

@@ -184,13 +184,13 @@ export default {
       this.visible = false
     },
     saveColumns(list) {
-      let labels = list.map((c) => c[this.labelKey] || c)
+      let columns = saveTransform(list, this.labelKey, this.isFilter)
       axios.post(
         '/bems/prod_1.0/user/pageHabit',
         {
           userNo: this.userNo,
           pageId: this.pageId,
-          showStructure: JSON.stringify(labels)
+          showStructure: JSON.stringify(columns)
         },
         { loading: false }
       )
@@ -201,6 +201,64 @@ export default {
   }
 }
 
+function saveTransform(list, labelKey, isFilter) {
+  let listN = []
+  if (!isFilter) {
+    list.forEach((c) => {
+      if (c.prop) {
+        listN.push({ _colKey: 'prop', _colVal: c.prop })
+      } else if (c.slotName) {
+        listN.push({ _colKey: 'slotName', _colVal: c.slotName })
+      } else if (c.type && ['selection', 'index', 'expand'].includes(c.type)) {
+        listN.push({ _colKey: 'type', _colVal: c.type })
+      } else {
+        let sFn = false
+        for (let k in c) {
+          if (typeof c[k] === 'function') sFn = true
+        }
+        if (!sFn && c[labelKey]) {
+          listN.push({ _colKey: labelKey, _colVal: c[labelKey] })
+        } else {
+          listN.push(c)
+        }
+      }
+    })
+  } else {
+    list.forEach((c) => {
+      if (c.value) {
+        listN.push({ _colKey: 'value', _colVal: c.value })
+      } else if (c.startValue) {
+        listN.push({ _colKey: 'startValue', _colVal: c.startValue })
+      } else if (c.startDate) {
+        listN.push({ _colKey: 'startDate', _colVal: c.startDate })
+      } else if (c.slotName) {
+        listN.push({ _colKey: 'slotName', _colVal: c.slotName })
+      } else {
+        listN.push(c)
+      }
+    })
+  }
+  return listN
+}
+
+function getTransform(list, columnsT, labelKey = 'label') {
+  let columns = []
+  list.forEach((d) => {
+    if (typeof d === 'string') {
+      let column = columnsT.find((c) => c[labelKey] === d)
+      column && columns.push(column)
+    } else if (typeof d === 'object') {
+      if (d._colKey) {
+        let column = columnsT.find((c) => c[d._colKey] === d._colVal)
+        column && columns.push(column)
+      } else {
+        columns.push(d)
+      }
+    }
+  })
+  return columns
+}
+
 // 这段代码在筛选组件中复用
 export function getColumns(pageId, userNo, columnsT, labelKey = 'label') {
   return new Promise((resolve, reject) => {
@@ -217,15 +275,7 @@ export function getColumns(pageId, userNo, columnsT, labelKey = 'label') {
         if (data) {
           let _data = JSON.parse(data)
           if (_data && _data.length > 0) {
-            let columns = []
-            _data.forEach((d) => {
-              if (typeof d === 'string') {
-                let column = columnsT.find((c) => c[labelKey] === d)
-                column && columns.push(column)
-              } else if (typeof d === 'object') {
-                columns.push(d)
-              }
-            })
+            let columns = getTransform(_data, columnsT, labelKey)
             return resolve(columns)
           }
         }

package/src/index.js

@@ -80,7 +80,6 @@ import VHas from './directives/VHas/index.js'
 /** 注入方法 */
 import dayjs from 'dayjs'
 import numerify from 'numerify'
-import { tipShow, tipHide } from './directives/VTitle'
 import axios from './utils/axios.js'
 import auth from './utils/auth.js'
 import { msgPor, msgboxPor } from './utils/msgboxPor.js'
@@ -217,8 +216,6 @@ export {
   dayjs,
   numerify,
   $l,
-  tipShow,
-  tipHide,
   // 组件
   ContentLoading,
   ContentNull,