@titaui/pc 1.9.36 → 1.9.40

package/src/components/change-okr-modal/Filter.tsx

@@ -282,8 +282,8 @@ export default class FilterComp extends PureComponent<Props, State> {
                   </ToolTip>
                 </a>
               ) : (
-                <ConfirmPop align='bottom left' confirmTipText='确定取消吗？取消后将不再记住以上条件' onSubmit={() => this.handlerFilterOptions(2)}>
-                  <ToolTip title='不再显示以上条件' overlayStyle={{ zIndex: 999999 }}>
+                <ConfirmPop align='bottom left' confirmTipText={getLocale('OKR_MyO_Err_Bemembere')} onSubmit={() => this.handlerFilterOptions(2)}>
+                  <ToolTip title={getLocale('OKR_MyO_Err_Showabove')} overlayStyle={{ zIndex: 999999 }}>
                     <a>{getLocale('OKR_MyO_Pop_Cancelremember')}</a>
                   </ToolTip>
                 </ConfirmPop>

package/src/components/communication/ConvertUserName.tsx

@@ -1,36 +1,33 @@
-import React, { PureComponent } from 'react'
-import { getBSGlobal, getUserInfo } from '../../utils/bs-global'
-import { OpenUserName } from '../../utils/open-data'
-import styled from 'styled-components'
-
+import classNames from "classnames";
+import React, { PureComponent } from "react";
+import { OpenUserName } from "../../utils/open-data";
+import "./index.scss";
 interface Props {
-  className?: string
-  userName: string
-  userId?: number
+  className?: string;
+  userName: string;
+  userId?: number;
 }
 
-const UserLink = styled.a`
-  font-size: 14px;
-  font-weight: 600;
-  color: #3F4755;
-  line-height: 22px;
-
-  &:hover {
-    color: #2879ff;
-  }
-`
-
 export default class ConvertUserName extends PureComponent<Props> {
   render() {
-    const { userName, userId, className } = this.props
+    const { userName, userId, className } = this.props;
     if (userId) {
-      const iframeBoxUrl = `${getBSGlobal('apiPath')}/u/${getUserInfo().Id}/Home#`;
+      // const iframeBoxUrl = `${getBSGlobal('apiPath')}/u/${getUserInfo().Id}/Home#`;
       return (
-        <UserLink className={className} target="_blank" href={`${iframeBoxUrl}${encodeURIComponent("widget/italent?iTalentFrameType=iframe&iTalentFrame=&iTalentFrame=" + encodeURIComponent(getBSGlobal('titaHost') + "/" + getUserInfo().Id + "/PageBuilderForEdit#/view?to_user_id=" + userId))}`}>
-          <span><OpenUserName name={userName} id={userId} /></span>
-        </UserLink>
-      )
+        <a
+          className={classNames(
+            className,
+            "titaui-communication__communication-content__user-link"
+          )}
+          target="_blank"
+          // href={`${iframeBoxUrl}${encodeURIComponent("widget/italent?iTalentFrameType=iframe&iTalentFrame=&iTalentFrame=" + encodeURIComponent(getBSGlobal('titaHost') + "/" + getUserInfo().Id + "/PageBuilderForEdit#/view?to_user_id=" + userId))}`}
+        >
+          <span>
+            <OpenUserName name={userName} id={userId} />
+          </span>
+        </a>
+      );
     }
-    return <span className={className}>{userName}</span>
+    return <span className={className}>{userName}</span>;
   }
 }

package/src/components/communication/index.scss

@@ -22,6 +22,16 @@
       img {
         vertical-align: text-bottom;
       }
