n20-common-lib 1.3.108 → 1.3.110

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -47,8 +47,10 @@
           ref="msg-input"
           v-model="messageC"
           type="textarea"
-          :placeholder="'请输入操作意见（50字以内），批准该意见为非必填，驳回/作废该意见为必填！' | $lc"
-          :maxlength="50"
+          :placeholder="
+            ('请输入操作意见（' + messageMax + '字以内），批准该意见为非必填，驳回/作废该意见为必填！') | $lc
+          "
+          :maxlength="messageMax"
           :autosize="{ minRows: 1 }"
         />
       </el-form-item>
@@ -56,6 +58,8 @@
 
     <div class="text-c">
       <el-button v-if="authList.includes('approval')" type="primary" @click="approvalFn">{{ '批 准' | $lc }}</el-button>
+      <el-button v-if="showApprovalTo" type="primary" @click="approvalToV = true">{{ '批准至' | $lc }}</el-button>
+      <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ '驳回至' | $lc }}</el-button>
       <el-button v-if="authList.includes('reject')" plain @click="rejectFn">{{ '驳回至发起人' | $lc }}</el-button>
       <el-button v-if="authList.includes('rejectPre')" plain @click="rejectPreFn">{{
         '驳回至上一节点' | $lc
@@ -91,6 +95,12 @@
         @confirm="setAddtaskOk"
       />
     </cl-dialog>
+    <cl-dialog v-drag :visible.sync="rejectToV" :title="'驳回至节点' | $lc" width="960px" append-to-body top="7.5vh">
+      <reject-to-prop :task-id="taskId" @close="rejectToV = false" @confirm="rejectToFn" />
+    </cl-dialog>
+    <cl-dialog v-drag :visible.sync="approvalToV" :title="'批准至节点' | $lc" width="960px" append-to-body top="7.5vh">
+      <reject-to-prop :task-id="taskId" type="approvalTo" @close="approvalToV = false" @confirm="approvalToFn" />
+    </cl-dialog>
   </div>
 </template>
 
@@ -101,18 +111,24 @@ import { linkGo } from '../../utils/urlToGo'
 import { closeTagsForBackPage } from '../../plugins/CompatibleOld'
 import ClDialog from '../Dialog'
 import CarboncopyProp from './setCarboncopyProp.vue'
+import RejectToProp from './setRejectToProp.vue'
 
 export default {
   name: 'ApprovalButtons',
   components: {
     ClDialog,
-    CarboncopyProp
+    CarboncopyProp,
+    RejectToProp
   },
   props: {
     message: {
       type: String,
       default: ''
     },
+    messageMax: {
+      type: Number,
+      default: 50
+    },
     formData: {
       type: Object,
       default: () => ({})
@@ -141,7 +157,10 @@ export default {
       carbonCopyList: [],
       setAddtaskV: false,
       addTaskList: [],
-      addTaskType: undefined
+      addTaskType: undefined,
+      rejectToV: false,
+      approvalToV: false,
+      showApprovalTo: false
     }
   },
   computed: {
@@ -162,6 +181,16 @@ export default {
     this.taskId = this.$route.query.taskId
     this.showBtn = this.$route.query.habtn !== 'true'
     this.getBtns()
+    if (this.showBtn && this.$route.query.state === '2') {
+      axios
+        .get(`/bems/activiti/sample/getTaskMoveVos/${this.$route.query.taskId}/1`, null, {
+          loading: false,
+          noMsg: true
+        })
+        .then(() => {
+          this.showApprovalTo = true
+        })
+    }
   },
   methods: {
     // 换回到发起页
@@ -264,8 +293,26 @@ export default {
         })
       })
     },
+    rejectToB() {
+      if (!this.messageC) {
+        return this.errMsgFn('驳回')
+      }
+      this.rejectToV = true
+    },
+    rejectToFn(taskId) {
+      this.rejectToV = false
+      let param = this.getParam()
+      param.forEach((item) => {
+        item.taskMoveVo = { taskId }
+      })
+      this.beforeFn(this.$attrs.beforeRejectPre, () => {
+        axios.post('/bems/activiti/admin/todo/rejectpre', param).then(({ data }) => {
+          this.thenMsg(data, $lc('驳回至'))
+        })
+      })
+    },
     // 驳回到上一步
-    rejectPreFn() {
+    rejectPreFn(list) {
       if (!this.messageC) {
         return this.errMsgFn('驳回')
       }
@@ -283,6 +330,18 @@ export default {
         })
       })
     },
