@titaui/pc 1.7.48 → 1.7.49

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

@@ -87,14 +87,13 @@ var Inform = function Inform(props) {
       if (messageType === _constant.informType.details) {
         (0, _tools.openPage)("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/taskinfo?Id=").concat(item.objId));
         return;
-      } 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 (objType === 0) {
-        var str = item.content.match(/\/\/.*?[\"|\']/gi).join("");
+        var str = item.content.match(/\/\/.*?[\"|\']/gi);
+        if (!str) return;
+        str = str.join("");
         var url = str.slice(0, str.length - 1);
 
         if (url) {
@@ -118,20 +117,37 @@ var Inform = function Inform(props) {
         window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#/work?iTalentNavCode=tita-work&work_id=").concat(objId));
         return;
       } else if (objType === _constant.informType.plan) {
-        var _str = item.content.match(/\/\/.*?[\"|\']/gi).join("");
+        var _str = item.content.match(/\/\/.*?[\"|\']/gi);
+
+        if (!_str) return;
+        _str = _str.join("");
 
         var _url2 = _str.slice(0, _str.length - 1);
 
         (0, _tools.openPage)(_url2);
+        return;
+      } else if (objType === _constant.informType.remindLeader) {
+        var _str2 = item.content.match(/https:.*?[\"|\']/gi);
+
+        if (!_str2) return;
+        _str2 = _str2.join("");
+
+        var _url3 = _str2.slice(0, _str2.length - 1);
+
+        (0, _tools.openPage)(_url3);
+        return;
+      } else if (objId && objType !== 8) {
+        window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#work?work_id=").concat(item.objId));
+        return;
       } else {
         var reg = /href='.*?(?=')/g;
-        var _url3 = '';
+        var _url4 = '';
         item.content.replace(reg, function ($0) {
-          _url3 = $0.slice(6);
+          _url4 = $0.slice(6);
         });
 
-        if (_url3) {
-          (0, _tools.openPage)(_url3);
+        if (_url4) {
+          (0, _tools.openPage)(_url4);
           return;
         }
       }

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

@@ -25,14 +25,16 @@ var informType = {
   //进入项目
   "details": 69,
   //查看详情
-  "daily": 55,
+  "daily1": 0,
   //日报月报周报
   "todayJob": 81,
   //进入今日工作
-  "Okr": 0,
-  //Okr
+  "Okr": 83,
   "okrRemind": 4,
-  "plan": 11 //计划
+  //okr提醒
+  "plan": 11,
+  //计划
+  "remindLeader": 74 //提醒上级邀请
 
 };
 exports.informType = informType;

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

@@ -108,7 +108,9 @@ var NavTop = function NavTop() {
 
     if (hash) {
       var activeMenu = menu.find(function (item) {
-        return hash.includes(item.href.split("#")[1].split('?')[0]);
+        var _item$href$split, _item$href$split$;
+
+        return hash.includes((_item$href$split = item.href.split("#")) === null || _item$href$split === void 0 ? void 0 : (_item$href$split$ = _item$href$split[1]) === null || _item$href$split$ === void 0 ? void 0 : _item$href$split$.split('?')[0]);
       });
 
       if (hash.includes('homepage')) {

package/lib/components/task-relation-modal/index.js

@@ -233,6 +233,7 @@ var TaskRelationModal = function TaskRelationModal(props) {
   };
 
   var removeSelected = function removeSelected(id) {
+    debugger;
     var newSelected = selected.filter(function (item) {
       return item.id !== id;
     });

package/lib/components/task-relation-modal/tree/okr-tree/index.js

@@ -126,6 +126,8 @@ var OkrTree = function OkrTree() {
   };
 
   (0, _react.useEffect)(function () {
+    console.log(treeNodes);
+
     if (contentRef.current) {
       contentRef.current.addEventListener("scroll", setScorll, true);
     }
@@ -138,10 +140,10 @@ var OkrTree = function OkrTree() {
   var formatKrNodes = function formatKrNodes(krs) {
     return krs.map(function (item, index) {
       var checked = !!selected.find(function (i) {
-        return i.id == item.mileStoneId;
+        return i.id == item.feedId;
       });
       return {
-        key: "".concat(item.mileStoneId),
+        key: "".concat(item.feedId),
         nodeType: "kr-node",
         data: item,
         title: "",
@@ -157,10 +159,10 @@ var OkrTree = function OkrTree() {
       var _item$Krs = item.Krs,
           Krs = _item$Krs === void 0 ? [] : _item$Krs;
       var checked = !!selected.find(function (i) {
-        return i.id == item.workId;
+        return i.id == item.feedId;
       });
       return {
-        key: item.workId,
+        key: item.feedId,
         nodeType: "o-node",
         title: "",
         children: formatKrNodes(Krs.filter(function (item) {

package/lib/components/task-relation-modal/tree/work-tree/index.js

@@ -114,6 +114,8 @@ var WorkTree = function WorkTree() {
   };
 
   (0, _react.useEffect)(function () {
+    console.log(treeNodes);
+
     if (contentRef.current) {
       contentRef.current.addEventListener("scroll", setScorll, true);
     }
@@ -126,10 +128,10 @@ var WorkTree = function WorkTree() {
   var formatKrNodes = function formatKrNodes(krs) {
     return krs.map(function (item, key) {
       var checked = !!selected.find(function (i) {
-        return i.id == item.mileStoneId;
+        return i.id == "mileStoneId-".concat(item.mileStoneId);
       });
       return {
-        key: item.mileStoneId,
+        key: "mileStoneId-".concat(item.mileStoneId),
         nodeType: "milestone",
         data: item,
         title: "",

package/lib/components/task-relation-modal/tree-node/kr-node/index.js

@@ -63,10 +63,10 @@ var KrNode = function KrNode(props) {
       type: "kr",
       workId: data.workId,
       krId: data.mileStoneId,
-      id: data.mileStoneId,
+      id: data.feedId,
       name: data.mileStoneName
     });
-    !checked && removeSelected(data.mileStoneId);
+    !checked && removeSelected(data.feedId);
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -84,7 +84,7 @@ var KrNode = function KrNode(props) {
     className: "".concat(precls, "__checkbox")
   }, /*#__PURE__*/_react["default"].createElement(_radio["default"], {
     onChange: onCheckHandler,
-    id: data.mileStoneId,
+    id: data.feedId,
     checked: checked
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(precls, "__pointer"), _defineProperty({}, "".concat(precls, "__pointer-first"), krIndex === 1))

package/lib/components/task-relation-modal/tree-node/milestone-node/index.js

@@ -68,10 +68,10 @@ var MileStone = function MileStone(props) {
       type: "milestone",
       workId: data.workId,
       krId: data.mileStoneId,
-      id: data.mileStoneId,
+      id: "mileStoneId-".concat(data.mileStoneId),
       name: data.mileStoneName
     });
-    !checked && removeSelected(data.mileStoneId);
+    !checked && removeSelected("mileStoneId-".concat(data.mileStoneId));
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/task-relation-modal/tree-node/o-node/index.js

@@ -85,10 +85,10 @@ var ONode = function ONode(props) {
       type: "okr",
       workId: data.workId,
       krId: 0,
-      id: data.workId,
+      id: data.feedId,
       name: data.workName
     });
-    !checked && removeSelected(data.workId);
+    !checked && removeSelected(data.feedId);
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -106,7 +106,7 @@ var ONode = function ONode(props) {
     className: "".concat(precls, "__checkbox")
   }, /*#__PURE__*/_react["default"].createElement(_radio["default"], {
     onChange: onCheckHandler,
-    id: data.workId,
+    id: data.feedId,
     checked: checked
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__name")

package/package.json

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