@titaui/pc 1.7.35 → 1.7.36

package/lib/components/form/form-fields/dropdown/index.css

@@ -21,6 +21,7 @@
 .form-field-dropdown--vertical .form-field-dropdown__label {
   width: 56px;
   margin-right: 20px;
+  white-space: nowrap;
 }
 
 .form-field-dropdown--horizontal {

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

@@ -21,6 +21,8 @@ var _constant = require("../../constant");
 
 var _drawerManager = _interopRequireDefault(require("../../../../../drawer-manager"));
 
+var _tools = require("../../../../../../utils/tools");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -69,17 +71,13 @@ var Inform = function Inform(props) {
     if (objType === _constant.EObjType.Remind) {
       window.Talent.app.vent.trigger('global-daily-detail-pull-screen', objId);
       return;
-    } // 日报
-    // if () {
-    // 	// @ts-ignore
-    // 	Talent.app.vent.trigger("global-daily-detail-pull-screen", feedId);
-    // }
-
+    }
 
     if (messageType == 135) {
-      var redisKey = item.content.match(/redisKey=(\S*?)"/g)[1]; // @ts-ignore
+      var redisKey = item.content.match(/redisKey=(\S*?)"/)[1]; // @ts-ignore
 
       Talent.app.vent.trigger("open-weekly-report-modal", redisKey);
+      return;
     } // 处理合并的消息
 
 
@@ -87,70 +85,43 @@ 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');
+        (0, _tools.openPage)("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/taskinfo?Id=").concat(item.objId));
         return;
-      } else if (item.objId && objType !== 8) {
+      } else if (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);
-        var Month = '';
-        var Day = '';
-        var Week = '';
-
-        if (isNaN(parseInt(str.charAt(10)))) {
-          Month = str.slice(9, 10);
-          Week = str.slice(12, 13);
-
-          if (isNaN(parseInt(str.charAt(12)))) {
-            Day = str.slice(11, 12);
-          } else {
-            Day = str.slice(11, 13);
-          }
-        } else {
-          Month = str.slice(9, 11);
-          Week = str.slice(13, 14);
-
-          if (isNaN(parseInt(str.charAt(13)))) {
-            Day = str.slice(12, 13);
-          } else {
-            Day = str.slice(12, 14);
-          }
-        }
+      } else if (objType === 0) {
+        var str = item.content.match(/[a-zA-z0-9%]+./g);
 
-        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;
+        if (str.indexOf("href=") !== -1) {
+          var url = str.slice(str.indexOf('href=') + 1, str.indexOf('a>')).join("");
+          (0, _tools.openPage)("https://".concat(url));
         }
+
+        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');
+      } else if (objType === _constant.informType.Okr) {
+        var _url = item.content.match(/(http[s]?:\/\/([\w-]+.)+([:\d+])?(\/[\w-\.\/\?%&=]*))/g);
+
+        (0, _tools.openPage)(_url);
         return;
-      } else if (item.objType === _constant.informType.okrRemind) {
+      } else if (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 = '';
+        var _url2 = '';
         item.content.replace(reg, function ($0) {
-          _url = $0.slice(6);
+          _url2 = $0.slice(6);
         });
 
-        if (_url) {
-          window.open(_url, '_blank');
+        if (_url2) {
+          (0, _tools.openPage)(_url2);
           return;
         }
       }

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

@@ -173,6 +173,7 @@ function Card(_ref, ref) {
       }
     };
   }, []);
+  var increase = Number(data.Increase);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls + "-content",
     ref: cardRef