+    approvalToFn(taskId) {
+      this.approvalToV = false
+      let param = this.getParam()
+      param.forEach((item) => {
+        item.taskMoveVo = { taskId }
+      })
+      this.beforeFn(this.$attrs.beforeRatify, () => {
+        axios.post('/bems/activiti/admin/todo/advance', param).then(({ data }) => {
+          this.thenMsg(data, $lc('批准至'))
+        })
+      })
+    },
     // 作废
     discardFn() {
       if (!this.messageC) {

package/src/components/ApprovalButtons/setRejectToProp.vue

@@ -0,0 +1,100 @@
+<template>
+  <cl-page style="height: 460px">
+    <div slot="header" class="flex-box flex-v m-b">
+      <span class="m-r-ss">{{ '节点名称' | $lc }}</span>
+      <span>
+        <el-input v-model="searchObj.taskName" size="mini" :placeholder="'请输入节点名称' | $lc" />
+      </span>
+      <el-button class="m-l" plain size="mini" @click="resetFn">{{ '重置' | $lc }}</el-button>
+      <el-button type="primary" size="mini" @click="searchFn">{{ '查询' | $lc }}</el-button>
+    </div>
+    <el-table :data="tableData" border height="100%">
+      <el-table-column :label="'选择' | $lc" align="center" width="100px">
+        <template slot-scope="{ row }">
+          <el-radio v-model="stlV" :label="row.taskId">
+            <span></span>
+          </el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column :label="'节点名称' | $lc" align="center" show-overflow-tooltip>
+        <template slot-scope="{ row }">
+          {{ row.taskName }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="'审批权限' | $lc" align="center" show-overflow-tooltip>
+        <template slot-scope="{ row }">{{ row | userF }}</template>
+      </el-table-column>
+    </el-table>
+    <div slot="footer" class="m-t text-c">
+      <el-button type="primary" @click="confirmFn">{{ type === 'approvalTo' ? $lc('批准') : $lc('驳回') }}</el-button>
+      <el-button @click="$emit('close')">{{ '取消' | $lc }}</el-button>
+    </div>
+  </cl-page>
+</template>
+
+<script>
+import { $lc } from '../../utils/i18n/index'
+import axios from '../../utils/axios'
+export default {
+  filters: {
+    userF(row) {
+      let usrArr = []
+      row.memberName && usrArr.push(row.memberName)
+      row.roleName && usrArr.push(row.roleName)
+      row.userName && usrArr.push(row.userName)
+      return usrArr.join(' -> ')
+    }
+  },
+  props: {
+    type: {
+      type: String,
+      default: undefined
+    },
+    taskId: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      searchObj: {
+        taskName: undefined
+      },
+      stlV: undefined,
+      list: [],
+      tableData: []
+    }
+  },
+  mounted() {
+    axios
+      .get(`/bems/activiti/sample/getTaskMoveVos/${this.taskId}/${this.type === 'approvalTo' ? 1 : 0}`)
+      .then((res) => {
+        this.list = res.data || []
+        this.tableData = this.list
+      })
+  },
+  methods: {
+    resetFn() {
+      this.searchObj.taskName = undefined
+
+      this.searchFn()
+    },
+    searchFn() {
+      if (this.searchObj.taskName) {
+        this.tableData = this.list.filter((item) => item.taskName.includes(this.searchObj.taskName))
+      } else {
+        this.tableData = this.list
+      }
+    },
+    confirmFn() {
+      if (!this.stlV) {
+        this.$message.warning($lc('请选择节点'))
+        return
+      }
+      this.$emit('confirm', this.stlV)
+    }
+  }
+}
+</script>
+
+<style></style>

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

@@ -254,11 +254,11 @@ 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]), Number(viewBox[1]) - 10, Number(viewBox[2]) + 20, Number(viewBox[3])]
+      viewBox = [Number(viewBox[0]) - 16, Number(viewBox[1]) - 16, Number(viewBox[2]) + 32, Number(viewBox[3]) + 32]
       viewBox = viewBox.join(' ')
 
