@titaui/pc 1.6.12 → 1.6.16

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

@@ -3,7 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.defaultRefObject = void 0;
+exports.defaultRefObject = exports["default"] = 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"); } }
 
@@ -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': ''
@@ -89,7 +105,12 @@ var okrMenus = /*#__PURE__*/function () {
       'key': 'panzi',
       'href': '#/okr/chart?iTalentFrameType=iframe&iTalentFrame=%2F%2Fwww.tita.gift%2Fmenuroute%3FmenuId%3D44269%26roleId%3D'
     }, {
-      'icon': 'rw-zx',
+      'icon': 'panel',
+      'label': 'OKR 工作法',
+      'key': 'panel',
+      'href': '#/okr/manage'
+    }, {
+      'icon': 'cases',
       'label': 'OKR 案例库',
       'key': 'cases',
       'href': '#/okr/cases'
@@ -111,10 +132,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 +182,7 @@ var okrMenus = /*#__PURE__*/function () {
           'icon': '',
           'label': user.name,
           'key': "".concat(user.userId),
-          'type': 'user',
+          'type': 'follower',
           'href': '',
           'data': user
         });
@@ -131,6 +190,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 +258,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,6 +1,5 @@
 .titaui-menus-okr-menus {
   position: relative;
-  height: 100vh;
   box-sizing: border-box;
 }
 

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

@@ -9,6 +9,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _reactRouter = require("react-router");
+
 var _menuTree = _interopRequireDefault(require("../../components/menu-tree"));
 
 var _requestApis = require("../../request-apis");
@@ -36,7 +38,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var SubOrdinateMenus = function SubOrdinateMenus(props) {
-  var toUserId = props.toUserId;
+  var toUserId = props.toUserId,
+      history = props.history;
   var loadedNode = (0, _react.useRef)([]);
 
   var _useState = (0, _react.useState)(false),
@@ -92,8 +95,12 @@ var SubOrdinateMenus = function SubOrdinateMenus(props) {
     });
   };
 
-  var onSelectHandler = function onSelectHandler() {
-    props.onSelect && props.onSelect();
+  var onSelectHandler = function onSelectHandler(_id, _ref) {
+    var node = _ref.node;
+    history.push({
+      pathname: "/okr/manage?toUserId=".concat(node.id)
+    });
+    history.go(); // location.href=`#/okr/manage?toUserId=${node.id}`
   };
 
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, !loading && /*#__PURE__*/_react["default"].createElement(_menuTree["default"], {
@@ -104,5 +111,6 @@ var SubOrdinateMenus = function SubOrdinateMenus(props) {
   }));
 };
 
-var _default = SubOrdinateMenus;
+var _default = (0, _reactRouter.withRouter)(SubOrdinateMenus);
+
 exports["default"] = _default;

package/lib/components/menus/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DepartMenus = exports["default"] = void 0;
+exports["default"] = exports.DepartMenus = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getDepsAndUsers = exports.addFollower = exports.getSubordinates = exports.getFollowerList = void 0;
+exports.removeFollower = exports.getSubordinates = exports.getFollowerList = exports.getDepsAndUsers = exports.addFollower = void 0;
 
 var _request = require("../../utils/request");
 
