From 6fa4bba623713c396432ba8b863846883d6a1906 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 26 一月 2022 10:52:23 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
PAMapp/components/Ui/UiDateFormat.vue | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/PAMapp/components/Ui/UiDateFormat.vue b/PAMapp/components/Ui/UiDateFormat.vue
index b929e7b..32f9651 100644
--- a/PAMapp/components/Ui/UiDateFormat.vue
+++ b/PAMapp/components/Ui/UiDateFormat.vue
@@ -9,18 +9,21 @@
@Component
export default class UiDateFormat extends Vue {
- @Prop() date!: Date | string;
- @Prop() onlyShowSection!: 'DAY' | 'TIME';
- compareTarget!: Date;
+ @Prop()
+ date!: Date | string;
+ @Prop()
+ onlyShowSection!: 'YEAR' | 'DATE' | 'DAY' | 'TIME';
+
+ compareTarget!: Date;
displayValue = '';
- @Watch('date', {immediate: true}) formattedDate(): void {
-
+ @Watch('date', {immediate: true})
+ formattedDate(): void {
if (!this.date) return;
const toDatePromise = new Promise((resolve, reject) => {
- const date: Date = typeof(this.date) === 'string' ? new Date(this.date) : this.date;
+ const date: Date = typeof(this.date) === 'string' ? new Date(this.date) : this.date as Date;
resolve(date);
});
@@ -35,7 +38,7 @@
const isThisYear = (compareDate: Date): boolean => {
return compareDate.getFullYear() === _now.getFullYear();
};
-
+
const minutes = compareTarget.getMinutes() > 9 ? compareTarget.getMinutes() : `0${compareTarget.getMinutes()}`;
const thisYearDayLabel = isToday(compareTarget) ? `隞予` : `${compareTarget.getMonth() + 1}/${compareTarget.getDate()}`;
@@ -43,15 +46,21 @@
this.displayValue = isThisYear(compareTarget) ? thisYearDayLabel : `${compareTarget.getFullYear()}/${compareTarget.getMonth() + 1}/${compareTarget.getDate()}`;
} else if (this.onlyShowSection === 'TIME') {
this.displayValue = `${compareTarget.getHours()}:${minutes}`;
+ } else if (this.onlyShowSection === 'DATE') {
+ this.displayValue = isThisYear(compareTarget)
+ ? thisYearDayLabel
+ : `${compareTarget.getMonth() + 1}/${compareTarget.getDate()}`;
+ } else if (this.onlyShowSection === 'YEAR') {
+ this.displayValue = `${compareTarget.getFullYear()}`;
}
if (this.onlyShowSection) return;
- this.displayValue = isThisYear(compareTarget)
- ? `${thisYearDayLabel} ${compareTarget.getHours()}:${minutes}`
+ this.displayValue = isThisYear(compareTarget)
+ ? `${thisYearDayLabel} ${compareTarget.getHours()}:${minutes}`
: `${compareTarget.getFullYear()}/${compareTarget.getMonth() + 1}/${compareTarget.getDate()} ${compareTarget.getHours()}:${minutes}`;
- }
+ }
)}
}
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.8.0