@titaui/pc 1.15.47 → 1.15.50-beta.1

package/lib/components/avatar/default.js

@@ -59,7 +59,9 @@ var Avatar = function Avatar(props) {
       showNameTips = _props$showNameTips === void 0 ? false : _props$showNameTips,
       color = props.color,
       canDelUser = props.canDelUser,
-      onDelUser = props.onDelUser;
+      onDelUser = props.onDelUser,
+      _props$isDept = props.isDept,
+      isDept = _props$isDept === void 0 ? false : _props$isDept;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -124,7 +126,10 @@ var Avatar = function Avatar(props) {
           lineHeight: "".concat(size.width, "px"),
           borderRadius: '50%'
         }
-      }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+      }, isDept && /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
+        name: name,
+        id: userId
+      }), !isDept && /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
         name: name,
         id: userId
       })));

package/lib/components/dynamic/dynamic-item/components/summary-header/index.js

@@ -160,28 +160,28 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       departmentName = _ref3.departmentName,
       departmentId = _ref3.departmentId;
 
-  console.log('users', users);
+  console.log('visibilityScope', visibilityScope);
   var departmentsRender = (0, _react.useMemo)(function () {
     return (departments === null || departments === void 0 ? void 0 : departments.length) !== 0 && departments.map(function (item, index) {
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
         name: item.name,
         id: item.id
-      }), /*#__PURE__*/_react["default"].createElement("span", null, ","));
+      }), index + 1 !== (departments === null || departments === void 0 ? void 0 : departments.length) && /*#__PURE__*/_react["default"].createElement("span", null, ","));
     });
-  }, [departments]);
+  }, [departments, users, str]);
   var usersRender = (0, _react.useMemo)(function () {
     return (users === null || users === void 0 ? void 0 : users.length) !== 0 && users.map(function (item, index) {
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
         name: item.name,
         id: item.userId
-      }), /*#__PURE__*/_react["default"].createElement("span", null, ","));
+      }), index + 1 !== (users === null || users === void 0 ? void 0 : users.length) && /*#__PURE__*/_react["default"].createElement("span", null, ","));
     });
-  }, [users]);
+  }, [users, str]);
   var typeTootips = {
     2: (0, _getLocale.getLocale)('Rep_NewS_RefeSummary'),
     3: /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('Per_Ass_New_Appr_detail_Affiliat'), (0, _getLocale.getLocale)('OKR_MyO_Text_Visible')),
     1: /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_Pop_Company'), (0, _getLocale.getLocale)('Rep_Tab_Subor_EveryoneSee')),
-    5: /*#__PURE__*/_react["default"].createElement("span", null, departmentsRender, usersRender, str)
+    5: /*#__PURE__*/_react["default"].createElement("span", null, departmentsRender, (usersRender || str) && /*#__PURE__*/_react["default"].createElement("span", null, ","), usersRender, str && /*#__PURE__*/_react["default"].createElement("span", null, ","), str)
   };
   var url = '';
   var loginUserId = (0, _bsGlobal.getUserInfo)().Id;

package/lib/components/dynamic/dynamic-item/dynamic-new-report/components/remind-user-view/index.js

@@ -62,10 +62,11 @@ var RemindUserView = function RemindUserView(props) {
     }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
       userId: item.Id,
       name: item === null || item === void 0 ? void 0 : item.Name,
-      color: "#3296fa"
+      color: "#3296fa",
+      isDept: true
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(preCls, "__user-name")
-    }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+    }, /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
       name: item === null || item === void 0 ? void 0 : item.Name,
       id: item.Id
     }))));

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.USER_NODE = exports.USER_CONCERN_NODE = exports.TONGJI_NODE = exports.SUB_MENU_ITEM_NOE = exports.SUBORDINATES_NODE = exports.SHARE_NODE = exports.SAME_LEVEL_USER_NODE = exports.PARENT_MENU_NODE = exports.NO_SUBORDINATES_NODE = exports.NO_FOLLOWER_NODE = exports.MENU_ITEM_NOE = exports.MENU_ASSESS_TEMPLATE = exports.MENU_ASSESS_MANAGE = exports.LOADING_NODE = exports.GROUP_NAME_NODE = exports.FOLLOWER_NODE = exports.DEPART_NODE = exports.COMPANY_NODE = exports.COMPANY_ALL_NODE = void 0;
+exports.USER_NODE = exports.USER_CONCERN_NODE = exports.TONGJI_NODE = exports.SUMMARY_USER_CONCERN_NODE = exports.SUMMARY_FOLLOWER_NODE = exports.SUB_MENU_ITEM_NOE = exports.SUBORDINATES_NODE = exports.SHARE_NODE = exports.SAME_LEVEL_USER_NODE = exports.PARENT_MENU_NODE = exports.NO_SUBORDINATES_NODE = exports.NO_FOLLOWER_NODE = exports.MENU_ITEM_NOE = exports.MENU_ASSESS_TEMPLATE = exports.MENU_ASSESS_MANAGE = exports.LOADING_NODE = exports.GROUP_NAME_NODE = exports.FOLLOWER_NODE = exports.DEPART_NODE = exports.COMPANY_NODE = exports.COMPANY_ALL_NODE = void 0;
 exports["default"] = _default;
 
 var _react = _interopRequireDefault(require("react"));
