n20-common-lib 2.5.1-beta → 2.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.5.1-beta",
+  "version": "2.5.2",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -116,4 +116,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}

package/src/assets/css/_coreLib.scss

@@ -41,7 +41,7 @@
 @import './select.scss';
 @import './plain-text.scss';
 @import './cl-date-quarter.scss';
-@import './work-card.scss';
+
 /* 临时引入 */
 @import '../../components/ChildRange/style.scss';
 @import '../../components/PageHeader/style.scss';

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

@@ -50,8 +50,11 @@
       width:
         form[item.value] && form[item.value].length > 0
           ? context.measureText(
-              item.options.find((r) => r.value === form[item.value] || r[item.props?.valueKey] === form[item.value])
-                .label
+              item.options.find(
+                (r) =>
+                  r.value === form[item.value] ||
+                  (item.props && item.props.valueKey && r[item.props.valueKey] === form[item.value])
+              ).label
             ).width *
               1.4 +
             48 +

package/src/components/AdvancedFilter/index.vue

@@ -25,7 +25,7 @@
       >
         <slot name="prefix"></slot>
       </div>
-      <template v-for="(item, i) in GroupData">
+      <template v-for="item in GroupData">
         <template v-if="item && item.slotName" :slot="item.slotName">
           <slot :name="item.slotName"></slot>
         </template>

package/src/components/ApprovalRecord/index.vue

@@ -1,6 +1,6 @@
 /* 审批记录 */
 <template>
-  <div>
+  <div v-if="buttonMode">
     <expandableWrap :title="'审批记录' | $lc" :show-expand="false" :icon="false">
       <template slot="tips">
         <el-button plain size="mini" :disabled="false" @click="cardV = true">{{ '审批进度查看' | $lc }}</el-button>
@@ -30,12 +30,24 @@
       <approvalImg class="text-c p-a" :proc-inst-id="procInstIdC" style="height: 70vh; overflow: auto" />
     </el-dialog>
   </div>
+  <div v-else>
+    <expandableWrap title="审批记录">
+      <template slot="tips">
+        <el-button size="mini" plain @click="imgV = true">流程图查看</el-button>
+      </template>
+      <approvalCard :procInstId="procInstIdC" />
+      <el-dialog v-drag title="查看流程" :visible.sync="imgV" width="65%" class="p-a-0" append-to-body top="10vh">
+        <approvalImg class="text-c p-a" style="height: 70vh; overflow: auto" />
+      </el-dialog>
+    </expandableWrap>
+  </div>
 </template>
 
 <script>
 import expandableWrap from '../Expandable/main.vue'
 import approvalCard from '../ApprovalCard/index.vue'
 import approvalImg from './approvalImg.vue'
