n20-common-lib 2.4.25 → 2.4.27

package/package.json

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

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -4,7 +4,7 @@
       v-model="approveMsgSlt"
       class="w-100p"
       clearable
-      multiple
+      :multiple="multiple"
       collapse-tags
       :placeholder="'请选择审批意见' | $lc"
       @change="changeFn"
@@ -35,13 +35,21 @@ export default {
   data() {
     return {
       approveMsgSlt: [],
-      approveMsgList: []
+      approveMsgList: [],
+      multiple: false
     }
   },
   mounted() {
     this.getData()
+    this.getIsMultiple()
   },
   methods: {
+    // 审批意见选择是否单选,1是 0 否
+    getIsMultiple() {
+      axios.get(`/bems/activiti/actAppOpi/queryAppOpiAndUser`).then(({ msg }) => {
+        this.multiple = msg === '0'
+      })
+    },
     getData() {
       if (this.andUser) {
         axios.post('/bems/activiti/actAppOpi/queryAppOpiAndUser').then(({ data }) => {

package/src/components/ShowColumn/index.vue

@@ -44,6 +44,7 @@
                     <el-checkbox
                       v-if="column.groupId === gp.groupId"
                       :key="i"
+                      v-hover-tooltip="column[labelKey]"
                       :label="column[labelKey]"
                       :disabled="column.checked"
                       class="m-t"

package/src/directives/VTitle/index.js

@@ -119,7 +119,7 @@ HoverTooltip.install = (Vue) => {
       el.$tipHide = () => tipHide(el)
       el.addEventListener('mouseenter', () => {
         console.log(getWidth(binding.value))
-        if (getWidth(binding.value) > (binding.arg || 100)) {
+        if (getWidth(binding.value) > (binding.arg || 98)) {
           return el.$tipShow()
         }
       })