@@ -18,6 +18,8 @@ var _groupName = _interopRequireDefault(require("./group-name"));
 
 var _userConcern = _interopRequireDefault(require("./user-concern"));
 
+var _summaryUserConcern = _interopRequireDefault(require("./summary-user-concern"));
+
 var _subordinates = _interopRequireDefault(require("./subordinates"));
 
 var _summaryShare = _interopRequireDefault(require("./summary-share"));
@@ -38,6 +40,8 @@ var _noFollower = _interopRequireDefault(require("./no-follower"));
 
 var _follower = _interopRequireDefault(require("./follower"));
 
+var _summaryFollower = _interopRequireDefault(require("./summary-follower"));
+
 var _loading = _interopRequireDefault(require("./loading"));
 
 var _noSubordinates = _interopRequireDefault(require("./no-subordinates"));
@@ -64,6 +68,11 @@ function _default(node, level, _ref) {
         level: level
       }));
 
+    case SUMMARY_FOLLOWER_NODE:
+      return /*#__PURE__*/_react["default"].createElement(_summaryFollower["default"], _extends({}, node, {
+        level: level
+      }));
+
     case NO_SUBORDINATES_NODE:
       return /*#__PURE__*/_react["default"].createElement(_noSubordinates["default"], null);
 
@@ -151,6 +160,12 @@ function _default(node, level, _ref) {
         onExpand: onExpand
       }));
 
+    case SUMMARY_USER_CONCERN_NODE:
+      return /*#__PURE__*/_react["default"].createElement(_summaryUserConcern["default"], _extends({}, node, {
+        level: level,
+        onExpand: onExpand
+      }));
+
     default:
   }
 }
@@ -192,4 +207,8 @@ exports.SHARE_NODE = SHARE_NODE;
 var TONGJI_NODE = 'tongji';
 exports.TONGJI_NODE = TONGJI_NODE;
 var SAME_LEVEL_USER_NODE = 'same-level-user';
-exports.SAME_LEVEL_USER_NODE = SAME_LEVEL_USER_NODE;
+exports.SAME_LEVEL_USER_NODE = SAME_LEVEL_USER_NODE;
+var SUMMARY_USER_CONCERN_NODE = 'summary-user-concern';
+exports.SUMMARY_USER_CONCERN_NODE = SUMMARY_USER_CONCERN_NODE;
+var SUMMARY_FOLLOWER_NODE = 'summary-follower';
+exports.SUMMARY_FOLLOWER_NODE = SUMMARY_FOLLOWER_NODE;

package/lib/components/menus/components/menu-tree/tree-node/subordinates.js

@@ -49,10 +49,7 @@ var Subordinates = function Subordinates(props) {
     if (data.href) {
       window.location.href = data.href;
     }
-  };
 
-  var handleShowSubordinatesList = function handleShowSubordinatesList(e) {
-    e.stopPropagation();
     onExpand(e);
     setIsShowSubordinates(!isShowSubordinates);
   };
@@ -66,8 +63,7 @@ var Subordinates = function Subordinates(props) {
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__user-concern-node-title"), "noselect")
   }, title), /*#__PURE__*/_react["default"].createElement("span", {
-    className: (0, _classnames["default"])("".concat(_precls["default"], "__user-concern-node-add"), "noselect"),
-    onClick: handleShowSubordinatesList
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__user-concern-node-add"), "noselect")
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])('tu-icon-APP-xi', _defineProperty({}, "".concat(_precls["default"], "__subordinates-arrow-down"), isShowSubordinates))
   })));

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

