@titaui/pc 1.7.76 → 1.7.77

package/lib/components/dynamic/dynamic-item/dynamic-share-to-dynamic/index.css

@@ -1,7 +1,6 @@
 .titaui-dynamic-share-to-dynamic__operate-desc {
   margin-left: 4px;
   font-size: 14px;
-  font-family: OPPOSans-R, OPPOSans;
   font-weight: normal;
   color: #89919f;
   line-height: 22px;
@@ -14,7 +13,6 @@
   box-sizing: border-box;
   margin-top: 16px;
   font-size: 14px;
-  font-family: OPPOSans-R, OPPOSans;
   font-weight: normal;
   color: #3f4755;
   line-height: 24px;
@@ -55,7 +53,6 @@
 .titaui-dynamic-share-to-dynamic__share-right-title {
   display: block;
   font-size: 16px;
-  font-family: OPPOSans-B, OPPOSans;
   font-weight: normal;
   color: #141c28;
   line-height: 24px;
@@ -64,7 +61,6 @@
 
 .titaui-dynamic-share-to-dynamic__share-right-content {
   font-size: 14px;
-  font-family: OPPOSans-R, OPPOSans;
   font-weight: normal;
   color: #3f4755;
   line-height: 24px;

package/lib/components/dynamic/dynamic-item/dynamic-share-to-dynamic/index.js

@@ -23,7 +23,9 @@ var _util = require("../../util");
 
 var _tools = require("../../../../utils/tools");
 
-var _userPhoto = _interopRequireDefault(require("./img/user-photo.png"));
+var _bsGlobal = require("../../../../utils/bs-global");
+
+var _guanlian = _interopRequireDefault(require("./img/guanlian.png"));
 
 require("./index.css");
 
@@ -37,11 +39,24 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 var prefix = "titaui-dynamic-share-to-dynamic";
+var userId = (0, _bsGlobal.getUserInfo)().Id;
 
 var DynamicShare = function DynamicShare(_ref) {
   var data = _ref.data,
@@ -59,22 +74,53 @@ var DynamicShare = function DynamicShare(_ref) {
       feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
 
   var isPublisher = data.publishUser.userId === window.BSGlobal.loginUserInfo.Id;
+
+  var _useState = (0, _react.useState)(),
+      _useState2 = _slicedToArray(_useState, 2),
+      title = _useState2[0],
+      setTitle = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      content = _useState4[0],
+      setContent = _useState4[1];
+
   var renderDesc = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
       className: prefix + "__operate-desc"
-    }, "\u5206\u4EAB\u4E86\u4E00\u7BC7\u6587\u7AE0"), /*#__PURE__*/_react["default"].createElement("span", {
+    }, "\u5206\u4EAB\u4E86\u4E00\u5802\u597D\u8BFE"), /*#__PURE__*/_react["default"].createElement("span", {
       className: prefix + "-desc-operate-type",
       style: {
         background: feedTypeColor
       }
     }));
   }, []);
+
+  var htmlToText = function htmlToText(text) {
+    var div = document.createElement('div');
+    div.innerHTML = text;
+    text = div.innerText || div.textContent;
+    return text;
+  };
+
+  var handleClick = function handleClick() {
+    window.open("".concat(window.location.origin, "/").concat(userId, "/eLearningHome").concat(data.shareUrl));
+  };
+
   (0, _react.useEffect)(function () {
     (0, _tools.highLightWord)({
       parentDom: contentRef.current,
       keyWord: searchKeyWord
     });
   }, [data, searchKeyWord]);
+  (0, _react.useEffect)(function () {
+    if (data.shareContent !== null) {
+      if (data.shareContent.charAt(0) === "{") {
+        setTitle(JSON.parse(data.shareContent).title);
+        setContent(htmlToText(JSON.parse(data.shareContent).content));
+      }
+    }
+  }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
   }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
@@ -91,19 +137,20 @@ var DynamicShare = function DynamicShare(_ref) {
   })), /*#__PURE__*/_react["default"].createElement("div", {
     ref: contentRef
   }, /*#__PURE__*/_react["default"].createElement(_dangerousHtml["default"], {
-    htmlText: "团队12312为当你把策划久别重逢后金"
+    htmlText: data.content
   }))), /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(prefix, "__share"))