@@ -211,15 +212,15 @@ function Card(_ref, ref) {
     percent: Number(data.Complete)
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls + "__comparison"
-  }, "OKR \u5B8C\u6210\u5EA6", data.Increase != '0' ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, " ", /*#__PURE__*/_react["default"].createElement("img", {
+  }, "OKR \u5B8C\u6210\u5EA6", increase != 0 && !isNaN(increase) ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, " ", /*#__PURE__*/_react["default"].createElement("img", {
     className: preCls + "__direction",
-    src: Number(data.Increase) > 0 ? require("./img/up.png") : require("./img/down.png"),
+    src: increase > 0 ? require("./img/up.png") : require("./img/down.png"),
     alt: ""
   }), /*#__PURE__*/_react["default"].createElement("span", {
     style: {
-      color: Number(data.Increase) > 0 ? "#4DC591" : '#F05E5E'
+      color: increase > 0 ? "#4DC591" : '#F05E5E'
     }
-  }, Math.abs(Number(data.Increase)), "%")) : ''), /*#__PURE__*/_react["default"].createElement("div", {
+  }, Math.abs(increase), "%")) : ''), /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls + "__colleague"
   }, data.PromptLanguage), /*#__PURE__*/_react["default"].createElement(_statistics["default"], {
     data: data

package/lib/utils/tools.js

@@ -8,10 +8,12 @@ exports.getQueryString = getQueryString;
 exports.highLightWord = exports.hexToRgba = exports.getUrlForUserPage = void 0;
 exports.htmlDecodeByRegExp = htmlDecodeByRegExp;
 exports.htmlEncodeByRegExp = htmlEncodeByRegExp;
-exports.unHighLight = void 0;
+exports.unHighLight = exports.openPage = void 0;
 
 var _platform = require("./platform");
 
+var _openData = require("./open-data");
+
 function htmlEncodeByRegExp(str) {
   if (!str) return "";
   var htmlString = {
@@ -206,4 +208,14 @@ var getUrlForUserPage = function getUrlForUserPage(options) {
   return homeCenter;
 };
 
-exports.getUrlForUserPage = getUrlForUserPage;
+exports.getUrlForUserPage = getUrlForUserPage;
+
+var openPage = function openPage(url) {
+  if ((0, _openData.isPlatform)("dd")) {
+    window.open(url, "_self");
+  } else {
+    window.open(url, "_blank");
+  }
+};
+
+exports.openPage = openPage;

package/package.json

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

package/src/components/form/form-fields/dropdown/index.scss

@@ -16,6 +16,7 @@
       &__label {
         width: 56px;
         margin-right: 20px;
+        white-space: nowrap;
       }
     }
   }

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

@@ -1,4 +1,4 @@
-import React, { useRef } from 'react';
+import React, { useRef} from 'react';
 import classNames from 'classnames';
 import Avatar from '../../../../../../components/avatar';
 import TooltipText from '../../../../../tooltip/tooltip-text';
@@ -6,6 +6,7 @@ import { htmlToText, deleteText } from '../../utils';
 import { userId, apiServer, informType } from '../../constant';
 import { EObjType } from '../../constant';
 import drawerManager from '../../../../../drawer-manager';
+import { openPage } from '../../../../../../utils/tools';
 import './index.scss';
 
 const preCls = 'titaui-user-message-msg-inform';
@@ -14,7 +15,7 @@ const Inform = (props) => {
   const { item, onItemClick, informs } = props;
   const domRef = useRef<any>();
 
-	const handleItemClick = () => {
+	const handleItemClick = () => {    
 		onItemClick && onItemClick(false);
 		const { objType, objId, messageType } = item;
 		if (objType === EObjType.Kr) {
@@ -33,81 +34,39 @@ const Inform = (props) => {
 			window.Talent.app.vent.trigger('global-daily-detail-pull-screen', objId);
 			return;
 		}
-		// 日报
-		// if () {
-		// 	// @ts-ignore
-		// 	Talent.app.vent.trigger("global-daily-detail-pull-screen", feedId);
-		// }
 		if(messageType == 135){
-			const redisKey = item.content.match(/redisKey=(\S*?)"/g)[1]
+			const redisKey = item.content.match(/redisKey=(\S*?)"/)[1]
 			// @ts-ignore
 			Talent.app.vent.trigger("open-weekly-report-modal", redisKey);
+			return;
 		}
 		// 处理合并的消息
 		const isMessageMerging = messageType == 13018 || messageType == 30362 || messageType == 131;
 		if (!isMessageMerging) {
 			if (messageType === informType.details) {
-				window.open(`${apiServer}/u/${userId}/Home#more/taskinfo?Id=${item.objId}`, '_blank');
+        openPage(`${apiServer}/u/${userId}/Home#more/taskinfo?Id=${item.objId}`)
         return;
-			} else if (item.objId && objType !== 8) {
+			} else if (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);
-				let Month = '';
-				let Day = '';
-				let Week = '';
-				if (isNaN(parseInt(str.charAt(10)))) {
-					Month = str.slice(9, 10);
-					Week = str.slice(12, 13);
-					if (isNaN(parseInt(str.charAt(12)))) {
-						Day = str.slice(11, 12);
-					} else {
-						Day = str.slice(11, 13);
-					}
-				} else {
-					Month = str.slice(9, 11);
-					Week = str.slice(13, 14);
-					if (isNaN(parseInt(str.charAt(13)))) {
-						Day = str.slice(12, 13);
-					} else {
-						Day = str.slice(12, 14);
-					}
-				}
-				if (str.indexOf('日报') !== -1) {
-					window.open(
-						`${apiServer}/u/${userId}/Home#/daily?to_user_id=${userId}&group_id=9&tag_type=1&date=${Year}/${Month}/${Day}&tag_id=${parseInt(
-							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 ( objType === 0) {        
+				let str = item.content.match(/[a-zA-z0-9%]+./g);
+        if(str.indexOf("href=") !== -1) {
+          let url  = str.slice(str.indexOf('href=') + 1, str.indexOf('a>')).join(""); 
+          openPage(`https://${url}`)        
+        }
+        return;
 			} else if (item.objUrl) {
 				window.open(item.objUrl);
         return;
-			} else if (item.objType === informType.Okr) {
+			} else if (objType === informType.Okr) {        
         let url = item.content.match(/(http[s]?:\/\/([\w-]+.)+([:\d+])?(\/[\w-\.\/\?%&=]*))/g);
-        window.open(url, '_blank');
+        openPage(url)
         return;
-      } else if(item.objType === informType.okrRemind) {
+      } else if(objType === informType.okrRemind) {
         window.open(`${apiServer}/u/${userId}/Home#/work?iTalentNavCode=tita-work&work_id=${objId}`);
         return;
       } else {
@@ -117,7 +76,7 @@ const Inform = (props) => {
 					url = $0.slice(6);
 				})
 				if(url) {
-					window.open(url, '_blank');
+          openPage(url)
           return;
 				}
 			}
@@ -167,6 +126,7 @@ const Inform = (props) => {
 		Talent.app.vent.trigger('openReactScreenPush', options);
 	};
 
+
   return (
     <li
       className={classNames(`${preCls}__item`, {

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

@@ -9,7 +9,7 @@ const preCls = 'titaui-user-message-msg-todos';
 const TodoItem: FC<any> = (props) => {
   const { item, onItemClick, todos } = props;
 
-  const handleTodosClick = (item) => {
+  const handleTodosClick = (item) => {    
     onItemClick && onItemClick(false);
     if (item.objType === 7) {
       window.Talent.app.vent.trigger('global-pull-screen', item.objId, 'task');

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

@@ -107,7 +107,7 @@ function Card({data}: Props, ref): ReactElement {
     };
   }, []);
 
-
+  const increase = Number(data.Increase)
 
   return (
     <div className={preCls + "-content"} ref={cardRef}>
@@ -135,12 +135,12 @@ function Card({data}: Props, ref): ReactElement {
          
             OKR 完成度
            {
-             data.Increase != '0' ? <> <img
+             increase != 0 && !isNaN(increase) ? <> <img
              className={preCls + "__direction"}
-             src={Number( data.Increase) > 0 ? require("./img/up.png") : require('./img/down.png')}
+             src={increase > 0 ? require("./img/up.png") : require('./img/down.png')}
              alt=""
            />
-           <span style={{ color: Number( data.Increase) > 0 ? "#4DC591" : '#F05E5E'}}>{Math.abs(Number(data.Increase))}%</span></> : ''
+           <span style={{ color: increase > 0 ? "#4DC591" : '#F05E5E'}}>{Math.abs(increase)}%</span></> : ''
            }
           
         </div>

package/src/utils/tools.js

@@ -1,4 +1,5 @@
 import { isDD, isFeishu } from "./platform";
+import { isPlatform } from "./open-data";
 
 export function htmlEncodeByRegExp(str) {
   if (!str) return "";
@@ -191,3 +192,12 @@ export const getUrlForUserPage = (options) => {
     );
   return homeCenter;
 };
+
+
+export const openPage = (url) => {
+  if(isPlatform("dd")) {
+    window.open(url, "_self");
+  } else {
+    window.open(url, "_blank");
+  }
+}