@@ -0,0 +1,47 @@
+.titaui-menus-tree__follower-node {
+  display: flex;
+  align-items: center;
+  height: 40px;
+  line-height: 40px;
+  border-radius: 12px;
+  cursor: pointer;
+  position: relative;
+}
+
+.titaui-menus-tree__follower-node:hover .titaui-menus-tree__follower-node-cancel {
+  opacity: 1;
+}
+
+.titaui-menus-tree__follower-node:hover .titaui-menus-tree__follower-node-username {
+  color: #2879ff;
+}
+
+.titaui-menus-tree__follower-node-username {
+  font-size: 14px;
+  font-weight: 400;
+  color: #3f4755;
+  line-height: 20px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.titaui-menus-tree__follower-node-cancel {
+  display: inline-flex;
+  align-items: center;
+  position: absolute;
+  right: 5px;
+  opacity: 0;
+  transition: all 0.2s cubic-bezier(0.785, 0.135, 0.15, 0.86) 0s;
+  will-change: opacity;
+  color: #a4acb9;
+  border: 5px solid transparent;
+}
+
+.titaui-menus-tree__follower-node-cancel > span {
+  color: #a4acb9 !important;
+}
+
+.titaui-menus-tree__follower-node-cancel:hover > span {
+  color: #f05e5e !important;
+}

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

@@ -0,0 +1,77 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = _default;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _i18n = require("../../../../i18n");
+
+var _openData = require("../../../../../../utils/open-data");
+
+var _tooltip = _interopRequireDefault(require("../../../../../tooltip"));
+
+var _context = require("../../../../context");
+
+var _avatar = _interopRequireDefault(require("../avatar"));
+
+var _precls = _interopRequireDefault(require("../../precls"));
+
+var _getLocale = require("../../../../../../utils/getLocale");
+
+require("./index.css");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+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 _default(props) {
+  var user = props.data,
+      _props$level = props.level,
+      level = _props$level === void 0 ? 0 : _props$level;
+
+  var _useContext = (0, _react.useContext)(_context.SummaryMenusContext),
+      onRemoveConcerner = _useContext.onRemoveConcerner;
+
+  var onCancelFollowHandler = function onCancelFollowHandler(e) {
+    e.stopPropagation();
+    onRemoveConcerner(user);
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    title: "",
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__follower-node")),
+    style: {
+      paddingLeft: 12 + level * 10
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
+    user: user
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    style: {
+      width: "calc(100% - ".concat(12 + 13 + 15 + level * 10, "px)")
+    },
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__follower-node-username"), "noselect")
+  }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+    name: user.name,
+    id: user.userId
+  })), /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__follower-node-cancel")),
+    onClick: onCancelFollowHandler
+  }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)(_i18n.locale.unsubscribe)),
+    placement: "top",
+    align: {
+      offset: [0, 5]
+    }
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "tu-icon-cross"
+  }))));
+}

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

@@ -0,0 +1,95 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = _default;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _userSelector = _interopRequireDefault(require("../../../../user-selector"));
+
+var _requestApis = require("../../../request-apis");
+
+var _toast = _interopRequireDefault(require("../../../../toast"));
+
+var _context = require("../../../context");
+
+var _precls = _interopRequireDefault(require("../precls"));
+
+require("./index.css");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+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 _default(props) {
+  var onExpand = props.onExpand,
+      title = props.title,
+      data = props.data;
+  var userRef = (0, _react.useRef)();
+
+  var _useContext = (0, _react.useContext)(_context.SummaryMenusContext),
+      onAddConcerner = _useContext.onAddConcerner;
+
+  var onExpandHander = function onExpandHander(e) {
+    onExpand(e);
+  };
+
+  var onAddConcernHandler = function onAddConcernHandler(e) {
+    e.stopPropagation(); // @ts-ignore
+
+    userRef.current && userRef.current.open();
+  };
+
+  var onUserSelectHandler = function onUserSelectHandler(users, _, e) {
+    (0, _requestApis.addSummaryFollower)(users[0].data.userId).then(function (res) {
+      if (res.Code != 1) {
+        _toast["default"].Error(res.Message, {});
+
+        return;
+      }
+
+      onAddConcerner(users[0]);
+    })["catch"](function (err) {
+      return console.log(err);
+    });
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__user-concern-node")),
+    onClick: onExpandHander,
+    title: ""
+  }, data.icon && /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__user-concern-node-icon"), data.icon)
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__user-concern-node-title"), "noselect")
+  }, title), /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__user-concern-node-add"), "noselect"),
+    onClick: onAddConcernHandler
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "tu-icon-add1"
+  })), /*#__PURE__*/_react["default"].createElement(_userSelector["default"], {
+    ref: userRef,
+    multiple: false,
+    position: "bottomLeft",
+    onSelect: onUserSelectHandler,
+    disabledDepartSelect: true,
+    showSearchInput: true,
+    searchedPanes: {
+      user: true,
+      depart: false,
+      group: false
+    },
+    trigger: /*#__PURE__*/_react["default"].createElement("span", null),
+    panes: {
+      depart: true
+    }
+  }));
+}