+    className: (0, _classnames["default"])("".concat(prefix, "__share")),
+    onClick: handleClick
   }, /*#__PURE__*/_react["default"].createElement("img", {
-    src: _userPhoto["default"],
+    src: _guanlian["default"],
     className: (0, _classnames["default"])("".concat(prefix, "__share-img"))
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(prefix, "__share-right"))
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(prefix, "__share-right-title"))
-  }, "\u56E2\u961F\u5982\u4F55\u5F00\u59CB OKR \u4E4B\u65C5\uFF1F"), /*#__PURE__*/_react["default"].createElement("span", {
+  }, title), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(prefix, "__share-right-content"))
-  }, "\u591A\u5E74\u6765\uFF0C\u6211\u6709\u5E78\u4E00\u76F4\u5728\u521B\u65B0\u548C\u4EA4\u4ED8\u751F\u547D\u5468\u671F\u7684\u6240\u5FC5\u7ECF\u7684\u9636\u6BB5\u4E0A\u5DE5\u4F5C\u3002\u65E0\u8BBA\u662F\u5728\u6218\u7565\u3001\u4EA7\u54C1\u8FD8\u662F\u4EA4\u4ED8\u9636\u6BB5\uFF0C\u6211\u90FD\u53D1\u89C9\uFF0C\u5982\u4F55\u786E\u4FDD\u5C06\u4ECE\u6700\u521D\u7684\u60F3\u6CD5\u5E26\u5165\u4E16\u754C\uFF0C\u5BF9\u9886\u5BFC\u8005\u6765\u8BF4\u662F\u4E00\u4E2A\u591A\u4E48\u5927\u7684\u6311\u6218\u3002\u591A\u5E74\u6765\uFF0C\u6211\u6709\u5E78\u4E00\u76F4\u5728\u521B\u4EA4ncmjdksncjndskjcndjsk\u65E0\u8BBA\u662F\u5728\u6218\u7565\u3001\u4EA7\u54C1\u8FD8\u662F\u4EA4\u4ED8\u9636\u6BB5\uFF0C\u6211\u90FD\u53D1\u89C9\uFF0C\u5982\u4F55\u786E\u4FDD\u5C06\u65E0\u8BBA\u662F\u5728\u6218\u7565\u3001\u4EA7\u54C1\u8FD8\u662F\u4EA4\u4ED8\u9636\u6BB5\uFF0C\u6211\u90FD\u53D1\u89C9\uFF0C\u5982\u4F55\u786E\u4FDD\u5C06\u65E0\u8BBA\u662F\u5728\u6218\u7565\u3001\u4EA7\u54C1\u8FD8\u662F\u4EA4\u4ED8\u9636\u6BB5\uFF0C\u6211\u90FD\u53D1\u89C9\uFF0C\u5982\u4F55\u786E\u4FDD\u5C06\u65E0\u8BBA\u662F\u5728\u6218\u7565\u3001\u4EA7\u54C1\u8FD8\u662F\u4EA4\u4ED8\u9636\u6BB5\uFF0C\u6211\u90FD\u53D1\u89C9\uFF0C\u5982\u4F55\u786E\u4FDD\u5C06\u65E0\u8BBA\u662F\u5728\u6218\u7565\u3001\u4EA7\u54C1\u8FD8\u662F\u4EA4\u4ED8\u9636\u6BB5\uFF0C\u6211\u90FD\u53D1\u89C9\uFF0C\u5982\u4F55\u786E\u4FDD\u5C06\u65E0\u8BBA\u662F\u5728\u6218\u7565\u3001\u4EA7\u54C1\u8FD8\u662F\u4EA4\u4ED8\u9636\u6BB5\uFF0C\u6211\u90FD\u53D1\u89C9\uFF0C\u5982\u4F55\u786E\u4FDD\u5C06\u65E0\u8BBA\u662F\u5728\u6218\u7565\u3001\u4EA7\u54C1\u8FD8\u662F\u4EA4\u4ED8\u9636\u6BB5\uFF0C\u6211\u90FD\u53D1\u89C9\uFF0C\u5982\u4F55\u786E\u4FDD\u5C06\u5982\u4F55\u786E\u4FDD\u5C06\u5982\u4F55\u786E\u4FDD\u5C06\u5982\u4F55\u786E\u4FDD\u5C06"))));
+  }, content))));
 };
 
 var _default = DynamicShare;

package/lib/components/dynamic/dynamic-item/index.js

