@titaui/pc 1.7.31 → 1.7.35

package/lib/components/nav-top/components/user-message/components/inform/inform-item.js

@@ -88,10 +88,13 @@ var Inform = function Inform(props) {
     if (!isMessageMerging) {
       if (messageType === _constant.informType.details) {
         window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/taskinfo?Id=").concat(item.objId), '_blank');
+        return;
       } else if (item.objId && objType !== 8) {
         window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#work?work_id=").concat(item.objId));
+        return;
       } else if (messageType === _constant.informType.todayJob) {
         window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#plan?tag_id=0&tag_type=0&filter=1"));
+        return;
       } else if (messageType === _constant.informType.daily) {
         var str = item.content.slice(0, 18);
         var Year = str.slice(4, 8);
@@ -121,16 +124,24 @@ var Inform = function Inform(props) {
 
         if (str.indexOf('日报') !== -1) {
           window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#/daily?to_user_id=").concat(_constant.userId, "&group_id=9&tag_type=1&date=").concat(Year, "/").concat(Month, "/").concat(Day, "&tag_id=").concat(parseInt(Month) + 1, "&dailyType=1"));
+          return;
         } else if (str.indexOf('月报') !== -1) {
           window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#/daily?to_user_id=").concat(_constant.userId, "&group_id=9&tag_type=1&date=").concat(Year, "/").concat(Month, "/01&tag_id=").concat(parseInt(Month) + 1, "&dailyType=3"));
+          return;
         } else {
           window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#/daily?to_user_id=").concat(_constant.userId, "&group_id=9&tag_type=1&date=").concat(Year, "/").concat(Month, "/").concat(parseInt(Week) * 7, "&tag_id=").concat(parseInt(Month) + 1, "&dailyType=2"));
+          return;
         }
       } else if (item.objUrl) {
         window.open(item.objUrl);
+        return;
       } else if (item.objType === _constant.informType.Okr) {
         var url = item.content.match(/(http[s]?:\/\/([\w-]+.)+([:\d+])?(\/[\w-\.\/\?%&=]*))/g);
         window.open(url, '_blank');
+        return;
+      } else if (item.objType === _constant.informType.okrRemind) {
+        window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#/work?iTalentNavCode=tita-work&work_id=").concat(objId));
+        return;
       } else {
         var reg = /href='.*?(?=')/g;
         var _url = '';
@@ -140,6 +151,7 @@ var Inform = function Inform(props) {
 
         if (_url) {
           window.open(_url, '_blank');
+          return;
         }
       }
     }

package/lib/components/nav-top/components/user-message/constant.js

@@ -29,8 +29,9 @@ var informType = {
   //日报月报周报
   "todayJob": 81,
   //进入今日工作
-  "Okr": 0 //Okr
-
+  "Okr": 0,
+  //Okr
+  "okrRemind": 4
 };
 exports.informType = informType;
 var EObjType;

package/lib/components/nav-top/index.js

@@ -27,8 +27,6 @@ var _utils = require("./utils");
 
 require("./index.css");
 
-var _logoWhite = _interopRequireDefault(require("./images/logo-white.png"));
-
 var _request = require("../../utils/request");
 
 var _toast = _interopRequireDefault(require("../toast"));
@@ -53,8 +51,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var Logo = (0, _bsGlobal.getTenantInfo)().Logo || _logoWhite["default"];
-
+var Logo = (0, _utils.getLogo)();
 var hasOKRApp = (0, _bsGlobal.getBSGlobal)("newNavigation").find(function (item) {
   return item.appId === 113;
 });

package/lib/components/nav-top/utils.js

@@ -3,7 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getMenus = void 0;
+exports.getMenus = exports.getLogo = void 0;
+
+var _bsGlobal = require("../../utils/bs-global");
+
+var _logoWhite = _interopRequireDefault(require("./images/logo-white.png"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var getMenus = function getMenus() {
   // @ts-ignore
@@ -14,4 +20,12 @@ var getMenus = function getMenus() {
   return navs;
 };
 
-exports.getMenus = getMenus;
+exports.getMenus = getMenus;
+
+var getLogo = function getLogo() {
+  // 232637ab8a674427a1d6489329035d86_n 是老logo的路径，没法判断是否用户自定义过，所以只能这么硬核
+  var tenantInfo = (0, _bsGlobal.getTenantInfo)();
+  return tenantInfo.isNewIndex && /232637ab8a674427a1d6489329035d86_n/g.test(tenantInfo.Logo) ? _logoWhite["default"] : tenantInfo.Logo;
+};
+
+exports.getLogo = getLogo;

package/lib/components/weekly-report/card.js

@@ -191,13 +191,16 @@ function Card(_ref, ref) {
     src: require("./img/bofang.png")
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls + "__avatar"
-  }, /*#__PURE__*/_react["default"].createElement("img", {
+  }, !!avatarSrc && /*#__PURE__*/_react["default"].createElement("img", {
     src: avatarSrc
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls + "__body"
   }, /*#__PURE__*/_react["default"].createElement("img", {
     className: preCls + "__userName",
-    src: nameSrc
+    src: nameSrc,
+    style: {
+      opacity: nameSrc ? 1 : 0
+    }
   }), /*#__PURE__*/_react["default"].createElement("img", {
     className: preCls + "__quote",
     src: require("./img/quote.png"),

package/lib/components/weekly-report/index.js

@@ -177,7 +177,7 @@ function WeeklyReportModal(_ref4) {
     if (!visible) return;
     var current = new Date();
     var dateTimeTicks = current.getFullYear() + '/' + (current.getMonth() + 1) + '/' + current.getDate();
-    var param = "redisKey=".concat(redisKey || null, "&dateTimeTicks=").concat(dateTimeTicks || null);
+    var param = "redisKey=".concat(redisKey || '', "&dateTimeTicks=").concat(dateTimeTicks || '');
 
     if (data) {
       setData(null);

package/package.json

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

package/src/components/nav-top/components/user-message/components/inform/inform-item.tsx

@@ -48,10 +48,13 @@ const Inform = (props) => {
 		if (!isMessageMerging) {
 			if (messageType === informType.details) {
 				window.open(`${apiServer}/u/${userId}/Home#more/taskinfo?Id=${item.objId}`, '_blank');
+        return;
 			} else if (item.objId && objType !== 8) {
 				window.open(`${apiServer}/u/${userId}/Home#work?work_id=${item.objId}`);
+        return;
 			} else if (messageType === informType.todayJob) {
 				window.open(`${apiServer}/u/${userId}/Home#plan?tag_id=0&tag_type=0&filter=1`);
+        return;
 			} else if (messageType === informType.daily) {
 				const str = item.content.slice(0, 18);
 				const Year = str.slice(4, 8);
@@ -81,24 +84,32 @@ const Inform = (props) => {
 							Month
 						) + 1}&dailyType=1`
 					);
+          return;
 				} else if (str.indexOf('月报') !== -1) {
 					window.open(
 						`${apiServer}/u/${userId}/Home#/daily?to_user_id=${userId}&group_id=9&tag_type=1&date=${Year}/${Month}/01&tag_id=${parseInt(
 							Month
 						) + 1}&dailyType=3`
 					);
+          return;
 				} else {
 					window.open(
 						`${apiServer}/u/${userId}/Home#/daily?to_user_id=${userId}&group_id=9&tag_type=1&date=${Year}/${Month}/${parseInt(
 							Week
 						) * 7}&tag_id=${parseInt(Month) + 1}&dailyType=2`
 					);
+          return;
 				}
 			} else if (item.objUrl) {
 				window.open(item.objUrl);
+        return;
 			} else if (item.objType === informType.Okr) {
         let url = item.content.match(/(http[s]?:\/\/([\w-]+.)+([:\d+])?(\/[\w-\.\/\?%&=]*))/g);
         window.open(url, '_blank');
+        return;
+      } else if(item.objType === informType.okrRemind) {
+        window.open(`${apiServer}/u/${userId}/Home#/work?iTalentNavCode=tita-work&work_id=${objId}`);
+        return;
       } else {
 				const reg = /href='.*?(?=')/g;
 				let url = '';
@@ -107,9 +118,11 @@ const Inform = (props) => {
 				})
 				if(url) {
 					window.open(url, '_blank');
+          return;
 				}
 			}
 		}
+		
 		let type = 'eReport'; // E-周报提醒消息合并
 		if (messageType == '83') {
 			// 项目，目标进展提醒消息合并

package/src/components/nav-top/components/user-message/constant.ts

@@ -16,6 +16,7 @@ export const informType = {
   "daily": 55, //日报月报周报
   "todayJob": 81, //进入今日工作
   "Okr": 0, //Okr
+  "okrRemind": 4
 };
 
 export enum EObjType {

package/src/components/nav-top/index.tsx

@@ -6,12 +6,11 @@ import Menu from "./components/menu";
 import Msg from "./components/user-message";
 import Home from "./images/home.png";
 import Version from "./components/version";
-import { getMenus } from "./utils";
+import { getLogo, getMenus } from "./utils";
 import "./index.scss";
-import defaultLogo from "./images/logo-white.png";
 import { rpost } from "../../utils/request";
 import Toast from "../toast";
-const Logo = getTenantInfo().Logo || defaultLogo;
+const Logo = getLogo();
 const hasOKRApp = getBSGlobal("newNavigation").find(
   (item) => item.appId === 113
 );

package/src/components/nav-top/utils.ts

@@ -1,5 +1,6 @@
-
+import { getTenantInfo } from "../../utils/bs-global";
 import {  INavType } from "./interface";
+import defaultLogo from "./images/logo-white.png";
 
 
 export const getMenus = () => {
@@ -11,3 +12,8 @@ export const getMenus = () => {
   return navs;
 }
 
+export const getLogo = () => {
+  // 232637ab8a674427a1d6489329035d86_n 是老logo的路径，没法判断是否用户自定义过，所以只能这么硬核
+  const tenantInfo = getTenantInfo();
+  return tenantInfo.isNewIndex && /232637ab8a674427a1d6489329035d86_n/g.test(tenantInfo.Logo) ? defaultLogo : tenantInfo.Logo
+}

package/src/components/weekly-report/card.tsx

@@ -117,11 +117,11 @@ function Card({data}: Props, ref): ReactElement {
       <img className={preCls + "__laba"} src={require("./img/laba.png")} />
       <img className={preCls + "__bofang"} src={require("./img/bofang.png")} />
       <div className={preCls + "__avatar"}>
-          <img src={avatarSrc} />
+          {!!avatarSrc && <img src={avatarSrc} />}
         </div>
       <div className={preCls + "__body"}>
        
-        <img className={preCls + "__userName"} src={nameSrc} />
+         <img className={preCls + "__userName"} src={nameSrc} style={{opacity:nameSrc ? 1:0}}/>
         <img
           className={preCls + "__quote"}
           src={require("./img/quote.png")}

package/src/components/weekly-report/index.tsx

@@ -79,7 +79,7 @@ function WeeklyReportModal({}: Props) {
     if(!visible) return
     const current = new Date()
     const dateTimeTicks=(current.getFullYear()+'/'+(current.getMonth()+1)+'/'+current.getDate())
-    let param = `redisKey=${redisKey||null}&dateTimeTicks=${dateTimeTicks||null}`
+    let param = `redisKey=${redisKey || ''}&dateTimeTicks=${dateTimeTicks||''}`
     if(data) {
       setData(null)
     }