package/lib/components/menus/context.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.OkrMenusContext = exports.FlipContext = void 0;
+exports.SummaryMenusContext = exports.OkrMenusContext = exports.FlipContext = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -15,4 +15,8 @@ exports.OkrMenusContext = OkrMenusContext;
 
 var FlipContext = /*#__PURE__*/_react["default"].createContext();
 
-exports.FlipContext = FlipContext;
+exports.FlipContext = FlipContext;
+
+var SummaryMenusContext = /*#__PURE__*/_react["default"].createContext();
+
+exports.SummaryMenusContext = SummaryMenusContext;

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

@@ -176,7 +176,7 @@ var _default = function _default() {
           deWeightData[item.id] = item;
         });
         var result = Object.values(deWeightData);
-        setRawTreeData(_toConsumableArray(result));
+        setRawTreeData([].concat(result));
         setTreeData((0, _utils.toTree)(rawTreeData));
         resolve(true);
       });

package/lib/components/menus/export-modules/summary-menus/menus.js

@@ -13,6 +13,18 @@ var _getLocale = require("../../../../utils/getLocale");
 
 var _bsGlobal = require("../../../../utils/bs-global");
 
+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); } }
@@ -61,6 +73,7 @@ var summaryMenus = /*#__PURE__*/function () {
     _classCallCheck(this, summaryMenus);
 
     this.COMPANYALL = _index.COMPANY_ALL_NODE;
+    this.USERCONCERN = _index.SUMMARY_USER_CONCERN_NODE;
     this.SHARE = _index.SHARE_NODE;
     this.TONGJI = _index.TONGJI_NODE;
     this.SUBORDINATES = _index.SUBORDINATES_NODE;
@@ -105,6 +118,13 @@ var summaryMenus = /*#__PURE__*/function () {
       children: [],
       href: "#/summary/share",
       isShow: props.isShowShare
+    }, {
+      icon: "guanzhu",
+      label: _i18n.locale.menu_concerned_user,
+      key: this.USERCONCERN,
+      type: this.USERCONCERN,
+      href: "#/summary/all",
+      isShow: true
     }, {
       icon: "bumen",
       label: _i18n.locale.menu_department,
@@ -278,6 +298,108 @@ var summaryMenus = /*#__PURE__*/function () {
 
       this.menus[3].children = treeNodeUsers;
     }
+  }, {
+    key: "setConcernLoading",
+    value: function setConcernLoading(loading) {
+      this.menus[5].children = [];
+
+      if (loading) {
+        this.menus[5].children.push({
+          icon: '',
+          label: 'loading',
+          key: 'loading-concern',
+          type: _index.LOADING_NODE,
+          href: '',
+          data: {}
+        });
+      }
+    }
+  }, {
+    key: "checkConcernExist",
+    value: function checkConcernExist(user) {
+      var concerns = this.menus[5].children;
+
+      for (var i = 0; i < concerns.length; i++) {
+        var it = concerns[i];
+
+        if (it.key == "concern-".concat(user.userId)) {
+          return true;
+        }
+      }
+
+      return false;
+    }
+  }, {
+    key: "insertConcern",
+    value: function insertConcern(users) {
+      var treeNodeUsers = []; // 如果没有关注者，显示空
+
+      this.setEmptyConcerners(false);
+
+      if (!users || !users.length) {
+        this.setEmptyConcerners(true);
+      }
+
+      for (var i = 0; i < users.length; i++) {
+        var user = users[i];
+        if (this.checkConcernExist(user)) continue;
+        treeNodeUsers.push({
+          icon: '',
+          label: user.name,
+          key: "concern-".concat(user.userId),
+          type: _index.SUMMARY_FOLLOWER_NODE,
+          href: '',
+          data: user
+        });
+      }
+
+      this.menus[5].children = this.menus[5].children.concat(treeNodeUsers);
+    }
+  }, {
+    key: "addConcerner",
+    value: function addConcerner(user) {
+      if (this.menus[5].children.length && this.menus[5].children[0].key == 'empty-concerners') {
+        this.menus[5].children = [];
+      }
+
+      this.menus[5].children.push({
+        icon: '',
+        label: user.name,
+        key: "concern-".concat(user.userId),
+        type: _index.SUMMARY_FOLLOWER_NODE,
+        href: '',
+        data: user
+      });
+    }
+  }, {
+    key: "setEmptyConcerners",
+    value: function setEmptyConcerners(empty) {
+      this.menus[5].children = [];
+
+      if (empty) {
+        this.menus[5].children.push({
+          icon: '',
+          label: 'empty-concerners',
+          key: 'empty-concerners',
+          type: _index.NO_FOLLOWER_NODE,
+          href: '',
+          data: {}
+        });
+      }
+    }
+  }, {
+    key: "removeConcerner",
+    value: function removeConcerner(user) {
+      var newChildren = _toConsumableArray(this.menus[5].children).filter(function (it) {
+        return it.key != "concern-".concat(user.userId);
+      });
+
+      if (!newChildren.length) {
+        this.setEmptyConcerners(true);
+      } else {
+        this.menus[5].children = newChildren;
+      }
+    }
   }, {
     key: "getMenus",
     value: function getMenus() {

package/lib/components/menus/export-modules/summary-menus/summary-front-menus.js

@@ -25,6 +25,8 @@ var _requestApis = require("../../request-apis");
 
 var _requestApi = require("./request-api");
 
+var _context = require("../../context");
+
 var _auth = require("../../../../utils/auth");
 
 require("../../index.css");
@@ -122,7 +124,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var nodeType = node.nodeType,
         data = node.data;
 
-    if (nodeType == _index.USER_NODE || nodeType == _index.FOLLOWER_NODE || nodeType == _index.SAME_LEVEL_USER_NODE) {
+    if (nodeType == _index.USER_NODE || nodeType == _index.FOLLOWER_NODE || nodeType == _index.SAME_LEVEL_USER_NODE || nodeType == _index.SUMMARY_FOLLOWER_NODE) {
       location.href = "#/summary/manage?toUserId=".concat(data.userId, "&subordinates=1");
     }
 
@@ -196,6 +198,23 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         resolve(true);
       })["catch"](reject);
     });
