bri-components 1.4.62 → 1.4.64
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.
- package/package.json +1 -1
- package/src/components/controls/base/DshDate/DshDate.vue +2 -2
- package/src/components/controls/base/DshDate/DshDaterange.vue +2 -2
- package/src/components/controls/mixins/dateMixin.js +3 -16
- package/src/components/form/searchMixin.js +1 -0
- package/src/components/unit/DshFormUnit.vue +1 -1
package/package.json
CHANGED
|
@@ -139,8 +139,8 @@
|
|
|
139
139
|
return {
|
|
140
140
|
shortcuts: this.getShortCuts(index),
|
|
141
141
|
disabledDate: (date) => {
|
|
142
|
-
const curDateStr = this.$
|
|
143
|
-
const rangeBool = this.$isWithinRange(curDateStr, this.
|
|
142
|
+
const curDateStr = this.$transformToDateStr(date, "/", this.subType);
|
|
143
|
+
const rangeBool = this.$isWithinRange(curDateStr, this.selfPropsObj._minDate, this.selfPropsObj._maxDate);
|
|
144
144
|
|
|
145
145
|
const selfValue = {
|
|
146
146
|
...this.value,
|
|
@@ -135,8 +135,8 @@
|
|
|
135
135
|
return {
|
|
136
136
|
shortcuts: this.getShortCuts(index),
|
|
137
137
|
disabledDate: (date) => {
|
|
138
|
-
const curDateStr = this.$
|
|
139
|
-
const rangeBool = this.$isWithinRange(curDateStr, this.
|
|
138
|
+
const curDateStr = this.$transformToDateStr(date, "/", this.subType);
|
|
139
|
+
const rangeBool = this.$isWithinRange(curDateStr, this.selfPropsObj._minDate, this.selfPropsObj._maxDate);
|
|
140
140
|
|
|
141
141
|
return !rangeBool;
|
|
142
142
|
}
|
|
@@ -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 () { },
|
|
@@ -95,17 +82,17 @@ export default {
|
|
|
95
82
|
getVal (val) {
|
|
96
83
|
return this.isDynDate(val)
|
|
97
84
|
? val
|
|
98
|
-
: this.$
|
|
85
|
+
: this.$transformToCompatibleDate(val, this.subType);
|
|
99
86
|
},
|
|
100
87
|
transformVal (val) {
|
|
101
88
|
return this.isDynDate(val)
|
|
102
89
|
? val
|
|
103
|
-
: this.$
|
|
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.$
|
|
95
|
+
: this.$transformToDateStr(val, "-", this.subType);
|
|
109
96
|
},
|
|
110
97
|
isDynDate (val) {
|
|
111
98
|
return val && typeof val === "string" && (
|