@titaui/pc 1.10.7 → 1.10.8-2.beta-1

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

@@ -97,20 +97,34 @@ function _default(props) {
     }, {
       disabledDottedSubordinatesDig: true
     }).then(function (users) {
-      var rawTreeData = (0, _helper.transToTreeNode)(users);
-      setRawTreeData(rawTreeData);
-      setTreeData((0, _utils.toTree)(rawTreeData));
+      var rawTreeData = (0, _helper.transToTreeNode)(users); // 要过滤掉那些既是登录者的虚线下级，又是登录者下属的下级，让他默认展开的时候重新获取
+
+      var newRawTreeData = rawTreeData.filter(function (item) {
+        return item.pid === loginUserId;
+      });
+      setRawTreeData(newRawTreeData);
+      setTreeData((0, _utils.toTree)(newRawTreeData));
       setLoading(false);
     });
   }, []);
 
   var loadNodes = function loadNodes(nodeId) {
-    return (// 钻去隔级的直接下级
-      (0, _requestApis.getSubordinates)({
-        toUserId: nodeId,
-        relationIds: "1"
-      })
-    );
+    // 钻去隔级的直接下级
+    return (0, _requestApis.getSubordinates)({
+      toUserId: nodeId,
+      relationIds: "1"
+    });
+  };
+
+  var filterData = function filterData(newNode, oldNode) {
+    var mark = {};
+    newNode.forEach(function (item) {
+      mark[item.userId] = true;
+    });
+    var newArry = oldNode.filter(function (item) {
+      return !mark[item.id];
+    });
+    return newArry;
   };
 
   var onLoadTreeNodeDataHandler = function onLoadTreeNodeDataHandler(treeNode) {
@@ -119,12 +133,20 @@ function _default(props) {
       var promise = loadNodes(treeNode.id);
       if (!promise) return resolve(true);
       promise.then(function (nodes) {
+        var _treeNode$children;
+
         if (!nodes.length) return null;
+        var oldRawTreeData = rawTreeData;
+
+        if (treeNode !== null && treeNode !== void 0 && (_treeNode$children = treeNode.children) !== null && _treeNode$children !== void 0 && _treeNode$children.length) {
+          oldRawTreeData = filterData(nodes, oldRawTreeData);
+        }
+
         (0, _helper.transToTreeNode)(nodes).forEach(function (it) {
-          return rawTreeData.push(it);
+          return oldRawTreeData.push(it);
         });
-        setRawTreeData(rawTreeData);
-        setTreeData((0, _utils.toTree)(rawTreeData));
+        setRawTreeData(oldRawTreeData);
+        setTreeData((0, _utils.toTree)(oldRawTreeData));
         return true;
       });
       resolve(true);

package/lib/components/menus/images/okr-gongsi.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>OKR-gongsi</title>
+    <g id="新" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="OKR-gongsi">
+            <rect id="矩形" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="18" height="18"></rect>
+            <g id="编组" transform="translate(3.000000, 1.875000)" fill="#141C28">
+                <path d="M4.10139571,0.207109154 C5.30548811,-0.332079068 6.71387503,0.21781894 7.24711594,1.43534073 C7.38177811,1.74280798 7.45134383,2.07535848 7.45134383,2.41162737 L7.45134383,2.41162737 L7.45134383,4.57179909 L8.31469627,5.11190194 C8.50972555,5.210975 8.64355884,5.41510258 8.64355884,5.65083722 C8.64355884,5.98373015 8.37667242,6.25359319 8.04745134,6.25359319 C7.93433435,6.25359319 7.82857621,6.22173481 7.73847398,6.16640762 L7.737,6.169 L6.54112363,5.41956638 C6.39501401,5.32796807 6.29659069,5.17813983 6.26784152,5.01002569 L6.25912882,4.90728246 L6.25912882,2.41162737 C6.25912882,2.24349293 6.22434596,2.07721768 6.15701487,1.92348405 L6.15701487,1.92348405 L6.14681255,1.9008124 C5.87280554,1.30793451 5.17867538,1.04314408 4.58415476,1.30936826 L4.58415476,1.30936826 L1.90167098,2.5105748 C1.47035103,2.70371832 1.19221501,3.13584938 1.19221501,3.61283391 L1.19221501,3.61283391 L1.19221501,11.8389761 C1.19221501,12.504762 1.72598786,13.0445078 2.38443003,13.0445078 L2.38443003,13.0445078 L7.995,13.044 L8.04745134,14.2401098 L9.74192999,14.2409586 C9.68587029,14.2458533 9.62924586,14.2488023 9.57212243,14.249738 L9.57212243,14.249738 L9.5377201,14.25 L2.38443003,14.25 C1.06754569,14.25 0,13.1705478 0,11.8389761 L0,11.8389761 L0,3.61283391 C0,2.65886485 0.556272039,1.79460272 1.41891194,1.4083157 L1.41891194,1.4083157 Z" id="形状结合" fill-rule="nonzero"></path>
+                <rect id="矩形" x="3.15" y="3.26067444" width="1.2" height="4.8" rx="0.6"></rect>
+            </g>
+            <g id="编组" transform="translate(7.275000, 8.775000)">
+                <path d="M2.65951382,0.134116403 L1.38451382,0.868914715 C0.643634524,1.29589264 0.1875,2.08321551 0.1875,2.93505159 L0.1875,4.41494841 C0.1875,5.26678449 0.643634524,6.05410736 1.38451382,6.48108529 L2.65951382,7.2158836 C3.40359267,7.64470547 4.32140733,7.64470547 5.06548618,7.2158836 L6.34048618,6.48108529 C7.08136548,6.05410736 7.5375,5.26678449 7.5375,4.41494841 L7.5375,2.93505159 C7.5375,2.08321551 7.08136548,1.29589264 6.34048618,0.868914715 L5.06548618,0.134116403 C4.32140733,-0.294705468 3.40359267,-0.294705468 2.65951382,0.134116403 Z M4.46399309,1.16718484 L5.73899309,1.90198315 C6.10943274,2.11547211 6.3375,2.50913355 6.3375,2.93505159 L6.3375,4.41494841 C6.3375,4.84086645 6.10943274,5.23452789 5.73899309,5.44801685 L4.46399309,6.18281516 C4.09195366,6.3972261 3.63304634,6.3972261 3.26100691,6.18281516 L1.98600691,5.44801685 C1.61556726,5.23452789 1.3875,4.84086645 1.3875,4.41494841 L1.3875,2.93505159 C1.3875,2.50913355 1.61556726,2.11547211 1.98600691,1.90198315 L3.26100691,1.16718484 C3.63304634,0.952773904 4.09195366,0.952773904 4.46399309,1.16718484 Z" id="多边形" fill="#141C28" fill-rule="nonzero" transform="translate(3.862500, 3.675000) rotate(-90.000000) translate(-3.862500, -3.675000) "></path>
+                <circle id="椭圆形" stroke="#2879FF" stroke-width="1.05" cx="3.8625" cy="3.675" r="1.0875"></circle>
+            </g>
+        </g>
+    </g>
+</svg>

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

@@ -13,6 +13,7 @@
   font-weight: 600;
   cursor: pointer;
   color: #ffffff;
+  position: relative;
 }
 
 .titaui-nav-top-menu__menu-show:hover {
@@ -38,6 +39,29 @@
   transform: translate(-50%, 0);
 }
 
+.titaui-nav-top-menu__menu--hasNum {
+  position: absolute;
+  right: 4px;
+  top: 1px;
+  background: #fe5042;
+  border-radius: 18px;
+  height: 16px;
+  font-size: 12px;
+  color: #ffffff;
+  line-height: 18px;
+  padding: 0 4px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 8px;
+  font-weight: 400;
+}
+
+.titaui-nav-top-menu__menu--hasNum-active {
+  right: 5px;
+  top: 3px;
+}
+
 .titaui-nav-top-menu__hide-menus {
   display: flex;
   flex-direction: column;

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

@@ -19,6 +19,8 @@ var _popup = _interopRequireDefault(require("../../../popup"));
 
 var _conditionRender = _interopRequireDefault(require("../../../../components/condition-render"));
 
+var _useGlobalValue3 = _interopRequireDefault(require("../../useGlobalValue"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -60,6 +62,10 @@ var Menu = function Menu(_ref) {
       popupVisible = _useState2[0],
       setPopupVisible = _useState2[1];
 
+  var _useGlobalValue = (0, _useGlobalValue3["default"])(),
+      _useGlobalValue2 = _slicedToArray(_useGlobalValue, 1),
+      feedNum = _useGlobalValue2[0];
+
   var containerRef = (0, _react.useRef)();
   var apiPath = (0, _bsGlobal.getBSGlobal)("apiPath");
   var userId = (0, _bsGlobal.getUserInfo)().Id;
@@ -94,7 +100,9 @@ var Menu = function Menu(_ref) {
       onClick: function onClick() {
         return handleTracker(menu);
       }
-    }, menu.title)), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    }, menu.title, menu.href === "#dynamic" && feedNum > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+      className: (0, _classnames["default"])("".concat(prefix, "__menu--hasNum"), _defineProperty({}, "".concat(prefix, "__menu--hasNum-active"), activeMenuId === menu.id && menu.href === "#dynamic"))
+    }, feedNum > 100 ? "99+" : feedNum))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
       condition: menu.title === "Learning"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), _defineProperty({}, "".concat(prefix, "__menu-show--active"), activeMenuId === menu.id)),

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

