@titaui/pc 1.7.49 → 1.7.50

package/lib/components/dynamic/quick-operation/index.js

@@ -76,8 +76,7 @@ var DynamicQuickOperation = function DynamicQuickOperation(_ref) {
         "objType": 4,
         "AppId": 1,
         "AppType": 1,
-        "TaskType": 0,
-        "WorkMileStoneId": ""
+        "TaskType": 0
       }
     }).then(function () {
       _toast["default"].Success("发布成功", {

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

@@ -78,6 +78,24 @@ var Inform = function Inform(props) {
 
       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;
     } // 处理合并的消息
 
 

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

@@ -126,8 +126,6 @@ var OkrTree = function OkrTree() {
   };
 
   (0, _react.useEffect)(function () {
-    console.log(treeNodes);
-
     if (contentRef.current) {
       contentRef.current.addEventListener("scroll", setScorll, true);
     }
@@ -137,11 +135,12 @@ var OkrTree = function OkrTree() {
     };
   }, [treeNodes]);
 
-  var formatKrNodes = function formatKrNodes(krs) {
+  var formatKrNodes = function formatKrNodes(krs, o) {
     return krs.map(function (item, index) {
       var checked = !!selected.find(function (i) {
         return i.id == item.feedId;
       });
+      item['workName'] = o.workName;
       return {
         key: "".concat(item.feedId),
         nodeType: "kr-node",
@@ -167,7 +166,7 @@ var OkrTree = function OkrTree() {
         title: "",
         children: formatKrNodes(Krs.filter(function (item) {
           return item.mileStoneId !== 0;
-        })),
+        }), item),
         data: item,
         checked: checked,
         disabled: !checked && selectedRoots.includes(item.workId)

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

@@ -114,8 +114,6 @@ var WorkTree = function WorkTree() {
   };
 
   (0, _react.useEffect)(function () {
-    console.log(treeNodes);
-
     if (contentRef.current) {
       contentRef.current.addEventListener("scroll", setScorll, true);
     }
@@ -125,11 +123,12 @@ var WorkTree = function WorkTree() {
     };
   }, [treeNodes]);
 
-  var formatKrNodes = function formatKrNodes(krs) {
+  var formatKrNodes = function formatKrNodes(krs, work) {
     return krs.map(function (item, key) {
       var checked = !!selected.find(function (i) {
         return i.id == "mileStoneId-".concat(item.mileStoneId);
       });
+      item['workName'] = work.WorkName;
       return {
         key: "mileStoneId-".concat(item.mileStoneId),
         nodeType: "milestone",
@@ -153,7 +152,7 @@ var WorkTree = function WorkTree() {
         key: item.WorkId,
         nodeType: "work-node",
         title: "",
-        children: formatKrNodes(mileStones || []),
+        children: formatKrNodes(mileStones || [], item),
         data: item,
         checked: checked,
         disabled: !checked && selectedRoots.includes(item.WorkId)

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

@@ -64,7 +64,8 @@ var KrNode = function KrNode(props) {
       workId: data.workId,
       krId: data.mileStoneId,
       id: data.feedId,
-      name: data.mileStoneName
+      name: data.mileStoneName,
+      workName: data.workName
     });
     !checked && removeSelected(data.feedId);
   };

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

@@ -69,7 +69,8 @@ var MileStone = function MileStone(props) {
       workId: data.workId,
       krId: data.mileStoneId,
       id: "mileStoneId-".concat(data.mileStoneId),
-      name: data.mileStoneName
+      name: data.mileStoneName,
+      workName: data.workName
     });
     !checked && removeSelected("mileStoneId-".concat(data.mileStoneId));
   };

package/package.json

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