@titaui/pc 1.9.51 → 1.9.55

package/lib/pages/appointment-demo/input/index.js

@@ -23,7 +23,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 

package/lib/pages/group-management/components/input-form/index.js

@@ -23,7 +23,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 

package/lib/utils/auth.js

@@ -9,7 +9,7 @@ exports.hasSuperior = exports.OAuth = exports.KRAuth = exports.EAuth = exports.D
 
 var _bsGlobal = require("./bs-global");
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 

package/lib/utils/bs-global.js

@@ -56,7 +56,7 @@ var getUploadMaxSize = function getUploadMaxSize() {
 exports.getUploadMaxSize = getUploadMaxSize;
 
 function isWx() {
-  return (getTenantInfo().Source == 860 || getTenantInfo().Source == 964) && getTenantInfo().corpCreateType != 2;
+  return getTenantInfo().Source == 860 && getTenantInfo().corpCreateType != 2;
 }
 /*
  *通过AppId,来查询是否开通这个产品

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.9.51",
+  "version": "1.9.55",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",

package/src/components/dynamic/dynamic.tsx

@@ -78,8 +78,7 @@ const Dynamic: FC = () => {
     setActiveFirstLevelTabKey(1004);
     setActiveSecondLevelTabKey(1018);
     // @ts-ignore
-    const secondTabsArr = tabsInfo.find((item) => item.CodeId === 1004)
-      .ChildMenus;
+    const secondTabsArr = tabsInfo.find((item) => item.CodeId === 1004)?.ChildMenus || [];
     setSecondTabs(secondTabsArr);
     resetValue();
     setIsChangeConditionLoading(true);

package/src/components/hr-header/index.scss

@@ -46,6 +46,25 @@
       transition: transform .2s ease;
     }
   }
+  &__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;
+    }
+  }
 }
 .tencent-hr-header-popup {
   position: relative;

package/src/components/hr-header/index.tsx

@@ -8,6 +8,10 @@ import './index.scss';
 
 interface Props {}
 const preCls = 'tencent-hr-header';
+const handleLogout = () => {
+  axios.get(window.BSGlobal.apiPath+'/Account/Logout');
+
+}
 function HrHeader({}: Props): ReactElement {
   const [menus, setMenus] = useState<any[]>([]);
   const [isShowMore, setIsShowMore] = useState(false);
@@ -88,7 +92,7 @@ function HrHeader({}: Props): ReactElement {
             <div key='more' className={classNames(preCls + '__item')}>
               <a>更多</a>
               <img
-                src={require('./arrow.png')}
+                src={require('./img/arrow.png')}
                 style={{ transform: `rotate(${isShowMore ? 180 : 0}deg)` }}
               />
             </div>
@@ -101,13 +105,13 @@ function HrHeader({}: Props): ReactElement {
         popupPlacement="bottom"
         popup={
           <div className='tencent-hr-header-popup'>
-            <a className='tencent-hr-header-popup__item' href={'/_logout?r='+(new Date().getTime())}>退出</a>
+            <a className='tencent-hr-header-popup__item' target="_self" href={'/_logout?r='+(new Date().getTime())} onClick={handleLogout}>退出</a>
           </div>
         }
       >
         <span className={preCls + '__user'}>
           {getLoginUserInfo().Name}
-          <img src={require('./arrow.png')} style={{ transform: `rotate(${isShowUserMenu ? 180 : 0}deg)` }}/>
+          <img src={require('./img/arrow.png')} style={{ transform: `rotate(${isShowUserMenu ? 180 : 0}deg)` }}/>
         </span>
       </Popup>
     </div>

package/src/components/mblog/components/MblogAction.tsx

@@ -205,14 +205,14 @@ export default class MblogAction extends PureComponent<Props> {
           )}
         </LeftBtnGroupWrapper>
         <RightBtnGroupWrapper className="action__right">
-          {this.props.isShowSendSms && !isLocal() && (
+          {/* {this.props.isShowSendSms && !isLocal() && (
             <Tooltip container={document.body} content={this.props.sendSmsTipText}>
               <RightBtn onMouseDown={this._sentMsgClickHandler}>
                 <span className={['checkbox-icon', isSendSms ? 'tu-icon-check-active' : 'tu-icon-xuan'].join(' ')}></span>
                 <span>{getLocale('Mod_SMS')}</span>
               </RightBtn>
             </Tooltip>
-          )}
+          )} */}
           {
             this.props.isShowRange && (
               <BtnPrivate id="1" data-name="range" className={disableRangeSelect ? 'disabled' : ''} disabled={disableRangeSelect}>

package/src/components/nav-top/components/user-message/hrMessage.tsx

@@ -0,0 +1,136 @@
+import React, { useState, useEffect } from 'react';
+import classNames from 'classnames';
+import Popup from '../../../popup';
+import ConditionRender from '../../../condition-render';
+import Message from './msg';
+import { getBSGlobal, getUserInfo } from '../../../../utils/bs-global';
+import { popupAlign } from './constant';
+import RedPack from './components/red-pack';
+import { getMessages } from '../../request.apis';
+import Bell from './images/bell@3x.png';
+import './index.scss';
+
+const prefixCls = 'titaui-user-message';
+
+const HrMessage = () => {
+	const [ infosNum, setInfosNum ] = useState(0);
+	const [ allData, setAllData ] = useState([]);
+	const [ redPackNum, setRedPackNum ] = useState(0);
+	const [ popupVisible, setPopupVisible ] = useState(false);
+	const [ preData, setPreData ] = useState(0);
+	const [ firstTab, setFirstTab ] = useState('todos');
+
+	const handleShowInfos = () => {
+		setPopupVisible(true);
+	};
+
+	const handleIntervalRequestMessageInfo = () => {
+		getMessages().then((res) => {
+			if (res.Code === 1) {
+				setAllData(res.Data.indicators);
+				const indicators = res.Data.indicators;
+				const todos = indicators.find((item) => item.type === 'todoIndicator');
+				const informs = indicators.find((item) => item.type === 'messageIndicator');
+				const replys = indicators.find((item) => item.type === 'mLeaveandComment');
+				const reminds = indicators.find((item) => item.type === 'Tx');
+				let total = 0;
+				// @与回复的数量在通知里面包含了
+				if (reminds && reminds.value) {
+					total += reminds.value;
+				}
+				if (informs) {
+					total += informs.value;
+				}
+				if (todos) {
+					total += todos.value;
+				}
+				setPreData(infosNum);
+				setInfosNum(total);
+				if (todos && todos.value) {
+					setFirstTab('todos');
+				} else if (informs && !replys && informs.value) {
+					setFirstTab('informs');
+				} else if (replys && informs.value - replys.value === 0) {
+					setFirstTab('replys');
+				} else if (replys && informs.value - replys.value > 0) {
+					setFirstTab('informs');
+				} else if (reminds && reminds.value){
+					setFirstTab('reminds');
+        } else {
+          setFirstTab("todos")
+        }
+				// 判断是企业勋章
+				const enterpriseMedalMsg = indicators.filter((item) => {
+					return item.messageType === 1 && item.indicatorType === 1969002;
+				});
+				// @ts-ignore
+				enterpriseMedalMsg.length > 0 && window.util.upaasEnterpriseMedal();
+
+				// upaas 勋章
+				const medalDetail = getBSGlobal('medalDetail');
+				// @ts-ignore
+				medalDetail && window.util.upaasMedal()(medalDetail);
+
+				// 红包
+				const mRedPackIndicator = indicators.filter((item) => {
+					return item.type === 'mRedPackIndicator';
+				});
+				mRedPackIndicator.length > 0 && setRedPackNum(mRedPackIndicator[0].value);
+
+				// 祝福，拆礼物
+				const blessIndicator = indicators.filter((item) => {
+					return item.type === 'mZhufu';
+				});
+				const weeklyReportIndicator = indicators.filter((item) => {
+					return item.type === 'mWeekStatisticIndicator';
+				});
+				if (blessIndicator.length === 1) {
+					const userInfo = getUserInfo();
+					const options = {
+						needMask: true,
+						toUserId: userInfo.Id,
+						blessingTime: blessIndicator[0]['latestUpdateDate']
+					};
+					// @ts-ignore
+					window.util.openGift(options);
+				}
+				if(weeklyReportIndicator.length){
+					window?.Talent.app.vent.trigger('open-weekly-report-modal')
+				}
+			}
+		});
+	};
+
+	useEffect(() => {
+		setPreData(infosNum);
+		handleIntervalRequestMessageInfo();
+		setInterval(handleIntervalRequestMessageInfo, 15000);
+	}, []);
+
+	return (
+		<div>
+			<Popup
+				popup={
+					<Message
+						onItemClick={setPopupVisible}
+						allData={allData}
+						handleIntervalRequestMessageInfo={handleIntervalRequestMessageInfo}
+						firstTab={firstTab}
+						tabs={['todos','informs','replys']}
+					/>
+				}
+				popupVisible={popupVisible}
+				popupTransitionName={classNames(`${prefixCls}__popup-right-bottom`)}
+				popupAlign={popupAlign}
+				mask={false}
+				destroyPopupOnHide={true}
+			>
+				<div className={classNames(`${prefixCls}__hr-notice`)} onClick={handleShowInfos}>
+        <img src={require("./images/notice.png")} />
+      </div>
+			</Popup>
+			<RedPack redPackNum={redPackNum} />
+		</div>
+	);
+};
+export default HrMessage;

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/stop-taking-modal/index.tsx

@@ -1,6 +1,7 @@
 import React, { ReactElement, useState, useCallback } from "react";
 import { Modal } from "tita-ui";
 import { getLocale } from "../../utils/getLocale";
+import {getTenantInfo} from '../../utils/bs-global'
 import { localStorage } from "../../utils/local-storage";
 import "./index.scss";
 
@@ -9,6 +10,7 @@ const storage = new localStorage();
 
 function StopTakingModel(): ReactElement {
   const [visible, setVisible] = useState<any>(() => {
+    if(getTenantInfo().Source == 964) return false;
     const stopTaking: any = storage.getItem("stopTaking");
     if (stopTaking?.date) {
       const oldDate = new Date(stopTaking?.date).getDate();

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>

package/src/utils/bs-global.js

@@ -36,7 +36,7 @@ export const getUploadMaxSize = () => {
 };
 
 export function isWx() {
-  return (getTenantInfo().Source == 860 || getTenantInfo().Source == 964) && getTenantInfo().corpCreateType != 2
+  return (getTenantInfo().Source == 860) && getTenantInfo().corpCreateType != 2
 }
 
 /*