+  }; // 获取关注的人数据列表
+
+
+  var getConcerners = function getConcerners() {
+    return new Promise(function (resolve, reject) {
+      var mdata = summaryMenusData.current; // 初始化 Loading
+
+      mdata.setConcernLoading(true);
+      setMenus(mdata.getMenus());
+      resolve(true); // 获取数据
+
+      (0, _requestApis.getSummaryFollowerList)().then(function (user) {
+        mdata.setConcernLoading(false);
+        mdata.insertConcern(user);
+        setMenus(mdata.getMenus());
+      })["catch"](reject);
+    });
   };
 
   var onLoadTreeNodeDataHandler = function onLoadTreeNodeDataHandler(treeNode) {
@@ -218,6 +237,12 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         })["catch"](function () {
           return resolve(true);
         });
+      } else if (treeNode.key == summaryMenusData.current.USERCONCERN) {
+        getConcerners().then(function () {
+          return resolve(true);
+        })["catch"](function () {
+          return resolve(true);
+        });
       } else {
         resolve(true);
       }
@@ -230,6 +255,22 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     setExpandedKeys(expandKeys);
   };
 
+  var onAddConcerner = function onAddConcerner(user) {
+    var mdata = summaryMenusData.current;
+    mdata.addConcerner(user.data);
+    setMenus(mdata.getMenus());
+  };
+
+  var onRemoveConcerner = function onRemoveConcerner(user) {
+    (0, _requestApis.removeSummaryFollower)(user.userId).then(function (res) {
+      if (res.Code == 1) {
+        var mdata = summaryMenusData.current;
+        mdata.removeConcerner(user);
+        setMenus(mdata.getMenus());
+      }
+    });
+  };
+
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       setSelectedMenuKeys: setSelectedMenuKeys
@@ -279,7 +320,12 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       obs.unobserve(document.body);
     };
   }, []);
