n20-common-lib 2.5.3 → 2.5.4

package/package.json

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

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/DatePicker/por.vue

@@ -51,6 +51,53 @@ 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('最近一月'),
@@ -149,6 +196,10 @@ export default {
       type: Boolean,
       default: true
     },
+    startStop: {
+      type: Boolean,
+      default: false
+    },
     clearable: {
       type: Boolean,
       default: true
@@ -160,7 +211,8 @@ export default {
   },
   data() {
     let shortcuts = undefined
-    if (this.shortcuts && ['daterange', 'datetimerange'].includes(this.type)) shortcuts = shortcuts_2
+    if (this.shortcuts && ['daterange', 'datetimerange'].includes(this.type))
+      shortcuts = this.startStop ? shortcuts_2 : shortcuts_1
 
     this.pickerOptionsAs = Object.assign(
       {
@@ -171,7 +223,11 @@ 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/Upload/index.vue

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