@titaui/pc 1.6.25 → 1.6.29

package/lib/components/menus/components/menu-tree/index.js

@@ -17,7 +17,7 @@ var _precls = _interopRequireDefault(require("./precls"));
 
 require("./index.css");
 
-var _excluded = ["data", "defaultExpandedKeys", "onSelect", "loadData"];
+var _excluded = ["data", "defaultExpandedKeys", "onSelect", "loadData", "selectedKeys"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -32,6 +32,7 @@ var _default = function _default(props) {
       defaultExpandedKeys = props.defaultExpandedKeys,
       onSelect = props.onSelect,
       loadData = props.loadData,
+      selectedKeys = props.selectedKeys,
       restProps = _objectWithoutProperties(props, _excluded);
 
   var beforeSelectHandler = function beforeSelectHandler(node) {
@@ -48,6 +49,7 @@ var _default = function _default(props) {
     treeData: data,
     draggable: false,
     selectNodeHighlight: false,
+    selectedKeys: selectedKeys,
     defaultExpandedKeys: defaultExpandedKeys,
     titleRender: _treeNode["default"],
     className: _precls["default"],

package/lib/components/menus/components/menu-tree/tree-node/index.css

@@ -131,7 +131,7 @@
   font-size: 14px;
   color: #3f4755;
   line-height: 22px;
-  font-weight: 500;
+  font-weight: 400;
 }
 
 .titaui-menus-tree__menu-node-icon {
@@ -292,7 +292,7 @@
   font-size: 14px;
   color: #3f4755;
   line-height: 22px;
-  font-weight: 500;
+  font-weight: 400;
 }
 
 .titaui-menus-tree__company-all-node-icon {
@@ -385,7 +385,7 @@
   font-size: 14px;
   color: #3f4755;
   line-height: 22px;
-  font-weight: 500;
+  font-weight: 400;
 }
 
 .titaui-menus-tree__user-concern-node-icon {

package/lib/components/menus/components/menu-tree/tree-node/user-node/index.js

@@ -64,7 +64,7 @@ var _default = function _default(props) {
     user: user
   }), /*#__PURE__*/_react["default"].createElement("span", {
     style: {
-      'width': "calc(100% - ".concat(12 + 13 + level * 10, "px)")
+      'width': "calc(100% - ".concat(12 + 13 + 16 + level * 10, "px)")
     },
     className: (0, _classnames["default"])("".concat(_precls["default"], "__user-node-username"), "noselect")
   }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {

package/lib/components/menus/export-modules/appraisal-menus/index.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _reactRouter = require("react-router");
+
 var _flipMenuCard = _interopRequireDefault(require("../../components/flip-menu-card"));
 
 var _menuTree = _interopRequireDefault(require("../../components/menu-tree"));
@@ -41,9 +43,16 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var _default = function _default(props) {
+var AppraisalMenus = function AppraisalMenus(props) {
   var _props$onSelect = props.onSelect,
-      onSelect = _props$onSelect === void 0 ? function () {} : _props$onSelect;
+      onSelect = _props$onSelect === void 0 ? function () {} : _props$onSelect,
+      history = props.history;
+
+  var _useState = (0, _react.useState)([]),
+      _useState2 = _slicedToArray(_useState, 2),
+      selectedMenuKeys = _useState2[0],
+      setSelectedMenuKeys = _useState2[1];
+
   var menuRef = (0, _react.useRef)();
   var flipRef = (0, _react.useRef)({
     next: function next() {},
@@ -51,16 +60,30 @@ var _default = function _default(props) {
   });
   var okrMenusData = (0, _react.useRef)(_datas.defaultRefObject);
 
-  var _useState = (0, _react.useState)(function () {
+  var _useState3 = (0, _react.useState)(function () {
     okrMenusData.current = new _datas["default"]();
     return okrMenusData.current.getMenus();
   }),
-      _useState2 = _slicedToArray(_useState, 1),
-      menus = _useState2[0];
+      _useState4 = _slicedToArray(_useState3, 1),
+      menus = _useState4[0]; // 判断路由是 我的评价
+
+
+  (0, _react.useEffect)(function () {
+    var _history$location = history.location,
+        pathname = _history$location.pathname,
+        search = _history$location.search;
 
-  var onSelectHandler = function onSelectHandler(_, _ref) {
+    if (pathname.match(/performance/) && (!search || search.match(/reactRouterName[\s]*?=[\s]*?self/))) {
+      setSelectedMenuKeys(['my-appraisal']);
+    }
+  }, [history.location.pathname, history.location.search]);
+
+  var onSelectHandler = function onSelectHandler(selectedKyes, _ref) {
     var node = _ref.node;
-    onSelect(node);
+    onSelect(node); // 处理菜单选中
+
+    if (!selectedKyes.length) return;
+    setSelectedMenuKeys(selectedKyes);
   };
 
   var collapseMenu = function collapseMenu(isHide) {
@@ -82,8 +105,12 @@ var _default = function _default(props) {
     className: (0, _classnames["default"])("".concat(_precls["default"], "-appraisal-menus-tree"))
   }, /*#__PURE__*/_react["default"].createElement(_menuTree["default"], {
     data: menus,
+    selectedKeys: selectedMenuKeys,
     onSelect: onSelectHandler
   }))), /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null)));
-};
+}; // @ts-ignore
+
+
+var _default = (0, _reactRouter.withRouter)(AppraisalMenus);
 
 exports["default"] = _default;

package/lib/components/menus/export-modules/{depart-menus → okr-menus/depart-menus}/index.js

@@ -9,15 +9,13 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _reactRouter = require("react-router");
+var _menuTree = _interopRequireDefault(require("../../../components/menu-tree"));
 
-var _menuTree = _interopRequireDefault(require("../../components/menu-tree"));
+var _requestApis = require("../../../request-apis");
 
-var _requestApis = require("../../request-apis");
+var _utils = require("../../../utils");
 
-var _utils = require("../../utils");
-
-require("../../index.css");
+require("../../../index.css");
 
 require("./index.css");
 
@@ -47,8 +45,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var _default = (0, _reactRouter.withRouter)(function (_ref) {
-  var history = _ref.history;
+var _default = function _default() {
   var loadedNode = (0, _react.useRef)([]);
 
   var _useState = (0, _react.useState)([]),
@@ -68,17 +65,17 @@ var _default = (0, _reactRouter.withRouter)(function (_ref) {
   (0, _react.useEffect)(function () {
     (0, _requestApis.getDepsAndUsers)(-1, isGetUser).then(function (rawTreeData) {
       var rootNode = {
-        async: true,
-        data: {
+        'async': true,
+        'data': {
           id: 0,
           name: "公司全部"
         },
-        id: "0",
-        isLeaf: true,
-        key: 0,
-        nodeType: "depart-node",
-        pid: -1,
-        title: "公司全部"
+        'id': "0",
+        'isLeaf': true,
+        'key': 0,
+        'nodeType': "depart-node",
+        'pid': -1,
+        'title': "公司全部"
       };
       setRawTreeData([rootNode].concat(_toConsumableArray(rawTreeData)));
       setTreeData((0, _utils.toTree)([rootNode].concat(_toConsumableArray(rawTreeData))));
@@ -104,22 +101,14 @@ var _default = (0, _reactRouter.withRouter)(function (_ref) {
     });
   };
 
-  var onSelectHandler = function onSelectHandler(_id, _ref2) {
-    var node = _ref2.node;
+  var onSelectHandler = function onSelectHandler(_id, _ref) {
+    var node = _ref.node;
     var nodeType = node.nodeType,
         data = node.data;
 
     if (nodeType == "user") {
-      // history.push({
-      //   pathname: `/okr/manage?toUserId=${data.userId}`,
-      // });
-      // history.go();
       location.href = "#/okr/manage?toUserId=".concat(data.userId);
     } else if (nodeType == "depart-node") {
-      // history.push({
-      //   pathname: `/okr/manage?departmentName=${data.name}&departmentId=${data.id}`,
-      // });
-      // history.go();
       location.href = "#/okr/manage?departmentName=".concat(data.name, "&departmentId=").concat(data.id);
     }
   };
@@ -130,6 +119,6 @@ var _default = (0, _reactRouter.withRouter)(function (_ref) {
     defaultExpandedKeys: ["0"],
     loadData: onLoadTreeNodeDataHandler
   });
-});
+};
 
 exports["default"] = _default;

package/lib/components/menus/export-modules/okr-menus/index.js

@@ -13,9 +13,9 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _reactRouter = require("react-router");
 
-var _departMenus = _interopRequireDefault(require("../depart-menus"));
+var _departMenus = _interopRequireDefault(require("./depart-menus"));
 
-var _subordinateMenus = _interopRequireDefault(require("../subordinate-menus"));
+var _subordinateMenus = _interopRequireDefault(require("./subordinate-menus"));
 
 var _flipMenuCard = _interopRequireDefault(require("../../components/flip-menu-card"));
 
@@ -58,15 +58,20 @@ var OkrMenus = function OkrMenus(props) {
       onSelect = _props$onSelect === void 0 ? function () {} : _props$onSelect,
       history = props.history;
 
-  var _useState = (0, _react.useState)(""),
+  var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
-      flipBackType = _useState2[0],
-      setFlipBackType = _useState2[1];
+      selectedMenuKeys = _useState2[0],
+      setSelectedMenuKeys = _useState2[1];
 
-  var _useState3 = (0, _react.useState)({}),
+  var _useState3 = (0, _react.useState)(""),
       _useState4 = _slicedToArray(_useState3, 2),
-      flipOptions = _useState4[0],
-      setFlipOptions = _useState4[1];
+      flipBackType = _useState4[0],
+      setFlipBackType = _useState4[1];
+
+  var _useState5 = (0, _react.useState)({}),
+      _useState6 = _slicedToArray(_useState5, 2),
+      flipOptions = _useState6[0],
+      setFlipOptions = _useState6[1];
 
   var menuRef = (0, _react.useRef)();
   var flipRef = (0, _react.useRef)({
@@ -75,35 +80,41 @@ var OkrMenus = function OkrMenus(props) {
   });
   var okrMenusData = (0, _react.useRef)(_datas.defaultRefObject);
 
-  var _useState5 = (0, _react.useState)(function () {
+  var _useState7 = (0, _react.useState)(function () {
     okrMenusData.current = new _datas["default"]();
     return okrMenusData.current.getMenus();
   }),
-      _useState6 = _slicedToArray(_useState5, 2),
-      menus = _useState6[0],
-      setMenus = _useState6[1];
+      _useState8 = _slicedToArray(_useState7, 2),
+      menus = _useState8[0],
+      setMenus = _useState8[1]; // 判断路由是 我的OKR
+
+
+  (0, _react.useEffect)(function () {
+    var _history$location = history.location,
+        pathname = _history$location.pathname,
+        search = _history$location.search;
 
-  var onSelectHandler = function onSelectHandler(_, _ref) {
+    if (pathname.match(/okr\/manage/) && search.match(/relation[\s]*?=[\s]*?1/)) {
+      setSelectedMenuKeys(['myownerokr']);
+    }
+  }, [history.location.pathname, history.location.search]);
+
+  var onSelectHandler = function onSelectHandler(selectedKyes, _ref) {
     var node = _ref.node;
     var nodeType = node.nodeType,
         data = node.data;
 
     if (nodeType == "user" || nodeType == "follower") {
-      // history.push({
-      //   pathname: `/okr/manage?toUserId=${data.userId}`,
-      // });
-      // history.go();
       location.href = "#/okr/manage?toUserId=".concat(data.userId);
     }
 
-    onSelect(node);
+    onSelect(node); // 处理菜单选中
+
+    if (!selectedKyes.length) return;
+    setSelectedMenuKeys(selectedKyes);
   };
 
   var onUserSelectHandler = function onUserSelectHandler(user) {
-    // history.push({
-    //   pathname: `/okr/manage?toUserId=${user.id}`,
-    // });
-    // history.go();
     location.href = "#/okr/manage?toUserId=".concat(user.id);
   }; // 获取关注的人数据列表
 
@@ -211,7 +222,7 @@ var OkrMenus = function OkrMenus(props) {
     defaultWidth: 180
   }, /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      marginBottom: 12
+      'marginBottom': 12
     }
   }, /*#__PURE__*/_react["default"].createElement(_searchColleague["default"], {
     onSelect: onUserSelectHandler
@@ -220,12 +231,14 @@ var OkrMenus = function OkrMenus(props) {
   }, /*#__PURE__*/_react["default"].createElement(_menuTree["default"], {
     data: menus,
     onSelect: onSelectHandler,
-    defaultExpandedKeys: ["myokr"],
+    defaultExpandedKeys: ['myokr'],
+    selectedKeys: selectedMenuKeys,
     loadData: onLoadTreeNodeDataHandler
   }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "-okr-menus-back"), "tita-bootstrap__scrollbar")
   }, flipBackType == "depart" && /*#__PURE__*/_react["default"].createElement(_departMenus["default"], null), flipBackType == "subordinate" && /*#__PURE__*/_react["default"].createElement(_subordinateMenus["default"], flipOptions)))));
-};
+}; // @ts-ignore
+
 
 var _default = (0, _reactRouter.withRouter)(OkrMenus);
 

package/lib/components/menus/export-modules/{subordinate-menus → okr-menus/subordinate-menus}/index.js

@@ -9,13 +9,11 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _reactRouter = require("react-router");
+var _menuTree = _interopRequireDefault(require("../../../components/menu-tree"));
 
-var _menuTree = _interopRequireDefault(require("../../components/menu-tree"));
+var _requestApis = require("../../../request-apis");
 
-var _requestApis = require("../../request-apis");
-
-var _utils = require("../../utils");
+var _utils = require("../../../utils");
 
 var _helper = require("./helper");
 
@@ -37,9 +35,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var SubOrdinateMenus = function SubOrdinateMenus(props) {
-  var toUserId = props.toUserId,
-      history = props.history;
+var _default = function _default(props) {
+  var toUserId = props.toUserId;
   var loadedNode = (0, _react.useRef)([]);
 
   var _useState = (0, _react.useState)(false),
@@ -61,7 +58,7 @@ var SubOrdinateMenus = function SubOrdinateMenus(props) {
     setLoading(true);
     (0, _requestApis.getSubordinates)({
       toUserId: toUserId,
-      relationIds: "0,3"
+      'relationIds': "0,3"
     }).then(function (users) {
       var rawTreeData = (0, _helper.transToTreeNode)(users);
       setRawTreeData(rawTreeData);
@@ -95,12 +92,8 @@ var SubOrdinateMenus = function SubOrdinateMenus(props) {
     });
   };
 
-  var onSelectHandler = function onSelectHandler(_id, _ref) {
+  var onSelectHandler = function onSelectHandler(_, _ref) {
     var node = _ref.node;
-    // history.push({
-    //   pathname: `/okr/manage?toUserId=${node.id}`,
-    // });
-    // history.go();
     location.href = "#/okr/manage?toUserId=".concat(node.id);
   };
 
@@ -112,6 +105,4 @@ var SubOrdinateMenus = function SubOrdinateMenus(props) {
   }));
 };
 
-var _default = (0, _reactRouter.withRouter)(SubOrdinateMenus);
-
 exports["default"] = _default;

package/lib/components/menus/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.DepartMenus = void 0;
+exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -13,8 +13,6 @@ var _okrMenus = _interopRequireDefault(require("./export-modules/okr-menus"));
 
 var _appraisalMenus = _interopRequireDefault(require("./export-modules/appraisal-menus"));
 
-var _departMenus = _interopRequireDefault(require("./export-modules/depart-menus"));
-
 require("./index.css");
 
 var _excluded = ["type"];
@@ -46,6 +44,4 @@ var _default = function _default(props) {
   }, renderMenuByType());
 };
 
-exports["default"] = _default;
-var DepartMenus = _departMenus["default"];
-exports.DepartMenus = DepartMenus;
+exports["default"] = _default;

package/lib/components/menus/request-apis.js

@@ -7,7 +7,7 @@ exports.removeFollower = exports.getSubordinates = exports.getFollowerList = exp
 
 var _request = require("../../utils/request");
 
-var _helper = require("./export-modules/depart-menus/helper");
+var _helper = require("./export-modules/okr-menus/depart-menus/helper");
 
 var _axios = _interopRequireDefault(require("axios"));
 
@@ -105,8 +105,7 @@ var getDepsAndUsers = function getDepsAndUsers() {
         departments = _res$Data.departments,
         users = _res$Data.users;
     var transDeparts = (0, _helper.translateDepartsToTreeNode)(departments || []);
-    var transUsers = (0, _helper.translateUsersToTreeNode)(users || [], departmentId); // resolve && resolve([...transUsers, ...transDeparts])
-
+    var transUsers = (0, _helper.translateUsersToTreeNode)(users || [], departmentId);
     return [].concat(_toConsumableArray(transUsers), _toConsumableArray(transDeparts));
   });
 };

package/lib/components/nav-top/components/user-message/components/empty/index.js

@@ -11,7 +11,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _emptyImg = _interopRequireDefault(require("../../images/empty-img.svg"));
 
-var _conditionRender = _interopRequireDefault(require("../../../../../dynamic/components/condition-render"));
+var _conditionRender = _interopRequireDefault(require("../../../../../condition-render"));
 
 require("./index.css");
 

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

@@ -13,7 +13,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _rcVirtualList = _interopRequireDefault(require("rc-virtual-list"));
 
-var _conditionRender = _interopRequireDefault(require("../../../../../dynamic/components/condition-render"));
+var _conditionRender = _interopRequireDefault(require("../../../../../condition-render"));
 
 var _request = require("../../../../request.apis");
 
@@ -150,7 +150,7 @@ var Inform = function Inform(props) {
     className: (0, _classnames["default"])("".concat(preCls, "__footer"))
   }, /*#__PURE__*/_react["default"].createElement("a", {
     target: "_blank",
-    href: "".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/messages?messageType=2&tabAppId=1&tabAppType=1&isRead=1&messageSubNav=1"),
+    href: "".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/messages?messageType=2&tabAppId=1&tabAppType=1&isRead=2&messageSubNav=1"),
     className: (0, _classnames["default"])("".concat(preCls, "__footer-all"))
   }, "\u67E5\u770B\u5168\u90E8"))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: isLoading === false && informs.length === 0

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

@@ -19,6 +19,8 @@ var _utils = require("../../utils");
 
 var _constant = require("../../constant");
 
+var _manager = _interopRequireDefault(require("../../../../../drawer/manager"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -37,22 +39,98 @@ var Inform = function Inform(props) {
 
   var handleItemClick = function handleItemClick() {
     onItemClick && onItemClick(false);
-    var isMessageMerging = item.messageType == 13018 || item.messageType == 30362 || item.messageType == 131;
+    var objType = item.objType,
+        objId = item.objId,
+        messageType = item.messageType;
+
+    if (objType === _constant.EObjType.Kr) {
+      _manager["default"].open('krDetail', {
+        krId: objId
+      });
+
+      return;
+    }
+
+    if (objType === _constant.EObjType.O) {
+      _manager["default"].open('okrDetail', {
+        okrId: objId
+      });
+
+      return;
+    }
+
+    if (objType === _constant.EObjType.Task) {
+      window.Talent.app.vent.trigger('global-pull-screen', objId, 'task');
+      return;
+    } // 日报
+    // if () {
+    // 	// @ts-ignore
+    // 	Talent.app.vent.trigger("global-daily-detail-pull-screen", feedId);
+    // }
+    // 处理合并的消息
+
+
+    var isMessageMerging = messageType == 13018 || messageType == 30362 || messageType == 131;
 
     if (!isMessageMerging) {
-      window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/taskinfo?Id=").concat(item.objId), '_blank');
+      if (messageType === _constant.informType.details) {
+        window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/taskinfo?Id=").concat(item.objId), '_blank');
+      } else if (item.objId) {
+        window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#work?work_id=").concat(item.objId));
+      } 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"));
+      } 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);
+          }
+        }
+
+        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"));
+        } 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"));
+        } 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"));
+        }
+      } else {
+        if (item.objUrl) {
+          window.open(item.objUrl);
+        }
+      }
+
       return;
     }
 
     var type = 'eReport'; // E-周报提醒消息合并
 
-    if (item.messageType == '83') {
+    if (messageType == '83') {
       // 项目，目标进展提醒消息合并
       type = 'objective';
-    } else if (Number(item.messageType) > 93 && Number(item.messageType) <= 100) {
+    } else if (Number(messageType) > 93 && Number(messageType) <= 100) {
       // OKR 仪表盘消息提醒
       type = 'okrDashBoard';
-    } else if (item.messageType == 131) {
+    } else if (messageType == 131) {
       type = 'performance';
     }
 
@@ -65,18 +143,18 @@ var Inform = function Inform(props) {
         type: type,
         // 消息类型
         objId: item.messageId,
-        objType: item.messageType,
+        objType: messageType,
         startDate: '',
         endDate: ''
       }
     };
 
-    if (item.messageType == 83) {
-      options.data.objType = item.messageType;
+    if (messageType == 83) {
+      options.data.objType = messageType;
       options.data.startDate = item.createTime;
-    } else if (item.messageType > 93 && item.messageType <= 100) {
+    } else if (messageType > 93 && messageType <= 100) {
       options.data.startDate = item.createTime;
-    } else if (item.messageType == 131) {
+    } 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];
@@ -84,8 +162,7 @@ var Inform = function Inform(props) {
       var regex = /\（(.+?)\）/g,
           content = domRef.current.textContent;
       var date = [];
-      date = content.match(regex); // @ts-ignore
-
+      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];
@@ -113,9 +190,6 @@ var Inform = function Inform(props) {
     }
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__item-right"))
-  }, /*#__PURE__*/_react["default"].createElement("a", {
-    target: "_blank",
-    href: "".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/taskinfo?Id=").concat(item.objId)
   }, /*#__PURE__*/_react["default"].createElement("span", {
     ref: domRef
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -134,7 +208,7 @@ var Inform = function Inform(props) {
     mouseEnterDelay: 0.8
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__item-right-time"))
-  }, item.createTime)))));
+  }, item.createTime))));
 };
 
 var _default = Inform;

package/lib/components/nav-top/components/user-message/components/remind/index.js

@@ -13,7 +13,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _rcVirtualList = _interopRequireDefault(require("rc-virtual-list"));
 
-var _conditionRender = _interopRequireDefault(require("../../../../../dynamic/components/condition-render"));
+var _conditionRender = _interopRequireDefault(require("../../../../../condition-render"));
 
 var _request = require("../../../../../../utils/request");