@titaui/pc 1.9.27 → 1.9.28

package/src/components/hr-header/index.tsx

@@ -0,0 +1,117 @@
+import React, { ReactElement, useState } from 'react';
+import { useEffect } from 'react';
+import classNames from 'classnames';
+import axios from 'axios';
+import  Popup  from '../popup';
+import { getLoginUserInfo } from '&/utils/helpers';
+import './index.scss';
+
+interface Props {}
+const preCls = 'tencent-hr-header';
+function HrHeader({}: Props): ReactElement {
+  const [menus, setMenus] = useState<any[]>([]);
+  const [isShowMore, setIsShowMore] = useState(false);
+  const [isShowUserMenu, setIsShowUserMenu] = useState(false);
+  useEffect(() => {
+    if (true) {
+      axios.get('/_caagw/getNavInfoByCorpKey').then((res) => {
+        const data = res.data.data;
+        setMenus(data.menus);
+      });
+    } else {
+      setMenus([
+        {
+          appKey: 'contacts',
+          appName: '人事通讯录',
+          appUrl: 'http://contacts-wxvendor.test-caagw.yunassess.com/',
+        },
+        {
+          appKey: 'regist',
+          appName: '入职管理',
+          appUrl: 'http://regist-wxvendor.test-caagw.yunassess.com/pc/',
+        },
+        {
+          appKey: 'jixiaobao',
+          appName: '绩效考核',
+          appUrl: 'http://contacts-wxvendor.test-caagw.yunassess.com/',
+        },
+        {
+          appKey: 'regist1',
+          appName: '入职管理1',
+          appUrl: 'http://regist-wxvendor.test-caagw.yunassess.com/pc/',
+        },
+        {
+          appKey: 'contacts2',
+          appName: '人事通讯录2',
+          appUrl: 'http://contacts-wxvendor.test-caagw.yunassess.com/',
+        },
+        {
+          appKey: 'regist2',
+          appName: '入职管理2',
+          appUrl: 'http://regist-wxvendor.test-caagw.yunassess.com/pc/',
+        },
+        {
+          appKey: 'regist3',
+          appName: '入职管理3',
+          appUrl: 'http://regist-wxvendor.test-caagw.yunassess.com/pc/',
+        },
+      ]);
+    }
+  }, []);
+  return (
+    <div className={preCls}>
+      <span className={preCls + '__title'}>腾讯HR助手</span>
+      <div className={preCls + '__menu-list'}>
+        {menus.slice(0, 5).map((menu) => (
+          <div
+            key={menu.appKey}
+            className={classNames(preCls + '__item', {
+              [preCls + '__item--active']: menu.appKey == 'jixiaobao',
+            })}
+          >
+            <a href={menu.appUrl}>{menu.appName}</a>
+          </div>
+        ))}
+        {menus.length > 5 && (
+          <Popup
+            popupVisible={isShowMore}
+            onPopupVisibleChange={setIsShowMore}
+            popupPlacement="bottom"
+            popup={
+                  <div className='tencent-hr-header-popup'>
+                    {menus.slice(6).map((menu) => (
+                      <a className='tencent-hr-header-popup__item' href={menu.appUrl}>{menu.appName}</a>
+                    ))}
+                  </div>
+                }
+          >
+            <div key='more' className={classNames(preCls + '__item')}>
+              <a>更多</a>
+              <img
+                src={require('./arrow.png')}
+                style={{ transform: `rotate(${isShowMore ? 180 : 0}deg)` }}
+              />
+            </div>
+          </Popup>
+        )}
+      </div>
+      <Popup
+        popupVisible={isShowUserMenu}
+        onPopupVisibleChange={setIsShowUserMenu}
+        popupPlacement="bottom"
+        popup={
+          <div className='tencent-hr-header-popup'>
+            <a className='tencent-hr-header-popup__item' href={'/_logout?r='+(new Date().getTime())}>退出</a>
+          </div>
+        }
+      >
+        <span className={preCls + '__user'}>
+          {getLoginUserInfo().Name}
+          <img src={require('./arrow.png')} style={{ transform: `rotate(${isShowUserMenu ? 180 : 0}deg)` }}/>
+        </span>
+      </Popup>
+    </div>
+  );
+}
+
+export default HrHeader;

package/src/components/nav-top/components/user-own-menu/utils.ts

