@titaui/pc 1.9.26 → 1.9.30

package/src/pages/home/components/data-list/table/utils-function.ts

@@ -1,182 +1,190 @@
-import { postForTableList } from '../../../../../utils/request'
-import { TableData } from './data-list-interface'
-import { getLocale } from '../../../../../utils/getLocale'
-import drawerManager from '../../../../../components/drawer-manager'
-import { okrAlignColumns, okrUpdateColumns, myOkrColumns } from './columns'
+import { postForTableList } from "../../../../../utils/request";
+import { TableData } from "./data-list-interface";
+import { getLocale } from "../../../../../utils/getLocale";
+import drawerManager from "../../../../../components/drawer-manager";
+import { okrAlignColumns, okrUpdateColumns, myOkrColumns } from "./columns";
+import PeriodSelector from "../../../../../components/period-selector";
 
 //日期参数转换
 const cycleFilterModels = (cycleTime) => {
-  const res = [{
-    "CptFilterName": "cycle_type",
-    "CptFilterValue": cycleTime.cycleType === '-1' ? '0,1,2,3,4,5' : cycleTime.cycleType
-  },]
-  if (cycleTime.cycleType !== '-1') {
+  const res = [
+    {
+      "CptFilterName": "cycle_type",
+      "CptFilterValue":
+        cycleTime.cycleType === "-1" ? "0,1,2,3,4,5" : cycleTime.cycleType,
+    },
+  ];
+  if (cycleTime.cycleType !== "-1") {
     res.push({
       "CptFilterName": "annual_num",
-      "CptFilterValue": cycleTime.yearNum
-    })
+      "CptFilterValue": cycleTime.yearNum,
+    });
   }
-  if (cycleTime.cycleType === '2' || cycleTime.cycleType === '3' || cycleTime.cycleType === '4' || cycleTime.cycleType === '5') {
+  if (
+    cycleTime.cycleType === "2" ||
+    cycleTime.cycleType === "3" ||
+    cycleTime.cycleType === "4" ||
+    cycleTime.cycleType === "5"
+  ) {
     res.push({
       "CptFilterName": "yqm_num",
-      "CptFilterValue": cycleTime.yqmNum
-    })
+      "CptFilterValue": cycleTime.yqmNum,
+    });
   }
-  return res
-}
+  return res;
+};
 //okr参数转换
 const getComponentDataProp = {
-  'all': 'allOkr',
-  'hadAlign': 'MyParentOkrCount',
-  'hadNotAlign': 'MyNoParentOkrCount',
-  'hadUpdate': 'allMyProgressCount',
-  'hadNotUpdate': 'allMyNoProgressCount',
-  'normalOkr': 'MyNormalOkrCount',
-  'riskOkr': 'MyRiskOkrCount',
-  'dalyOkr': 'MyDlayOkrCount',
-  'endOkr': 'MyFinishOkrCount'
-}
+  "all": "allOkr",
+  "hadAlign": "MyParentOkrCount",
+  "hadNotAlign": "MyNoParentOkrCount",
+  "hadUpdate": "allMyProgressCount",
+  "hadNotUpdate": "allMyNoProgressCount",
+  "normalOkr": "MyNormalOkrCount",
+  "riskOkr": "MyRiskOkrCount",
+  "dalyOkr": "MyDlayOkrCount",
+  "endOkr": "MyFinishOkrCount",
+};
 // 周期转换
 const cycleTimeDisplay = (cycleType, annualNum, yqmNum): string => {
-  switch (cycleType) {
-    case 1:
-      return `${annualNum}年`
-    case 2:
-      return `${annualNum}年 第${numberToWord(yqmNum)}季度`
-    case 3:
-      return `${annualNum}年 ${yqmNum}月`
-    case 4:
-      return `${annualNum}年 ${yqmNum}-${(yqmNum + 1) % 12 || 12}月`
-    case 5:
-      return `${annualNum}年 ${yqmNum == 1 ? '上' : '下'}半年`
-    default:
-      return '-'
-  }
-}
-//数字大小写转换
-const numberToWord = (num) => {
-  const arr = ['一', '二', '三', '四']
-  return arr[num - 1]
-}
+  return PeriodSelector.formatPeriod({
+    annualNum,
+    cycleType,
+    yqmNum,
+  });
+};
+
 //ComponentId转换
 const ComponentIdMap = {
-  align: 'Align-OKR-Target',
-  update: 'OKR-Progress-Display',
-  target: 'OKR-Target-Display'
-}
+  align: "Align-OKR-Target",
+  update: "OKR-Progress-Display",
+  target: "OKR-Target-Display",
+};
 
