cloud-web-corejs 1.0.94 → 1.0.96

package/src/components/xform/utils/format.js

@@ -1,57 +1,48 @@
+import dayjs from 'dayjs'
+
+function validateDate(dateStr) {
+	let date = new Date( Date.parse(dateStr) )
+	return (date instanceof Date) && !isNaN(date.getTime())
+}
 
 export function formatDate1(date) {
-	if (new Date(Date.parse(date.replace(/-/g, "/"))) === "Invalid Date") {
+	if (!validateDate(date)) {
 		return date;
 	}
-	date = new Date(Date.parse(date.replace(/-/g, "/"))); //转换成Date
-	let y = date.getFullYear();
-	let m = date.getMonth() + 1;
-	m = m < 10 ? '0' + m : m;
-	let d = date.getDate();
-	d = d < 10 ? ('0' + d) : d;
-	return y + '-' + m + '-' + d;
+
+	return dayjs(date).format('YYYY-MM-DD')
 }
 
 export function formatDate2(date) {
-	if (new Date(Date.parse(date.replace(/-/g, "/"))) === "Invalid Date") {
+	if (!validateDate(date)) {
 		return date;
 	}
-	date = new Date(Date.parse(date.replace(/-/g, "/"))); //转换成Date
-	let y = date.getFullYear();
-	let m = date.getMonth() + 1;
-	m = m < 10 ? '0' + m : m;
-	let d = date.getDate();
-	d = d < 10 ? ('0' + d) : d;
-	return y + '/' + m + '/' + d;
+
+	return dayjs(date).format('YYYY/MM/DD')
 }
 
 export function formatDate3(date) {
-	if (new Date(Date.parse(date.replace(/-/g, "/"))) === "Invalid Date") {
+	if (!validateDate(date)) {
 		return date;
 	}
-	date = new Date(Date.parse(date.replace(/-/g, "/"))); //转换成Date
-	let y = date.getFullYear();
-	let m = date.getMonth() + 1;
-	m = m < 10 ? '0' + m : m;
-	let d = date.getDate();
-	d = d < 10 ? ('0' + d) : d;
-	return y + '年' + m + '月' + d +'日';
+
+	return dayjs(date).format('YYYY年MM月DD日')
 }
 
 export function formatDate4(date) {
-	if (new Date(Date.parse(date.replace(/-/g, "/"))) === "Invalid Date"){
+	if (!validateDate(date)) {
 		return date;
 	}
-	date = new Date(Date.parse(date.replace(/-/g, "/"))); //转换成Date
-	return date.toLocaleString()
+
+	return dayjs(date).format('YYYY-MM-DD HH:mm:ss')
 }
 
 export function formatDate5(date) {
-	if (new Date(Date.parse(date.replace(/-/g, "/"))) === "Invalid Date") {
+	if (!validateDate(date)) {
 		return date;
 	}
-	date = new Date(Date.parse(date.replace(/-/g, "/"))); //转换成Data();
-	return date.toLocaleString('chinese', { hour12: false })
+
+	return dayjs(date).format('YYYY-MM-DD hh:mm:ss')
 }
 
 // ###,###,###,##0.######