n20-common-lib 2.2.10 → 2.2.11

package/package.json

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

package/src/components/DateSelect/index.vue

@@ -130,10 +130,14 @@ export default {
       this.$emit('selectChange', val)
     },
 
-    dayChange(val) {
-      console.log(val)
-      this.$emit('input', val)
-      this.$emit('change', { startDate: val[0], endDate: val[1] })
+    dayChange(value) {
+      if (value) {
+        this.$emit('input', value)
+        this.$emit('change', { startDate: value[0], endDate: value[1] })
+      } else {
+        this.$emit('input', '')
+        this.$emit('change', { startDate: '', endDate: '' })
+      }
     },
     timestampToTime(timestamp) {
       var date = new Date(timestamp) // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
@@ -143,7 +147,6 @@ export default {
       return Y + M + D
     },
     weekChange(val) {
-      console.log(val)
       let todayDay = val ? new Date(val) : new Date()
       let todayOfWeek = todayDay.getDay()
       let spendDay = 1
@@ -164,21 +167,38 @@ export default {
       this.$emit('change', weekTime)
     },
     monthChange(val) {
-      console.log(val)
-      let IMonth = {
-        startDate: dayjs(val).startOf('month').format('YYYY-MM-DD'),
-        endDate: dayjs(val).endOf('month').format('YYYY-MM-DD')
+      if (val) {
+        let IMonth = {
+          startDate: dayjs(val).startOf('month').format('YYYY-MM-DD'),
+          endDate: dayjs(val).endOf('month').format('YYYY-MM-DD')
+        }
+        this.$emit('input', val)
+        this.$emit('change', IMonth)
+      } else {
+        let IMonth = {
+          startDate: '',
+          endDate: ''
+        }
+        this.$emit('input', val)
+        this.$emit('change', IMonth)
       }
-      this.$emit('input', val)
-      this.$emit('change', IMonth)
     },
     yearChange(val) {
-      let iYear = {
-        startDate: dayjs(val).startOf('year').format('YYYY-MM-DD'),
-        endDate: dayjs(val).endOf('year').format('YYYY-MM-DD')
+      if (val) {
+        let iYear = {
+          startDate: dayjs(val).startOf('year').format('YYYY-MM-DD'),
+          endDate: dayjs(val).endOf('year').format('YYYY-MM-DD')
+        }
+        this.$emit('input', val)
+        this.$emit('change', iYear)
+      } else {
+        let iYear = {
+          startDate: '',
+          endDate: ''
+        }
+        this.$emit('input', val)
+        this.$emit('change', iYear)
       }
-      this.$emit('input', val)
-      this.$emit('change', iYear)
     },
     handleChange(val) {
       this.$emit('input', val)