-  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_scrollbar["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_context.SummaryMenusContext.Provider, {
+    value: {
+      onAddConcerner: onAddConcerner,
+      onRemoveConcerner: onRemoveConcerner
+    }
+  }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_scrollbar["default"], {
     style: {
       maxHeight: maxHeight
     }
@@ -290,7 +336,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     onSelect: onSelectHandler,
     onExpand: onExpandHandler,
     loadData: onLoadTreeNodeDataHandler
-  })));
+  }))));
 });
 
 exports["default"] = _default;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.removeFollower = exports.getTongjiUsersData = exports.getSubordinates = exports.getShareUsersData = exports.getMyDepartMent = exports.getFollowerList = exports.getDepsAndUsers = exports.addFollower = void 0;
+exports.removeSummaryFollower = exports.removeFollower = exports.getTongjiUsersData = exports.getSummaryFollowerList = exports.getSubordinates = exports.getShareUsersData = exports.getMyDepartMent = exports.getFollowerList = exports.getDepsAndUsers = exports.addSummaryFollower = exports.addFollower = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
@@ -41,6 +41,14 @@ var getFollowerList = function getFollowerList() {
 
 exports.getFollowerList = getFollowerList;
 
+var getSummaryFollowerList = function getSummaryFollowerList() {
+  return _axios["default"].post("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/follow/general/getFollower?moduleType=8")).then(function (res) {
+    return res.data.Data;
+  });
+};
+
+exports.getSummaryFollowerList = getSummaryFollowerList;
+
 // export const checkHasSubordinates = () => {
 //   return axios.get(`${requestDomain()}/api/v2/${tenantId}/${userId}/user/getSubUserCount?toUserId=${userId}&countType=1`, {
 //     'headers': {
@@ -173,4 +181,32 @@ var getMyDepartMent = function getMyDepartMent() {
   return (0, _request.rget)('v2')("department/sub/depsAndUsersByPrivilege?objType=8&isGetUser=false");
 };
 
-exports.getMyDepartMent = getMyDepartMent;
+exports.getMyDepartMent = getMyDepartMent;
+
+var addSummaryFollower = function addSummaryFollower(id) {
+  return _axios["default"].post("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/follow/general/addFollower?followerId=").concat(id, "&moduleType=8"), null, {
+    headers: {
+      "Content-Type": "application/json; charset=utf-8",
+      Accept: "application/json, application/xml, text/play, text/html, *.*"
+    },
+    withCredentials: true
+  }).then(function (res) {
+    return res.data;
+  });
+};
+
+exports.addSummaryFollower = addSummaryFollower;
+
+var removeSummaryFollower = function removeSummaryFollower(id) {
+  return _axios["default"].post("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/follow/general/delFollower?followerId=").concat(id, "&moduleType=8"), null, {
+    headers: {
+      "Content-Type": "application/json; charset=utf-8",
+      Accept: "application/json, application/xml, text/play, text/html, *.*"
+    },
+    withCredentials: true
+  }).then(function (res) {
+    return res.data;
+  });
+};
+
+exports.removeSummaryFollower = removeSummaryFollower;

package/lib/components/okr-excel/hooks.js

