@titaui/pc 1.9.33 → 1.9.37

package/src/pages/like-ranking/index.tsx

@@ -144,9 +144,10 @@ const LikeRanking: FC = () => {
   };
 
   const handleLinkToPraiseRaking = () => {
-    let href = window.location.href;
-    let url = `${href.split("#")[0]}#dev`;
-    window.open(url, "self");
+    window.history.go(-1)
+    // let href = window.location.href;
+    // let url = `${href.split("#")[0]}#dynamic`;
+    // window.open(url, "self");
   };
 
   return (

package/src/utils/date-test-change.ts

@@ -1,27 +1,30 @@
-import { getMonth } from "./constant"
-import { getLocale, isEn } from "./getLocale"
+import { getMonth } from "./constant";
+import { getLocale, isEn } from "./getLocale";
 
 //精确到日期的检测 date为2021/8/26这样的类型，返回距现在几天
 export const testDateDiff = (date) => {
+  const handleDate =
+    date.length == 5 ? `${new Date().getFullYear()}/${date}` : date;
+  const testTime = Date.parse(
+    handleDate.replace(/-/g, "/").split("T").join(" ").split(".")[0]
+  );
+  const now = Date.now();
 
-  const handleDate = date.length == 5 ? `${new Date().getFullYear()}/${date}` : date
-  const testTime = Date.parse(handleDate.replace(/-/g, '/').split('T').join(' ').split('.')[0])
-  const now = Date.now()
+  const diffDay = Math.floor((now - testTime) / (1000 * 60 * 60 * 24));
 
-  const diffDay = Math.floor((now - testTime) / (1000 * 60 * 60 * 24))
-
-  return diffDay
-}
+  return diffDay;
+};
 
 //精确到天的检测
-export const judgeTimeSpaceFromNow = (date) => {
-
-  if (!date)
-    return getLocale('OKR_MyO_KRP_Notupdated');
+export const judgeTimeSpaceFromNow = (date, withHM = true) => {
+  if (!date) return getLocale("OKR_MyO_KRP_Notupdated");
 
   const months = getMonth();
   // 兼容safari，safari不支持yy-mm-dd格式，支持yy/mm/dd格式
-  const handleDate = date.length === 5 ? new Date().getFullYear() + '/' + date : date.replace(/-/g, '/').split('T').join(' ').split('.')[0]
+  const handleDate =
+    date.length === 5
+      ? new Date().getFullYear() + "/" + date
+      : date.replace(/-/g, "/").split("T").join(" ").split(".")[0];
   const timeDateObj = new Date(handleDate);
   const timeMilliSecond = timeDateObj.getTime();
   const timeYear = timeDateObj.getFullYear();
@@ -30,7 +33,7 @@ export const judgeTimeSpaceFromNow = (date) => {
   const timeHours = timeDateObj.getHours();
   const timeMinutes = timeDateObj.getMinutes();
 
-  const nowTime = new Date()
+  const nowTime = new Date();
 
   const nowMilliSecond = nowTime.getTime();
   const nowYear = nowTime.getFullYear();
@@ -38,32 +41,70 @@ export const judgeTimeSpaceFromNow = (date) => {
 
   const secondDiff = Math.floor((nowMilliSecond - timeMilliSecond) / 1000);
   if (secondDiff <= 3) {
-    return getLocale('Pro_page_Int_Justnow');
+    return getLocale("Pro_page_Int_Justnow");
   }
   if (secondDiff < 60) {
-    return `${secondDiff}${getLocale('Mood_secago')}`;
+    return `${secondDiff}${getLocale("Mood_secago")}`;
   }
   if (secondDiff < 60 * 60) {
-    return `${Math.floor(secondDiff / 60)}${getLocale('Tasks_Tab_MyS_minuteago')}`;
+    return `${Math.floor(secondDiff / 60)}${getLocale(
+      "Tasks_Tab_MyS_minuteago"
+    )}`;
   }
   if (secondDiff < 60 * 60 * 24) {
-    return `${Math.floor(secondDiff / (60 * 60))}${getLocale('Mood_hoursago')}`;
+    return `${Math.floor(secondDiff / (60 * 60))}${getLocale("Mood_hoursago")}`;
   }
   if (secondDiff < 60 * 60 * 24 * 2 && nowDate - 1 === timeDate) {
-    return `${getLocale('OKR_MyO_Pr_Text_Yesterday')} ${timeHours + ":" + timeMinutes}`;
+    return (
+      `${getLocale("OKR_MyO_Pr_Text_Yesterday")}` +
+      (withHM
+        ? ` ${
+            (timeHours < 10 ? "0" + timeHours : timeHours) +
+            ":" +
+            (timeMinutes < 10 ? "0" + timeMinutes : timeMinutes)
+          }`
+        : "")
+    );
   }
   if (secondDiff < 60 * 60 * 24 * 3 && nowDate - 2 === timeDate) {
-    return `${getLocale('Mood_2daysago')} ${timeHours + ":" + timeMinutes}`;
+    return (
+      `${getLocale("Mood_2daysago")}` +
+      (withHM
+        ? ` ${
+            (timeHours < 10 ? "0" + timeHours : timeHours) +
+            ":" +
+            (timeMinutes < 10 ? "0" + timeMinutes : timeMinutes)
+          }`
+        : "")
+    );
   }
   if (timeYear === nowYear) {
-    const dateStr = months[timeMonth-1] + (isEn ? ` ${timeDate} ` : `${timeDate}日`)
-    return `${dateStr} ${
-      timeHours < 10 ? "0" + timeHours : timeHours
-    }:${timeMinutes < 10 ? "0" + timeMinutes : timeMinutes}`;
+    const dateStr =
+      months[timeMonth - 1] + (isEn ? ` ${timeDate} ` : `${timeDate}日`);
+    return (
+      `${dateStr}` +
+      (withHM
+        ? ` ${
+            (timeHours < 10 ? "0" + timeHours : timeHours) +
+            ":" +
+            (timeMinutes < 10 ? "0" + timeMinutes : timeMinutes)
+          }`
+        : "")
+    );
   }
-  const dateStr = (isEn ? '' : `${timeYear}年`) + months[timeMonth-1] + (isEn ? ` ${timeDate} ` : `${timeDate}日`) + (isEn ? `,${timeYear}` : '');
-  return `${dateStr} ${
-    timeHours < 10 ? "0" + timeHours : timeHours
-  }:${timeMinutes < 10 ? "0" + timeMinutes : timeMinutes}`;
-
-}
+  const dateStr =
+    (isEn ? "" : `${timeYear}年`) +
+    months[timeMonth - 1] +
+    (isEn ? ` ${timeDate}` : `${timeDate}日`) +
+    (isEn ? `,${timeYear}` : "");
+  return (
+    `${dateStr}` +
+    (withHM
+      ? ` ${
+          (timeHours < 10 ? "0" + timeHours : timeHours) +
+          ":" +
+          (timeMinutes < 10 ? "0" + timeMinutes : timeMinutes)
+        }`
+      : "")
+  );
+};