@titaui/pc 1.9.48 → 1.9.52

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

@@ -68,6 +68,59 @@
       }
     }
   }
+  &__popup-right-bottom {
+    &-enter {
+      opacity: 0;
+      animation-duration: 0.2s;
+      animation-fill-mode: both;
+      animation-timing-function: linear;
+      animation-play-state: paused;
+      &-active {
+        animation-name: titaPopupInRB;
+        animation-play-state: running;
+      }
+    }
+    &-appear {
+      opacity: 0;
+      animation-duration: 0.2s;
+      animation-fill-mode: both;
+      animation-timing-function: linear;
+      animation-play-state: paused;
+      &-active {
+        animation-name: titaPopupInRB;
+        animation-play-state: running;
+      }
+    }
+    &-leave {
+      animation-duration: 0.1s;
+      animation-fill-mode: both;
+      animation-timing-function: linear;
+      animation-play-state: paused;
+      &-active {
+        animation-name: titaPopupOutRB;
+        animation-play-state: running;
+      }
+    }
+  }
+  &__hr-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;
+    }
+  }
 }
 
 @keyframes titaPopupInRT {
@@ -84,6 +137,20 @@
   }
 }
 
+@keyframes titaPopupInRB {
+  0% {
+    opacity: 0;
+    transform-origin: 100% 100%;
+    transform: scale(0, 0);
+  }
+
+  100% {
+    opacity: 1;
+    transform-origin: 100% 100%;
+    transform: scale(1, 1);
+  }
+}
+
 @keyframes titaPopupOutRT {
   0% {
     opacity: 1;
@@ -98,6 +165,20 @@
   }
 }
 
+@keyframes titaPopupOutRB {
+  0% {
+    opacity: 1;
+    transform-origin: 100% 100%;
+    transform: scale(1, 1);
+  }
+
+  100% {
+    opacity: 0;
+    transform-origin: 100% 100%;
+    transform: scale(0, 0);
+  }
+}
+
 @keyframes bell-shake {
   5%,
   25%,

package/src/components/nav-top/components/user-message/msg/index.tsx

@@ -1,4 +1,4 @@
-import React, {useState,useEffect} from "react";
+import React, { useState, useEffect } from "react";
 import classNames from "classnames";
 import Tabs, { TabPane } from "../../../../tabs";
 import Reply from "../components/reply";
@@ -12,9 +12,14 @@ import "./index.scss";
 
 const prefixCls = "titaui-user-message-msg";
 
-
 const UserMessage = (props) => {
-  const { onItemClick, allData,handleIntervalRequestMessageInfo,firstTab} = props;
+  const {
+    onItemClick,
+    allData,
+    handleIntervalRequestMessageInfo,
+    firstTab,
+    tabs = ["todos", "informs", "replys", "reminds"],
+  } = props;
 
   const [remindTotal, setRemindTotal] = useState(0);
 
@@ -35,19 +40,19 @@ const UserMessage = (props) => {
     } else {
       setRemindTotal(remindTotal - 1);
     }
-  }
+  };
 