@@ -41,14 +41,14 @@ const getLimit = () => [
     id: "manage",
     icon: "tu-icon-myqyht",
     title: getLocale('Per_Menu_Admin'),
-    objUrl: `${tm}`,
+    objUrl: `${apiServer}/${userId}/tmHome`,
     otherInfo: {}
   },
   {
     id: "open",
     icon: "tu-icon-my-gjgn",
     title: getLocale('Per_Menu_AdvancedFeatures'),
-    objUrl: `${tm}${tm.indexOf(`${userId}/TmHome`) != -1 ?'':`/${userId}/TmHome`}#?iTalentFrameType=iframe&iTalentFrame=${tm.indexOf(`${userId}/TmHome`) != -1 ?`${tm.replace(`/TmHome`,'')}`:`${tm}/${userId}`}/indexV2#/advancedSettings`,
+    objUrl: `${apiServer}/${userId}/tmHome#?iTalentFrameType=iframe&iTalentFrame=${apiServer}/${userId}/indexV2#/advancedSettings`,
     otherInfo: {}
   },
   {

package/src/components/okr-detail/okr-list/create-kr-item/heart.js

@@ -11,7 +11,7 @@ export default ({ heartOnActive, setHeartOnActive, confidenceIndex, editAble })
       onClick={() => setHeartOnActive(true)}
     >
       <Image className='kr-heart-icon' src={ImageHeart} />
-      <span className='kr-heart-middle'>{confidenceIndex} 分</span>
+      <span className='kr-heart-middle'>{confidenceIndex} {getLocale('Per_Set_Form_Quantifier_Points')}</span>
     </div>
   );
 };

package/src/components/okr-detail/okr-list/create-kr-item/index.tsx

@@ -184,7 +184,7 @@ function CreateKr({
           </div>
         </p>
         <span className={classNames(`${preCls}__heart`)}>
-          <Tooltip content='修改信心指数1'>
+          <Tooltip content='修改1'>
             <span style={{ display: 'inline-flex' }}>
               <Confidence
                 editable

package/src/components/okr-share/index.scss

@@ -166,9 +166,9 @@
 .okr-share-mblog {
   &__container {
     width: 480px;
-    height: 420px;
+    min-height: 420px;
     background-color: #fff;
-    border-radius: 6px;
+    border-radius: 12px;
   }
   &__header {
     height: 58px;

package/src/components/search-dropdown/index.scss

@@ -71,6 +71,7 @@
   background: #ffffff;
   box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
   border: 1px solid #f0f2f5;
+  border-radius: 12px;
 
   .tui-select {
     &-item-option {

package/src/pages/aha2021/index.tsx

@@ -7,6 +7,8 @@ import HelpCard from '../../components/help-card';
 import PointDemo from '../../components/point-demo/point-demo';
 import { isOfficialSite } from '../../utils/platform';
 import './index.scss';
+import { getTenantInfo } from '../../utils/helpers';
+import HrHeader from '../../components/hr-header';
 
 const preCls = `titaui-aha-2021`;
 
@@ -45,11 +47,11 @@ const PageLayout = (props) => {
   return (
     <div className={classNames(preCls)}>
       <div className={classNames(`${preCls}__header`)}>
-        <NavTop />
+        {getTenantInfo().Source == 964 ? <HrHeader/> : <NavTop />}
       </div>
       <div className={classNames(`${preCls}__message`)}>
         <FollowerVisitor />
-      </div>
+      </div> 
       <div className={classNames(`${preCls}__body`)}>{children}</div>
       <div className={classNames(`${preCls}__help`)}>
         <HelpCard />

package/src/pages/home/components/data-list/index.scss

@@ -4,6 +4,8 @@
   overflow: auto;
   padding: 14px 20px;
   box-sizing: border-box;
+  padding-bottom: 20px;
+  box-sizing: border-box;
   div {
     // box-sizing: border-box;
   }
@@ -54,8 +56,27 @@
       justify-content: start;
       align-items: center;
       &--type {
-        width: 58px;
+        .titaui-select .tui-select-selection-item, .titaui-select .tui-select-selection-placeholder {
+          font-size: 12px !important;
+          font-weight: 400 !important;
+          color: #3f4755;
+          line-height: 30px;
+        }
+        .titaui-select .tui-select-selector:before {
+          display: none;
+        }
+        .titaui-select .tui-select-selector {
+          padding: 0 !important;
+        }
         position: relative;
+        cursor: pointer;
+        display: inline-flex;
+        align-items: center;
+        font-size: 12px;
+        margin-right: 12px;
+        &:hover {
+          color: #2879ff;
+        }
         &--text {
           width: 58px;
           position: absolute;
@@ -73,12 +94,6 @@
             height: 8px;
           }
         }
-        &:hover > div {
-          color: #2879ff;
-          .tu-icon-arrow-down1 {
-            color: #2879ff;
-          }
-        }
       }
       b {
         margin: 0 10px;

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

@@ -19,7 +19,7 @@ const HomePageDataList = () => {
 
   const [source, setSource] = useState('')//从url中获取页面来源
   const [type, setType] = useState('')//从url中获取查找类型
-  const [cycleTime, setCycleTime] = useState<CycleTime>({ name: getLocale('OKR_MyO_Butt_AllStates'), yearNum: '2021', cycleType: '-1', yqmNum: '0' })//周期时间
+  const [cycleTime, setCycleTime] = useState<CycleTime>({ name: getLocale('OKR_MyO_Butt_AllStatee'), yearNum: '2021', cycleType: '-1', yqmNum: '0' })//周期时间
 
   const typeMap = new Map()
   typeMap.set('all', getLocale('Mod_all'))
@@ -57,9 +57,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/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>