-      this.svgC.setAttribute('width', Number(width) + 20)
-      this.svgC.setAttribute('height', Number(height) + 10)
+      this.svgC.setAttribute('width', Number(width) + 32)
+      this.svgC.setAttribute('height', Number(height) + 32)
       this.svgC.setAttribute('viewBox', viewBox)
 
       let marker = this.svgC.querySelector('defs marker')
@@ -277,6 +277,10 @@ export default {
           this.setRejectLink(from, to, $lc('驳回至发起人'))
         } else if (type === '2') {
           this.setRejectLink(from, to, $lc('驳回至上一步'))
+        } else if (type === '3') {
+          this.setRejectLink(from, to, $lc('驳回至'))
+        } else if (type === '4') {
+          this.setPropelLink(from, to, $lc('推进 至'))
         }
       }
     },
@@ -284,20 +288,18 @@ export default {
       const fromO = this.getElRect(from)
       const toO = this.getElRect(to)
       let oTop = Math.min(fromO.top, toO.top) - 12
-      let fromLC = fromO.left + fromO.with / 2
-      let toLC = toO.left + toO.with / 2
+      let fromXC = fromO.left + fromO.with / 2
+      let toXC = 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 oRight = Math.max(fromO.right, toO.right) + 12
+      let fromYC = fromO.top + fromO.height / 2
+      let toYC = 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}`
+      if (fromXC !== toXC) {
+        d = `M${fromXC},${fromO.top} L${fromXC},${oTop} L${toXC},${oTop} L${toXC},${toO.top}`
       } else {
-        d = `M${fromO.left + fromO.with},${fromTC} L${oRight},${fromTC} L${oRight},${toTC} L${
-          toO.left + toO.with
-        },${toTC}`
+        d = `M${fromO.right},${fromYC} L${oRight},${fromYC} L${oRight},${toYC} L${toO.right},${toYC}`
       }
 
       let path = document.createElementNS('http://www.w3.org/2000/svg', 'path')
@@ -309,11 +311,11 @@ export default {
       if (msg) {
         let text = document.createElementNS('http://www.w3.org/2000/svg', 'text')
         text.setAttribute('class', 'activiti-text-reject')
-        if (fromLC !== toLC) {
-          text.setAttribute('x', (fromLC + toLC) / 2)
+        if (fromXC !== toXC) {
+          text.setAttribute('x', (fromXC + toXC) / 2)
           text.setAttribute('y', oTop + 6)
         } else {
-          text.setAttribute('y', (fromTC + toTC) / 2)
+          text.setAttribute('y', (fromYC + toYC) / 2)
           text.setAttribute('x', oRight + 8)
           text.setAttribute('writing-mode', 'tb')
         }
@@ -330,6 +332,54 @@ export default {
         this.svgC.insertBefore(rect, text)
       }
     },
+    setPropelLink(from, to, msg) {
+      const fromO = this.getElRect(from)
+      const toO = this.getElRect(to)
+      let oBottom = Math.min(fromO.bottom, toO.bottom) + 12
+      let fromXC = fromO.left + fromO.with / 2
+      let toXC = toO.left + toO.with / 2
+
+      let oLeft = Math.max(fromO.left, toO.left) - 12
+      let fromYC = fromO.top + fromO.height / 2
+      let toYC = toO.top + toO.height / 2
+
+      let d
+      if (fromXC !== toXC) {
+        d = `M${fromXC},${fromO.bottom} L${fromXC},${oBottom} L${toXC},${oBottom} L${toXC},${toO.bottom}`
+      } else {
+        d = `M${fromO.left},${fromYC} L${oLeft},${fromYC} L${oLeft},${toYC} L${toO.left},${toYC}`
+      }
+
+      let path = document.createElementNS('http://www.w3.org/2000/svg', 'path')
+      path.setAttribute('class', 'activiti-line-propel')
+      path.setAttribute('d', d)
+      path.style.markerEnd = `url('#${this.markerId}')`
+      this.svgC.appendChild(path)
+
+      if (msg) {
+        let text = document.createElementNS('http://www.w3.org/2000/svg', 'text')
+        text.setAttribute('class', 'activiti-text-propel')
+        if (fromXC !== toXC) {
+          text.setAttribute('x', (fromXC + toXC) / 2)
+          text.setAttribute('y', oBottom + 6)
+        } else {
+          text.setAttribute('y', (fromYC + toYC) / 2)
+          text.setAttribute('x', oLeft + 8)
+          text.setAttribute('writing-mode', 'tb')
+        }
+        text.textContent = msg
+        this.svgC.appendChild(text)
+
+        let textO = text.getBBox()
+        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)
+        rect.setAttribute('width', textO.width)
+        rect.setAttribute('height', textO.height)
+        this.svgC.insertBefore(rect, text)
+      }
+    },
     getElRect(id) {
       let g = this.svgW.querySelector(`[data-element-id="${id}"]`)
       let rect = {
@@ -345,6 +395,8 @@ export default {
           left: Number(g.getAttribute('data-element-left')),
           top: Number(g.getAttribute('data-element-top'))
         }
+        rect.right = rect.left + rect.with
+        rect.bottom = rect.top + rect.height
         return rect
       }
 
@@ -358,6 +410,8 @@ export default {
         matrix = matrix.split(' ')
         rect.left = Number(matrix[4])
         rect.top = Number(matrix[5])
+        rect.right = rect.left + rect.with
+        rect.bottom = rect.top + rect.height
       }
       return rect
     },
@@ -641,6 +695,21 @@ setRejectLink(from, to) {
   font-weight: normal;
   text-anchor: middle;
 }
+.activiti-line-propel,
+.activiti-line-propel path {
+  fill: none;
+  stroke-width: 1px;
+  stroke: #3cb495 !important;
+  stroke-linejoin: round;
+  /* marker-end: url('#sequenceflow-end-white-black-3aw0mc6w8vg7jarca1qf355gu'); */
+}
+.activiti-text-propel {
+  fill: #3cb495 !important;
+  font-family: Arial, sans-serif;
+  font-size: 12px;
+  font-weight: normal;
+  text-anchor: middle;
+}
 .activiti-text-bg-reject {
   fill: #ffffff;
 }

package/src/components/InputNumber/index.vue

@@ -7,6 +7,7 @@
       :value="valueStr"
       :disabled="disabled"
       :placeholder="phd"
+      :clearable="false"
       @focus="focusFn"
       @blur.native.capture.stop
     />

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

@@ -1,19 +1,26 @@
 <template>
-  <keep-alive v-if="dnsKey">
-    <router-view ref="content-cache" :key="$route.path" class="content-box" :no-cache="$route.meta.noCache" />
-  </keep-alive>
-  <router-view v-else ref="content-cache" class="content-box" :no-cache="$route.meta.noCache" />
+  <div>
+    <keep-alive v-if="dnsKey" :max="32">
+      <router-view v-if="!$route.meta.noCache" ref="content-cache" :key="$route | keyF" class="content-box" />
+    </keep-alive>
+    <router-view v-if="!dnsKey || $route.meta.noCache" ref="content-cache" class="content-box" />
+  </div>
 </template>
 
 <script>
-const TestProduction = process.env.VUE_APP_TestProduction === 'true'
-
 import { setRela } from '../../../utils/relaNo'
-const routerBase = process.env.BASE_URL
-const routerBaseRe = new RegExp('^' + routerBase)
+const routerBase = (process.env.BASE_URL + '/').replace(/\/\/$/, '/')
 
 export default {
   name: 'SubContent',
+  filters: {
+    keyF({ path, query = {} }) {
+      path = path.replace(/^\//, routerBase)
+      let key = path + '^' + JSON.stringify({ ...query, _fromNo: undefined }) + '^' + window._tab_route_key[path]
+
+      return key
+    }
+  },
   props: {
     isTest: {
       type: Boolean,
@@ -22,94 +29,74 @@ export default {
   },
   data() {
     return {
-      dnsKey: this.isTest || TestProduction
-    }
-  },
-  watch: {
-    $route: {
-      handler(vn, vo) {
-        if (vo.meta.noCache) {
-          this.removeOcache({ path: vo.path })
-        }
-      }
+      dnsKey: this.isTest || (process.env.NODE_ENV === 'production' && process.env.VUE_APP_KEEP_ALIVE === 'true')
     }
   },
   created() {
     setRela()
 
     window.addEventListener('message', this.watchMessage)
+  },
+  mounted() {
+    console.log(this.$refs, 'bbb')
 
-    setTimeout(() => {
-      this.pendingRemoveCaches()
-    }, 60)
+    this.removeCacheTimerFn()
   },
   activated() {
     window.addEventListener('message', this.watchMessage)
 
-    setTimeout(() => {
-      this.pendingRemoveCaches()
-    }, 60)
+    this.removeCacheTimerFn()
   },
   deactivated() {
     window.removeEventListener('message', this.watchMessage)
+
+    clearInterval(this.removeCacheTimer)
   },
   beforeDestroy() {
     window.removeEventListener('message', this.watchMessage)
+
+    clearInterval(this.removeCacheTimer)
   },
   methods: {
     watchMessage(ev) {
-      const { updateCache, originName, targetName } = ev.data
-      if (updateCache && originName === 'main' && targetName === '*') {
-        this.pendingRemoveCaches()
+      const { updateActiveCache, originName, targetName } = ev.data
+      if (updateActiveCache && originName === 'main' && targetName === '*') {
+        this.updateActiveCache()
       }
     },
-    pendingRemoveCaches() {
-      for (let key in window._pending_update_cache) {
-        if (routerBaseRe.test(key) && window._pending_update_cache[key]) {
-          let cacheKey = key.replace(routerBaseRe, '/')
-          if (cacheKey === this.$route.path) {
-            let path = this.$route.path
-            let oTab = JSON.parse(
-              JSON.stringify({
-                path: this.$route.path,
-                query: this.$route.query
-              })
-            )
-
-            this.$router.replace('/loading')
-            this.removeOcache({ path: path })
-            setTimeout(() => {
-              this.$router.replace(oTab)
-            }, 300)
-          } else {
-            this.removeOcache({ path: cacheKey })
-          }
-        }
-      }
+    updateActiveCache() {
+      let oTab = JSON.parse(
+        JSON.stringify({
+          path: this.$route.path,
+          query: this.$route.query,
+          params: this.$route.params
+        })
+      )
+      this.$router.replace('/loading')
+      this.$nextTick(() => {
+        this.$router.replace({
+          path: oTab.path,
+          query: oTab.query
+        })
+      })
     },
-    removeOcache({ path }) {
-      if (!this.dnsKey) return
-
-      let componentInstance = this.$refs['content-cache']?.$vnode.parent.componentInstance
-
-      if (componentInstance) {
-        let kI = componentInstance.keys.findIndex((k) => k === path)
-        if (kI !== -1) {
-          let destroy = componentInstance.cache[path].componentInstance.destroy
-          destroy && destroy()
-
-          delete componentInstance.cache[path]
-          componentInstance.keys.splice(kI, 1)
-
-          let spath = path.replace(/^\//, routerBase)
-          delete window._pending_update_cache[spath]
+    removeCacheTimerFn() {
+      this.removeCacheTimer = setInterval(() => {
+        if (this.$refs['content-cache']) {
+          let cache = this.$refs['content-cache'].$vnode.parent.componentInstance.cache
+          for (let k in cache) {
+            if (cache[k]) {
+              let kM = k.split('^')
+              let _K = kM[0]
+              let _V = kM[2]
+              if (window._tab_route_key[_K] && window._tab_route_key[_K] !== Number(_V)) {
+                cache[k].componentInstance.destroy?.()
+                cache[k] = null
+              }
+            }
+          }
         }
-
-        // console.log({
-        //   cache: componentInstance.cache,
-        //   keys: componentInstance.keys
-        // })
-      }
+      }, 120000)
     }
   }
 }