-  useEffect(() => { 
-    getMessages().then(res => {
+  useEffect(() => {
+    getMessages().then((res) => {
       if (res.Code === 1) {
         res.Data.indicators.forEach((item) => {
           if (item.type === "Tx") {
-            setRemindTotal(item.value)
+            setRemindTotal(item.value);
           }
-        })
+        });
       }
     });
-  }, [])  
+  }, []);
 
   return (
     <div className={classNames(`${prefixCls}`)}>
@@ -57,48 +62,80 @@ const UserMessage = (props) => {
           defaultActiveKey={firstTab}
           animated={{ inkBar: true, tabPane: false }}
         >
-          <TabPane
-            tab={
-              <TabTitle
-                data={getData("todoIndicator")}
-                title={getLocale('Top_Message_title_Todos')}
-                tab={"todos"}
+          {tabs.includes("todos") && (
+            <TabPane
+              tab={
+                <TabTitle
+                  data={getData("todoIndicator")}
+                  title={getLocale("Top_Message_title_Todos")}
+                  tab={"todos"}
+                />
+              }
+              key="todos"
+            >
+              <Todos onItemClick={onItemClick} />
+            </TabPane>
+          )}
+          {tabs.includes("informs") && (
+            <TabPane
+              tab={
+                <TabTitle
+                  data={
+                    getData("messageIndicator") - getData("mLeaveandComment")
+                  }
+                  title={getLocale("Menu_Title_Notice")}
+                  tab={"informs"}
+                />
+              }
+              key="informs"
+            >
+              <Inform
+                onItemClick={onItemClick}
+                handleIntervalRequestMessageInfo={
+                  handleIntervalRequestMessageInfo
+                }
               />
-            }
-            key="todos"
-          >
-            <Todos onItemClick={onItemClick} />
-          </TabPane>
-          <TabPane
-            tab={
-              <TabTitle
-                data={(getData("messageIndicator"))-(getData("mLeaveandComment"))}
-                title={getLocale('Menu_Title_Notice')}
-                tab={"informs"}
+            </TabPane>
+          )}
+          {tabs.includes("replys") && (
+            <TabPane
+              tab={
+                <TabTitle
+                  data={getData("mLeaveandComment")}
+                  title={getLocale("Top_Message_title_@&Replies")}
+                  tab={"replys"}
+                />
+              }
+              key="replys"
+            >
+              <Reply
+                onItemClick={onItemClick}
+                handleIntervalRequestMessageInfo={
+                  handleIntervalRequestMessageInfo
+                }
               />
-            }
-            key="informs"
-          >
-            <Inform onItemClick={onItemClick} handleIntervalRequestMessageInfo={handleIntervalRequestMessageInfo}/>
-          </TabPane>
-          <TabPane
-            tab={
-              <TabTitle
-                data={getData("mLeaveandComment")}
-                title={getLocale('Top_Message_title_@&Replies')}
-                tab={"replys"}
+            </TabPane>
+          )}
+          {tabs.includes("reminds") && (
+            <TabPane
+              tab={
+                <TabTitle
+                  data={remindTotal}
+                  title={getLocale("Top_Message_title_AlarmReminders")}
+                  tab={"reminds"}
+                />
+              }
+              key="reminds"
+            >
+              <Remind
+                onItemClick={onItemClick}
+                handleIntervalRequestMessageInfo={
+                  handleIntervalRequestMessageInfo
+                }
+                handleIgnoreTask={handleIgnoreTask}
               />
-            }
-            key="replys"
-          >
-            <Reply onItemClick={onItemClick} handleIntervalRequestMessageInfo={handleIntervalRequestMessageInfo}/>
-          </TabPane>
-          <TabPane
-            tab={<TabTitle data={remindTotal} title={getLocale('Top_Message_title_AlarmReminders')} tab={"reminds"} />}
-            key="reminds"
-          >
-            <Remind onItemClick={onItemClick} handleIntervalRequestMessageInfo={handleIntervalRequestMessageInfo} handleIgnoreTask={handleIgnoreTask}/>
-          </TabPane>
+            </TabPane>
+          )}
         </Tabs>
       </div>
     </div>

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

@@ -317,7 +317,7 @@ const BaseInfo: FC<IBaseInfoProps> = ({ okrId }) => {
         const data = resp.Data;
         setGeneralPrincipalUser(formatAvatarInfo(data[0].users)[0]);
         setParticipant(formatAvatarInfo(data[1].users));
-        setFollowers(formatAvatarInfo(data[2].users));
+        setFollowers(formatAvatarInfo(data[2]?.users || []));
       }
     });
   }, []);

package/src/components/stop-taking-modal/index.tsx

@@ -1,48 +1,61 @@
 import React, { ReactElement, useState, useCallback } from "react";
 import { Modal } from "tita-ui";
 import { getLocale } from "../../utils/getLocale";
-import { localStorage } from "../../utils/local-storage"
+import { localStorage } from "../../utils/local-storage";
 import "./index.scss";
 
 const preCls = "tt-stop-taking-model";
