@titaui/pc 1.6.14 → 1.6.15

package/lib/components/img-viewer/index.css

@@ -78,6 +78,10 @@
   background: #f7f9fb;
 }
 
+.titaui-img-viewer__body-img {
+  max-width: 800px;
+}
+
 .titaui-img-viewer__body-operate-btn {
   position: absolute;
   width: 48px;

package/lib/components/img-viewer/index.js

@@ -188,8 +188,9 @@ var ImgViewer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
         transform: "rotate(".concat(currentRotateDeg, "deg)")
       }
     }, /*#__PURE__*/_react["default"].createElement("img", {
+      className: prefix + '__body-img',
       ref: imgRef,
-      src: currentImgData.bigImageUrl,
+      src: currentImgData.previewUrl || currentImgData.bigImageUrl,
       style: {
         transform: "scale(".concat(currentScale, ")")
       }

package/lib/components/menus/components/flip-menu-card/index.js

@@ -107,7 +107,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     setTimeout(function () {
       // 1秒后隐藏菜单到左侧
       setIsFloatHide(!isFloatHide);
-    }, !isFloat ? 200 : 0);
+    }, !isFloat ? 400 : 0);
   };
 
   var onFixedHideIconMouseEnter = function onFixedHideIconMouseEnter() {

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

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _openData = require("../../../../../../utils/open-data");
+
 var _precls = _interopRequireDefault(require("../../precls"));
 
 require("./index.css");
@@ -37,8 +39,7 @@ var DepartNode = function DepartNode(props) {
   var onExpand = props.onExpand,
       data = props.data,
       _props$level = props.level,
-      level = _props$level === void 0 ? 0 : _props$level,
-      title = props.title;
+      level = _props$level === void 0 ? 0 : _props$level;
   var hasChild = data.hasChild;
 
   var _useState = (0, _react.useState)(false),
@@ -60,7 +61,10 @@ var DepartNode = function DepartNode(props) {
     className: "tu-icon-biaoqian-bumen"
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(_precls["default"], "__depart-node-title")
-  }, title), !isOpen && hasChild && /*#__PURE__*/_react["default"].createElement("span", {
+  }, /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
+    name: data.name,
+    id: data.id
+  })), !isOpen && hasChild && /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("tu-icon-APP-xi", "".concat(_precls["default"], "__depart-node-expand")),
     onClick: handleExpand
   }), isOpen && /*#__PURE__*/_react["default"].createElement("span", {

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

@@ -39,6 +39,10 @@
   border: 5px solid transparent;
 }
 
-.titaui-menus-tree__follower-node-cancel:hover {
-  color: #f05e5e;
+.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/follower-node/index.js

@@ -1,16 +1,20 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _openData = require("../../../../../../utils/open-data");
 
+var _context = require("../../../../context");
+
 var _avatar = _interopRequireDefault(require("../avatar"));
 
 var _precls = _interopRequireDefault(require("../../precls"));
@@ -19,12 +23,21 @@ 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; }
+
 var _default = function _default(props) {
   var user = props.data,
       _props$level = props.level,
       level = _props$level === void 0 ? 0 : _props$level;
 
-  var onCancelFollowHandler = function onCancelFollowHandler() {};
+  var _useContext = (0, _react.useContext)(_context.OkrMenusContext),
+      onRemoveConcerner = _useContext.onRemoveConcerner;
+
+  var onCancelFollowHandler = function onCancelFollowHandler() {
+    onRemoveConcerner(user);
+  };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__follower-node")),

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

@@ -428,4 +428,5 @@
   height: 14px;
   width: 14px;
   background: url(../images/user-concern-add.svg) transparent no-repeat 50% 50%;
+  border: 5px solid transparent;
 }

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/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); } }
@@ -18,6 +30,8 @@ var defaultRefObject = {
   'getMenus': function getMenus() {},
   'setConcernLoading': function setConcernLoading() {},
   'setSubordinatesLoading': function setSubordinatesLoading() {},
+  'addConcerner': function addConcerner() {},
+  'removeConcerner': function removeConcerner() {},
   'USERCONCERN': '',
   'SUBORDINATES': '',
   'MYOKR': ''
@@ -187,6 +201,35 @@ var okrMenus = /*#__PURE__*/function () {
         });
       }
     }
+  }, {
+    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) {

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

@@ -4,7 +4,6 @@
 }
 
 .titaui-menus-okr-menus-back {
-  height: 100%;
   overflow-y: auto;
 }
 
@@ -18,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,11 +82,17 @@ 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);
   }; // 获取关注的人数据列表
 
@@ -163,9 +169,27 @@ 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,

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"], {

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.getDepsAndUsers = exports.removeFollower = exports.addFollower = exports.getSubordinates = exports.getFollowerList = 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/user-message/components/inform/index.css

@@ -1,3 +1,13 @@
+.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;
 }
@@ -8,8 +18,7 @@
   height: 82px;
   border-radius: 12px;
   margin-bottom: 4px;
-  margin: 0 12px;
-  margin-top: 8px;
+  margin-left: 12px;
 }
 
 .titaui-user-message-msg-inform__item:first-of-type {
@@ -103,6 +112,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;
@@ -110,13 +123,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;
+}