From 1622a4d80dd86d0fde35af6908937f9be670fee3 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期二, 17 十二月 2024 10:13:00 +0800
Subject: [PATCH] 停止生成

---
 src/utils/util.ts |   33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/utils/util.ts b/src/utils/util.ts
index d35d575..d92279e 100644
--- a/src/utils/util.ts
+++ b/src/utils/util.ts
@@ -541,11 +541,13 @@
  * 鏈�杩� n 澶╃殑 startDate銆乪ndDate
  * @param dates
  */
-export const getRecentDateRange = (dates: number) => {
+export const getRecentDateRange = (dates: number, includesCurrent = true) => {
+	dates = includesCurrent ? dates - 1 : dates;
 	// 鑾峰彇褰撳墠鏃ユ湡
 	const endDate = new Date();
 	const startDate = new Date();
 	startDate.setTime(startDate.getTime() - 3600 * 1000 * 24 * dates);
+	endDate.setHours(23,59,59,59)
 	startDate.setHours(0, 0, 0, 0);
 	return [startDate, endDate];
 };
@@ -619,11 +621,28 @@
 
 export const toPercent = (num: number, havePercentSymbol = true, decimalPlaces = 1, defaultValue = '-') => {
 	if (num == null) return `${defaultValue} %`;
-	let percent = Number(num * 100).toFixed(decimalPlaces);
+	const factor = Math.pow(10, decimalPlaces);
+
+	let percent = Math.round(Number(num) * 100 * factor) / factor + '';
 	if (havePercentSymbol) {
 		percent += '%';
 	}
 	return percent;
+};
+
+
+
+/**
+ * 淇濈暀鎸囧畾绮惧害灏忔暟浣嶏紝涓斾笉琛ラ浂
+ * @param num
+ * @param precision
+ * @returns
+ */
+export const toMyFixed = (num, precision) => {
+	if (num == null) return '';
+	if (!precision) return num + '';
+	const factor = Math.pow(10, precision);
+	return Math.round(Number(num) * factor) / factor + '';
 };
 
 /**
@@ -704,6 +723,7 @@
 };
 
 export function getTextWidth(text: string, option: GetTextWidthOption) {
+	if (!text) return 0;
 	const { size = '14px', family = 'Microsoft YaHei' } = option;
 	const spanEle = document.createElement('span');
 	document.body.appendChild(spanEle);
@@ -721,3 +741,12 @@
 	document.body.removeChild(spanEle);
 	return width;
 }
+
+export function decodeFormData(formDataString) {
+	const params = new URLSearchParams(formDataString);
+	const decodedData = {};
+	for (const [key, value] of params) {
+		decodedData[key] = decodeURIComponent(value);
+	}
+	return decodedData;
+}

--
Gitblit v1.9.3