@titaui/pc 1.9.34 → 1.9.38

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_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/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/components-v1/userSelector/components/MultiMode/DepartmentTree.tsx

@@ -5,6 +5,7 @@ import UserItem from '../UserItem';
 import { TreeHeader, TreeList } from '../../style';
 import { getApiUrl, taker } from '../../../../utils/request-v1';
 import { OpenDepartmentName } from '../../../../utils/open-data';
+import { getLocale } from '../../../../utils/getLocale';
 interface Props {
   tree: Dept;
   level: number;
@@ -82,7 +83,7 @@ export default class DepartmentTree extends PureComponent<Props, State> {
               <OpenDepartmentName name={tree.DepartmentName} id={tree.Id} />
               {/* {tree.DepartmentName} */}
             </span>
-            <span>{tree.TotalUserCount}人</span>
+            <span>{tree.TotalUserCount}{getLocale('Mod_Number')}</span>
           </div>
           {isRootSelect && onSelectDept && <i className='tu-icon-add2' onMouseDown={this.handleSelectDept} />}
           {onDeleteDept && <i className='tu-icon-cross' onMouseDown={this.handleDeleteDept} />}

package/src/components-v1/userSelector/components/MultiMode/SubsList.tsx

@@ -4,6 +4,7 @@ import { getApiUrl, taker } from '../../../../utils/request-v1'
 import { getUserInfo } from '../../../../utils/bs-global'
 import { ListHeader, ListWrapper, List, EmptyWrapper, ListEmptyText } from '../../style'
 import UserItem from '../UserItem'
+import { getLocale, isEn } from '../../../../utils/getLocale'
 import PerfectScrollbar from 'react-perfect-scrollbar'
 import 'react-perfect-scrollbar/dist/css/styles.css';
 interface Props {
@@ -38,7 +39,7 @@ export default class CommonList extends PureComponent<Props,State> {
         {
           hasUser && 
           <ListHeader>
-            <span>下属&nbsp;{users.length}人</span>
+            <span>{getLocale('OKR_MyO_Butt_Subordinate')}&nbsp;{users.length}{getLocale('Mod_Number')}</span>
             <i className="tu-icon-add2" onMouseDown={()=>this.props.onSelect(users)}/>
           </ListHeader>
         }

package/src/index.js

@@ -43,6 +43,7 @@ export { default as GridLayout } from "./components/grid-layout";
 export { default as HelpCard } from "./components/help-card";
 export { default as ImgViewer } from "./components/img-viewer";
 export { default as InvitePeople } from "./components/invite-people";
+export { default as KeywordSearch } from './components/keyword-search';
 export { default as Mblog } from "./components/mblog";
 export { default as Menus } from "./components/menus";
 export { default as NavTop } from "./components/nav-top";

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

@@ -41,7 +41,8 @@ const PageLayout = (props) => {
   const { children } = props;
 
   const isTrial =
-    window.BSGlobal.tenantAuthentication.Version == 1 && isOfficialSite();
+    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,26 +65,34 @@ 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"
           align={{ offset: [0, 0] }}
         >
           <div
-            className={classNames(`${preCls}__kefu`)}
+            className={`${preCls}__kefu`}
             onClick={onClickKefu}
           />
         </Tooltip>
       )}
-      {isTrial && (
-        <div className={classNames(`${preCls}__invite`)}>
+      {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,9 +144,10 @@ const LikeRanking: FC = () => {
   };
 
   const handleLinkToPraiseRaking = () => {
-    let href = window.location.href;
-    let url = `${href.split("#")[0]}#dev`;
-    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/utils/date-test-change.ts

@@ -1,27 +1,30 @@
-import { getMonth } from "./constant"
-import { getLocale, isEn } from "./getLocale"
+import { getMonth } from "./constant";
+import { getLocale, isEn } from "./getLocale";
 
 //精确到日期的检测 date为2021/8/26这样的类型，返回距现在几天
 export const testDateDiff = (date) => {
+  const handleDate =
+    date.length == 5 ? `${new Date().getFullYear()}/${date}` : date;
+  const testTime = Date.parse(
+    handleDate.replace(/-/g, "/").split("T").join(" ").split(".")[0]
+  );
+  const now = Date.now();
 
-  const handleDate = date.length == 5 ? `${new Date().getFullYear()}/${date}` : date
-  const testTime = Date.parse(handleDate.replace(/-/g, '/').split('T').join(' ').split('.')[0])
-  const now = Date.now()
+  const diffDay = Math.floor((now - testTime) / (1000 * 60 * 60 * 24));
 
-  const diffDay = Math.floor((now - testTime) / (1000 * 60 * 60 * 24))
-
-  return diffDay
-}
+  return diffDay;
+};
 
 //精确到天的检测
-export const judgeTimeSpaceFromNow = (date) => {
-
-  if (!date)
-    return getLocale('OKR_MyO_KRP_Notupdated');
+export const judgeTimeSpaceFromNow = (date, withHM = true) => {
+  if (!date) return getLocale("OKR_MyO_KRP_Notupdated");
 
   const months = getMonth();
   // 兼容safari，safari不支持yy-mm-dd格式，支持yy/mm/dd格式
-  const handleDate = date.length === 5 ? new Date().getFullYear() + '/' + date : date.replace(/-/g, '/').split('T').join(' ').split('.')[0]
+  const handleDate =
+    date.length === 5
+      ? new Date().getFullYear() + "/" + date
+      : date.replace(/-/g, "/").split("T").join(" ").split(".")[0];
   const timeDateObj = new Date(handleDate);
   const timeMilliSecond = timeDateObj.getTime();
   const timeYear = timeDateObj.getFullYear();
@@ -30,7 +33,7 @@ export const judgeTimeSpaceFromNow = (date) => {
   const timeHours = timeDateObj.getHours();
   const timeMinutes = timeDateObj.getMinutes();
 
-  const nowTime = new Date()
+  const nowTime = new Date();
 
   const nowMilliSecond = nowTime.getTime();
   const nowYear = nowTime.getFullYear();
@@ -38,32 +41,70 @@ export const judgeTimeSpaceFromNow = (date) => {
 
   const secondDiff = Math.floor((nowMilliSecond - timeMilliSecond) / 1000);
   if (secondDiff <= 3) {
-    return getLocale('Pro_page_Int_Justnow');
+    return getLocale("Pro_page_Int_Justnow");
   }
   if (secondDiff < 60) {
-    return `${secondDiff}${getLocale('Mood_secago')}`;
+    return `${secondDiff}${getLocale("Mood_secago")}`;
   }
   if (secondDiff < 60 * 60) {
-    return `${Math.floor(secondDiff / 60)}${getLocale('Tasks_Tab_MyS_minuteago')}`;
+    return `${Math.floor(secondDiff / 60)}${getLocale(
+      "Tasks_Tab_MyS_minuteago"
+    )}`;
   }
   if (secondDiff < 60 * 60 * 24) {
-    return `${Math.floor(secondDiff / (60 * 60))}${getLocale('Mood_hoursago')}`;
+    return `${Math.floor(secondDiff / (60 * 60))}${getLocale("Mood_hoursago")}`;
   }
   if (secondDiff < 60 * 60 * 24 * 2 && nowDate - 1 === timeDate) {
-    return `${getLocale('OKR_MyO_Pr_Text_Yesterday')} ${timeHours + ":" + timeMinutes}`;
+    return (
+      `${getLocale("OKR_MyO_Pr_Text_Yesterday")}` +
+      (withHM
+        ? ` ${
+            (timeHours < 10 ? "0" + timeHours : timeHours) +
+            ":" +
+            (timeMinutes < 10 ? "0" + timeMinutes : timeMinutes)
+          }`
+        : "")
+    );
   }
   if (secondDiff < 60 * 60 * 24 * 3 && nowDate - 2 === timeDate) {
-    return `${getLocale('Mood_2daysago')} ${timeHours + ":" + timeMinutes}`;
+    return (
+      `${getLocale("Mood_2daysago")}` +
+      (withHM
+        ? ` ${
+            (timeHours < 10 ? "0" + timeHours : timeHours) +
+            ":" +
+            (timeMinutes < 10 ? "0" + timeMinutes : timeMinutes)
+          }`
+        : "")
+    );
   }
   if (timeYear === nowYear) {
-    const dateStr = months[timeMonth-1] + (isEn ? ` ${timeDate} ` : `${timeDate}日`)
-    return `${dateStr} ${
-      timeHours < 10 ? "0" + timeHours : timeHours
-    }:${timeMinutes < 10 ? "0" + timeMinutes : timeMinutes}`;
+    const dateStr =
+      months[timeMonth - 1] + (isEn ? ` ${timeDate} ` : `${timeDate}日`);
+    return (
+      `${dateStr}` +
+      (withHM
+        ? ` ${
+            (timeHours < 10 ? "0" + timeHours : timeHours) +
+            ":" +
+            (timeMinutes < 10 ? "0" + timeMinutes : timeMinutes)
+          }`
+        : "")
+    );
   }
-  const dateStr = (isEn ? '' : `${timeYear}年`) + months[timeMonth-1] + (isEn ? ` ${timeDate} ` : `${timeDate}日`) + (isEn ? `,${timeYear}` : '');
-  return `${dateStr} ${
-    timeHours < 10 ? "0" + timeHours : timeHours
-  }:${timeMinutes < 10 ? "0" + timeMinutes : timeMinutes}`;
-
-}
+  const dateStr =
+    (isEn ? "" : `${timeYear}年`) +
+    months[timeMonth - 1] +
+    (isEn ? ` ${timeDate}` : `${timeDate}日`) +
+    (isEn ? `,${timeYear}` : "");
+  return (
+    `${dateStr}` +
+    (withHM
+      ? ` ${
+          (timeHours < 10 ? "0" + timeHours : timeHours) +
+          ":" +
+          (timeMinutes < 10 ? "0" + timeMinutes : timeMinutes)
+        }`
+      : "")
+  );
+};