@@ -47,6 +47,8 @@ var _dynamicReward = _interopRequireDefault(require("./dynamic-reward"));
 
 var _dynamicMilestone = _interopRequireDefault(require("./dynamic-milestone"));
 
+var _dynamicShareToDynamic = _interopRequireDefault(require("./dynamic-share-to-dynamic"));
+
 var _bsGlobal = require("../../../utils/bs-global");
 
 var _avatar = _interopRequireDefault(require("../../avatar"));
@@ -226,11 +228,17 @@ var DynamicItem = function DynamicItem(_ref) {
         });
 
       case _constant.EFeedType.Share:
-        return /*#__PURE__*/_react["default"].createElement(_dynamicShare["default"], {
-          data: data,
-          onDeleteFeed: onDeleteFeed,
-          hasDynamicOpereateAuth: hasDynamicOpereateAuth
-        });
+        if (data.shareType === 0) {
+          return /*#__PURE__*/_react["default"].createElement(_dynamicShare["default"], {
+            data: data,
+            onDeleteFeed: onDeleteFeed,
+            hasDynamicOpereateAuth: hasDynamicOpereateAuth
+          });
+        } else {
+          return /*#__PURE__*/_react["default"].createElement(_dynamicShareToDynamic["default"], {
+            data: data
+          });
+        }
 
       case _constant.EFeedType.Assessment:
         return /*#__PURE__*/_react["default"].createElement(_dynamicAssessment["default"], {

package/lib/components/nav-top/components/menu/index.css

@@ -92,3 +92,91 @@
   max-width: 100%;
   position: relative;
 }
+
+.titaui-nav-top-menu__tips {
+  position: relative;
+}
+
+.titaui-nav-top-menu__tips-new {
+  width: 36px;
+  height: 26px;
+  position: absolute;
+  top: 6px;
+  right: -8px;
+}
+
+.titaui-nav-top-menu__tips-box {
+  width: 308px;
+  height: 142px;
+  box-sizing: border-box;
+  padding: 16px;
+  background: #2879ff;
+  box-shadow: 0px -4px 12px 0px rgba(127, 145, 180, 0.2);
+  border: 1px solid #eff0f1;
+  border-radius: 12px;
+  z-index: 99;
+}
+
+.titaui-nav-top-menu__tips-box-title {
+  display: block;
+  font-size: 14px;
+  color: #ffffff;
+  line-height: 18px;
+}
+
+.titaui-nav-top-menu__tips-box-content {
+  font-size: 12px;
+  color: #ffffff;
+  line-height: 22px;
+  margin-top: 10px;
+  margin-left: 20px;
+}
+
+.titaui-nav-top-menu__tips-box-ok {
+  width: 64px;
+  height: 28px;
+  margin-top: 8px;
+  margin-left: 210px;
+  background: #ffffff;
+  box-shadow: 0px -4px 12px 0px rgba(127, 145, 180, 0.2);
+  border-radius: 14px;
+  box-sizing: border-box;
+  padding: 3px 18px;
+  font-size: 14px;
+  color: #2879FF;
+  line-height: 22px;
+  cursor: pointer;
+}
+
+.titaui-nav-top-menu__tips-triangle {
+  position: absolute;
+  top: -4px;
+  left: 50%;
+  margin-left: -4px;
+  width: 0;
+  height: 0;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 5px solid #fff;
+}
+
+.titaui-nav-top-menu__tips-triangle::after {
+  content: "";
+  width: 0;
+  height: 0;
+  position: absolute;
+  left: -4px;
+  top: 2px;
+  border-left: solid 4px transparent;
+  border-right: solid 4px transparent;
+  border-bottom: solid 4px #2879ff;
+  z-index: 99;
+}
+
+.titaui-nav-top-menu__tips-hide {
+  display: none;
+}
+
+.titaui-nav-top-menu .rc-overflow-item {
+  position: relative;
+}

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

@@ -15,6 +15,10 @@ var _popup = _interopRequireDefault(require("../../../popup"));
 
 var _rcOverflow = _interopRequireDefault(require("rc-overflow"));
 
+var _conditionRender = _interopRequireDefault(require("../../../../components/condition-render"));
+
+var _new = _interopRequireDefault(require("./img/new.png"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -37,7 +41,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var prefix = "titaui-nav-top-menu";
+var prefix = 'titaui-nav-top-menu';
 var popupAlign = {
   offset: [0, 5],
   overflow: {
@@ -49,16 +53,24 @@ var popupAlign = {
 
 var Menu = function Menu(_ref) {
   var menus = _ref.menus,
-      activeMenuId = _ref.activeMenuId;
+      activeMenuId = _ref.activeMenuId,
+      isShowTips = _ref.isShowTips;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       popupVisible = _useState2[0],
       setPopupVisible = _useState2[1];
 
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      isKnow = _useState4[0],
+      setIsKonw = _useState4[1];
+
   var containerRef = (0, _react.useRef)(); // @ts-ignore
 
-  var apiPath = BSGlobal.apiPath;
+  var apiPath = BSGlobal.apiPath; // @ts-ignore
+
+  var userId = BSGlobal.loginUserInfo.Id;
 
   var handlePopupVisibleChange = function handlePopupVisibleChange(visible) {
     setPopupVisible(visible);
@@ -74,9 +86,40 @@ var Menu = function Menu(_ref) {
     });
   };
 
+  var handleClick = function handleClick() {
+    setIsKonw(true);
+    localStorage.setItem("isKonwLearning", "true");
+  };
+
+  var popupAlign2 = {
+    offset: [104, -5],
+    overflow: {
+      adjustX: true,
+      adjustY: true
+    },
+    targetOffset: [0, 0]
+  };
+
+  var popup = /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__tips")
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(prefix, "__tips-box"), _defineProperty({}, "".concat(prefix, "__tips-hide"), isKnow))
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__tips-box-title")
+  }, "\uD83C\uDF89  Tita Learning \u4E0A\u7EBF\u5566"), /*#__PURE__*/_react["default"].createElement("p", {
+    className: "".concat(prefix, "__tips-box-content")
+  }, "OKR \u5B66\u4E60\u8D44\u6599\uFF0COKR \u63A8\u8FDB\u65B9\u6CD5\uFF0COKR\u6559\u7EC3\u5728\u7EBF", /*#__PURE__*/_react["default"].createElement("br", null), "\u6307\u5BFC\uFF0C\u901A\u901A\u90FD\u5728\u8FD9\u91CC\uFF01\u5FEB\u6765\u770B\u770B\u5427\uFF01"), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__tips-box-ok"),
+    onClick: handleClick
+  }, "\u597D\u54D2")), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(prefix, "__tips-triangle"), _defineProperty({}, "".concat(prefix, "__tips-hide"), isKnow))
+  }));
+
   var renderRawItem = function renderRawItem(menu) {
     return /*#__PURE__*/_react["default"].createElement(_rcOverflow["default"].Item, {
       component: "span"
+    }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+      condition: menu.id !== 44312
     }, /*#__PURE__*/_react["default"].createElement("a", {
       className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), _defineProperty({}, "".concat(prefix, "__menu-show--active"), activeMenuId == menu.id)),
       href: "".concat(menu.href),
@@ -84,7 +127,25 @@ var Menu = function Menu(_ref) {
       onClick: function onClick() {
         return handleTracker(menu);
       }
-    }, menu.title));
+    }, menu.title)), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+      condition: menu.id === 44312
+    }, /*#__PURE__*/_react["default"].createElement(_popup["default"], {
+      popupVisible: isShowTips,
+      popup: popup,
+      mask: false,
+      action: ['focus'],
+      popupAlign: popupAlign2
+    }, /*#__PURE__*/_react["default"].createElement("a", {
+      className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), _defineProperty({}, "".concat(prefix, "__menu-show--active"), activeMenuId == menu.id)),
+      href: "".concat(apiPath, "/").concat(userId, "/eLearningHome#/"),
+      target: "_self",
+      onClick: function onClick() {
+        return handleTracker(menu);
+      }
+    }, menu.title)), /*#__PURE__*/_react["default"].createElement("img", {
+      src: _new["default"],
+      className: "".concat(prefix, "__tips-new")
+    })));
   };
 
   var renderRest = function renderRest(items) {
@@ -96,12 +157,21 @@ var Menu = function Menu(_ref) {
     var popContent = /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__hide-menus")
     }, items.map(function (menu) {
-      return /*#__PURE__*/_react["default"].createElement("a", {
+      return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+        condition: menu.id !== 44312
+      }, /*#__PURE__*/_react["default"].createElement("a", {
         className: (0, _classnames["default"])("".concat(prefix, "__menu-hide"), _defineProperty({}, "".concat(prefix, "__menu-hide--active"), activeMenuId == menu.id)),
         href: "".concat(menu.href),
         key: menu.id,
         target: "_self"
-      }, menu.title);
+      }, menu.title)), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+        condition: menu.id === 44312
+      }, /*#__PURE__*/_react["default"].createElement("a", {
+        className: (0, _classnames["default"])("".concat(prefix, "__menu-hide"), _defineProperty({}, "".concat(prefix, "__menu-hide--active"), activeMenuId == menu.id)),
+        href: "".concat(apiPath, "/").concat(userId, "/eLearningHome#/"),
+        key: menu.id,
+        target: "_self"
+      }, menu.title)));
     }));
 
     return /*#__PURE__*/_react["default"].createElement(_popup["default"], {
@@ -111,7 +181,7 @@ var Menu = function Menu(_ref) {
       popupPlacement: "bottomLeft",
       popupAlign: popupAlign
     }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("tu-icon-diot", "".concat(prefix, "__more-icon"), _defineProperty({}, "".concat(prefix, "__more-icon--active"), isActiveHideMeun))
+      className: (0, _classnames["default"])('tu-icon-diot', "".concat(prefix, "__more-icon"), _defineProperty({}, "".concat(prefix, "__more-icon--active"), isActiveHideMeun))
     }));
   };
 