-const storage = new localStorage()
+const storage = new localStorage();
 
 function StopTakingModel(): ReactElement {
   const [visible, setVisible] = useState<any>(() => {
-    const bol = storage.getItem('stopTaking')
-    if(typeof(storage.getItem('stopTaking'))==='boolean'){
-      return bol
+    const stopTaking: any = storage.getItem("stopTaking");
+    if (stopTaking?.date) {
+      const oldDate = new Date(stopTaking?.date).getDate();
+      const newDate = new Date().getDate();
+      if (newDate > oldDate) {
+        return true;
+      } else {
+        return false;
+      }
     }
-    return true
+    return true;
   });
 
   const handleClose = useCallback(() => {
     setVisible(false);
-    storage.setItem('stopTaking',false)
+    storage.setItem("stopTaking", { bol: false, date: new Date() });
   }, []);
 
   return (
     <Modal visible={visible} customContent footer={null} width={420}>
-      
-        <div className={preCls}>
-          <div className={`${preCls}__background`}></div>
-          <span className={`tu-icon-close ${preCls}__close`} onClick={handleClose} ></span>
-          <div className={`${preCls}__head`}>亲爱的用户</div>
-          <div className={`${preCls}__content`}>
-            <div className={`${preCls}__content-line1`}>
-            您好～
-            </div>
-            <div className={`${preCls}__content-line2`}>
+      <div className={preCls}>
+        <div className={`${preCls}__background`}></div>
+        <span
+          className={`tu-icon-close ${preCls}__close`}
+          onClick={handleClose}
+        ></span>
+        <div className={`${preCls}__head`}>亲爱的用户</div>
+        <div className={`${preCls}__content`}>
+          <div className={`${preCls}__content-line1`}>您好～</div>
+          <div className={`${preCls}__content-line2`}>
             为了给您带来更好的安全与稳定体验，Tita
             将在周五晚上进行升级，预计耗时一天，介时将无法使用
             Tita，请您提前安排好工作，感谢您的支持与理解！
-            </div>
-            <div className={`${preCls}__content-line3`}>
+          </div>
+          <div className={`${preCls}__content-line3`}>
             升级时间：
-            <span style={{color:'#2879ff',fontWeight:500}}>1.21 (周五) 23:00 - 1.22 (周六) 23:59</span>
-            </div>
+            <span style={{ color: "#2879ff", fontWeight: 500 }}>
+              1.21 (周五) 23:00 - 1.22 (周六) 23:59
+            </span>
           </div>
-          <div className={`${preCls}__action`} onClick={()=>window.open('https://wiki.tita.com/x/RICeAQ')} >了解详情</div>
+        </div>
+        <div
+          className={`${preCls}__action`}
+          onClick={() => window.open("https://wiki.tita.com/x/RICeAQ")}
+        >
+          了解详情
+        </div>
       </div>
     </Modal>
   );

package/src/components/upload-photo-modal/index.tsx

@@ -199,7 +199,7 @@ const ChangePhoto = (props: Props) => {
               </ConditionRender>
               <ConditionRender condition={type === "browser"}>
                 <img src={cropData} className={`${preCls}__preview-browser-img`}/>
-                <span className={`${preCls}__preview-browser-name`}>一体化人才管理云平台</span>
+                <span className={`${preCls}__preview-browser-name`}>Tita</span>
                 <span className={`${preCls}__preview-browser-title`}>{item?.previewTitle}</span>
               </ConditionRender>
 						</div>

package/src/pages/aha2021/index.tsx

@@ -10,6 +10,7 @@ import { isOfficialSite, isPlatform } from "../../utils/platform";
 import "./index.scss";
 import { getTenantInfo } from "../../utils/helpers";
 import HrHeader from "../../components/hr-header";
+import HrMessage from "../../components/nav-top/components/user-message/hrMessage";
 
 const preCls = `titaui-aha-2021`;
 
@@ -86,12 +87,7 @@ const PageLayout = (props) => {
         </div>
       )}
       {isTencentHr && (
-        <div
-          className={classNames(`${preCls}__notice`)}
-          onClick={onClickNotice}
-        >
-          <img src={require('./img/notice.png')}/>
-        </div>
+       <HrMessage/>
       )}
       <PointDemo />
     </div>