-
-export default (source, params): Promise<{ dataList: TableData[], dataTotal: number }> => {
-  const { type, cycleTime, pageNum, pageSize } = params
+export default (
+  source,
+  params
+): Promise<{ dataList: TableData[]; dataTotal: number }> => {
+  const { type, cycleTime, pageNum, pageSize } = params;
 
   return new Promise((resolve, reject) => {
-    let dataList: TableData[] = []
-    let dataTotal = 0
+    let dataList: TableData[] = [];
+    let dataTotal = 0;
 
     postForTableList({
       "ComponentId": ComponentIdMap[source],
       "ComponentDataProp": getComponentDataProp[type],
       "PageSize": pageSize,
       "PageNum": pageNum,
-      "FilterModels": cycleFilterModels(cycleTime)
-    }).then(res => {
+      "FilterModels": cycleFilterModels(cycleTime),
+    }).then((res) => {
       if (res.Code == 1) {
-        const listData: TableData[] = []
+        const listData: TableData[] = [];
         if (res.Data.componentData) {
           for (let item of res.Data.componentData) {
             listData.push({
               columnId: item.workId,
-              okrType: 'O',
+              okrType: "O",
               okrName: item.workName,
-              cycleTime: cycleTimeDisplay(item.cycleType, item.annualNum, item.yqmnum),
+              cycleTime: cycleTimeDisplay(
+                item.cycleType,
+                item.annualNum,
+                item.yqmnum
+              ),
               userInfo: {
                 name: item.principalUser.name,
                 avatarImg: item.principalUser.avatar.medium,
                 userId: item.principalUser.userId,
-                avatarColor: item.principalUser.avatar.color
+                avatarColor: item.principalUser.avatar.color,
               },
               riskLevel: item.manualRiskLevel,
               progress: item.progress,
-              typeName: item.parentId > 0 || item.parentKrId > 0 ? getLocale('OKR_Db_Aligned') : getLocale('OKR_Db_Unaligned'),
+              typeName:
+                item.parentId > 0 || item.parentKrId > 0
+                  ? getLocale("OKR_Db_Aligned")
+                  : getLocale("OKR_Db_Unaligned"),
               updateTime: item.lastUpdatedDate,
               status: item.status,
               createDate: item.CreateDate,
-              behave: () => drawerManager.open('okrDetail', { okrId: item.workId })
-            })
-            if (item.Krs.length && source !== 'align') {
+              behave: () =>
+                drawerManager.open("okrDetail", { okrId: item.workId }),
+            });
+            if (item.Krs.length && source !== "align") {
               for (let item1 of item.Krs) {
                 listData.push({
                   columnId: item1.mileStoneId,
-                  okrType: 'KR',
+                  okrType: "KR",
                   okrName: item1.mileStoneName,
-                  cycleTime: `${item1.startDate.slice(-5)}~${item1.endDate.slice(-5)}`,
+                  cycleTime: `${item1.startDate.slice(
+                    -5
+                  )}~${item1.endDate.slice(-5)}`,
                   userInfo: {
                     name: item1.user.name,
                     avatarImg: item1.user.avatar.medium,
                     userId: item1.user.userId,
-                    avatarColor: item1.user.avatar.color
+                    avatarColor: item1.user.avatar.color,
                   },
                   riskLevel: item1.manualRiskLevel,
                   progress: item1.progress,
                   status: item1.status,
                   updateTime: item1.progressDescriptionDate,
                   createDate: item1.CreateDate,
-                  behave: () => drawerManager.open('krDetail', { krId: item1.mileStoneId })
-                })
+                  behave: () =>
+                    drawerManager.open("krDetail", { krId: item1.mileStoneId }),
+                });
               }
             }
           }
         }
-        dataList = listData
-        dataTotal = res.Data.total
-        resolve({ dataList, dataTotal })
+        dataList = listData;
+        dataTotal = res.Data.total;
+        resolve({ dataList, dataTotal });
       } else {
-        reject('请求失败')
+        reject("请求失败");
       }
-    })
-  })
-
-}
+    });
+  });
+};
 
 export const getColumsBySource = (source) => {
   switch (source) {
-    case 'align':
-      return okrAlignColumns
+    case "align":
+      return okrAlignColumns;
       break;
-    case 'update':
-      return okrUpdateColumns
+    case "update":
+      return okrUpdateColumns;
       break;
-    case 'target':
-      return myOkrColumns
+    case "target":
+      return myOkrColumns;
       break;
   }
-}
+};
 
 export const getEmptyBySource = (source) => {
   switch (source) {
-    case 'align':
+    case "align":
       return {
-        imageSrc: require('../../../image/align-list-empty.png'),
-        link: 'https://club.tita.com/18150.html',
-        emptyText: '暂无对齐',
-        linkText: '如何对齐'
-      }
+        imageSrc: require("../../../image/align-list-empty.png"),
+        link: "https://club.tita.com/18150.html",
+        emptyText: "暂无对齐",
+        linkText: "如何对齐",
+      };
       break;
-    case 'update':
+    case "update":
       return {
-        imageSrc: require('../../../image/update-list-empty.png'),
-        link: 'https://club.tita.com/18179.html',
-        emptyText: '暂无更新',
-        linkText: '如何更新'
-      }
+        imageSrc: require("../../../image/update-list-empty.png"),
+        link: "https://club.tita.com/18179.html",
+        emptyText: "暂无更新",
+        linkText: "如何更新",
+      };
       break;
