@titaui/pc 1.9.41 → 1.9.45

package/src/components/dynamic/dynamic-like-ranking/index.tsx

@@ -18,7 +18,7 @@ const Auth = new DynamicManagerAuth();
 
 const DynamicLikeRanking: FC = () => {
   const [rankingData, setRankingData] = useState([]);
-  const [type, setType] = useState(getLocale('Mod_all'));
+  const [type, setType] = useState(getLocale("Mod_all"));
   const [date, setDate] = useState({ createDate: "", endDate: "" });
   useEffect(() => {
     const { createDate, endDate } = date;
@@ -62,10 +62,10 @@ const DynamicLikeRanking: FC = () => {
     setType(item);
     let createDate = "";
     let endDate = "";
-    if (item == getLocale('Feed_Tab_Title_Thismonth')) {
+    if (item == getLocale("Feed_Tab_Title_Thismonth")) {
       createDate = showMonthFirstDay();
       endDate = showNextMonthFirstDay();
-    } else if (item == getLocale('Feed_Tab_Title_Thisweek')) {
+    } else if (item == getLocale("Feed_Tab_Title_Thisweek")) {
       createDate = showWeekFirstDay();
       endDate = showNextWeekFirstDay();
     }
@@ -73,7 +73,11 @@ const DynamicLikeRanking: FC = () => {
   };
 
   const TabBar = () => {
-    const typeData = [getLocale('Mod_all'), getLocale('Feed_Tab_Title_Thisweek'), getLocale('Feed_Tab_Title_Thismonth')];
+    const typeData = [
+      getLocale("Mod_all"),
+      getLocale("Feed_Tab_Title_Thisweek"),
+      getLocale("Feed_Tab_Title_Thismonth"),
+    ];
     return (
       <div className={`${preCls}__tab-bar`}>
         {typeData.map((item, key) => {
@@ -102,7 +106,7 @@ const DynamicLikeRanking: FC = () => {
             src={require("./image/like-ranking.svg")}
           ></img>
           <span className={classNames(`${preCls}__header-text`)}>
-            {getLocale('Feed_Title_Likeranking')}
+            {getLocale("Feed_Title_Likeranking")}
           </span>
         </div>
         {Auth.hasPraiseAuth() && (
@@ -110,7 +114,7 @@ const DynamicLikeRanking: FC = () => {
             className={classNames(`${preCls}__header-right`)}
             onClick={handleLinkToPraiseRaking}
           >
-            {getLocale('Feed_Set_Pop_Butt_More')}
+            {getLocale("Feed_Set_Pop_Butt_More")}
           </div>
         )}
       </div>
@@ -125,11 +129,13 @@ const DynamicLikeRanking: FC = () => {
                 </span>
               </div>
             ))}
-          {rankingData &&
-            rankingData.length > 0 &&
-            rankingData.map((item, index) => {
-              return <Item userInfo={item} key={index}></Item>;
-            })}
+          {rankingData && rankingData.length > 0 && (
+            <div className={classNames(`${preCls}__content-table-items`)}>
+              {rankingData.map((item, index) => {
+                return <Item userInfo={item} key={index}></Item>;
+              })}
+            </div>
+          )}
         </div>
       </div>
     </div>

package/src/components/dynamic/dynamic-like-ranking/item.tsx

@@ -1,9 +1,8 @@
-import React, { FC } from "react";
-import classNames from "classnames";
+import React, { FC, Fragment } from "react";
 import Avatar from "../../avatar";
 import { formatNum } from "../../../utils/bs-global";
 import { OpenUserName } from "../../../utils/open-data";
-import Tooltip from '../../tooltip';
+import Tooltip from "../../tooltip";
 import { getLocale } from "../../../utils/getLocale";
 import "./index.scss";
 const preCls = "danamic-like-ranking__item";
@@ -42,7 +41,7 @@ const Item: FC<any> = ({ userInfo }) => {
   if (!userInfo || Object.keys(userInfo).length === 0) return null;
   const { rankNum, user, pariseNums } = userInfo;
   const { avatar, name, userId, userType } = user;
-  
+
   // 之后要用
   // const url = getUrlForUserPage({
   //   userId: userId,
@@ -54,32 +53,28 @@ const Item: FC<any> = ({ userInfo }) => {
   // };
 
   return (
-    <div className={classNames(`${preCls}`)}>
-      <div className={classNames(`${preCls}-left`)}>
-        <div className={`${preCls}-pre`}>{formatRaking(rankNum)}</div>
-        <div className={`${preCls}-avatar`}>
-          <Avatar
-            name={name}
-            src={avatar.small}
-            color={avatar.color}
-            userId={userId}
-            size={{ width: 28, textNum: 1, fontSize: 14 }}
-          />
-        </div>
-        <div className={`${preCls}-name`}>
-          <Tooltip.Text
-            text={<OpenUserName id={userId} name={name} />}
-            maxWidth={120}
-          />
-        </div>
+    <Fragment>
+      <div className={`${preCls}-pre`}>{formatRaking(rankNum)}</div>
+      <div className={`${preCls}-avatar`}>
+        <Avatar
+          name={name}
+          src={avatar.small}
+          color={avatar.color}
+          userId={userId}
+          size={{ width: 28, textNum: 1, fontSize: 14 }}
+        />
+      </div>
+      <div className={`${preCls}-name`}>
+        <Tooltip.Text
+          text={<OpenUserName id={userId} name={name} />}
+          maxWidth={120}
+        />
       </div>
-      <div className={classNames(`${preCls}-left`)}>
-        <div className={`${preCls}-like-text`}>
-          <span className={`${preCls}-like-num`}>{formatNum(pariseNums)}</span>
-          {getLocale('Mod_Kudos')}
-        </div>
+      <div className={`${preCls}-like-text`}>
+        <span className={`${preCls}-like-num`}>{formatNum(pariseNums)}</span>
+        {getLocale("Mod_Kudos")}
       </div>
-    </div>
+    </Fragment>
   );
 };
 

package/src/components/dynamic/online-broadcast/data.ts

@@ -14,18 +14,32 @@ if (source === 860) {
 }
 
 export const onlineBroadcastData = [
+  {
+    hasOnline: true,
+    preContent: '「OKR」支持手动进行目标打分',
+    preHref: 'https://wiki.tita.com/x/GYCeAQ',
+    isNew: true,
+    date: '1/12',
+  },
+  {
+    hasOnline: true,
+    preContent: '「考核」支持批量公布考核结果 ',
+    preHref: 'https://wiki.tita.com/x/L4CeAQ',
+    isNew: true,
+    date: '1/11',
+  },
   {
     hasOnline: true,
     preContent: 'Tita「Learning」 全新上线',
     preHref: 'https://wiki.tita.com/x/doNrAQ',
-    isNew: true,
+    isNew: false,
     date: '12/26',
   },
   {
     hasOnline: true,
     preContent: '「OKR」支持设置子目标权重',
     preHref: 'https://wiki.tita.com/x/mIFrAQ',
-    isNew: true,
+    isNew: false,
     date: '12/18',
   },
   {

package/src/components/edit-kr-wight/EditKrWightModal.tsx

@@ -159,6 +159,7 @@ export default class EditKrWightModal extends Component<EditKrWightProps, EditKr
         onClose={this.onModalClose}
         onOk={this.handleOk}
         onCancel={this.handleCancel}
+        zIndex={2000}
       >
         <EditWightContent>
           {milepostData &&

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

@@ -0,0 +1,73 @@
+.tt-stop-taking-model {
+  width: 420px;
+  height: 338px;
+  background: #FFFFFF;
+  box-sizing: border-box;
+  position: relative;
+  padding: 40px;
+  border-radius: 0px 0px 32px 32px;
+  &__background{
+    width: 420px;
+    height: 192px;
+    position: absolute;
+    top: -102px;
+    left: 0;
+    background-image: url('./img/stop-taking.png');
+    background-repeat: no-repeat;
+    background-size: 420px 192px;
+    background-position: 0 0;
+  }
+  &__close{
+    width: 17px;
+    height: 17px;
+    font-size: 17px;
+    color: #fff; 
+    position: absolute;
+    right: 3px;
+    top: -68px; 
+    cursor: pointer;
+  }
+
+  &__head {
+    margin-top: 18px;
+    font-size: 24px;
+    font-weight: 600;
+    color: #141C28;
+    line-height: 34px;
+    letter-spacing: 2px;
+    position: relative;
+    z-index: 2;
+  }
+
+  &__content {
+    margin-top: 12px;
+    font-size: 14px;
+    color: #3F4755;
+    line-height: 22px;
+
+    &-line2{
+      margin-top: 4px;
+    }
+    &-line3{
+      margin-top: 12px;
+    }
+  }
+
+  &__action {
+    margin: 28px auto 0;
+    width: 188px;
+    height: 40px;
+    background: #2879FF;
+    box-shadow: 0px 8px 12px 0px rgba(40, 121, 255, 0.3);
+    border-radius: 20px;
+    font-size: 14px;
+    color: #FFFFFF;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    &:hover{
+      background: #5C8EFF;
+    }
+  }
+}

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

@@ -0,0 +1,51 @@
+import React, { ReactElement, useState, useCallback } from "react";
+import { Modal } from "tita-ui";
+import { getLocale } from "../../utils/getLocale";
+import { localStorage } from "../../utils/local-storage"
+import "./index.scss";
+
+const preCls = "tt-stop-taking-model";
+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
+    }
+    return true
+  });
+
+  const handleClose = useCallback(() => {
+    setVisible(false);
+    storage.setItem('stopTaking',false)
+  }, []);
+
+  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`}>
+            为了给您带来更好的安全与稳定体验，Tita
+            将在周五晚上进行升级，预计耗时一天，介时将无法使用
+            Tita，请您提前安排好工作，感谢您的支持与理解！
+            </div>
+            <div className={`${preCls}__content-line3`}>
+            升级时间：
+            <span style={{color:'#2879ff',fontWeight:500}}>1.21 (周五) 23:00 - 1.22 (周六) 23:59</span>
+            </div>
+          </div>
+          <div className={`${preCls}__action`} onClick={()=>window.open('https://wiki.tita.com/x/RICeAQ')} >了解详情</div>
+      </div>
+    </Modal>
+  );
+}
+
+export default StopTakingModel;

package/src/index.js

@@ -68,6 +68,7 @@ export { default as TitaChart } from "./components/tita-chart";
 export { default as Tooltip } from "./components/tooltip";
 export { default as TooltipText } from './components/tooltip/tooltip-text';
 export { default as UpdateModal } from "./components/update-modal";
+import { default as StopTakingModal } from "./components/stop-taking-modal"
 export { default as upload } from "./components/upload";
 export { default as Upvote } from "./components/upvote";
 export { default as VersionChangeModal } from "./components/version-change-modal";

package/src/utils/open-data.js

@@ -109,23 +109,31 @@ export const parseTag = (str) => {
   var source = window.BSGlobal.tenantInfo.Source,
     ua = navigator.userAgent.toLowerCase();
 
-  if (source != 860 && ua.indexOf('micromessenger') == -1)
-    return <span dangerouslySetInnerHTML={{ '__html': str }} />;
-
-  const reg = /<\w+[\w\W]*?(userId|departmentId)=["'](\S+?)["'][\w\W]*?>@([\w\W]*?)<\/\w+>/g;
-  const strReg = /<\w+[\w\s"'\/=\:\.]*?(?:userId|departmentId)=["']\S+?["'][\w\s"'\/=\:\.]*?>[\w\W]*?<\/\w+?>/;
+  const reg =
+    /<\w+[\w\W]*?(userId|departmentId)=["'](\S+?)["'][\w\W]*?>@([\w\W]*?)<\/\w+>/g;
+  const strReg =
+    /<\w+[\w\s"'\/=\:\.]*?(?:userId|departmentId)=["']\S+?["'][\w\s"'\/=\:\.]*?>[\w\W]*?<\/\w+?>/;
   const openDatas = [];
   let matchStr = reg.exec(str);
 
+  // if (source != 860 && ua.indexOf('micromessenger') == -1)
+  //   return <span dangerouslySetInnerHTML={{ '__html': str }} />;
+  
   while (matchStr != null) {
-    const OpenDataCompoent = matchStr[1] == 'userId' ? OpenUserName : OpenDepartmentName;
+    const OpenDataCompoent =
+      matchStr[1] == "userId" ? OpenUserName : OpenDepartmentName;
     if (!OpenDataCompoent) {
-      openDatas.push(<span dangerouslySetInnerHTML={{ '__html': matchStr[0] }} />);
+      openDatas.push(
+        <span
+          dangerouslySetInnerHTML={{ __html: matchStr[0] }}
+          onClick={(e) => e.stopPropagation()}
+        />
+      );
     } else {
       openDatas.push(
-        <span style={{ 'color': '#1890ff' }}>
+        <span style={{ color: "#1890ff" }} onClick={(e) => e.stopPropagation()}>
           @<OpenDataCompoent id={matchStr[2]} name={matchStr[3]} />
-        </span>,
+        </span>
       );
     }
     matchStr = reg.exec(str);
@@ -135,12 +143,14 @@ export const parseTag = (str) => {
   const renderData = [];
 
   for (let i = 0; i < commonStrs.length; i++) {
-    renderData.push(<span dangerouslySetInnerHTML={{ __html: commonStrs[i] }} />);
+    renderData.push(
+      <span dangerouslySetInnerHTML={{ __html: commonStrs[i] }} />
+    );
     renderData.push(openDatas[i]);
   }
 
   return renderData;
-}
+};
 
 export const parseString = (str) => {
   //@ts-ignore