@titaui/pc 1.9.37 → 1.9.41

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

@@ -28,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;

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';