-    case 'target':
+    case "target":
       return {
-        imageSrc: require('../../../image/myokr-list-empty.png'),
-        link: '#okr%2Fmanage',
-        emptyText: '「暂无 OKR 数据」',
-        linkText: '去查看'
-      }
+        imageSrc: require("../../../image/myokr-list-empty.png"),
+        link: "#okr%2Fmanage",
+        emptyText: `「${getLocale("Tasks_Tab_MyS_NoOKRilable")}」`,
+        linkText: getLocale('OKR_MyO_Gotoview'),
+      };
       break;
   }
-}
+};

package/src/pages/home-page-data-list/index.tsx

@@ -18,7 +18,7 @@ const HomePageDataList = () => {
   const [source, setSource] = useState(''); //从url中获取页面来源
   const [type, setType] = useState(''); //从url中获取查找类型
   const [cycleTime, setCycleTime] = useState<CycleTime>({
-    name: getLocale('OKR_MyO_Butt_AllStates'),
+    name: getLocale('OKR_MyO_Butt_AllStatee'),
     yearNum: '2021',
     cycleType: '-1',
     yqmNum: '0',
@@ -58,9 +58,9 @@ const HomePageDataList = () => {
           {getLocale('Mod_Back')}
         </a>
         <b />
-        {source === 'align' && 'OKR 对齐'}
-        {source === 'update' && 'OKR 更新'}
-        {source === 'target' && '我的OKR'}
+        {source === 'align' && getLocale('HP_OKRAlignment')}
+        {source === 'update' && getLocale('OKR_MyO_OKRUpdate')}
+        {source === 'target' && getLocale('OKR_Menu_Title_MyOKRs')}
       </div>
       <div className={`${preCls}__main`}>
         <HomeNavSelector

package/src/utils/bs-global.js

@@ -36,7 +36,7 @@ export const getUploadMaxSize = () => {
 };
 
 export function isWx() {
-  return getTenantInfo().Source == 860;
+  return (getTenantInfo().Source == 860 || getTenantInfo().Source == 964) && getTenantInfo().corpCreateType != 2
 }
 
 /*

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}字`;
+  }
+}

package/yarn-error.log

@@ -1,103 +0,0 @@
-Arguments: 
-  /usr/local/bin/node /usr/local/bin/yarn
-
-PATH: 
-  /opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin:/opt/homebrew/bin:/opt/homebrew/sbin
-
-Yarn version: 
-  1.22.10
-
-Node version: 
-  12.22.1
-
-Platform: 
-  darwin x64
-
-Trace: 
-  SyntaxError: /Users/yang/tita/titaui-pc/package.json: Unexpected token < in JSON at position 26
-      at JSON.parse (<anonymous>)
-      at /usr/local/lib/node_modules/yarn/lib/cli.js:1625:59
-      at Generator.next (<anonymous>)
-      at step (/usr/local/lib/node_modules/yarn/lib/cli.js:310:30)
-      at /usr/local/lib/node_modules/yarn/lib/cli.js:321:13
-
-npm manifest: 
-  {
-    "name": "@titaui/pc",
-  <<<<<<< HEAD
-    "version": "1.2.22",
-  =======
-    "version": "1.2.13",
-  >>>>>>> master
-    "nameCN": "",
-    "description": "",
-    "main": "src/index.js",
-    "scripts": {
-      "storybook": "start-storybook -p 6006 --no-dll",
-      "start": "dev_server=on webpack-dev-server --disableHostCheck=true --progress --colors  --config webpack-stories.config.js",
-      "build-storybook": "build-storybook --docs --no-dll",
-      "build:es": "babel src -d es --ignore **/__tests__",
-      "build:lib": "cross-env OUTPUT_MODULE=commonjs babel src -d lib --ignore **/__tests__",
-      "build:umd": "webpack --config ./.scripts/webpack.umd.js",
-      "build": "npm run build:lib && npm run build:es && npm run build:umd"
-    },
-    "author": "",
-    "license": "ISC",
-    "devDependencies": {
-      "del": "^6.0.0",
-      "gulp": "^3.x",
-      "gulp-autoprefixer": "^7.0.1",
-      "gulp-babel": "^8.0.0",
-      "gulp-concat": "^2.6.1",
-      "gulp-cssbeautify": "^3.0.0",
-      "gulp-cssnano": "^2.1.3",
-      "gulp-filesize": "0.0.6",
-      "gulp-postcss": "^9.0.0",
-      "gulp-rename": "^2.0.0",
-      "gulp-replace": "^1.0.0",
-      "gulp-sass": "^4.1.0",
-      "gulp-sourcemaps": "^2.6.5",
-      "sass-resources-loader": "^2.2.1"
-    },
-    "dependencies": {
-      "@titaui/dagre": "^0.8.8-pre",
-      "@titaui/rc-tree2": "^4.1.15",
-      "@titaui/rc-trigger": "^5.2.5",
-      "@titaui/react-flow-renderer": "9.5.4",
-      "@titaui/toast": "^1.0.0",
-      "axios": "^0.21.1",
-      "classnames": "^2.2.6",
-      "clone-deep": "^4.0.1",
-      "d3-cloud": "^1.2.5",
-      "dayjs": "^1.10.4",
-      "html2canvas": "^1.0.0-rc.7",
-      "moment": "^2.29.1",
-      "qs": "^6.10.1",
-      "rc-checkbox": "^2.3.2",
-      "rc-dialog": "8.5.2",
-      "rc-drawer": "^4.3.1",
-      "rc-input-number": "^5.0.0",
-      "rc-pagination": "^3.1.6",
-      "rc-queue-anim": "1.4.1",
-      "rc-select": "^12.1.7",
-      "rc-switch": "^3.2.2",
-      "rc-table": "^7.13.2",
-      "rc-tabs": "^11.7.3",
-      "rc-tooltip": "^5.1.1",
-      "rc-tree": "^4.1.5",
-      "rc-trigger": "^5.2.3",
-      "rc-upload": "^4.2.0-alpha.0",
-      "rc-util": "^5.13.1",
-      "react-collapse": "^5.1.0",
-      "react-perfect-scrollbar": "^1.5.2",
-      "url-parse": "^1.5.1",
-      "uuid": "^3.1.0",
-      "wordcloud": "^1.2.2"
-    }
-  }
-
-yarn manifest: 
-  No manifest
-
-Lockfile: 
-  No lockfile