n20-common-lib 2.2.5 → 2.2.6

package/package.json

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

package/src/components/DatePicker/por.vue

@@ -19,10 +19,14 @@
 <script>
 import { $lc } from '../../utils/i18n/index'
 let disabledDate_1 = (t) => {
-  return t < Date.now() - 86400000
+  let now = new Date()
+  now.setHours(0, 0, -1)
+  return t < now
 }
 let disabledDate_2 = (t) => {
-  return t >= Date.now()
+  let now = new Date()
+  now.setHours(23, 59, 59)
+  return t > now
 }
 let shortcuts_1 = [
   {
@@ -120,10 +124,6 @@ export default {
       type: [String, Number, Date],
       default: undefined
     },
-    valueFormat: {
-      type: String,
-      default: 'yyyy-MM-dd'
-    },
     startDate: {
       type: [String, Number, Date],
       default: null
@@ -132,6 +132,10 @@ export default {
       type: [String, Number, Date],
       default: null
     },
+    valueFormat: {
+      type: String,
+      default: 'yyyy-MM-dd'
+    },
     minNow: {
       type: Boolean,
       default: false
@@ -140,7 +144,7 @@ export default {
       type: Boolean,
       default: false
     },
-    showShortcut: {
+    shortcuts: {
       type: Boolean,
       default: true
     },
@@ -155,8 +159,8 @@ export default {
   },
   data() {
     let shortcuts = undefined
-    if (['date', 'datetime'].includes(this.type)) shortcuts = shortcuts_1
-    if (['daterange', 'datetimerange'].includes(this.type)) shortcuts = shortcuts_2
+    if (this.shortcuts && ['date', 'datetime'].includes(this.type)) shortcuts = shortcuts_1
+    if (this.shortcuts && ['daterange', 'datetimerange'].includes(this.type)) shortcuts = shortcuts_2
 
     this.pickerOptionsAs = Object.assign(
       {
@@ -184,9 +188,30 @@ export default {
       },
       set(val) {
         if (['daterange', 'monthrange', 'datetimerange'].includes(this.type)) {
-          this.$emit('update:start-date', val ? val[0] : null)
-          this.$emit('update:end-date', val ? val[1] : null)
-          this.$emit('change', val)
+          if (val && val[0]) {
+            if (this.type === 'monthrange' && ['yyyy-MM-dd', 'yyyy-MM-dd HH:mm:ss'].includes(this.valueFormat)) {
+              let end = new Date(val[1])
+              end.setMonth(end.getMonth() + 1)
+              end.setDate(0)
+              let Y = end.getFullYear()
+              let M = end.getMonth() + 1
+              let D = end.getDate()
+              let str = `${Y}-${M > 9 ? M : '0' + M}-${D > 9 ? D : '0' + D}`
+              if (this.valueFormat === 'yyyy-MM-dd HH:mm:ss') str = str + ' 23:59:59'
+
+              this.$emit('update:start-date', val[0])
+              this.$emit('update:end-date', str)
+              this.$emit('change', [val[0], str])
+            } else {
+              this.$emit('update:start-date', val[0])
+              this.$emit('update:end-date', val[1])
+              this.$emit('change', val)
+            }
+          } else {
+            this.$emit('update:start-date', null)
+            this.$emit('update:end-date', null)
+            this.$emit('change', val)
+          }
         } else {
           this.$emit('input', val)
           this.$emit('change', val)

package/src/components/DateSelect/index.vue

@@ -55,6 +55,7 @@
 </template>
 
 <script>
+// TODO: 双休绑定数值格式不统一
 import datePicker from '../DatePicker/index.vue'
 import quarterDatePicker from './quarterDatePicker'
 import dayjs from 'dayjs'
@@ -108,7 +109,6 @@ export default {
         break
       case '月':
         this.month = dayjs(this.value.startDate).format('YYYY-MM')
-        console.log(this.month)
         break
       case '季':
         this.quarter = this.value