+      &__user-link {
+        font-size: 14px;
+        font-weight: 600;
+        color: #3F4755;
+        line-height: 22px;
+      
+        &:hover {
+          color: #2879ff;
+        }
+      }
       a {
         color: #2879ff;
         &:hover {

package/src/components/create-okr-modal/img/check-right.svg

@@ -1,16 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="10px" viewBox="0 0 10 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>对号</title>
-    <g id="创建OKR" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="目标实时校验" transform="translate(-1015.000000, -384.000000)" fill-rule="nonzero">
-            <g id="单行" transform="translate(976.000000, 129.000000)">
-                <g id="编组-12" transform="translate(23.000000, 225.000000)">
-                    <g id="对号" transform="translate(16.000000, 30.000000)">
-                        <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="10" height="10"></rect>
-                        <path d="M0.633865976,4.59654663 L3.04772746,6.45071008 C3.04772746,6.45071008 3.18087497,6.51691307 3.34730936,6.45071008 L9.29070556,1.51474948 C9.29070556,1.51474948 10.1376717,1.33516988 9.98056404,2.22923006 C9.40729003,2.80858618 3.56375447,8.40433792 3.56375447,8.40433792 C3.56375447,8.40433792 3.18087497,8.6195776 2.8145585,8.40433792 C2.44856365,8.04006157 0.00173690497,5.37467163 0.00173690497,5.37467163 C0.00173690497,5.37467163 -0.0653192697,4.72911252 0.633865976,4.59654663 Z" id="路径" fill="#5AD8A6"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg width="18" height="18" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg"><path d="M4.634 8.597l2.414 1.854s.133.066.3 0l5.943-4.936s.847-.18.69.714c-.574.58-6.417 6.175-6.417 6.175s-.383.216-.75 0c-.365-.364-2.812-3.03-2.812-3.03s-.067-.645.632-.777z" fill="#5AD8A6" fill-rule="nonzero"/></svg>

package/src/components/create-okr-modal/img/check-wrong.svg

@@ -1,29 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>不建议</title>
-    <defs>
-        <circle id="path-1" cx="8" cy="8" r="4"></circle>
-        <filter x="-78.1%" y="-78.1%" width="256.2%" height="256.2%" filterUnits="objectBoundingBox" id="filter-2">
-            <feMorphology radius="0.25" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
-            <feOffset dx="0" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feComposite in="shadowBlurOuter1" in2="SourceAlpha" operator="out" result="shadowBlurOuter1"></feComposite>
-            <feColorMatrix values="0 0 0 0 0.964705882   0 0 0 0 0.741176471   0 0 0 0 0.0862745098  0 0 0 1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
-        </filter>
-    </defs>
-    <g id="创建OKR" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="激活-关键成果" transform="translate(-1011.000000, -466.000000)">
-            <g id="单行" transform="translate(976.000000, 129.000000)">
-                <g id="编组-12" transform="translate(23.000000, 267.000000)">
-                    <g id="不建议" transform="translate(13.000000, 71.000000)">
-                        <circle id="椭圆形" fill="#F6BD16" opacity="0.08" cx="8" cy="8" r="8"></circle>
-                        <g id="椭圆形">
-                            <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
-                            <use stroke="#FFFFFF" stroke-width="0.5" fill="#F6BD16" fill-rule="evenodd" xlink:href="#path-1"></use>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg width="18" height="18" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg"><path d="M9 8.317l3.246-3.246a.242.242 0 0 1 .342 0l.341.341a.242.242 0 0 1 0 .342L9.683 9l3.246 3.246a.242.242 0 0 1 0 .342l-.341.341a.242.242 0 0 1-.342 0L9 9.683 5.754 12.93a.242.242 0 0 1-.342 0l-.341-.341a.242.242 0 0 1 0-.342L8.317 9 5.07 5.754a.242.242 0 0 1 0-.342l.341-.341a.242.242 0 0 1 .342 0L9 8.317z" fill="#F05E5E" fill-rule="nonzero"/></svg>

package/src/components/dialog/index.scss

@@ -15,11 +15,11 @@ Microsoft YaHei;
   display: flex;
   justify-content: center;
   align-items: center;
-  z-index: 1299 !important;
+  z-index: 1299;
 }
 
 .rc-dialog-mask {
-  z-index: 1299 !important;
+  z-index: 1299;
   background: rgba(20, 28, 40, 0.7) !important;
 }
 

package/src/components/dynamic/dynamic-item/components/header/index.tsx

@@ -137,12 +137,11 @@ const DynamicItemHeader: FC<IDynamicItemHeaderProps> = ({
       <DialogConfirm visible={showDialogConfirm} type="warning">
         {/* @ts-ignore */}
         <span type="title">
-          确定删除该{feedType === EFeedType.Share ? getLocale('OKR_MyO_Share') : '公告'}吗？
+          {feedType === EFeedType.Share ? getLocale('OKR_MyO_Err_Delesh') : getLocale('OKR_MyO_Err_Delepost')}
         </span>
         {/* @ts-ignore */}
         <span type="content">
-          该{feedType === EFeedType.Share ? getLocale('OKR_MyO_Share') : '公告'}
-          将被删除不可恢复，请谨慎操作!
+          {feedType === EFeedType.Share ? getLocale('OKR_MyO_Err_Deleshre') : getLocale('OKR_MyO_Err_Delepostsu')}
         </span>
         <CancelButton type="button" onClick={cancelDeleteDynamic}>
           {getLocale('Mod_Cancel')}

package/src/components/form/form-fields/duties/duties-input.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
 import { getLocale } from '../../../../utils/getLocale';
+import Tooltip from '../../../tooltip';
 import './index.scss';
 
 interface Props {
@@ -28,7 +29,9 @@ export default (props: Props) => {
   return <div className={classNames(`${preCls}__input`)} onClick={onClick}>
     {!duties ?
       <span className={classNames(`${preCls}__input--placeholder`)}>{placeholder}</span> :
-      duties.name
+      // @ts-ignore
+      <Tooltip.Text text={ duties.name } isPercent />
+     
     }
     {duties && <span className={classNames(`tu-icon-cross ${preCls}__input--clear`)} onClick={onHandleClear}></span>}
     <span className={classNames(`${preCls}__input--down tu-icon-sort-down`)}></span>

package/src/components/form/form-fields/duties/index.scss

@@ -22,6 +22,7 @@
     transition: all 0.2s;
     border: 1px solid #e9ecf0;
     box-sizing: border-box;
+    overflow: hidden;
   }
   &__border--error {
     box-shadow: inset 0px 0px 4px 0px rgba(240, 94, 94, 0.3);

package/src/components/keyword-search/index.tsx

@@ -12,13 +12,12 @@ interface IProps {
 
 const KeywordSearch = (props: IProps) => {;
   const { onSearch } = props;
-  const inputRef = useRef();
+  const inputRef = useRef<any>();
   const [active, setActive] = useState(false);
   const [keyword, setKeyword] = useState('');
   const handleSearchClick = () => {
     if(!active) {
       setActive(true);
-      //@ts-ignore
       inputRef?.current?.focus();
     } else {
       handleSearch()
@@ -40,7 +39,9 @@ const KeywordSearch = (props: IProps) => {;
     }
   }
   const clearKeyword = (e) =>{
-    setKeyword('')
+    setKeyword('');
+    inputRef?.current?.focus();
+    onSearch && onSearch({keyWords: ''});
   };
 
   return <div className={classnames(precls, {[`${precls}--active`]: active})}>

package/src/components/menus/components/flip-menu-card/index.tsx

@@ -154,9 +154,9 @@ export default forwardRef((props: Props, ref) => {
       const el = scrollArea?.getScrollElement();
       if (el && el.scrollHeight > el.offsetHeight) {
         if (el.scrollHeight - el.offsetHeight == el.scrollTop) {
-          setShowFrontMore(false);
+          setShowMore(false);
         } else {
-          setShowFrontMore(true);
+          setShowMore(true);
         }
       } else {
         setShowMore(false);
@@ -294,7 +294,7 @@ export default forwardRef((props: Props, ref) => {
                 <div
                   className={`${preCls}__has-more`}
                   onClick={onClickShowMore}
-                ></div>
+                />
               )}
             </div>
           </div>

package/src/components/menus/export-modules/appraisal-menus/index.tsx

@@ -23,7 +23,7 @@ const AppraisalMenus = (props: Props) => {
   const { onSelect = () => { }, history } = props;
 
   const [maxHeight, setMaxHeight] = useState<number>(() => {
-    return document.body.offsetHeight - 170;
+    return document.body.offsetHeight - 150;
   });
   const [selectedMenuKeys, setSelectedMenuKeys] = useState<string[]>([]);
 
@@ -75,7 +75,7 @@ const AppraisalMenus = (props: Props) => {
     const obs = new ResizeObserver(entries => {
       for (let entry of entries) {
         const cr = entry.contentRect;
-        setMaxHeight(cr.height - 170);
+        setMaxHeight(cr.height - 150);
       }
     })
     obs.observe(document.body);

package/src/components/menus/export-modules/okr-menus/depart-menus/index.tsx

@@ -53,7 +53,7 @@ export default () => {
 
   // 因为要实现虚拟列表的功能，所有要动态的计算出一个菜单的高度
   useEffect(() => {
-    setHeight(document.body.offsetHeight - 210);
+    setHeight(document.body.offsetHeight - 164);
   }, [])
 
   useEffect(() => {
@@ -93,7 +93,7 @@ export default () => {
     const obs = new ResizeObserver(entries => {
       for (let entry of entries) {
         const cr = entry.contentRect;
-        setHeight(cr.height - 210);
+        setHeight(cr.height - 164);
       }
     })
     obs.observe(document.body);

package/src/components/menus/export-modules/okr-menus/index.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useRef } from "react";
+import React, { useState, useRef, useEffect } from "react";
 import classNames from "classnames";
 import { withRouter } from "react-router";
 import DepartMenus from "./depart-menus";

package/src/components/menus/export-modules/okr-menus/menu-highlight.ts

@@ -24,6 +24,8 @@ export default class {
         cb(PAGE_MY_PART_OKR);
       } else if (this.isMyTargetOkr()) {
         cb(PAGE_MY_TARGET_OKR);
+      } else {
+        cb(PAGE_MY_OWNER_OKR);
       }
     } else if (this.isOkrMap()) {
       cb(PAGE_OKR_MAP);

package/src/components/menus/export-modules/okr-menus/okr-front-menus.tsx

@@ -32,7 +32,7 @@ export default forwardRef((props: Props, ref) => {
   } = props;
 
   const [maxHeight, setMaxHeight] = useState<number>(() => {
-    return document.body.offsetHeight - 210;
+    return document.body.offsetHeight - 198;
   });
   const [expandedKeys, setExpandedKeys] = useState(['myokr']);
   const [selectedMenuKeys, setSelectedMenuKeys] = useState<string[]>([]);
@@ -159,7 +159,7 @@ export default forwardRef((props: Props, ref) => {
     const obs = new ResizeObserver(entries => {
       for (let entry of entries) {
         const cr = entry.contentRect;
-        setMaxHeight(cr.height - 210);
+        setMaxHeight(cr.height - 198);
       }
     })
     obs.observe(document.body);

package/src/components/nav-top/components/user-message/components/remind/index.scss

@@ -29,7 +29,7 @@
 
     &-right {
       box-sizing: border-box;
-      width: 192px;
+      width: 175px;
       height: 60px;
       margin-left: 12px;
       padding-top: 8px;

package/src/components/okr-detail/base-info/base-info.tsx

@@ -377,8 +377,10 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
       <DialogConfirm visible={showDialogConfirm} type="warning">
         {/* @ts-ignore */}
         <span type="title">
-          确定删除此
-          {delUserType === 1 ? "参与" : getLocale("OKR_MyO_Butt_Follow")}人吗？
+          {delUserType === 1
+            ? getLocale("OKR_MyO_Err_Delepar")
+            : getLocale("OKR_MyO_Err_Delefol")}
+          ？
         </span>
         <CancelButton type="button" onClick={cancelDelPerson}>
           {getLocale("Mod_Cancel")}

package/src/components/okr-detail/base-info/other-infos/principal/index.tsx

@@ -59,7 +59,7 @@ const Principal: FC<IPrincipalProps> = ({user, onChangeUser, canEdit = false}) =
             ref={popConfirmRef}
             showArrow={false}
             style={{ width: 300 }}
-            title="您确定把负责人的权限转交吗?"
+            title={getLocale('OKR_MyO_Err_Transfer')}
             onCancel={cancelHandler}
             onConfirm={confirmHandler}
           >

package/src/components/okr-detail/components/header/o-avatar.tsx

@@ -5,6 +5,7 @@ import UserSelector from "../../../user-selector";
 import { GeneralDataContext } from "../../context";
 import { updateOkrPrincipal } from "../../request-apis";
 import PopConfirm from "../../../../components-v1/popConfirm";
+import { getLocale } from "../../../../utils/getLocale";
 
 interface IProps {
   editable: boolean;
@@ -79,7 +80,7 @@ const OAvatar = (props: IProps) => {
         ref={popConfirmRef}
         showArrow={false}
         style={{ width: 300 }}
-        title="您确定把负责人的权限转交吗?"
+        title={getLocale('OKR_MyO_Err_Transfer')}
         onCancel={cancelHandler}
         onConfirm={confirmHandler}
       >

package/src/components/okr-detail/components/header/o-score.tsx

@@ -91,8 +91,10 @@ const OScore = (props: IOScoreProps) => {
         onClose={handleCancel}
         onOk={handleOk}
         onCancel={handleCancel}
+        getContainer={() => document.body}
         noHeadLine
         noFooterLine
+        zIndex={1310}
       >
         <div ref={formContainerRef} className={`${preCls}__form`}>
           <Form

package/src/components/okr-detail/components/okr-tree/tree-node/o-child-node/edit-child-okr-weight.tsx

@@ -100,7 +100,7 @@ const EditChildOkrWeight = (props: IProps) => {
               <span className={`${precls}__item-precls`} />
               <div className={`${precls}__item-name`}>{item.workName}</div>
               <div className={`${precls}__item-weight`}>
-                <span className={`${precls}__item-weight-label`}>权重</span>
+                <span className={`${precls}__item-weight-label`}>{getLocale('OKR_MyO_Err_Weights')}</span>
                 <WeightInput
                   workId={item.workId}
                   value={item.pweight}
@@ -113,7 +113,7 @@ const EditChildOkrWeight = (props: IProps) => {
       </Dialog>
       <DialogConfirm zIndex={1299} visible={showDialogConfirm} type="warning" className={`${precls}__confirm`}>
         {/* @ts-ignore */}
-        <span type="title">当前子目标权重合计小于100%，确定要保存吗？</span>
+        <span type="title">{getLocale('OKR_MyO_Err_Delefocus')}</span>
         <CancelButton type="button" onClick={closeDialogConfirm}>
           {getLocale('Mod_Cancel')}
         </CancelButton>

package/src/components/okr-detail/detail-header/index.tsx

@@ -94,10 +94,10 @@ function OkrDetailHeader({ detailInfo }: Props): ReactElement {
       },
       onChangeOkrFollow: async (follow: boolean) => {
         const res = await openOkrHeaderConfirm(
-          follow ? "确定关注该目标吗？" : "确定取消关注该目标吗？",
+          follow ? getLocale('OKR_MyO_Err_Focuson') : getLocale('OKR_MyO_Err_Unfollow'),
           follow
-            ? "关注后进展信息将推送到 “动态” 下"
-            : "取消后进展信息将不在推送到 “动态” 下"
+            ? getLocale('OKR_MyO_Err_Payatten')
+            : getLocale('OKR_MyO_Err_Progress')
         );
         if (res) {
           follow
@@ -114,7 +114,7 @@ function OkrDetailHeader({ detailInfo }: Props): ReactElement {
       },
       onFinishOrReOpen: async (isFinish: boolean) => {
         const res = await openOkrHeaderConfirm(
-          isFinish ? getLocale('OKR_MyO_Areycloseobjective') : "确定重启该目标吗？"
+          isFinish ? getLocale('OKR_MyO_Areycloseobjective') : getLocale('OKR_MyO_Err_Restart')
         );
         if (res) {
           isFinish
@@ -127,8 +127,8 @@ function OkrDetailHeader({ detailInfo }: Props): ReactElement {
       },
       onQuit: async () => {
         const res = await openOkrHeaderConfirm(
-          "确定退出吗？",
-          "再次加入需要联系负责人"
+          getLocale('OKR_MyO_Err_Quit'),
+          getLocale('OKR_MyO_Err_Inchargec')
         );
         if (res) {
           await deleteUser(loginUserId, detailInfo.workId, 2);

package/src/components/toast/index.tsx

@@ -16,6 +16,7 @@ async function getInstance() {
           'left': '50%',
           'position': 'absolute',
           // 'transform': 'translate(-50%, 0)'
+          'borderRadius': 12
         },
         'maxCount': 1,
         'className': 'document-mouse-event-ignore',

package/src/components/user-selector/select-tree/tree-nodes/tree-duties-node/index.js

@@ -1,11 +1,14 @@
 import React from 'react';
+import Tooltip from "../../../../tooltip"
 import './index.scss';
 
 export default props => {
   const { data } = props;
   return <div className="perspm-duties">
     <span className="perspm-duties__name" title="">
-      <span>{data.name}</span>
+      <span>
+        <Tooltip.Text text={data.name} isPercent />
+      </span>
     </span>
   </div>
 }

package/src/components/user-selector/select-tree/tree-nodes/tree-duties-node/index.scss

@@ -14,7 +14,6 @@
     line-height: 22px;
     overflow: hidden;
     white-space: nowrap;
-    text-overflow: ellipsis;
   }
 
   &__member-count {

package/src/pages/aha2021/index.scss

@@ -2,6 +2,7 @@
   position: relative;
   height: 100vh;
   background: #f0f4fa;
+  overflow: hidden;
 
   &__header {
     height: 54px;
@@ -27,13 +28,31 @@
   &__kefu {
     width: 42px;
     height: 42px;
-    background: url('./kefu.svg') no-repeat;
+    background: url('./img/kefu.svg') no-repeat;
     background-size: 42px;
     box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
     cursor: pointer;
     border-radius: 50%;
   }
-
+  &__notice {
+    width: 42px;
+    height: 42px;
+    background: linear-gradient(180deg, #4E90FF 0%, #2879FF 100%);
+    box-shadow: 0px 4px 12px 0px rgba(40, 121, 255, 0.3), inset 0px 0px 6px 2px rgba(255, 255, 255, 0.5);
+    cursor: pointer;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: absolute;
+    bottom: 36px;
+    right: 24px;
+    z-index: 2;
+    img {
+      width: 32px;
+      height: 42px;
+    }
+  }
   &__help {
     position: absolute;
     bottom: 20px;
@@ -45,7 +64,6 @@
     display: flex;
     height: calc(100vh - 74px);
     padding: 0 16px;
-    overflow: hidden;
 
     &-menu {
       position: relative;

package/src/pages/aha2021/index.tsx

@@ -42,6 +42,7 @@ const PageLayout = (props) => {
 
   const isTrial =
     window.BSGlobal.tenantAuthentication.Version == 1 && isOfficialSite();
+  const isTencentHr = window.BSGlobal.tenantInfo.Source == 964;
 
   const onClickKefu = () => {
     const kefuUrl = isTrial
@@ -50,6 +51,11 @@ const PageLayout = (props) => {
     window.open(kefuUrl);
   };
 
+  const onClickNotice = () => {
+    const url = `//${location.host}/u/${window.BSGlobal.loginUserInfo.Id}/Home#more/messages?messageType=1&isRead=2&messageSubNav=1`
+    window.open(url)
+  }
+
   return (
     <div className={classNames(preCls)}>
       <div className={classNames(`${preCls}__header`)}>
@@ -59,10 +65,10 @@ const PageLayout = (props) => {
         <FollowerVisitor />
       </div>
       <div className={classNames(`${preCls}__body`)}>{children}</div>
-      <div className={classNames(`${preCls}__help`)}>
+      {!isTencentHr && <div className={classNames(`${preCls}__help`)}>
         <HelpCard />
-      </div>
-      {!isTrial && (
+      </div>}
+      {!isTrial && !isTencentHr && (
         <Tooltip
           overlay={"联系客服"}
           placement="left"
@@ -74,11 +80,19 @@ const PageLayout = (props) => {
           />
         </Tooltip>
       )}
-      {isTrial && (
+      {isTrial && !isTencentHr &&(
         <div className={`${preCls}__invite`}>
           <InvitePeople />
         </div>
       )}
+      {isTencentHr && (
+        <div
+          className={classNames(`${preCls}__notice`)}
+          onClick={onClickNotice}
+        >
+          <img src={require('./img/notice.png')}/>
+        </div>
+      )}
       <PointDemo />
     </div>
   );

package/src/pages/group-management/tree/delete-group-dialog/index.js

@@ -35,10 +35,10 @@ export default props => {
       visible={visible}
     >
         <div className={classNames(`${preCls}__dialog-dele-group-title`)} >
-            <span className="tu-icon-tishi"/><span className={classNames(`${preCls}__dialog-dele-group-title-text`)}>确定要删除该群组吗？</span>
+            <span className="tu-icon-tishi"/><span className={classNames(`${preCls}__dialog-dele-group-title-text`)}>{getLocale('OKR_MyO_Err_Delegroup')}</span>
         </div>
         <div className={classNames(`${preCls}__dialog-dele-group-subtitle`)}>
-            删除群组不会导致成员从组织架构中删除
+            {getLocale('OKR_MyO_Err_Remove')}
         </div>
         <div className={classNames(`${preCls}__dialog-dele-group-footer`)}>
             <div type="button" className="btn btn-default" key="close" onClick={() => setVisible(false)}>

package/src/pages/like-ranking/index.tsx

@@ -144,10 +144,10 @@ const LikeRanking: FC = () => {
   };
 
   const handleLinkToPraiseRaking = () => {
-    window.history.go(-1)
-    // let href = window.location.href;
-    // let url = `${href.split("#")[0]}#dynamic`;
-    // window.open(url, "self");
+    // window.history.go(-1)
+    let href = window.location.href;
+    let url = `${href.split("#")[0]}#dynamic`;
+    window.open(url, "self");
   };
 
   return (

package/src/pages/okr-map/share-dialog/index.js

@@ -5,7 +5,7 @@ import Dialog from '../../../components/dialog';
 import preCls from '../precls';
 import { getShareUrl } from '../request-apis';
 import { getLocale } from '../../../utils/getLocale';
-import Toast from '@titaui/toast';
+import Toast from '../../../components/toast';
 
 import './index.scss';