@titaui/pc 1.9.24 → 1.9.28

package/src/pages/home/components/data-list/table/columns/index.tsx

@@ -14,7 +14,7 @@ export const okrAlignColumns = [{
   width: '38%',
   render: (data) => <OkrNameColumn onClick={data.behave}>{data.okrName}</OkrNameColumn>
 }, {
-  title: '周期时间',
+  title: getLocale('Mod_period'),
   width: '19%',
   render: (data) => <CycleTime>{data.cycleTime}</CycleTime>
 }, {
@@ -22,7 +22,7 @@ export const okrAlignColumns = [{
   width: '12%',
   render: (data) => <UserColumn userInfo={data.userInfo} />
 }, {
-  title: '风险/进度',
+  title: getLocale('OKR_MyO_RiskProgress'),
   width: '12%',
   render: (data) => <ProgressAndRiskColumn status={data.status} progress={data.progress} riskLevel={data.riskLevel} />
 }, {
@@ -44,7 +44,7 @@ export const okrUpdateColumns = [{
   width: '38%',
   render: (data) => <OkrNameColumn onClick={data.behave} type={data.okrType}>{data.okrName}</OkrNameColumn>
 }, {
-  title: '周期时间',
+  title: getLocale('Mod_period'),
   width: '19%',
   render: (data) => <CycleTime>{data.cycleTime}</CycleTime>
 }, {
@@ -52,7 +52,7 @@ export const okrUpdateColumns = [{
   width: '12%',
   render: (data) => <UserColumn userInfo={data.userInfo} />
 }, {
-  title: '风险/进度',
+  title: getLocale('OKR_MyO_RiskProgress'),
   width: '12%',
   render: (data) => <ProgressAndRiskColumn status={data.status} progress={data.progress} riskLevel={data.riskLevel} />
 }, {
@@ -73,7 +73,7 @@ export const myOkrColumns = [{
   width: '38%',
   render: (data) => <OkrNameColumn onClick={data.behave} type={data.okrType}>{data.okrName}</OkrNameColumn>
 }, {
-  title: '周期时间',
+  title: getLocale('Mod_period'),
   width: '19%',
   render: (data) => <CycleTime>{data.cycleTime}</CycleTime>
 }, {
@@ -81,7 +81,7 @@ export const myOkrColumns = [{
   width: '12%',
   render: (data) => <UserColumn userInfo={data.userInfo} />
 }, {
-  title: '风险/进度',
+  title: getLocale('OKR_MyO_RiskProgress'),
   width: '12%',
   render: (data) => <ProgressAndRiskColumn status={data.status} progress={data.progress} riskLevel={data.riskLevel} />
 }, {
@@ -89,7 +89,7 @@ export const myOkrColumns = [{
   width: '12%',
   render: (data) => <UpdateTime updateTime={data.updateTime} />
 }, {
-  title: '创建日期',
+  title: getLocale('OKR_MyO_CreationDate'),
   width: '7%',
   render: (data) => <CreateDate createDate={data.createDate} />
 }

package/src/pages/home/components/data-list/table/columns/updateTime.tsx

@@ -1,5 +1,6 @@
 import React, { ReactElement } from 'react'
-import { testDateDiff, testDayChange } from '../../../../../../utils/date-test-change'
+import { getLocale } from '../../../../../../utils/getLocale'
+import { testDateDiff, judgeTimeSpaceFromNow } from '../../../../../../utils/date-test-change'
 
 
 function UpdateTime({ updateTime }): ReactElement {
@@ -12,10 +13,10 @@ function UpdateTime({ updateTime }): ReactElement {
       {
         updateTime && updateTime.length
           ? dayDiff > 30
-            ? testDayChange(updateTime)
+            ? judgeTimeSpaceFromNow(updateTime)
             : dayDiff === 0
-              ? '刚刚更新'
-              : `${dayDiff}天前`
+              ? getLocale('Mod_Justupdated')
+              : `${dayDiff}${getLocale('Mod_dayago')}`
           : '—'
       }
     </div>

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/pages/personal-info/components/base-info/index.tsx

@@ -64,13 +64,13 @@ const BaseInfo: FC = () => {
         </span>
       </div>
       <div className={`${prefix}__form`}>
-        <div className={`${prefix}__form-title`}>手机号码</div>
+        <div className={`${prefix}__form-title`}>{getLocale('Set_PI_PhoneNumber')}</div>
         <span className={`${prefix}__form-value`}>
           {userInfo.mobile ? userInfo.mobile : getLocale('Data_Notset')}
         </span>
       </div>
       <div className={`${prefix}__form`}>
-        <div className={`${prefix}__form-title`}>电子邮箱</div>
+        <div className={`${prefix}__form-title`}>{getLocale('Set_PI_Email')}</div>
         <span className={`${prefix}__form-value`}>
           {userInfo.email ? userInfo.email : getLocale('Data_Notset')}
         </span>

package/src/pages/personal-info/components/edit-base-info/index.tsx

@@ -88,7 +88,7 @@ const EditBaseInfo = (props) => {
       width={480}
       mask
       centered
-      title={"基本信息设置"}
+      title={getLocale('Set_PI_BasicInSettings')}
       noHeadLine
       maskClosable={false}
       onClose={() => {
@@ -127,7 +127,7 @@ const EditBaseInfo = (props) => {
                 test: /^[\s\S]+$/,
               },
               {
-                tip: "姓名只能为中文，英文字母和数字及下划线的组合",
+                tip: getLocale('Set_PI_Thenameonly'),
                 test: /^((?!(\uff08|\uff09)).)*$/g,
               },
               {
@@ -141,18 +141,18 @@ const EditBaseInfo = (props) => {
           <Fields.Input
             name="phone"
             type="text"
-            label={"手机号码"}
+            label={getLocale('Set_PI_PhoneNumber')}
             placeholder={getLocale('Pro_page_Ext_Tab_PhoneNumber')}
             require
             layout="row"
             value={userInfo.mobile}
             verifies={[
               {
-                tip: "手机号不能为空",
+                tip: getLocale('OKR_MyO_Ew_MobileNum'),
                 test: /^[\s\S]+$/,
               },
               {
-                tip: "格式错误，海外手机格式如：(+852)52345678",
+                tip: getLocale('OKR_MyO_Ew_FormatErr'),
                 test: /^1[3456789]\d{9}$/,
               },
             ]}

package/src/pages/personal-info/components/person-photo/index.scss

@@ -32,6 +32,7 @@
     }
   }
   &__main {
+    position: relative;
     display: flex;
     align-items: center;
     &-mask {
@@ -41,11 +42,23 @@
       box-sizing: border-box;
       padding: 7px 52px;
       background: rgba(20, 28, 40, 0.5);
-      // filter: blur(4px);
       font-size: 12px;
       color: #FFFFFF;
       line-height: 18px;
     }
+    &-change {
+      position: absolute;
+      bottom: 7px;
+      width: 160px;
+      height: 32px;
+      color: #FFFFFF;
+      font-size: 12px;
+      line-height: 18px;
+      text-align: center;
+      box-sizing: border-box;
+      padding: 7px 0;
+      cursor: pointer;
+    }
     &-tip {
       margin-left: 32px;
       font-size: 12px;
@@ -73,7 +86,7 @@
       position: absolute;
       bottom:0;
       display: block;
-      content: "点击修改";
+      content: "";
       width: 160px;
       height: 32px;
       background: rgba(20, 28, 40, 0.5);

package/src/pages/personal-info/components/person-photo/index.tsx

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { getUserInfo } from '../../../../utils/bs-global';
 import Avatar from '../../../../components/avatar';
 import ChangePhotoModal from '../../../../components/upload-photo-modal';
+import { getLocale } from '../../../../utils/getLocale';
 import './index.scss';
 
 const prefix = 'titaui-personal-info-person-photo';
@@ -32,7 +33,7 @@ const PersonPhoto = () => {
 	return (
 		<div className={prefix}>
 			<div className={`${prefix}__header`}>
-				<span className={`${prefix}__header-title`}>上传头像</span>
+				<span className={`${prefix}__header-title`}>{getLocale('Set_PI_Uploadavatar')}</span>
 			</div>
 			<div className={`${prefix}__main`}>
 				<Avatar
@@ -47,7 +48,8 @@ const PersonPhoto = () => {
 					}}
           onClick={handleChangePhoto}
 				/>
-        <span className={`${prefix}__main-tip`}>建议图片最小尺寸 150*150px</span>
+        <div className={`${prefix}__main-change`} onClick={handleChangePhoto}>{getLocale('Set_PI_Clicktomodify')}</div>
+        <span className={`${prefix}__main-tip`}>{getLocale('Set_PI_Suggestedsize')} 150*150px</span>
 			</div>
       <ChangePhotoModal visible={visible} onCancel={handleCancel} type="person" handleSuccessUploadPhoto={handleSuccessUploadPhoto}/>
     </div>

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/constant.ts

@@ -0,0 +1,18 @@
+import { getLocale } from "./getLocale";
+
+export const getMonth = () => {
+  return [
+    getLocale("Mod_Jan"),
+    getLocale("Mod_Feb"),
+    getLocale("Mod_Mar"),
+    getLocale("Mod_Apr"),
+    getLocale("Mod_May"),
+    getLocale("Mod_Jun"),
+    getLocale("Mod_Jul"),
+    getLocale("Mod_Aug"),
+    getLocale("Mod_Sept"),
+    getLocale("Mod_Oct"),
+    getLocale("Mod_Nov"),
+    getLocale("Mod_Dec"),
+  ];
+};