bri-components 1.4.62 → 1.4.63

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.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/src/components/controls/base/DshDate/DshDate.vue +2 -2
  3. package/src/components/controls/base/DshDate/DshDaterange.vue +2 -2
  4. package/src/components/controls/mixins/dateMixin.js +2 -15
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bri-components",
3
- "version": "1.4.62",
3
+ "version": "1.4.63",
4
4
  "author": "dengshanghui",
5
5
  "description": "a component lib for vue project",
6
6
  "main": "src/index.js",
package/src/components/controls/base/DshDate/DshDate.vue CHANGED
@@ -139,8 +139,8 @@
139
139
  return {
140
140
  shortcuts: this.getShortCuts(index),
141
141
  disabledDate: (date) => {
142
- const curDateStr = this.$transformDate(date, "/", this.subType);
143
- const rangeBool = this.$isWithinRange(curDateStr, this.minDate, this.maxDate, this.subType);
142
+ const curDateStr = this.$transformToDateStr(date, "/", this.subType);
143
+ const rangeBool = this.$isWithinRange(curDateStr, this.selfPropsObj._minDate, this.selfPropsObj._maxDate, this.subType);
144
144
 
145
145
  const selfValue = {
146
146
  ...this.value,
package/src/components/controls/base/DshDate/DshDaterange.vue CHANGED
@@ -135,8 +135,8 @@
135
135
  return {
136
136
  shortcuts: this.getShortCuts(index),
137
137
  disabledDate: (date) => {
138
- const curDateStr = this.$transformDate(date, "/", this.subType);
139
- const rangeBool = this.$isWithinRange(curDateStr, this.minDate, this.maxDate, this.subType);
138
+ const curDateStr = this.$transformToDateStr(date, "/", this.subType);
139
+ const rangeBool = this.$isWithinRange(curDateStr, this.selfPropsObj._minDate, this.selfPropsObj._maxDate, this.subType);
140
140
 
141
141
  return !rangeBool;
142
142
  }
package/src/components/controls/mixins/dateMixin.js CHANGED
@@ -55,19 +55,6 @@ export default {
55
55
  .filter(dynDateItem => !!dynDateItem)
56
56
  : dynDateData
57
57
  ).filter(dynDateItem => dynDateItem.dateTypes.includes(this.subType));
58
- },
59
-
60
- minDate () {
61
- const date = this.selfPropsObj._minDate;
62
- return this.isDynDate(date)
63
- ? this.$transformDynToNormalDate(date, "-", this.subType)
64
- : date;
65
- },
66
- maxDate () {
67
- const date = this.selfPropsObj._maxDate;
68
- return this.isDynDate(date)
69
- ? this.$transformDynToNormalDate(date, "-", this.subType)
70
- : date;
71
58
  }
72
59
  },
73
60
  created () { },
@@ -100,12 +87,12 @@ export default {
100
87
  transformVal (val) {
101
88
  return this.isDynDate(val)
102
89
  ? val
103
- : this.$transformDate(val, "-", this.subType);
90
+ : this.$transformToDateStr(val, "-", this.subType);
104
91
  },
105
92
  getShowVal (val) {
106
93
  return this.isDynDate(val)
107
94
  ? (this.dynDateList.find(dynDateItem => dynDateItem._key === val) || { name: `"${val}"动态时间不存在` }).name
108
- : this.$transformDate(val, "-", this.subType);
95
+ : this.$transformToDateStr(val, "-", this.subType);
109
96
  },
110
97
  isDynDate (val) {
111
98
  return val && typeof val === "string" && (