@@ -122,7 +192,7 @@ var Menu = function Menu(_ref) {
     data: menus,
     renderRawItem: renderRawItem,
     renderRest: renderRest,
-    maxCount: "responsive"
+    maxCount: 'responsive'
   }));
 };
 

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

@@ -76,12 +76,30 @@ var Inform = function Inform(props) {
     if (messageType == 135) {
       var redisKey = item.content.match(/redisKey=(\S*?)"/)[1]; // @ts-ignore
 
-      Talent.app.vent.trigger('open-weekly-report-modal', redisKey);
+      Talent.app.vent.trigger("open-weekly-report-modal", redisKey);
+      return;
+    }
+
+    if (messageType === 99) {
+      var _options = {
+        width: 680,
+        showScroll: false,
+        type: 'message',
+        // 推屏类型
+        data: {
+          type: 'okrDashBoard',
+          // 消息类型
+          objId: item.messageId,
+          objType: messageType
+        }
+      }; // @ts-ignore
+
+      Talent.app.vent.trigger('openReactScreenPush', _options);
       return;
     } // 处理合并的消息
 
 
-    var isMessageMerging = [83, 93, 94, 95, 96, 97, 98, 99, 100, 131, 136, 13018, 30362].includes(messageType);
+    var isMessageMerging = messageType == 13018 || messageType == 30362 || messageType == 131;
 
     if (!isMessageMerging) {
       if (messageType === _constant.informType.details) {
@@ -93,11 +111,11 @@ var Inform = function Inform(props) {
       } else if (objType === 0) {
         var str = item.content.match(/\/\/.*?[\"|\']/gi);
         if (!str) return;
-        str = str.join('');
+        str = str.join("");
         var url = str.slice(0, str.length - 1);
 
         if (url) {
-          if (item.content.indexOf('点击此处下载') !== -1) {
+          if (item.content.indexOf("点击此处下载") !== -1) {
             window.open(url, '_self');
           }
 
@@ -120,7 +138,7 @@ var Inform = function Inform(props) {
         var _str = item.content.match(/\/\/.*?[\"|\']/gi);
 
         if (!_str) return;
-        _str = _str.join('');
+        _str = _str.join("");
 
         var _url2 = _str.slice(0, _str.length - 1);
 
@@ -130,7 +148,7 @@ var Inform = function Inform(props) {
         var _str2 = item.content.match(/https:.*?[\"|\']/gi);
 
         if (!_str2) return;
-        _str2 = _str2.join('');
+        _str2 = _str2.join("");
 
         var _url3 = _str2.slice(0, _str2.length - 1);
 
@@ -153,37 +171,56 @@ var Inform = function Inform(props) {
       }
     }
 
-    var notificationType = 'e-report'; // E-周报提醒消息合并
-
-    var content = domRef.current.textContent;
+    var type = 'eReport'; // E-周报提醒消息合并
 
     if (messageType == '83') {
       // 项目，目标进展提醒消息合并
-      notificationType = 'project-objective';
+      type = 'objective';
     } else if (Number(messageType) > 93 && Number(messageType) <= 100) {
       // OKR 仪表盘消息提醒
-      notificationType = 'okr-dashBoard';
-    } else if (messageType == 131 || messageType == 136) {
-      notificationType = 'performance';
-      content = item.content;
+      type = 'okrDashBoard';
+    } else if (messageType == 131) {
+      type = 'performance';
     }
 
-    _drawerManager["default"].open('NotificationMergeDetail', {
-      config: {
-        content: content,
-        messageId: item.messageId,
-        messageType: item.messageType,
-        notificationDate: item.createTime,
-        notificationType: notificationType,
-        objId: item.objId,
-        objType: item.objType
+    var options = {
+      width: 680,
+      showScroll: true,
+      type: 'message',
+      // 推屏类型
+      data: {
+        type: type,
+        // 消息类型
+        objId: item.messageId,
+        objType: messageType,
+        startDate: '',
+        endDate: ''
       }
-    }, {
-      width: 680
-    });
+    };
+
+    if (messageType == 83) {
+      options.data.objType = messageType;
+      options.data.startDate = item.createTime;
+    } else if (messageType > 93 && messageType <= 100) {
+      options.data.startDate = item.createTime;
+    } else if (messageType == 131) {
+      options.data.objType = item.objId.split('_')[0];
+      options.data.startDate = item.objId.split('_')[1];
+      options.data.endDate = item.objId.split('_')[2];
+    } else {
+      var regex = /\（(.+?)\）/g,
+          content = domRef.current.textContent;
+      var date = [];
+      date = content.match(regex);
+      options.data.startDate = date[0].slice(1, date[0].length - 1).split('-')[0]; // @ts-ignore
+
+      options.data.endDate = date[0].slice(1, date[0].length - 1).split('-')[1];
+    } // @ts-ignore
+
+
+    Talent.app.vent.trigger('openReactScreenPush', options);
   };
 
-  ;
   return /*#__PURE__*/_react["default"].createElement("li", {
     className: (0, _classnames["default"])("".concat(preCls, "__item"), _defineProperty({}, "".concat(preCls, "__item--scroll"), informs.length >= 4)),
     key: item.messageId,

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

@@ -72,6 +72,11 @@ var NavTop = function NavTop() {
       activeMenuId = _useState4[0],
       setActiveMenuId = _useState4[1];
 
+  var _useState5 = (0, _react.useState)(true),
+      _useState6 = _slicedToArray(_useState5, 2),
+      isShowTips = _useState6[0],
+      setIsShowTips = _useState6[1];
+
   var ua = navigator.userAgent.toLowerCase();
   var showWxInvite = (0, _bsGlobal.getTenantInfo)().mainCorpId && ua.indexOf("micromessenger") != -1;
   var openWxInvite = (0, _react.useCallback)(function () {
@@ -130,6 +135,11 @@ var NavTop = function NavTop() {
   (0, _react.useEffect)(function () {
     handleHashChange();
     window.addEventListener("hashchange", handleHashChange);
+
+    if (!localStorage.getItem("isKonwLearning")) {
+      setIsShowTips(false);
+    }
+
     return function () {
       window.removeEventListener("hashchange", handleHashChange);
     };
@@ -153,7 +163,8 @@ var NavTop = function NavTop() {
     className: (0, _classnames["default"])("".concat(preCls, "__middle"))
   }, /*#__PURE__*/_react["default"].createElement(_menu["default"], {
     menus: menu,
-    activeMenuId: activeMenuId
+    activeMenuId: activeMenuId,
+    isShowTips: isShowTips
   })), showWxInvite && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__invite")),
     onClick: openWxInvite

package/lib/components/okrcase-library/okrcases-components/caseLibrary-cardList/okrcase-card.js

@@ -147,7 +147,12 @@ var OkrCaseCard = function OkrCaseCard(props) {
     }, " ", item.name));
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "okr-cases-library__cardList__card__footer"
-  }, /*#__PURE__*/_react["default"].createElement("div", null, usedNumber, "\u6B21\u5957\u7528"), /*#__PURE__*/_react["default"].createElement("div", null, hasLike ? /*#__PURE__*/_react["default"].createElement("img", {
+  }, /*#__PURE__*/_react["default"].createElement("div", null, usedNumber, "\u6B21\u5957\u7528"), /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      display: 'flex',
+      alignItems: 'center'
+    }
+  }, hasLike ? /*#__PURE__*/_react["default"].createElement("img", {
     src: require("../../image/thumb-up.svg"),
     onClick: function onClick() {
       return handleLikeClick(hasLike, id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.7.76",
+  "version": "1.7.77",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",

package/yarn-error.log

@@ -0,0 +1,103 @@
+Arguments: 
+  /usr/local/bin/node /usr/local/bin/yarn
+
+PATH: 
+  /opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin:/opt/homebrew/bin:/opt/homebrew/sbin
+
+Yarn version: 
+  1.22.10
+
+Node version: 
+  12.22.1
+
+Platform: 
+  darwin x64
+
+Trace: 
+  SyntaxError: /Users/yang/tita/titaui-pc/package.json: Unexpected token < in JSON at position 26
+      at JSON.parse (<anonymous>)
+      at /usr/local/lib/node_modules/yarn/lib/cli.js:1625:59
+      at Generator.next (<anonymous>)
+      at step (/usr/local/lib/node_modules/yarn/lib/cli.js:310:30)
+      at /usr/local/lib/node_modules/yarn/lib/cli.js:321:13
+
+npm manifest: 
+  {
+    "name": "@titaui/pc",
+  <<<<<<< HEAD
+    "version": "1.2.22",
+  =======
+    "version": "1.2.13",
+  >>>>>>> master
+    "nameCN": "",
+    "description": "",
+    "main": "src/index.js",
+    "scripts": {
+      "storybook": "start-storybook -p 6006 --no-dll",
+      "start": "dev_server=on webpack-dev-server --disableHostCheck=true --progress --colors  --config webpack-stories.config.js",
+      "build-storybook": "build-storybook --docs --no-dll",
+      "build:es": "babel src -d es --ignore **/__tests__",
+      "build:lib": "cross-env OUTPUT_MODULE=commonjs babel src -d lib --ignore **/__tests__",
+      "build:umd": "webpack --config ./.scripts/webpack.umd.js",
+      "build": "npm run build:lib && npm run build:es && npm run build:umd"
+    },
+    "author": "",
+    "license": "ISC",
+    "devDependencies": {
+      "del": "^6.0.0",
+      "gulp": "^3.x",
+      "gulp-autoprefixer": "^7.0.1",
+      "gulp-babel": "^8.0.0",
+      "gulp-concat": "^2.6.1",
+      "gulp-cssbeautify": "^3.0.0",
+      "gulp-cssnano": "^2.1.3",
+      "gulp-filesize": "0.0.6",
+      "gulp-postcss": "^9.0.0",
+      "gulp-rename": "^2.0.0",
+      "gulp-replace": "^1.0.0",
+      "gulp-sass": "^4.1.0",
+      "gulp-sourcemaps": "^2.6.5",
+      "sass-resources-loader": "^2.2.1"
+    },
+    "dependencies": {
+      "@titaui/dagre": "^0.8.8-pre",
+      "@titaui/rc-tree2": "^4.1.15",
+      "@titaui/rc-trigger": "^5.2.5",
+      "@titaui/react-flow-renderer": "9.5.4",
+      "@titaui/toast": "^1.0.0",
+      "axios": "^0.21.1",
+      "classnames": "^2.2.6",
+      "clone-deep": "^4.0.1",
+      "d3-cloud": "^1.2.5",
+      "dayjs": "^1.10.4",
+      "html2canvas": "^1.0.0-rc.7",
+      "moment": "^2.29.1",
+      "qs": "^6.10.1",
+      "rc-checkbox": "^2.3.2",
+      "rc-dialog": "8.5.2",
+      "rc-drawer": "^4.3.1",
+      "rc-input-number": "^5.0.0",
+      "rc-pagination": "^3.1.6",
+      "rc-queue-anim": "1.4.1",
+      "rc-select": "^12.1.7",
+      "rc-switch": "^3.2.2",
+      "rc-table": "^7.13.2",
+      "rc-tabs": "^11.7.3",
+      "rc-tooltip": "^5.1.1",
+      "rc-tree": "^4.1.5",
+      "rc-trigger": "^5.2.3",
+      "rc-upload": "^4.2.0-alpha.0",
+      "rc-util": "^5.13.1",
+      "react-collapse": "^5.1.0",
+      "react-perfect-scrollbar": "^1.5.2",
+      "url-parse": "^1.5.1",
+      "uuid": "^3.1.0",
+      "wordcloud": "^1.2.2"
+    }
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  No lockfile