@titaui/pc 1.9.27 → 1.9.31

package/src/pages/home/components/data-list/nav-selector/index.tsx

@@ -1,8 +1,8 @@
 import React from "react";
-import SearchDropdown from '../../../../../components/search-dropdown'
-import PeriodSelector from '../../../../../components/period-selector'
+import SearchDropdown from "../../../../../components/search-dropdown";
+import PeriodSelector from "../../../../../components/period-selector";
 import { getLocale } from "../../../../../utils/getLocale";
-import { CycleTime } from '../index'
+import { CycleTime } from "../index";
 
 interface Props {
   type: string;
@@ -13,128 +13,90 @@ interface Props {
   typeMap: Map<string, string>;
 }
 
-const preCls = 'homepage-datalist'
+const preCls = "homepage-datalist";
 
 const HomeNavSelector = (props: Props) => {
-
-  const { type, source, setType, cycleTime, setCycleTime, typeMap } = props
+  const { type, source, setType, cycleTime, setCycleTime, typeMap } = props;
 
   const onPeriodChange = (cycle) => {
-    const { annualNum, cycleType, yqmNum } = cycle
-    switch (cycleType) {
-      case '-1':
-        setCycleTime({
-          name: getLocale('OKR_MyO_Butt_AllStates'),
-          cycleType: cycleType,
-          yearNum: annualNum,
-          yqmNum: yqmNum
-        })
-        break
-      case '0':
-        setCycleTime({
-          name: getLocale('Mod_Customization'),
-          yearNum: annualNum,
-          cycleType: cycleType,
-          yqmNum: yqmNum
-        })
-        break
-      case '1':
-        setCycleTime({
-          name: `${annualNum}年`,
-          yearNum: annualNum,
-          cycleType: cycleType,
-          yqmNum: yqmNum
-        })
-        break
-      case '2':
-        setCycleTime({
-          name: `第${numberToWord(yqmNum)}季度`,
-          yearNum: annualNum,
-          cycleType: cycleType,
-          yqmNum: yqmNum
-        })
-        break
-      case '3':
-        setCycleTime({
-          name: `${yqmNum}月`,
-          yearNum: annualNum,
-          cycleType: cycleType,
-          yqmNum: yqmNum
-        })
-        break
-      case '4': 
-        setCycleTime({
-          name: `${yqmNum}-${(Number(yqmNum) + 1) % 12 || 12}月`,
-          yearNum: annualNum,
-          cycleType: cycleType,
-          yqmNum: yqmNum
-        })
-      break;
-      case '5': 
-        setCycleTime({
-          name: `${yqmNum == 1 ? '上' : '下'}半年`,
-          yearNum: annualNum,
-          cycleType: cycleType,
-          yqmNum: yqmNum
-        })
-      break;
-    }
-  }
-
-  const numberToWord = (num) => {
-    const arr = ['一', '二', '三', '四']
-    return arr[num - 1]
-  }
+    const { annualNum, cycleType, yqmNum } = cycle;
+    setCycleTime({
+      name: PeriodSelector.formatPeriod(cycle),
+      cycleType: cycleType,
+      yearNum: annualNum,
+      yqmNum: yqmNum,
+    });
+  };
 
   return (
     <div className={`${preCls}__main__navSelecter`}>
-      <div className={`${preCls}__main__navSelecter--type`} >
-        <div style={{ opacity: 0, zIndex: 10, position: 'relative' }}>
-          {
-            source === 'align' &&
-            <SearchDropdown value={type} onChange={setType} >
-              <SearchDropdown.Option value="all">{getLocale('Mod_all')}</SearchDropdown.Option>
-              <SearchDropdown.Option value='hadNotAlign'>{getLocale('OKR_Db_Unaligned')}</SearchDropdown.Option>
-              <SearchDropdown.Option value='hadAlign'>{getLocale('OKR_Db_Aligned')}</SearchDropdown.Option>
-            </SearchDropdown>
-          }
-          {
-            source === 'update' &&
-            <SearchDropdown value={type} onChange={setType} >
-              <SearchDropdown.Option value="all">{getLocale('Mod_all')}</SearchDropdown.Option>
-              <SearchDropdown.Option value='hadNotUpdate'>{getLocale('HP_Notupdated')}</SearchDropdown.Option>
-              <SearchDropdown.Option value='hadUpdate'>{getLocale('HP_Updated')}</SearchDropdown.Option>
-            </SearchDropdown>
-          }
-          {
-            source === 'target' &&
-            <SearchDropdown value={type} onChange={setType} >
-              <SearchDropdown.Option value="all">{getLocale('Mod_all')}</SearchDropdown.Option>
-              <SearchDropdown.Option value='normalOkr'>{getLocale('OKR_MyO_Pop_Upd_Notrack')}</SearchDropdown.Option>
-              <SearchDropdown.Option value='riskOkr'>{getLocale('OKR_MyO_Pop_Upd_Atrisk')}</SearchDropdown.Option>
-              <SearchDropdown.Option value='dalyOkr'>{getLocale('OKR_MyO_Pop_Upd_Postoned')}</SearchDropdown.Option>
-              <SearchDropdown.Option value='endOkr'>{getLocale('OKR_MyO_Butt_Hasended')}</SearchDropdown.Option>
-            </SearchDropdown>
-          }
-        </div>
-        <div className={`${preCls}__main__navSelecter--type--text`}>
-          {typeMap.get(type)}<span className="tu-icon-arrow-down1" />
-        </div>
+      <div className={`${preCls}__main__navSelecter--type`}>
+        {source === "align" && (
+          <SearchDropdown value={type} onChange={setType}>
+            <SearchDropdown.Option value="all">
+              {getLocale("Mod_all")}
+            </SearchDropdown.Option>
+            <SearchDropdown.Option value="hadNotAlign">
+              {getLocale("OKR_Db_Unaligned")}
+            </SearchDropdown.Option>
+            <SearchDropdown.Option value="hadAlign">
+              {getLocale("OKR_Db_Aligned")}
+            </SearchDropdown.Option>
+          </SearchDropdown>
+        )}
+        {source === "update" && (
+          <SearchDropdown value={type} onChange={setType}>
+            <SearchDropdown.Option value="all">
+              {getLocale("Mod_all")}
+            </SearchDropdown.Option>
+            <SearchDropdown.Option value="hadNotUpdate">
+              {getLocale("HP_Notupdated")}
+            </SearchDropdown.Option>
+            <SearchDropdown.Option value="hadUpdate">
+              {getLocale("HP_Updated")}
+            </SearchDropdown.Option>
+          </SearchDropdown>
+        )}
+        {source === "target" && (
+          <SearchDropdown value={type} onChange={setType}>
+            <SearchDropdown.Option value="all">
+              {getLocale("Mod_all")}
+            </SearchDropdown.Option>
+            <SearchDropdown.Option value="normalOkr">
+              {getLocale("OKR_MyO_Pop_Upd_Notrack")}
+            </SearchDropdown.Option>
+            <SearchDropdown.Option value="riskOkr">
+              {getLocale("OKR_MyO_Pop_Upd_Atrisk")}
+            </SearchDropdown.Option>
+            <SearchDropdown.Option value="dalyOkr">
+              {getLocale("OKR_MyO_Pop_Upd_Postoned")}
+            </SearchDropdown.Option>
+            <SearchDropdown.Option value="endOkr">
+              {getLocale("OKR_MyO_Butt_Hasended")}
+            </SearchDropdown.Option>
+          </SearchDropdown>
+        )}
+        <span className="tu-icon-arrow-down1" />
       </div>
-
-      <b />
-
       <PeriodSelector
-        selected={cycleTime ? {
-          annualNum: cycleTime.yearNum,
-          cycleType: cycleTime.cycleType,
-          yqmNum: cycleTime.yqmNum,
-        }:{
-          annualNum: '2021',
-          cycleType: '-1',
-          yqmNum: '0',
-        }}
-        onChange={(cycle: { annualNum: string, cycleType: string, yqmNum: string }) => onPeriodChange(cycle)}
+        selected={
+          cycleTime
+            ? {
+                annualNum: cycleTime.yearNum,
+                cycleType: cycleTime.cycleType,
+                yqmNum: cycleTime.yqmNum,
+              }
+            : {
+                annualNum: "2021",
+                cycleType: "-1",
+                yqmNum: "0",
+              }
+        }
+        onChange={(cycle: {
+          annualNum: string;
+          cycleType: string;
+          yqmNum: string;
+        }) => onPeriodChange(cycle)}
         yearsRange={[2018, 2030]}
       >
         <div className={`${preCls}__main__navSelecter--cycle`}>
@@ -142,7 +104,7 @@ const HomeNavSelector = (props: Props) => {
         </div>
       </PeriodSelector>
     </div>
-  )
-}
+  );
+};
 
-export default HomeNavSelector
+export default HomeNavSelector;

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/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
 }
 
 /*