@opendesign-plus/components 0.0.1-rc.29 → 0.0.1-rc.30
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
CHANGED
|
@@ -95,19 +95,26 @@ const computedList = computed<any[]>(() => {
|
|
|
95
95
|
let end_date_time = '';
|
|
96
96
|
if (type !== CalendarDataType.MEETING) {
|
|
97
97
|
let activity_type = activityTypeMap.value.get(v.activity_type)?.label;
|
|
98
|
+
const isSameDay = v.start_date && v.start_date === v.end_date;
|
|
98
99
|
if (v.start_date) {
|
|
99
100
|
dateRange = props.disableFormat ? v.start_date : formatDate(v.start_date);
|
|
100
101
|
}
|
|
101
|
-
if (
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
dateRange += `${ dateRange ? ' ' : '' }${ props.disableFormat ? v.end_date : formatDate(v.end_date) }`;
|
|
102
|
+
if (isSameDay) {
|
|
103
|
+
if (v.start) {
|
|
104
|
+
dateRange += `${ dateRange ? ' ' : '' }${ v.start }`;
|
|
105
|
+
if (v.end) {
|
|
106
|
+
dateRange += `${ dateRange ? ' - ' : '' }${ v.end }`;
|
|
107
|
+
}
|
|
108
108
|
}
|
|
109
|
-
|
|
110
|
-
|
|
109
|
+
} else {
|
|
110
|
+
if (v.start) {
|
|
111
|
+
dateRange += `${ dateRange ? ' ' : '' }${ v.start }`;
|
|
112
|
+
}
|
|
113
|
+
if (v.end_date) {
|
|
114
|
+
dateRange += `${ dateRange ? ' - ' : '' }${ v.end_date }`;
|
|
115
|
+
if (v.end) {
|
|
116
|
+
dateRange += `${ dateRange ? ' ' : '' }${ v.end }`;
|
|
117
|
+
}
|
|
111
118
|
}
|
|
112
119
|
}
|
|
113
120
|
if (v.start_date) {
|