@titaui/pc 1.6.11 → 1.6.15

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

@@ -17,6 +17,8 @@ var _requestApis = require("../../../request-apis");
 
 var _popDownNotification = require("../../../../pop-down-notification");
 
+var _context = require("../../../context");
+
 var _precls = _interopRequireDefault(require("../precls"));
 
 require("./index.css");
@@ -33,6 +35,9 @@ var _default = function _default(props) {
       data = props.data;
   var userRef = (0, _react.useRef)();
 
+  var _useContext = (0, _react.useContext)(_context.OkrMenusContext),
+      onAddConcerner = _useContext.onAddConcerner;
+
   var onExpandHander = function onExpandHander(e) {
     onExpand(e);
   };
@@ -45,14 +50,13 @@ var _default = function _default(props) {
 
   var onUserSelectHandler = function onUserSelectHandler(users, _, e) {
     (0, _requestApis.addFollower)(users[0].data.userId).then(function (res) {
-      if (res.Message) {
+      if (res.Code != 1) {
         _popDownNotification.Toast.Error(res.Message, {});
 
-        onExpand(e);
         return;
       }
 
-      debugger;
+      onAddConcerner(users[0]);
     })["catch"](function (err) {
       return console.log(err);
     });

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

@@ -36,6 +36,9 @@
   font-weight: 400;
   color: #3f4755;
   line-height: 20px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .titaui-menus-tree__user-node-sub {

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

@@ -15,6 +15,8 @@ var _openData = require("../../../../../../utils/open-data");
 
 var _context = require("../../../../context");
 
+var _avatar = _interopRequireDefault(require("../avatar"));
+
 var _precls = _interopRequireDefault(require("../../precls"));
 
 require("./index.css");
@@ -25,18 +27,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-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; }
-
 var _default = function _default(props) {
   var user = props.data,
       _props$level = props.level,
@@ -49,34 +39,6 @@ var _default = function _default(props) {
   var _useContext = (0, _react.useContext)(_context.OkrMenusContext),
       flipGoNext = _useContext.flipGoNext;
 
-  var _useState = (0, _react.useState)(function () {
-    return !!user.avatar.medium;
-  }),
-      _useState2 = _slicedToArray(_useState, 1),
-      hasAvatar = _useState2[0];
-
-  var renderImgAvatar = function renderImgAvatar() {
-    return /*#__PURE__*/_react["default"].createElement("img", {
-      style: {
-        width: 24,
-        height: 24,
-        verticalAlign: "top"
-      },
-      src: user.avatar.medium
-    });
-  };
-
-  var renderTextAvatar = function renderTextAvatar() {
-    return /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(_precls["default"], "__user-node-avatar"), "noselect"),
-      style: {
-        backgroundColor: user.avatar.color
-      }
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(_precls["default"], "__user-node-avatar-slice"))
-    }, user.name));
-  };
-
   var openSubordinate = function openSubordinate(e) {
     if (isFlip) {
       flipGoNext({
@@ -93,9 +55,14 @@ var _default = function _default(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__user-node")),
     style: {
-      paddingLeft: 12 + level * 10
+      'paddingLeft': 12 + level * 10
     }
-  }, hasAvatar ? renderImgAvatar() : renderTextAvatar(), /*#__PURE__*/_react["default"].createElement("span", {
+  }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
+    user: user
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    style: {
+      'width': "calc(100% - ".concat(12 + 13 + level * 10, "px)")
+    },
     className: (0, _classnames["default"])("".concat(_precls["default"], "__user-node-username"), "noselect")
   }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
     name: user.name,

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = exports.defaultRefObject = void 0;
 
+var _bsGlobal = require("../../../../utils/bs-global");
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -17,6 +19,18 @@ var defaultRefObject = {
 };
 exports.defaultRefObject = defaultRefObject;
 
+var _getBSGlobal = (0, _bsGlobal.getBSGlobal)('AssessAdvancedSetting'),
+    _getBSGlobal$AssessFu = _getBSGlobal.AssessFunctionSetting,
+    StartAssessByDepartmentLeader = _getBSGlobal$AssessFu.StartAssessByDepartmentLeader,
+    StartAssessByUser = _getBSGlobal$AssessFu.StartAssessByUser;
+
+var _getUserInfo = (0, _bsGlobal.getUserInfo)(),
+    HasSub = _getUserInfo.HasSub,
+    IsAssessManager = _getUserInfo.IsAssessManager,
+    IsLeader = _getUserInfo.IsLeader;
+
+var performanceManageAuthority = IsAssessManager || IsLeader && StartAssessByDepartmentLeader || StartAssessByUser;
+
 var AppraisalMenus = /*#__PURE__*/function () {
   function AppraisalMenus() {
     _classCallCheck(this, AppraisalMenus);
@@ -25,54 +39,64 @@ var AppraisalMenus = /*#__PURE__*/function () {
       'icon': 'kaohe',
       'label': '我的考核',
       'key': 'my-appraisal',
-      'href': '#/performance?reactRouterName=self'
+      'href': '#/performance?reactRouterName=self',
+      'isShow': true
     }, {
       'icon': 'caidan-xiashu',
       'label': '下属绩效',
       'key': 'subordinate-appraisal',
-      'href': '#/performance?reactRouterName=subordinate'
+      'href': '#/performance?reactRouterName=subordinate',
+      'isShow': HasSub
     }, {
       'icon': 'bumen',
       'label': '部门绩效',
       'key': 'depart-appraisal',
-      'href': '#/performance?reactRouterName=department'
+      'href': '#/performance?reactRouterName=department',
+      'isShow': IsLeader
     }, {
       'icon': '',
       'label': '考核管理',
       'key': 'manage-appraisal-group',
       'type': 'group-name',
-      'href': ''
+      'href': '',
+      'isShow': performanceManageAuthority
     }, {
       'icon': 'untitled',
       'label': '考核管理',
       'key': 'manage-appraisal',
-      'href': '#/performance?reactRouterName=manage'
+      'href': '#/performance?reactRouterName=manage',
+      'isShow': performanceManageAuthority
     }, {
       'icon': 'uniEA10',
       'label': '考核表',
       'key': 'template-appraisal',
-      'href': '#/performance?reactRouterName=template'
+      'href': '#/performance?reactRouterName=template',
+      'isShow': performanceManageAuthority
     }, {
       'icon': 'ZBmuban',
       'label': '考核指标库',
       'key': 'library-appraisal',
-      'href': '#/performance?reactRouterName=templateLibrary'
+      'href': '#/performance?reactRouterName=templateLibrary',
+      'isShow': performanceManageAuthority
     }, {
       'icon': 'PF-shezhi',
       'label': '评分设置',
       'key': 'score-appraisal',
-      'href': '#/performance?reactRouterName=setting'
+      'href': '#/performance?reactRouterName=setting',
+      'isShow': IsAssessManager
     }, {
       'icon': '',
       'label': '考核统计',
       'key': 'statistics-appraisal',
       'type': 'group-name',
-      'href': ''
+      'href': '',
+      'isShow': false
     }, {
       'icon': 'yibiao',
       'label': '考核仪表盘',
       'key': 'dashboard-appraisal',
-      'href': ''
+      'href': '',
+      'isShow': false
     }];
   }
 
@@ -89,14 +113,17 @@ var AppraisalMenus = /*#__PURE__*/function () {
 
       for (var i = 0; i < menus.length; i++) {
         var menu = menus[i];
-        treeNodes.push({
-          'key': "".concat(menu.key),
-          'title': menu.label,
-          'data': menu,
-          'isLeaf': true,
-          'children': [],
-          'nodeType': menu.type || 'menu-item'
-        });
+
+        if (menu.isShow) {
+          treeNodes.push({
+            'key': "".concat(menu.key),
+            'title': menu.label,
+            'data': menu,
+            'isLeaf': true,
+            'children': [],
+            'nodeType': menu.type || 'menu-item'
+          });
+        }
       }
 
       return treeNodes;

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

@@ -25,6 +25,14 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 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."); }
@@ -37,7 +45,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var DepartMenus = function DepartMenus(props) {
+var _default = function _default() {
   var loadedNode = (0, _react.useRef)([]);
 
   var _useState = (0, _react.useState)([]),
@@ -56,8 +64,21 @@ var DepartMenus = function DepartMenus(props) {
 
   (0, _react.useEffect)(function () {
     (0, _requestApis.getDepsAndUsers)(-1, isGetUser).then(function (rawTreeData) {
-      setRawTreeData(rawTreeData);
-      setTreeData((0, _utils.toTree)(rawTreeData));
+      var rootNode = {
+        'async': true,
+        'data': {
+          'id': 0,
+          'name': "公司全部"
+        },
+        '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))));
     });
   }, []); // 动态加载子节点数据集
 
@@ -82,9 +103,16 @@ var DepartMenus = function DepartMenus(props) {
     return (0, _requestApis.getDepsAndUsers)(nodeId, isGetUser);
   };
 
-  var onSelectHandler = function onSelectHandler() {
-    props.onSelect && props.onSelect();
-    location.href = '#/okr/manage';
+  var onSelectHandler = function onSelectHandler(_id, _ref) {
+    var node = _ref.node;
+    var nodeType = node.nodeType,
+        data = node.data;
+
+    if (nodeType == "user") {
+      location.href = "#/okr/manage?toUserId=".concat(data.userId);
+    } else if (nodeType == "depart-node") {
+      location.href = "#/okr/manage?departmentName=".concat(data.name, "&departmentId=").concat(data.id);
+    }
   };
 
   return /*#__PURE__*/_react["default"].createElement(_menuTree["default"], {
@@ -95,5 +123,4 @@ var DepartMenus = function DepartMenus(props) {
   });
 };
 
-var _default = DepartMenus;
 exports["default"] = _default;

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

@@ -5,6 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = exports.defaultRefObject = void 0;
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -16,6 +28,10 @@ var defaultRefObject = {
   'insertConcern': function insertConcern() {},
   'insertSubordinates': function insertSubordinates() {},
   'getMenus': function getMenus() {},
+  'setConcernLoading': function setConcernLoading() {},
+  'setSubordinatesLoading': function setSubordinatesLoading() {},
+  'addConcerner': function addConcerner() {},
+  'removeConcerner': function removeConcerner() {},
   'USERCONCERN': '',
   'SUBORDINATES': '',
   'MYOKR': ''
@@ -111,10 +127,48 @@ var okrMenus = /*#__PURE__*/function () {
 
       return false;
     }
+  }, {
+    key: "setConcernLoading",
+    value: function setConcernLoading(loading) {
+      this.menus[2].children = [];
+
+      if (loading) {
+        this.menus[2].children.push({
+          'icon': '',
+          'label': 'loading',
+          'key': "loading-concern",
+          'type': 'loading',
+          'href': '',
+          'data': {}
+        });
+      }
+    }
+  }, {
+    key: "setSubordinatesLoading",
+    value: function setSubordinatesLoading(loading) {
+      this.menus[1].children = [];
+
+      if (loading) {
+        this.menus[1].children.push({
+          'icon': '',
+          'label': 'loading',
+          'key': "loading-concern",
+          'type': 'loading',
+          'href': '',
+          'data': {}
+        });
+      }
+    }
   }, {
     key: "insertConcern",
     value: function insertConcern(users) {
-      var treeNodeUsers = [];
+      var treeNodeUsers = []; // 如果没有关注者，显示空
+
+      this.setEmptyConcerners(false);
+
+      if (!users || !users.length) {
+        this.setEmptyConcerners(true);
+      }
 
       for (var i = 0; i < users.length; i++) {
         var user = users[i];
@@ -123,7 +177,7 @@ var okrMenus = /*#__PURE__*/function () {
           'icon': '',
           'label': user.name,
           'key': "".concat(user.userId),
-          'type': 'user',
+          'type': 'follower',
           'href': '',
           'data': user
         });
@@ -131,6 +185,51 @@ var okrMenus = /*#__PURE__*/function () {
 
       this.menus[2].children = this.menus[2].children.concat(treeNodeUsers);
     }
+  }, {
+    key: "setEmptyConcerners",
+    value: function setEmptyConcerners(empty) {
+      this.menus[2].children = [];
+
+      if (empty) {
+        this.menus[2].children.push({
+          'icon': '',
+          'label': 'empty-concerners',
+          'key': "empty-concerners",
+          'type': 'no-follower',
+          'href': '',
+          'data': {}
+        });
+      }
+    }
+  }, {
+    key: "addConcerner",
+    value: function addConcerner(user) {
+      if (this.menus[2].children.length && this.menus[2].children[0].key == 'empty-concerners') {
+        this.menus[2].children = [];
+      }
+
+      this.menus[2].children.push({
+        'icon': '',
+        'label': user.name,
+        'key': "".concat(user.userId),
+        'type': 'follower',
+        'href': '',
+        'data': user
+      });
+    }
+  }, {
+    key: "removeConcerner",
+    value: function removeConcerner(user) {
+      var newChildren = _toConsumableArray(this.menus[2].children).filter(function (it) {
+        return it.key != user.userId;
+      });
+
+      if (!newChildren.length) {
+        this.setEmptyConcerners(true);
+      } else {
+        this.menus[2].children = newChildren;
+      }
+    }
   }, {
     key: "insertSubordinates",
     value: function insertSubordinates(users) {
@@ -154,6 +253,7 @@ var okrMenus = /*#__PURE__*/function () {
     key: "getMenus",
     value: function getMenus() {
       var menus = this.formateToTreeNodeData(this.menus);
+      1;
       return menus;
     }
   }, {

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

@@ -1,11 +1,9 @@
 .titaui-menus-okr-menus {
   position: relative;
-  height: 100vh;
   box-sizing: border-box;
 }
 
 .titaui-menus-okr-menus-back {
-  height: 100%;
   overflow-y: auto;
 }
 
@@ -19,7 +17,6 @@
 }
 
 .titaui-menus-okr-menus-tree {
-  height: 100%;
   overflow-y: auto;
 }
 

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

@@ -55,7 +55,7 @@ var _default = function _default(props) {
   var _props$onSelect = props.onSelect,
       onSelect = _props$onSelect === void 0 ? function () {} : _props$onSelect;
 
-  var _useState = (0, _react.useState)("depart"),
+  var _useState = (0, _react.useState)(""),
       _useState2 = _slicedToArray(_useState, 2),
       flipBackType = _useState2[0],
       setFlipBackType = _useState2[1];
@@ -82,36 +82,71 @@ var _default = function _default(props) {
 
   var onSelectHandler = function onSelectHandler(_, _ref) {
     var node = _ref.node;
+    var nodeType = node.nodeType,
+        data = node.data;
+
+    if (nodeType == 'user') {
+      location.href = "#/okr/manage?toUserId=".concat(data.userId);
+    }
+
     onSelect(node);
   };
 
   var onUserSelectHandler = function onUserSelectHandler(user) {
-    onSelect(user);
     location.href = "#/okr/manage?26toUserId=".concat(user.id);
+  }; // 获取关注的人数据列表
+
+
+  var getConcerners = function getConcerners() {
+    return new Promise(function (resolve, reject) {
+      var mdata = okrMenusData.current; // 初始化 Loading
+
+      mdata.setConcernLoading(true);
+      setMenus(mdata.getMenus());
+      resolve(true); // 获取数据
+
+      (0, _requestApis.getFollowerList)().then(function (user) {
+        mdata.setConcernLoading(false);
+        mdata.insertConcern(user);
+        setMenus(mdata.getMenus());
+      })["catch"](reject);
+    });
+  }; // 获取下属OKR数据列表
+
+
+  var getSubordinaters = function getSubordinaters() {
+    return new Promise(function (resolve, reject) {
+      var mdata = okrMenusData.current; // 初始化 Loading
+
+      mdata.setSubordinatesLoading(true);
+      setMenus(mdata.getMenus());
+      resolve(true); // 获取数据
+
+      (0, _requestApis.getSubordinates)({
+        'relationIds': '1,3'
+      }).then(function (users) {
+        mdata.setSubordinatesLoading(false);
+        mdata.insertSubordinates(users);
+        setMenus(mdata.getMenus());
+        resolve(true);
+      })["catch"](reject);
+    });
   };
 
   var onLoadTreeNodeDataHandler = function onLoadTreeNodeDataHandler(treeNode) {
     return new Promise(function (resolve) {
       if (treeNode.key == okrMenusData.current.MYOKR) {
         resolve(true);
-      } // 关注的人
-      else if (treeNode.key == okrMenusData.current.USERCONCERN) {
-        (0, _requestApis.getFollowerList)().then(function (user) {
-          okrMenusData.current.insertConcern(user);
-          setMenus(okrMenusData.current.getMenus());
-          resolve(true);
-        })["catch"](function (err) {
+      } else if (treeNode.key == okrMenusData.current.USERCONCERN) {
+        getConcerners().then(function () {
+          return resolve(true);
+        })["catch"](function () {
           return resolve(true);
         });
-      } // 下属OKR
-      else if (treeNode.key == okrMenusData.current.SUBORDINATES) {
-        (0, _requestApis.getSubordinates)({
-          'relationIds': '1,3'
-        }).then(function (users) {
-          okrMenusData.current.insertSubordinates(users);
-          setMenus(okrMenusData.current.getMenus());
-          resolve(true);
-        })["catch"](function (err) {
+      } else if (treeNode.key == okrMenusData.current.SUBORDINATES) {
+        getSubordinaters().then(function () {
+          return resolve(true);
+        })["catch"](function () {
           return resolve(true);
         });
       } else {
@@ -134,16 +169,34 @@ var _default = function _default(props) {
     }
   };
 
+  var onAddConcerner = function onAddConcerner(user) {
+    var mdata = okrMenusData.current;
+    mdata.addConcerner(user.data);
+    setMenus(mdata.getMenus());
+  };
+
+  var onRemoveConcerner = function onRemoveConcerner(user) {
+    (0, _requestApis.removeFollower)(user.userId).then(function (res) {
+      if (res.Code == 1) {
+        var mdata = okrMenusData.current;
+        mdata.removeConcerner(user);
+        setMenus(mdata.getMenus());
+      }
+    });
+  };
+
   return /*#__PURE__*/_react["default"].createElement(_context.OkrMenusContext.Provider, {
     value: {
-      flipGoNext: flipGoNext
+      flipGoNext: flipGoNext,
+      onAddConcerner: onAddConcerner,
+      onRemoveConcerner: onRemoveConcerner
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     ref: menuRef,
     className: (0, _classnames["default"])("".concat(_precls["default"], "-okr-menus"))
   }, /*#__PURE__*/_react["default"].createElement(_flipMenuCard["default"], {
-    collapseMenu: collapseMenu,
     ref: flipRef,
+    collapseMenu: collapseMenu,
     defaultWidth: 180
   }, /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
     style: {

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

@@ -92,8 +92,9 @@ var SubOrdinateMenus = function SubOrdinateMenus(props) {
     });
   };
 
-  var onSelectHandler = function onSelectHandler() {
-    props.onSelect && props.onSelect();
+  var onSelectHandler = function onSelectHandler(_id, _ref) {
+    var node = _ref.node;
+    location.href = "#/okr/manage?toUserId=".concat(node.id);
   };
 
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, !loading && /*#__PURE__*/_react["default"].createElement(_menuTree["default"], {