@@ -47,7 +47,7 @@ var dic = function dic() {
     '目标（O）': "".concat((0, _getLocale.getLocale)('Mod_Objective'), "\uFF08O\uFF09"),
     '类型': (0, _getLocale.getLocale)('OKR_MyO_Pop_Type'),
     '负责人': (0, _getLocale.getLocale)('OKR_MyO_Pop_Owner'),
-    '对齐目标': (0, _getLocale.getLocale)('OKR_MyO_Pop_SetAlignment'),
+    '对齐目标负责人': (0, _getLocale.getLocale)('OKR_MyO_AlignOOwner'),
     '可见范围': (0, _getLocale.getLocale)('OKR_MyO_Pop_Title_Perm'),
     '目标完成度': "".concat((0, _getLocale.getLocale)('Mod_Objective')).concat((0, _getLocale.getLocale)('OKR_MyO_Pop_Upd_Progresss1')),
     '目标最新进展': "".concat((0, _getLocale.getLocale)('Mod_Objective')).concat((0, _getLocale.getLocale)('Pro_page_Plan_Latestpro')),
@@ -173,7 +173,7 @@ var defaultColumnCtlData = function defaultColumnCtlData() {
       label: dicData['负责人'],
       value: '0,2'
     }, {
-      label: dicData['对齐目标'],
+      label: dicData['对齐目标负责人'],
       value: '0,3'
     }, {
       label: dicData['可见范围'],

package/lib/components/okr-excel/index.js

@@ -81,9 +81,9 @@ var App = function App(_ref2) {
       width: 100,
       cellRenderer: _renders.userRenderer
     }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
-      field: dicData['对齐目标'],
+      field: dicData['对齐目标负责人'],
       valueGetter: 'data.parentPrincipal.principalName',
-      width: 100,
+      width: 120,
       hide: true
     }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
       field: dicData['可见范围'],

package/lib/components/okr-filter-drawer/filter-form.js

@@ -85,9 +85,9 @@ var getOkrClassifyList = function getOkrClassifyList() {
 
 var getOrderTypeList = function getOrderTypeList() {
   return [{
-    label: '自定义排序',
+    label: (0, _getLocale.getLocale)('OKR_MyO_Text_CustomSorting'),
     value: 0,
-    toolTip: '自定义排序'
+    toolTip: (0, _getLocale.getLocale)('OKR_MyO_Text_CustomSorting')
   }, {
     label: (0, _getLocale.getLocale)("OKR_MyO_Text_Firstcreated"),
     value: 2,

package/lib/components/picker/picker-panels.js

@@ -90,7 +90,7 @@ var PickerPanels = function PickerPanels(props) {
 
   var onDateSelect = function onDateSelect(date) {
     if (onChange) {
-      onChange([date]);
+      onChange([(0, _moment["default"])(date).format(format)]);
     }
 
     onCloseHandler();

package/lib/components/picker/range-picker/components/picker-trigger/index.js

@@ -35,6 +35,8 @@ var RangePickerTrigger = function RangePickerTrigger(props) {
   var children = props.children,
       focused = props.focused,
       viewDate = props.viewDate,
+      _props$triggerClassNa = props.triggerClassName,
+      triggerClassName = _props$triggerClassNa === void 0 ? '' : _props$triggerClassNa,
       disabled = props.disabled,
       allowClear = props.allowClear,
       placeholder = props.placeholder,
@@ -77,7 +79,7 @@ var RangePickerTrigger = function RangePickerTrigger(props) {
         return !disabled && _onClick();
       }
     }, children) : /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])(_utils.PickerRangeTriggerClass, (_classNames = {}, _defineProperty(_classNames, "".concat(_utils.PickerRangeTriggerClass, "--disabled"), disabled), _defineProperty(_classNames, "".concat(_utils.PickerRangeTriggerClass, "--focused"), focused), _classNames)),
+      className: (0, _classnames["default"])(_utils.PickerRangeTriggerClass, (_classNames = {}, _defineProperty(_classNames, "".concat(_utils.PickerRangeTriggerClass, "--disabled"), disabled), _defineProperty(_classNames, "".concat(_utils.PickerRangeTriggerClass, "--focused"), focused), _classNames), triggerClassName),
       onClick: function onClick() {
         return !disabled && _onClick();
       }

package/lib/components/picker/range-picker/index.js

@@ -167,7 +167,9 @@ var RangePicker = function RangePicker(props) {
   };
 
   var onConfirmHandler = function onConfirmHandler() {
-    var result = onChange(viewDate);
+    var result = onChange(viewDate.map(function (date) {
+      return (0, _moment["default"])(date).format(format);
+    }));
 
     if (result && result instanceof Promise) {
       result.then(function (res) {

package/lib/components/rich-editor-at/components/index.js

@@ -53,7 +53,9 @@ var RichEditorAtAvatar = function RichEditorAtAvatar(props) {
       textClass = props.textClass,
       renderRightTopCmp = props.renderRightTopCmp,
       _props$avatarTips = props.avatarTips,
-      avatarTips = _props$avatarTips === void 0 ? '' : _props$avatarTips;
+      avatarTips = _props$avatarTips === void 0 ? '' : _props$avatarTips,
+      _props$isDept = props.isDept,
+      isDept = _props$isDept === void 0 ? false : _props$isDept;
   var hasAvatar = src && !src.match(/default\w*.jpg$/);
 
   var _useState = (0, _react.useState)(false),
@@ -106,7 +108,10 @@ var RichEditorAtAvatar = function RichEditorAtAvatar(props) {
           overflow: 'hidden',
           whiteSpace: 'nowrap'
         }
-      }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+      }, isDept && /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
+        name: name,
+        id: userId
+      }), !isDept && /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
         name: name,
         id: userId
       })));
@@ -169,7 +174,10 @@ var RichEditorAtAvatar = function RichEditorAtAvatar(props) {
     }
   }, /*#__PURE__*/_react["default"].createElement("span", {
     ref: textRef
-  }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+  }, isDept && /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
+    name: name,
+    id: userId
+  }), !isDept && /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
     name: name,
     id: userId
   })))) : /*#__PURE__*/_react["default"].createElement("span", {
@@ -179,7 +187,10 @@ var RichEditorAtAvatar = function RichEditorAtAvatar(props) {
     }
   }, /*#__PURE__*/_react["default"].createElement("span", {
     ref: textRef
-  }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+  }, isDept && /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
+    name: name,
+    id: userId
+  }), !isDept && /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
     name: name,
     id: userId
   }))));

