n20-common-lib 2.5.4 → 2.5.5-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.5.4",
+  "version": "2.5.5-beta.0",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/assets/css/filter.scss

@@ -104,6 +104,13 @@
     display: inline-block;
     white-space: nowrap;
     text-overflow: ellipsis;
+    .el-select.el-select--small {
+      .el-select__tags {
+        max-width: 88px !important;
+        display: flex;
+        flex-wrap: nowrap;
+      }
+    }
   }
   :hover {
     border-color: $--color-primary;

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

@@ -46,19 +46,11 @@
     v-model="form[item.value]"
     :clearable="(item.props && item.props.clearable) || false"
     :multiple="item.multiple"
+    collapse-tags
     :style="{
       width:
         form[item.value] && form[item.value].length > 0
-          ? context.measureText(
-              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 +
-            'px'
+          ? 156 + 'px'
           : 120 - 18 - context.measureText(item.label).width * 1.4 + 'px'
     }"
     v-bind="item.props"

package/src/components/AdvancedFilter/index.vue

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

package/src/components/ApprovalButtons/index.vue

@@ -66,19 +66,6 @@
         </el-form-item>
       </div>
       <div class="flex-box">
-        <el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" :required="required" style="width: 70%">
-          <el-input
-            ref="msg-input"
-            v-model="messageC"
-            type="textarea"
-            :placeholder="
-              ('请输入操作意见（' + messageMax + '字以内），批准该意见为非必填，驳回/作废该意见为必填！') | $lc
-            "
-            :maxlength="messageMax"
-            show-word-limit
-            :autosize="{ rows: 1 }"
-          />
-        </el-form-item>
         <template v-if="taskId && showBtn">
           <show-app-opi
             v-if="opiAndUser || authList.includes('showAppOpi')"
@@ -96,6 +83,19 @@
             style="width: 18%"
           />
         </template>
+        <el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" :required="required" style="width: 70%">
+          <el-input
+            ref="msg-input"
+            v-model="messageC"
+            type="textarea"
+            :placeholder="
+              ('请输入操作意见（' + messageMax + '字以内），批准该意见为非必填，驳回/作废该意见为必填！') | $lc
+            "
+            :maxlength="messageMax"
+            show-word-limit
+            :autosize="{ rows: 1 }"
+          />
+        </el-form-item>
       </div>
       <el-form-item v-if="fileKit || fileKitT" label="附加上传">
         <cl-upload

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -62,9 +62,10 @@ export default {
       }
     },
     changeFn() {
-      // if (this.approveMsgSlt?.length) {
-      this.$emit('update:message', this.approveMsgSlt.join('\n'))
-      // }
+      this.$emit(
+        'update:message',
+        Array.isArray(this.approveMsgSlt) ? this.approveMsgSlt.join('\n') : this.approveMsgSlt
+      )
     }
   }
 }

package/src/components/ApprovalRecord/index.vue

@@ -1,6 +1,6 @@
 /* 审批记录 */
 <template>
-  <div v-if="buttonMode">
+  <div v-if="approvalMode === 'dialog' || !approvalMode">
     <expandableWrap :title="'审批记录' | $lc" :show-expand="false" :icon="false">
       <template slot="tips">
         <el-button plain size="mini" :disabled="false" @click="cardV = true">{{ '审批进度查看' | $lc }}</el-button>
@@ -47,7 +47,7 @@
 import expandableWrap from '../Expandable/main.vue'
 import approvalCard from '../ApprovalCard/index.vue'
 import approvalImg from './approvalImg.vue'
