mali-applet-ui 0.2.49 → 0.2.51

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -18,7 +18,7 @@ export default {
18
18
  virtualHost: true
19
19
  },
20
20
  props: {
21
- defaultType: Number,
21
+ dateType: Number,
22
22
  border: Boolean,
23
23
  startDate: String,
24
24
  endDate: String,
@@ -29,17 +29,18 @@ export default {
29
29
  },
30
30
  data () {
31
31
  return {
32
- selectType: 0,
32
+ selectType: 5,
33
33
  selectDates: []
34
34
  }
35
35
  },
36
36
  computed: {
37
37
  typeList () {
38
38
  return [
39
- { label: '', value: 1 },
40
- { label: '', value: 2 },
41
- { label: '', value: 3 },
42
- { label: '自定义', value: 0 }
39
+ { label: '', value: 1 },
40
+ { label: '', value: 2 },
41
+ { label: '', value: 3 },
42
+ { label: '', value: 4 },
43
+ { label: '自定义', value: 5 }
43
44
  ]
44
45
  }
45
46
  },
@@ -52,8 +53,8 @@ export default {
52
53
  if (this.startDate) {
53
54
  this.selectDates = this.startDate && this.endDate ? [this.startDate, this.endDate] : []
54
55
  }
55
- if (this.defaultType) {
56
- this.selectType = this.defaultType
56
+ if (this.dateType) {
57
+ this.selectType = this.dateType
57
58
  this.$nextTick(() => {
58
59
  if (!this.startDate) {
59
60
  this.changeTypeEvent()
@@ -65,7 +66,8 @@ export default {
65
66
  changeTypeEvent () {
66
67
  let startStr = ''
67
68
  let enStr = ''
68
- if (this.selectType === 0) {
69
+ if (this.selectType === 5) {
70
+ this.$emit('dateType', this.selectType)
69
71
  return
70
72
  }
71
73
  if (this.selectType !== null) {
@@ -73,12 +75,14 @@ export default {
73
75
  const endDate = new Date()
74
76
  switch (this.selectType) {
75
77
  case 1:
78
+ startDate = new Date()
79
+ case 2:
76
80
  startDate = XEUtils.getWhatWeek(endDate, -1)
77
81
  break
78
- case 2:
82
+ case 3:
79
83
  startDate = XEUtils.getWhatDay(XEUtils.getWhatMonth(endDate, -1), 1)
80
84
  break
81
- case 3:
85
+ case 4:
82
86
  startDate = XEUtils.getWhatDay(XEUtils.getWhatYear(endDate, -1), 1)
83
87
  break
84
88
  }
@@ -86,6 +90,7 @@ export default {
86
90
  enStr = XEUtils.toDateString(endDate, 'yyyy-MM-dd')
87
91
  }
88
92
  this.selectDates = startStr && enStr ? [startStr, enStr] : []
93
+ this.$emit('dateType', this.selectType)
89
94
  this.$emit('update:startDate', startStr)
90
95
  this.$emit('update:endDate', enStr)
91
96
  this.$emit('change', { startDate: startStr, endDate: enStr })
@@ -93,7 +98,8 @@ export default {
93
98
  changeEvent (value) {
94
99
  const [startDate, endDate] = value
95
100
  if (!startDate || !endDate) {
96
- this.selectType = 0
101
+ this.selectType = 5
102
+ this.$emit('dateType', this.selectType)
97
103
  }
98
104
  this.$emit('update:startDate', startDate || '')
99
105
  this.$emit('update:endDate', endDate || '')
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mali-applet-ui",
3
- "version": "0.2.49",
3
+ "version": "0.2.51",
4
4
  "description": "码里云小程序组件库",
5
5
  "scripts": {
6
6
  "release": "node script/release.js && npm publish"