@titaui/pc 1.9.27 → 1.9.31

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

@@ -1,4 +1,5 @@
-import { getLocale } from "./getLocale"
+import { getMonth } from "./constant"
+import { getLocale, isEn } from "./getLocale"
 
 //精确到日期的检测 date为2021/8/26这样的类型，返回距现在几天
 export const testDateDiff = (date) => {
@@ -12,59 +13,13 @@ export const testDateDiff = (date) => {
   return diffDay
 }
 
-// //精确到分的检测
-// export const testMinChange = (date) => {
-//   if (!date)
-//     return '暂未'
-//   const now = new Date()
-//   //兼容传进来 月份/日期
-//   const date1 = date.length == 5 ? now.getFullYear() + '/' + date : date
-
-//   const testTime = new Date(date1)
-
-//   if (testTime.getFullYear() === now.getFullYear()) {
-//     if (now.getMonth() === testTime.getMonth()) {
-
-//       const dateDiff = now.getDate() - testTime.getDate()
-//       switch (dateDiff) {
-//         case 2:
-//           return `前天${testTime.getHours()}:${testTime.getMinutes()}`
-//           break;
-//         case 1:
-//           return `昨天${testTime.getHours()}:${testTime.getMinutes()}`
-//           break;
-//         case 0:
-//           const tTime = Date.parse(date)
-//           const nTime = Date.now()
-//           const hourDiff = Math.floor((nTime - tTime) / (1000 * 60 * 60))
-//           if (hourDiff < 1) {
-//             const minDiff = Math.floor((nTime - tTime) / (1000 * 60))
-//             if (minDiff < 1) {
-//               return getLocale('Pro_page_Int_Justnow')
-//             } else {
-//               return `${minDiff}分钟前`
-//             }
-//           } else {
-//             return `${hourDiff}小时前`
-//           }
-//           break
-//         default:
-//           return `${testTime.getMonth() + 1}/${testTime.getDate()} ${testTime.getHours()}:${testTime.getMinutes()}`
-//       }
-//     } else {
-//       return `${testTime.getMonth() + 1}/${testTime.getDate()} ${testTime.getHours()}:${testTime.getMinutes()}`
-//     }
-//   } else {
-//     return `${testTime.getFullYear()}/${testTime.getMonth() + 1}/${testTime.getDate()} ${testTime.getHours()}:${testTime.getMinutes()}`
-//   }
-// }
-
 //精确到天的检测
-export const testDayChange = (date) => {
+export const judgeTimeSpaceFromNow = (date) => {
 
   if (!date)
-    return '暂未'
+    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 timeDateObj = new Date(handleDate);
@@ -86,23 +41,29 @@ export const testDayChange = (date) => {
     return getLocale('Pro_page_Int_Justnow');
   }
   if (secondDiff < 60) {
-    return `${secondDiff}秒前`;
+    return `${secondDiff}${getLocale('Mood_secago')}`;
   }
   if (secondDiff < 60 * 60) {
-    return `${Math.floor(secondDiff / 60)}分钟前`;
+    return `${Math.floor(secondDiff / 60)}${getLocale('Tasks_Tab_MyS_minuteago')}`;
   }
   if (secondDiff < 60 * 60 * 24) {
-    return `${Math.floor(secondDiff / (60 * 60))}小时前`;
+    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');
+    return `${getLocale('OKR_MyO_Pr_Text_Yesterday')} ${timeHours + ":" + timeMinutes}`;
   }
   if (secondDiff < 60 * 60 * 24 * 3 && nowDate - 2 === timeDate) {
-    return `前天`;
+    return `${getLocale('Mood_2daysago')} ${timeHours + ":" + timeMinutes}`;
   }
   if (timeYear === nowYear) {
-    return `${timeMonth}月${timeDate}日`;
+    const dateStr = months[timeMonth-1] + (isEn ? ` ${timeDate} ` : `${timeDate}日`)
+    return `${dateStr} ${
+      timeHours < 10 ? "0" + timeHours : timeHours
+    }:${timeMinutes < 10 ? "0" + timeMinutes : timeMinutes}`;
   }
-  return `${timeYear}年${timeMonth}月${timeDate}日`;
+  const dateStr = (isEn ? '' : `${timeYear}年`) + months[timeMonth-1] + (isEn ? ` ${timeDate} ` : `${timeDate}日`) + (isEn ? `,${timeYear}` : '');
+  return `${dateStr} ${
+    timeHours < 10 ? "0" + timeHours : timeHours
+  }:${timeMinutes < 10 ? "0" + timeMinutes : timeMinutes}`;
 
 }

package/src/utils/i18n-front-translate.ts

@@ -6,3 +6,11 @@ export const i18nLimitCharacters = (length) => {
     return `最多可输入${length}个字`;
   }
 };
+
+export const inputWordTrans = (inputValueLength, maxLength) => {
+  if (isEn) {
+    return `Already entered ${inputValueLength} characters,max ${maxLength} characters`;
+  } else {
+    return `已输入${inputValueLength}个字，最多可输入${maxLength}字`;
+  }
+}