package/lib/components/rich-editor-at/index.js

@@ -144,7 +144,9 @@ var RichEditorAt = function RichEditorAt(_ref) {
         return handleDeleteDepart(item);
       },
       color: '#3296fa',
-      name: item.name
+      name: item.name,
+      userId: item.id,
+      isDept: true
     }));
   }), selectGroups && selectGroups.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement("span", {

package/lib/pages/new-okr-list/index.js

@@ -247,7 +247,7 @@ var NewOkrList = function NewOkrList(props) {
     }
   };
 
-  var getOkrs = function getOkrs() {
+  var getOkrsRequest = function getOkrsRequest() {
     var params = _objectSpread(_objectSpread({
       relation: relation,
       toUserId: (0, _bsGlobal.getUserInfo)().Id,
@@ -270,7 +270,6 @@ var NewOkrList = function NewOkrList(props) {
       params.keyWords = "";
     }
 
-    setLoading(true);
     recordVisitUser();
     (0, _requestApi.okrSearch)(params).then(function (res) {
       setOkrs(res && res.works || []);
@@ -279,6 +278,17 @@ var NewOkrList = function NewOkrList(props) {
     });
   };
 
+  var getOkrs = function getOkrs() {
+    // 这个用于loading加载
+    setLoading(true);
+    getOkrsRequest();
+  };
+
+  var onRefreshOkrs = function onRefreshOkrs() {
+    // 这个不要loading，推屏出来的时候用这个
+    getOkrsRequest();
+  };
+
   (0, _react.useEffect)(function () {
     okrsRef.current = okrs;
   }, [okrs]);
@@ -401,7 +411,7 @@ var NewOkrList = function NewOkrList(props) {
   }))), okrs.length > 0 && viewType === _header.ViewType.Table && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_okrExcel["default"], {
     showCycle: query.cycleType === '-1',
     data: okrExcelData,
-    onRefresh: getOkrs
+    onRefresh: onRefreshOkrs
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_precls.precls, "__pagination")
   }, /*#__PURE__*/_react["default"].createElement(_pagination["default"], {

package/lib/pages/new-okr-list/list/index.js

@@ -42,12 +42,14 @@ function List(props) {
       annualNum = _useContext.annualNum,
       cycleType = _useContext.cycleType,
       yqmNum = _useContext.yqmNum,
-      orderType = _useContext.orderType;
+      orderType = _useContext.orderType,
+      relation = _useContext.relation;
 
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(OkrListCmp, {
     orderType: orderType,
     okrData: okrs,
     setData: setOkrs,
+    relation: relation,
     cycle: {
       annualNum: annualNum,
       cycleType: cycleType,

package/lib/pages/new-okr-list/loading.js

@@ -16,9 +16,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 function Loading(_ref) {
   var children = _ref.children,
       loading = _ref.loading;
-  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, children, loading && /*#__PURE__*/_react["default"].createElement("div", {
+  if (!loading) return children;
+  return /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_precls.precls, "__loading")
-  }));
+  });
 }
 
 var _default = Loading;

package/package.json

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