@titaui/pc 1.7.4 → 1.7.5

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

@@ -13,10 +13,14 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _reactRouter = require("react-router");
 
+var _resizeObserver = require("@juggle/resize-observer");
+
 var _flipMenuCard = _interopRequireDefault(require("../../components/flip-menu-card"));
 
 var _menuTree = _interopRequireDefault(require("../../components/menu-tree"));
 
+var _scrollbar = _interopRequireDefault(require("../../../scrollbar"));
+
 var _menus = _interopRequireWildcard(require("./menus"));
 
 var _menuHighlight = _interopRequireDefault(require("./menu-highlight"));
@@ -33,6 +37,8 @@ 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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+
 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."); }
@@ -50,10 +56,17 @@ var AppraisalMenus = function AppraisalMenus(props) {
       onSelect = _props$onSelect === void 0 ? function () {} : _props$onSelect,
       history = props.history;
 
-  var _useState = (0, _react.useState)([]),
+  var _useState = (0, _react.useState)(function () {
+    return document.body.offsetHeight - (220 + 28 * 2);
+  }),
       _useState2 = _slicedToArray(_useState, 2),
-      selectedMenuKeys = _useState2[0],
-      setSelectedMenuKeys = _useState2[1];
+      maxHeight = _useState2[0],
+      setMaxHeight = _useState2[1];
+
+  var _useState3 = (0, _react.useState)([]),
+      _useState4 = _slicedToArray(_useState3, 2),
+      selectedMenuKeys = _useState4[0],
+      setSelectedMenuKeys = _useState4[1];
 
   var menuRef = (0, _react.useRef)();
   var flipRef = (0, _react.useRef)({
@@ -62,12 +75,12 @@ var AppraisalMenus = function AppraisalMenus(props) {
   });
   var okrMenusData = (0, _react.useRef)(_menus.defaultRefObject);
 
-  var _useState3 = (0, _react.useState)(function () {
+  var _useState5 = (0, _react.useState)(function () {
     okrMenusData.current = new _menus["default"]();
     return okrMenusData.current.getMenus();
   }),
-      _useState4 = _slicedToArray(_useState3, 1),
-      menus = _useState4[0]; // 判断路由高亮菜单
+      _useState6 = _slicedToArray(_useState5, 1),
+      menus = _useState6[0]; // 判断路由高亮菜单
 
 
   (0, _react.useEffect)(function () {
@@ -100,6 +113,28 @@ var AppraisalMenus = function AppraisalMenus(props) {
     }
   };
 
+  (0, _react.useEffect)(function () {
+    var obs = new _resizeObserver.ResizeObserver(function (entries) {
+      var _iterator = _createForOfIteratorHelper(entries),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var entry = _step.value;
+          var cr = entry.contentRect;
+          setMaxHeight(cr.height - (220 + 28 * 2));
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    });
+    obs.observe(document.body);
+    return function () {
+      obs.unobserve(document.body);
+    };
+  }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     ref: menuRef,
     className: (0, _classnames["default"])(_precls["default"], "".concat(_precls["default"], "-appraisal-menus"))
@@ -109,11 +144,15 @@ var AppraisalMenus = function AppraisalMenus(props) {
     defaultWidth: 180
   }, /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "-appraisal-menus-tree"))
+  }, /*#__PURE__*/_react["default"].createElement(_scrollbar["default"], {
+    style: {
+      maxHeight: maxHeight
+    }
   }, /*#__PURE__*/_react["default"].createElement(_menuTree["default"], {
     data: menus,
     selectedKeys: selectedMenuKeys,
     onSelect: onSelectHandler
-  }))), /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null)));
+  })))), /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null)));
 }; // @ts-ignore
 
 

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

@@ -194,21 +194,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         setMenus(mdata.getMenus());
       }
     });
-  }; // 如果有下属则显示 “下属 OKR” 菜单
-  // useEffect(() => {
-  //   checkHasSubordinates().then(res => {
-  //     if (
-  //       res.Code == 1 &&
-  //       res.Data.subUserCount &&
-  //       res.Data.subUserCount.subUserCount > 0
-  //     ) {
-  //       const mdata = okrMenusData.current;
-  //       mdata.showSubordinateMenu();
-  //       setMenus(mdata.getMenus());
-  //     }
-  //   })
-  // }, [])
-
+  };
 
   (0, _react.useImperativeHandle)(ref, function () {
     return {
@@ -237,7 +223,6 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       obs.unobserve(document.body);
     };
   }, []);
-  console.log(menus);
   return /*#__PURE__*/_react["default"].createElement(_context.OkrMenusContext.Provider, {
     value: {
       onAddConcerner: onAddConcerner,

package/package.json

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