+
 export default {
   name: 'ApprovalRecord',
   components: {
@@ -47,6 +59,10 @@ export default {
     procInstId: {
       type: String,
       default: undefined
+    },
+    buttonMode: {
+      type: Boolean,
+      default: true
     }
   },
   data() {

package/src/components/WorkCard/index.vue

@@ -3,9 +3,9 @@
     <slot name="header">
       <div v-if="header" class="m-b flex-box">
         <el-badge :value="badgeNum" :hidden="!badgeNum">
-          <span class="f-s-m work-card-title">{{ header }}</span>
+          <span class="f-s-m">{{ header }}</span>
         </el-badge>
-        <el-link v-if="showMore" class="m-l-auto work-card-more" :underline="false" @click="$emit('more')"
+        <el-link v-if="showMore" class="m-l-auto" :underline="false" @click="$emit('more')"
           >{{ '更多' | $lc }}<i class="el-icon-arrow-right"></i
         ></el-link>
       </div>
@@ -56,3 +56,24 @@ export default {
   }
 }
 </script>
+
+<style>
+.work-card {
+  height: 100%;
+}
+.work-card ::v-deep .el-badge__content {
+  line-height: 14px;
+}
+.work-card .el-badge__content.is-fixed {
+  position: absolute;
+  top: 0;
+  right: -1px;
+  transform: scale(0.7) translateY(-50%) translateX(100%);
+}
+
+.work-card--empty-title {
+  color: #cacaca;
+  padding-bottom: 80px;
+  margin-top: -16px;
+}
+</style>

package/src/directives/VDrag/index.js

@@ -1,72 +1,72 @@
-/**
- * author: zhengwei
- * tiem: 2021-8-31
- * amend: 只注册到bind上,有问题;onXX会导致事件覆盖
- */
-// 封装全局弹窗拖拽指令 v-drag
-function dialogMoveFn(_this) {
-  var dialogDom = _this.parentNode
-  dialogDom.style.top = parseFloat(dialogDom.style.top || '0') + _this.pageYc + 'px'
-  dialogDom.style.left = parseFloat(dialogDom.style.left || '0') + _this.pageXc + 'px'
-}
-
-const dialogMove = {
-  install: function (Vue) {
-    Vue.directive('drag', {
-      update(el, binding) {
-        if (el.style.display === 'none') {
-          var dialogDom = el.querySelector('.el-dialog')
-          if (dialogDom) {
-            dialogDom.style.left = ''
-            dialogDom.style.top = ''
-          }
-        }
-        Vue.nextTick(function () {
-          var dialogHeader = el.querySelector('.el-dialog__header')
-          if (dialogHeader && !dialogHeader._hasMoveDir) {
-            var _this, pvrPageX, pvrPageY
-            dialogHeader._hasMoveDir = true
-            dialogHeader.style.cursor = 'move'
-
-            dialogHeader.addEventListener('mousedown', function (evt) {
-              var ev = evt || event
-              this.pageXc = this.pageYc = 0
-              _this = this
-              pvrPageX = ev.pageX
-              pvrPageY = ev.pageY
-              document.addEventListener('mousemove', mousemoveThisMove)
-              document.addEventListener('mouseup', mouseupThisMove)
-            })
-
-            var mousemoveThisMove = function (evt) {
-              var ev = evt || event
-              ev.stopPropagation()
-              ev.preventDefault()
-              if (
-                ev.clientX >= 0 &&
-                ev.clientY >= 0 &&
-                ev.clientX <= document.documentElement.clientWidth &&
-                ev.clientY <= document.documentElement.clientHeight
-              ) {
-                _this.pageXc = ev.pageX - pvrPageX
-                _this.pageYc = ev.pageY - pvrPageY
-                if (_this.pageXc !== 0 || _this.pageYc !== 0) {
-                  binding.value ? binding.value(_this, binding.arg) : dialogMoveFn(_this)
-                }
-                pvrPageX = ev.pageX
-                pvrPageY = ev.pageY
-              }
-            }
-
-            var mouseupThisMove = function () {
-              document.removeEventListener('mousemove', mousemoveThisMove)
-              document.removeEventListener('mouseup', mouseupThisMove)
-            }
-          }
-        })
-      }
-    })
-  }
-}
-
-export default dialogMove
+/**
+ * author: zhengwei
+ * tiem: 2021-8-31
+ * amend: 只注册到bind上,有问题;onXX会导致事件覆盖
+ */
+// 封装全局弹窗拖拽指令 v-drag
+function dialogMoveFn(_this) {
+  var dialogDom = _this.parentNode
+  dialogDom.style.top = parseFloat(dialogDom.style.top || '0') + _this.pageYc + 'px'
+  dialogDom.style.left = parseFloat(dialogDom.style.left || '0') + _this.pageXc + 'px'
+}
+
+const dialogMove = {
+  install: function (Vue) {
+    Vue.directive('drag', {
+      update(el, binding) {
+        if (el.style.display === 'none') {
+          var dialogDom = el.querySelector('.el-dialog')
+          if (dialogDom) {
+            dialogDom.style.left = ''
+            dialogDom.style.top = ''
+          }
+        }
+        Vue.nextTick(function () {
+          var dialogHeader = el.querySelector('.el-dialog__header')
+          if (dialogHeader && !dialogHeader._hasMoveDir) {
+            var _this, pvrPageX, pvrPageY
+            dialogHeader._hasMoveDir = true
+            dialogHeader.style.cursor = 'move'
+
+            dialogHeader.addEventListener('mousedown', function (evt) {
+              var ev = evt || event
+              this.pageXc = this.pageYc = 0
+              _this = this
+              pvrPageX = ev.pageX
+              pvrPageY = ev.pageY
+              document.addEventListener('mousemove', mousemoveThisMove)
+              document.addEventListener('mouseup', mouseupThisMove)
+            })
+
+            var mousemoveThisMove = function (evt) {
+              var ev = evt || event
+              ev.stopPropagation()
+              ev.preventDefault()
+              if (
+                ev.clientX >= 0 &&
+                ev.clientY >= 0 &&
+                ev.clientX <= document.documentElement.clientWidth &&
+                ev.clientY <= document.documentElement.clientHeight
+              ) {
+                _this.pageXc = ev.pageX - pvrPageX
+                _this.pageYc = ev.pageY - pvrPageY
+                if (_this.pageXc !== 0 || _this.pageYc !== 0) {
+                  binding.value ? binding.value(_this, binding.arg) : dialogMoveFn(_this)
+                }
+                pvrPageX = ev.pageX
+                pvrPageY = ev.pageY
+              }
+            }
+
+            var mouseupThisMove = function () {
+              document.removeEventListener('mousemove', mousemoveThisMove)
+              document.removeEventListener('mouseup', mouseupThisMove)
+            }
+          }
+        })
+      }
+    })
+  }
+}
+
+export default dialogMove