@@ -69,10 +69,13 @@ var getSubordinates = function getSubordinates(_ref) {
 
 exports.getSubordinates = getSubordinates;
 
-var addFollower = function addFollower(userId) {
-  return _axios["default"].post("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/follow/addFollower?followerId=").concat(userId), null, {// 'headers': {
-    //   'Content-Type': 'application/json; charset=utf-8'
-    // }
+var addFollower = function addFollower(id) {
+  return _axios["default"].post("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/follow/addFollower?followerId=").concat(id), 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;
   });
@@ -80,6 +83,20 @@ var addFollower = function addFollower(userId) {
 
 exports.addFollower = addFollower;
 
+var removeFollower = function removeFollower(id) {
+  return _axios["default"].post("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/follow/delFollower?followerId=").concat(id), 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.removeFollower = removeFollower;
+
 var getDepsAndUsers = function getDepsAndUsers() {
   var departmentId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
   var isGetUser = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;

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

@@ -56,6 +56,7 @@
   font-weight: 400;
   color: #3F4755;
   line-height: 22px;
+  min-width: 104px;
 }
 
 .titaui-nav-top-menu__menu-hide--active {

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

@@ -69,8 +69,9 @@ var Menu = function Menu(_ref) {
       component: "span"
     }, /*#__PURE__*/_react["default"].createElement("a", {
       className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), _defineProperty({}, "".concat(prefix, "__menu-show--active"), activeMenuId == menu.id)),
-      href: "#".concat(menu.hash)
-    }, menu.name));
+      href: "".concat(menu.href),
+      target: "_self"
+    }, menu.title));
   };
 
   var renderRest = function renderRest(items) {
@@ -84,9 +85,10 @@ var Menu = function Menu(_ref) {
     }, items.map(function (menu) {
       return /*#__PURE__*/_react["default"].createElement("a", {
         className: (0, _classnames["default"])("".concat(prefix, "__menu-hide"), _defineProperty({}, "".concat(prefix, "__menu-hide--active"), activeMenuId == menu.id)),
-        href: "#".concat(menu.hash),
-        key: menu.id
-      }, menu.name);
+        href: "".concat(menu.href),
+        key: menu.id,
+        target: "_self"
+      }, menu.title);
     }));
 
     return /*#__PURE__*/_react["default"].createElement(_popup["default"], {

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

@@ -26,7 +26,7 @@ var Empty = function Empty() {
     className: (0, _classnames["default"])("".concat(preCls, "__empty-text"))
   }, "\u6682\u65F6\u6CA1\u6709\u9700\u8981\u5904\u7406\u7684\u6D88\u606F\u54E6\uFF5E"), /*#__PURE__*/_react["default"].createElement("a", {
     target: "_blank",
-    href: "".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more%2Fmessages%3FmessageType%3D2%26isRead%3D2%26messageSubNav%3D1")
+    href: "".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/messages?messageType=2&isRead=1")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__empty-all"))
   }, "\u67E5\u770B\u5168\u90E8\u6D88\u606F")));

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

@@ -1,6 +1,15 @@
+.titaui-user-message-msg-inform__loading {
+  width: 80px;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: auto;
+}
+
 .titaui-user-message-msg-inform__items {
   width: 420px;
-  margin-top: 8px;
 }
 
 .titaui-user-message-msg-inform__item {
@@ -9,7 +18,16 @@
   height: 82px;
   border-radius: 12px;
   margin-bottom: 4px;
-  margin: 0 12px;
+  margin-left: 12px;
+  cursor: pointer;
+}
+
+.titaui-user-message-msg-inform__item:first-of-type {
+  margin-top: 8px;
+}
+
+.titaui-user-message-msg-inform__item:last-of-type {
+  margin-bottom: 0;
 }
 
 .titaui-user-message-msg-inform__item-photo {
@@ -95,6 +113,10 @@
   position: absolute;
   bottom: 0;
   left: 0;
+  box-sizing: border-box;
+  padding-right: 24px;
+  display: flex;
+  align-items: center;
   width: 420px;
   height: 50px;
   background: #ffffff;
@@ -102,13 +124,14 @@
 }
 
 .titaui-user-message-msg-inform__footer-all {
-  display: inline-block;
-  margin: 16px 24px 16px 348px;
-  width: 48px;
-  height: 18px;
+  margin-left: auto;
   font-size: 12px;
   font-family: Resource-Han-Rounded-CN-Regular, Resource-Han-Rounded-CN;
   font-weight: 400;
   color: #2879ff;
   line-height: 18px;
 }
+
+.titaui-user-message-msg-inform__footer-all:hover {
+  color: #2879ff;
+}