-
+import getJsonc from '../../assets/getJsonc'
 export default {
   name: 'ApprovalRecord',
   components: {
@@ -59,22 +59,24 @@ export default {
     procInstId: {
       type: String,
       default: undefined
-    },
-    buttonMode: {
-      type: Boolean,
-      default: true
     }
   },
   data() {
     return {
       cardV: false,
-      imgV: false
+      imgV: false,
+      approvalMode: undefined
     }
   },
   computed: {
     procInstIdC() {
       return this.procInstId || this.$route.query.processInstanceId
     }
+  },
+  mounted() {
+    getJsonc('/server-config.jsonc').then(({ approvalMode }) => {
+      this.approvalMode = approvalMode
+    })
   }
 }
 </script>

package/src/components/DatePicker/por.vue

@@ -51,53 +51,6 @@ let disabledDate_2 = (t) => {
   return t > now
 }
 
-let shortcuts_1 = [
-  {
-    text: $lc('最近一月'),
-    onClick(picker) {
-      const start = new Date()
-      const end = new Date()
-      start.setMonth(start.getMonth() - 1)
-      start.setHours(0, 0, 0)
-      end.setHours(23, 59, 59)
-      picker.$emit('pick', [start, end])
-    }
-  },
-  {
-    text: $lc('最近三月'),
-    onClick(picker) {
-      const start = new Date()
-      const end = new Date()
-      start.setMonth(start.getMonth() - 3)
-      start.setHours(0, 0, 0)
-      end.setHours(23, 59, 59)
-      picker.$emit('pick', [start, end])
-    }
-  },
-  {
-    text: $lc('最近六月'),
-    onClick(picker) {
-      const start = new Date()
-      const end = new Date()
-      start.setMonth(start.getMonth() - 6)
-      start.setHours(0, 0, 0)
-      end.setHours(23, 59, 59)
-      picker.$emit('pick', [start, end])
-    }
-  },
-  {
-    text: $lc('最近一年'),
-    onClick(picker) {
-      const start = new Date()
-      const end = new Date()
-      start.setFullYear(start.getFullYear() - 1)
-      start.setHours(0, 0, 0)
-      end.setHours(23, 59, 59)
-      picker.$emit('pick', [start, end])
-    }
-  }
-]
-
 let shortcuts_2 = [
   {
     text: $lc('最近一月'),
@@ -196,10 +149,6 @@ export default {
       type: Boolean,
       default: true
     },
-    startStop: {
-      type: Boolean,
-      default: false
-    },
     clearable: {
       type: Boolean,
       default: true
@@ -211,8 +160,7 @@ export default {
   },
   data() {
     let shortcuts = undefined
-    if (this.shortcuts && ['daterange', 'datetimerange'].includes(this.type))
-      shortcuts = this.startStop ? shortcuts_2 : shortcuts_1
+    if (this.shortcuts && ['daterange', 'datetimerange'].includes(this.type)) shortcuts = shortcuts_2
 
     this.pickerOptionsAs = Object.assign(
       {
@@ -223,11 +171,7 @@ export default {
       this.pickerOptions
     )
 
-    this.listeners = Object.assign({}, this.$listeners, {
-      input: () => {},
-      change: () => {},
-      blur: this.HandleBlur
-    })
+    this.listeners = Object.assign({}, this.$listeners, { input: () => {}, change: () => {}, blur: this.HandleBlur })
     return {}
   },
   computed: {

package/src/components/ShowColumn/index.vue

@@ -10,6 +10,11 @@
     :close-on-click-modal="false"
     @open="popOpen"
   >
+    <div class="flex-box flex-lr p-r-lg" slot="title">
+      <div>{{ title }}</div>
+
+      <div v-has="isHas" class="pointer color-primary" @click="handleInitialize">{{ '初始化' | $lc }}</div>
+    </div>
     <div class="dialog-view">
       <div class="flex-box">
         <div class="left-c flex-column p-t-m bd-r">
@@ -78,6 +83,7 @@
 <script>
 import { $lc } from '../../utils/i18n/index'
 import axios from '../../utils/axios'
+
 import dialogWrap from '../Dialog/index.vue'
 import dragList from '../DragList/index.vue'
 export default {
@@ -124,6 +130,10 @@ export default {
     width: {
       type: String,
       default: '800px'
+    },
+    isHas: {
+      type: String,
+      default: undefined
     }
   },
   data() {
@@ -167,6 +177,31 @@ export default {
     }
   },
   methods: {
+    async handleInitialize() {
+      if (this.dragList.length < 1) {
+        this.$message.error(
+          `${$lc(`至少设置`)}${
+            this.isExport ? $lc('一列导出数据') : this.isFilter ? $lc('一个筛选条件') : $lc('一列显示列')
+          }!`
+        )
+        return
+      }
+      await this.$msgboxPor({
+        title: $lc('确认初始化吗？'),
+        message: $lc('初始化后将全局生效！'),
+        type: 'info',
+        confirmButtonText: $lc('确定'),
+        cancelButtonText: $lc('取消')
+      })
+
+      let list = []
+      let preCols = this.columns.filter((col) => col.static === 'pre')
+      let nextCols = this.columns.filter((col) => col.static === 'next')
+      list.push(...preCols, ...this.dragList, ...nextCols)
+      this.userNo = '_global_'
+      this.saveColumns(list)
+      this.visible = false
+    },
     popOpen() {
       this.dragList = this.checkColumns.filter((col) => !col.static)
     },
@@ -205,6 +240,7 @@ export default {
       list.push(...preCols, ...this.dragList, ...nextCols)
 
       // 自动保存设置的显示列
+      this.userNo = sessionStorage.getItem('userNo')
       !this.isExport && this.autoSave && this.saveColumns(list)
 
       this.$emit('setColumns', list)

package/src/components/Upload/index.vue

@@ -131,6 +131,10 @@ export default {
       type: Function,
       default: undefined
     },
+    beforeRemove: {
+      type: Function,
+      default: undefined
+    },
     beforeUpload: {
       type: Function,
       default: undefined
@@ -188,13 +192,24 @@ export default {
       this.$emit('importError')
     },
     clearFile() {
-      if (this.onRemove) {
-        this.onRemove(this.fileList[0], this.fileList)
+      if (!this.beforeRemove) {
+        if (this.onRemove) {
+          this.onRemove(this.fileList[0], this.fileList)
+        } else {
+          this.fileNameC = ''
+          this.fileUrlC = ''
+          this.fileList.pop()
+          console.log('删除上传')
+        }
       } else {
-        this.fileNameC = ''
-        this.fileUrlC = ''
-        this.fileList.pop()
-        console.log('删除上传')
+        const before = this.beforeRemove(this.fileList)
+        if (before && before.then) {
+          before.then(() => {
+            this.onRemove(this.fileList[0], this.fileList)
+          })
+        } else if (before !== false) {
+          this.onRemove(this.fileList[0], this.fileList)
+        }
       }
     },
     beforeUploadFn(file) {
@@ -333,8 +348,19 @@ export default {
       }
     },
     removeFn(file, fileList) {
-      if (this.onRemove) {
-        this.onRemove(file, fileList)
+      if (!this.beforeRemove) {
+        if (this.onRemove) {
+          this.onRemove(file, fileList)
+        }
+      } else {
+        const before = this.beforeRemove(file, fileList)
+        if (before && before.then) {
+          before.then(() => {
+            this.onRemove(file, fileList)
+          })
+        } else if (before !== false) {
+          this.onRemove(file, fileList)
+        }
       }
     },
     submit() {

package/src/directives/VTitle/index.js

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

package/src/i18n.json

@@ -2,6 +2,15 @@
   "筛选": {
     "en": "Filter"
   },
+  "初始化": {
+    "en": "Initialization"
+  },
+  "确认初始化吗？": {
+    "en": "Are you sure to initialize?"
+  },
+  "初始化后将全局生效！": {
+    "en": "After initialization, it will be global!"
+  },
   "数据请求": {
     "en": "Data request"
   },
@@ -1880,4 +1889,4 @@
   "请先勾选要删除的数据！": {
     "en": "Please select the data to be deleted first!"
   }
-}
+}