@@ -56,8 +56,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var preCls = "titaui-user-message-msg-reply";
 
 function Reply(props) {
-  var onItemClick = props.onItemClick,
-      handleIntervalRequestMessageInfo = props.handleIntervalRequestMessageInfo;
+  var onItemClick = props.onItemClick;
 
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -108,6 +107,10 @@ function Reply(props) {
     }
   };
 
+  var handleDeleteReply = function handleDeleteReply(msgId) {
+    (0, _request.deleteReply)(msgId);
+  };
+
   (0, _react.useEffect)(function () {
     setTimeout(function () {
       (0, _request.getReplys)(1).then(function (res) {
@@ -118,17 +121,14 @@ function Reply(props) {
 
         setIsLoading(false);
       });
-      (0, _request.clearReplys)().then(function () {
-        return handleIntervalRequestMessageInfo();
-      });
     }, 300);
   }, []);
-  console.log(replys);
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: isLoading
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: _loading["default"],
-    className: (0, _classnames["default"])("".concat(preCls, "__loading"))
+    className: (0, _classnames["default"])("".concat(preCls, "__loading")),
+    alt: "\u6B63\u5728\u8BF7\u6C42"
   })), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: replys.length !== 0
   }, /*#__PURE__*/_react["default"].createElement("ul", {
@@ -144,7 +144,8 @@ function Reply(props) {
     return /*#__PURE__*/_react["default"].createElement(_replyItem["default"], {
       item: item,
       onItemClick: onItemClick,
-      replys: replys
+      replys: replys,
+      handleDeleteReply: handleDeleteReply
     });
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__footer"))

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

@@ -30,14 +30,17 @@ var preCls = "titaui-user-message-msg-reply";
 function Reply(props) {
   var item = props.item,
       onItemClick = props.onItemClick,
-      replys = props.replys;
+      replys = props.replys,
+      handleDeleteReply = props.handleDeleteReply;
 
   var handleReplyClick = function handleReplyClick() {
-    onItemClick && onItemClick(false);
+    if (onItemClick) {
+      onItemClick(false);
+    }
   };
 
   var getDescText = function getDescText() {
-    if (item.content.indexOf("@") != -1) {
+    if (item.content.indexOf("@") !== -1) {
       return "@我";
     }
 
@@ -56,8 +59,15 @@ function Reply(props) {
     return (0, _utils.deleteText)((0, _utils.htmlToText)(item.content));
   };
 
-  return /*#__PURE__*/_react["default"].createElement("li", {
-    className: (0, _classnames["default"])("".concat(preCls, "__item"), _defineProperty({}, "".concat(preCls, "__item--scroll"), replys.length >= 4))
+  var handleReplyItemClick = function handleReplyItemClick(msgId) {
+    handleDeleteReply(msgId);
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item"), _defineProperty({}, "".concat(preCls, "__item--scroll"), replys.length >= 4)),
+    onClick: function onClick() {
+      return handleReplyItemClick(item.msgId);
+    }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__item-photo"))
   }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {

package/lib/components/nav-top/components/user-message/index.css

@@ -26,15 +26,16 @@
 
 .titaui-user-message__msg-total {
   position: absolute;
-  background: #f05e5e;
-  box-shadow: 0px 2px 4px 0px rgba(240, 94, 94, 0.6), inset 0px 0px 2px 1px rgba(255, 255, 255, 0.4);
-  border-radius: 8px;
+  background: #fe5042;
+  border-radius: 18px;
   font-size: 12px;
   color: #ffffff;
   line-height: 16px;
   padding: 0 4px;
   top: -4px;
   left: 12px;
+  text-align: center;
+  min-width: 8px;
 }
 
 .titaui-user-message__popup-right-top-enter {

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

@@ -27,6 +27,8 @@ var _request = require("../../request.apis");
 
 var _bell3x = _interopRequireDefault(require("./images/bell@3x.png"));
 
+var _useGlobalValue = _interopRequireDefault(require("../../useGlobalValue"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -82,6 +84,8 @@ function UserMessage() {
       firstTab = _useState12[0],
       setFirstTab = _useState12[1];
 
+  var setFeedNum = (0, _useGlobalValue["default"])()[1];
+
   var handleShowInfos = function handleShowInfos() {
     setPopupVisible(true);
   };
@@ -137,18 +141,28 @@ function UserMessage() {
 
         var enterpriseMedalMsg = indicators.filter(function (item) {
           return item.messageType === 1 && item.indicatorType === 1969002;
-        }); // @ts-ignore
+        });
 
-        enterpriseMedalMsg.length > 0 && window.util.upaasEnterpriseMedal(); // upaas 勋章
+        if (enterpriseMedalMsg.length > 0) {
+          window.util.upaasEnterpriseMedal();
+        } // upaas 勋章
 
-        var medalDetail = (0, _bsGlobal.getBSGlobal)("medalDetail"); // @ts-ignore
 
-        medalDetail && window.util.upaasMedal()(medalDetail); // 红包
+        var medalDetail = (0, _bsGlobal.getBSGlobal)("medalDetail");
+
+        if (medalDetail) {
+          window.util.upaasMedal()(medalDetail);
+        } // 红包
+
 
         var mRedPackIndicator = indicators.filter(function (item) {
           return item.type === "mRedPackIndicator";
         });
-        mRedPackIndicator.length > 0 && setRedPackNum(mRedPackIndicator[0].value); // 祝福，拆礼物
+
+        if (mRedPackIndicator.length > 0) {
+          setRedPackNum(mRedPackIndicator[0].value);
+        } // 祝福，拆礼物
+
 
         var blessIndicator = indicators.filter(function (item) {
           return item.type === "mZhufu";
@@ -173,6 +187,18 @@ function UserMessage() {
 
           (_window = window) === null || _window === void 0 ? void 0 : _window.Talent.app.vent.trigger("open-weekly-report-modal");
         }
+
+        var feedInfo = indicators.find(function (item) {
+          return item.type === "feedAboutMeIndicator";
+        });
+
+        if (feedInfo) {
+          // @ts-ignore
+          setFeedNum(feedInfo.value);
+        } else {
+          // @ts-ignore
+          setFeedNum(0);
+        }
       }
     });
   };
@@ -203,7 +229,8 @@ function UserMessage() {
     className: (0, _classnames["default"])("".concat(prefixCls, "__msg-total"))
   }, infosNum > 100 ? "99+" : infosNum)), /*#__PURE__*/_react["default"].createElement("img", {
     src: _bell3x["default"],
-    className: (0, _classnames["default"])(_defineProperty({}, "".concat(prefixCls, "__msg-dot"), infosNum !== preData))
+    className: (0, _classnames["default"])(_defineProperty({}, "".concat(prefixCls, "__msg-dot"), infosNum !== preData)),
+    alt: ""
   }))), /*#__PURE__*/_react["default"].createElement(_redPack["default"], {
     redPackNum: redPackNum
   }));

package/lib/components/nav-top/request.apis.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTodos = exports.getReplys = exports.getReminds = exports.getMessages = exports.getInforms = exports.getData = exports.clearReplys = exports.clearInforms = exports.changeLang = void 0;
+exports.getTodos = exports.getReplys = exports.getReminds = exports.getMessages = exports.getInforms = exports.getData = exports.deleteReply = exports.clearReplys = exports.clearInforms = exports.changeLang = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
@@ -11,6 +11,7 @@ var _request = require("../../utils/request");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+/* eslint-disable default-case */
 // @ts-ignore
 var tenantId = window.BSGlobal && window.BSGlobal.tenantInfo.Id || 0; // @ts-ignore
 
@@ -36,7 +37,7 @@ var getData = function getData(url, saveData) {
 exports.getData = getData;
 
 var getReplys = function getReplys(pageNum) {
-  return (0, _request.rget)("v1")("comment/messages?page_num=".concat(pageNum, "&page_size=10&status=1"));
+  return (0, _request.rget)("v1")("comment/messages?page_num=".concat(pageNum, "&page_size=10&status=1&clear=0"));
 };
 
 exports.getReplys = getReplys;
@@ -65,20 +66,33 @@ var clearReplys = function clearReplys() {
 
 exports.clearReplys = clearReplys;
 
+var deleteReply = function deleteReply(msgId) {
+  return (0, _request.rpost)("v1")("messages/clear?msgId=".concat(msgId));
+};
+
+exports.deleteReply = deleteReply;
+
 var getMessages = function getMessages() {
   var nowTime = new Date();
   var year = nowTime.getFullYear();
   var month = nowTime.getMonth() + 1;
   var date = nowTime.getDate();
-  return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/RemindV2/Get?dateTime=").concat(year, "/").concat(month, "/").concat(date)).then(function (resp) {
-    if (resp.code === 401) {
-      window.location.href = "/Account/Logout";
-      return undefined;
+
+  _axios["default"].interceptors.response.use(function (response) {
+    return response;
+  }, function (error) {
+    if (error.response) {
+      switch (error.response.status) {
+        case 401:
+          window.location.reload();
+      }
     }
 
+    return Promise.reject(error.response.data);
+  });
+
+  return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/RemindV2/Get?dateTime=").concat(year, "/").concat(month, "/").concat(date)).then(function (resp) {
     return resp.data;
-  }).then(function (data) {
-    return data;
   });
 };
 

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

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _useGlobalState = _interopRequireDefault(require("../../hooks/useGlobalState"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var useGlobalValue = (0, _useGlobalState["default"])(0);
+var _default = useGlobalValue;
+exports["default"] = _default;

package/lib/components/okr-detail/components/header/o-name.js

@@ -11,6 +11,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _getLocale = require("../../../../utils/getLocale");
 
+var _tools = require("../../../../utils/tools");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function OName(props) {
@@ -19,16 +21,21 @@ function OName(props) {
       setIsEdit = props.setIsEdit,
       okrStatus = props.okrStatus,
       children = props.children;
+
+  var handleEditClick = function handleEditClick() {
+    if (editable) {
+      setIsEdit(true);
+    }
+  };
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("okr-drawer-header__title", {
       "okr-drawer-header__title--editable": editable
     })
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "okr-drawer-header__name",
-    onClick: function onClick() {
-      editable && setIsEdit(true);
-    }
-  }, okrName), children, okrStatus == 2 && /*#__PURE__*/_react["default"].createElement("span", {
+    onClick: handleEditClick
+  }, (0, _tools.htmlDecodeByRegExp)(okrName)), children, Number(okrStatus) === 2 && /*#__PURE__*/_react["default"].createElement("span", {
     className: "okr-drawer-header__over-tag"
   }, (0, _getLocale.getLocale)("OKR_MyO_Butt_Hasended")));
 }

package/lib/components/okr-detail/components/header/o-score.js

@@ -75,7 +75,7 @@ function OScore(props) {
       refreshAll = _useContext.refreshAll;
 
   var _useState3 = (0, _react.useState)({
-    score: score == 1 ? "1" : Number(score).toFixed(2) * 1
+    score: Number(score) === 1 ? "1" : Number(score).toFixed(2) * 1
   }),
       _useState4 = _slicedToArray(_useState3, 2),
       formFiedlsValue = _useState4[0],
@@ -85,7 +85,7 @@ function OScore(props) {
   var formRef = (0, _react.useRef)();
   (0, _react.useEffect)(function () {
     setFormFiedlsValue({
-      score: score == 1 ? "1" : Number(score).toFixed(2) * 1
+      score: Number(score) === 1 ? "1" : Number(score).toFixed(2) * 1
     });
   }, [score]);
 
@@ -115,9 +115,7 @@ function OScore(props) {
       } else {
         _toast["default"].Error(res.Message || "".concat((0, _getLocale.getLocale)("OKR_MyO_Ew_Fail")));
       }
-    })["catch"](function (err) {
-      console.log(err);
-
+    })["catch"](function () {
       _toast["default"].Error("".concat((0, _getLocale.getLocale)("OKR_MyO_Ew_Fail")));
     });
   };
@@ -133,7 +131,7 @@ function OScore(props) {
     score: score,
     onClick: changeOScore
   }, restProps)), /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
-    title: "O ".concat((0, _getLocale.getLocale)("Per_Ass_New_Appr_detail_Scor")),
+    title: "".concat((0, _getLocale.getLocale)("Mod_Objective")).concat((0, _getLocale.getLocale)("Per_Ass_New_Appr_detail_Scor")),
     visible: visible,
     animation: "slide-fade",
     maskAnimation: "fade",

package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.css

@@ -5,46 +5,59 @@
   display: flex;
 }
 
+.tita-okrdt-tree__e-kr-node:hover .tita-okrdt-tree__e-kr-node-actions {
+  opacity: 1;
+  transition: all 0.2s linear;
+}
+
+.tita-okrdt-tree__e-kr-node-preicon {
+  display: inline-block;
+  line-height: 18px;
+  color: #2879ff;
+  font-size: 16px;
+}
+
 .tita-okrdt-tree__e-kr-node-prefix {
   display: inline-block;
-  height: 22px;
-  font-size: 14px;
+  height: 18px;
+  font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #2879ff;
-  line-height: 22px;
+  line-height: 18px;
 }
 
 .tita-okrdt-tree__e-kr-node-title {
   display: inline-block;
   margin-left: 4px;
-  height: 22px;
-  font-size: 14px;
+  height: 18px;
+  font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #89919f;
-  line-height: 22px;
+  line-height: 18px;
   width: 100%;
 }
 
 .tita-okrdt-tree__e-kr-node-actions {
   display: inline-block;
+  opacity: 0;
   position: absolute;
   right: 0;
+  transition: all 0.2s linear;
 }
 
 .tita-okrdt-tree__e-kr-node-actions-create {
   height: 18px;
-  font-size: 13px;
+  font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #2879ff;
   line-height: 18px;
   cursor: pointer;
-  margin-right: 20px;
   display: inline-flex;
   align-items: center;
 }
 
 .tita-okrdt-tree__e-kr-node-actions-create:hover {
-  color: #5C8EFF;
+  color: #5c8eff;
 }
 
 .tita-okrdt-tree__e-kr-node-actions-create .tu-icon-add1 {
@@ -53,21 +66,22 @@
 
 .tita-okrdt-tree__e-kr-node-actions-connect {
   height: 18px;
-  font-size: 13px;
+  font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #2879ff;
   line-height: 18px;
   cursor: pointer;
+  margin-left: 20px;
   display: inline-flex;
   align-items: center;
 }
 
 .tita-okrdt-tree__e-kr-node-actions-connect:hover {
-  color: #5C8EFF;
+  color: #5c8eff;
 }
 
 .e-kr-node-layer-icon {
-  color: #89919F;
+  color: #89919f;
 }
 
 .e-kr-node__guanlian-icon {

package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.js

@@ -44,10 +44,14 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 var hasProject = (0, _bsGlobal.hasWebHead)("project");
 
 var EKrNode = function EKrNode(props) {
+  var _okrInfo$authority;
+
   var index = props.index,
       title = props.title,
       data = props.data,
-      isOTask = props.isOTask;
+      isOTask = props.isOTask,
+      _props$hasRelation = props.hasRelation,
+      hasRelation = _props$hasRelation === void 0 ? true : _props$hasRelation;
   var btnRef = (0, _react.useRef)();
 
   var _useContext = (0, _react.useContext)(_context2.CommonContext),
@@ -56,7 +60,7 @@ var EKrNode = function EKrNode(props) {
   var _useContext2 = (0, _react.useContext)(_context2.EListContext),
       refreshEList = _useContext2.refreshEList;
 
-  var isParticipant = okrInfo.authority.roleRelation && okrInfo.authority.roleRelation.roleType === 2;
+  var isParticipant = ((_okrInfo$authority = okrInfo.authority) === null || _okrInfo$authority === void 0 ? void 0 : _okrInfo$authority.roleRelation) && okrInfo.authority.roleRelation.roleType === 2;
   var hasRelativeAuth;
 
   if (isOTask) {
@@ -168,9 +172,11 @@ var EKrNode = function EKrNode(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     key: index,
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node"))
-  }, isOTask ? null : /*#__PURE__*/_react["default"].createElement("span", {
+  }, isOTask ? /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("tu-icon-O ".concat(_precls["default"], "__e-kr-node-preicon"))
+  }) : /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-prefix"))
-  }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
+  }, "KR", data.SortNum ? data.SortNum + 1 : index + 1), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-title")),
     onClick: function onClick() {
       if (data.mileStoneId) {
@@ -202,7 +208,7 @@ var EKrNode = function EKrNode(props) {
     icon: "tu-icon-Add-xiangmu",
     exIconClass: "e-kr-node-layer-icon",
     name: "addProject"
-  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("OKR_MyO_E_Butt_Addproject"))) : /*#__PURE__*/_react["default"].createElement("span", null)), /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
+  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("OKR_MyO_E_Butt_Addproject"))) : /*#__PURE__*/_react["default"].createElement("span", null)), hasRelation && /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
     popupPlacement: "bottomRight",
     onChange: openRelatePop,
     trigger: /*#__PURE__*/_react["default"].createElement("span", {