@titaui/pc 1.10.6-3.beta-9 → 1.10.6-3.beta-14

package/.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-# npm run lint-staged
+npm run lint-staged

package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.css

@@ -5,6 +5,18 @@
   display: flex;
 }
 
+.tita-okrdt-tree__e-kr-node:hover .tita-okrdt-tree__e-kr-node-actions {
+  opacity: 1;
+  transition: all 0.2s linear;
+}
+
+.tita-okrdt-tree__e-kr-node-preicon {
+  display: inline-block;
+  line-height: 22px;
+  color: #6f7886;
+  font-size: 16px;
+}
+
 .tita-okrdt-tree__e-kr-node-prefix {
   display: inline-block;
   height: 22px;
@@ -27,8 +39,10 @@
 
 .tita-okrdt-tree__e-kr-node-actions {
   display: inline-block;
+  opacity: 0;
   position: absolute;
   right: 0;
+  transition: all 0.2s linear;
 }
 
 .tita-okrdt-tree__e-kr-node-actions-create {
@@ -43,7 +57,7 @@
 }
 
 .tita-okrdt-tree__e-kr-node-actions-create:hover {
-  color: #5C8EFF;
+  color: #5c8eff;
 }
 
 .tita-okrdt-tree__e-kr-node-actions-create .tu-icon-add1 {
@@ -63,11 +77,11 @@
 }
 
 .tita-okrdt-tree__e-kr-node-actions-connect:hover {
-  color: #5C8EFF;
+  color: #5c8eff;
 }
 
 .e-kr-node-layer-icon {
-  color: #89919F;
+  color: #89919f;
 }
 
 .e-kr-node__guanlian-icon {

package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.js

@@ -172,7 +172,9 @@ var EKrNode = function EKrNode(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     key: index,
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node"))
-  }, isOTask ? null : /*#__PURE__*/_react["default"].createElement("span", {
+  }, isOTask ? /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("tu-icon-O ".concat(_precls["default"], "__e-kr-node-preicon"))
+  }) : /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-prefix"))
   }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-title")),

package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/index.css

@@ -84,13 +84,13 @@
   line-height: 18px;
   display: inline-flex;
   align-items: center;
+  justify-content: flex-end;
   box-sizing: border-box;
   width: 78px;
   height: 26px;
   padding: 4px;
   text-align: left;
   line-height: 26px;
-  margin-left: 16px;
 }
 
 .tita-okrdt-tree__e-task-node-actions-date > span {
@@ -103,7 +103,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -171,14 +171,14 @@
   height: 20px;
   font-size: 12px;
   font-weight: 400;
-  color: #F05E5E;
+  color: #f05e5e;
   background: rgba(240, 94, 94, 0.1);
   border-radius: 10px;
   margin-left: 8px;
 }
 
 .tita-okrdt-tree__e-project-node-gray {
-  color: #BFC7D5 !important;
+  color: #bfc7d5 !important;
 }
 
 .tita-okrdt-tree__e-project-node-priority {
@@ -235,13 +235,13 @@
   line-height: 18px;
   display: inline-flex;
   align-items: center;
+  justify-content: flex-end;
   box-sizing: border-box;
   width: 78px;
   height: 26px;
   padding: 4px;
   text-align: left;
   line-height: 26px;
-  margin-left: 16px;
 }
 
 .tita-okrdt-tree__e-project-node-actions-date > span {
@@ -254,7 +254,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -357,13 +357,13 @@
   line-height: 18px;
   display: inline-flex;
   align-items: center;
+  justify-content: flex-end;
   box-sizing: border-box;
   width: 78px;
   height: 26px;
   padding: 4px;
   text-align: left;
   line-height: 26px;
-  margin-left: 16px;
 }
 
 .tita-okrdt-tree__e-task-level2-node-actions-date > span {
@@ -376,7 +376,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -398,7 +398,7 @@
 .tita-okrdt-tree__e-empty-node {
   font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
-  color: #A4ACB9;
+  color: #a4acb9;
   line-height: 18px;
   padding-left: 12px;
 }
@@ -408,5 +408,5 @@
 }
 
 .e-node-status-icon {
-  color: #89919F;
+  color: #89919f;
 }

package/lib/components/okr-detail/e-list/index.js

@@ -183,13 +183,6 @@ function Elist(props, ref) {
     setTotalDataNum(totalLength);
     setIsEmpty && setIsEmpty(!totalLength);
   }, [krList, oEList]);
-  var krsTree = (0, _react.useCallback)(function (kr) {
-    return /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
-      key: Math.random(),
-      data: [kr],
-      defaultExpandedKeys: expandedKrEs
-    });
-  }, [expandedKrEs, krList]);
   return /*#__PURE__*/_react["default"].createElement(_context.EListContext.Provider, {
     value: {
       refreshEList: function refreshEList() {
@@ -214,7 +207,11 @@ function Elist(props, ref) {
   }, krList.map(function (kr, index) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], {
       padding: layoutPadding
-    }, krsTree(kr)), // kr左后一个节点 && 没有 OE 时，不显示横线
+    }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
+      key: Math.random(),
+      data: [kr],
+      defaultExpandedKeys: expandedKrEs
+    })), // kr左后一个节点 && 没有 OE 时，不显示横线
     !(index + 1 == krList.length && oEList.length == 0) && hasdivider && /*#__PURE__*/_react["default"].createElement("div", {
       className: "e__divider"
     }));

package/lib/components/okr-progress-detail/index.css

@@ -6,6 +6,7 @@
   display: flex;
   align-items: center;
   position: relative;
+  height: 24px;
 }
 
 .okr-progress-item-wrapper .okr-progress-item-content__icon-state {
@@ -15,7 +16,7 @@
 .okr-progress-item-wrapper .okr-progress-item__percent {
   font-size: 16px;
   font-weight: 600;
-  color: #3F4755;
+  color: #3f4755;
   line-height: 24px;
   margin-left: 12px;
 }
@@ -28,11 +29,11 @@
 }
 
 .okr-progress-item-wrapper .okr-progress-item__percent--advance {
-  color: #5AD8A6;
+  color: #5ad8a6;
 }
 
 .okr-progress-item-wrapper .okr-progress-item__percent--delay {
-  color: #F05E5E;
+  color: #f05e5e;
 }
 
 .okr-progress-item-wrapper .okr-progress-item-content--edit {
@@ -42,7 +43,7 @@
 }
 
 .okr-progress-item-wrapper .okr-progress-item-content--edit:hover {
-  background: #F7F8FA;
+  background: #f7f8fa;
 }
 
 .okr-progress-item-wrapper .okr-progress-item-content__body-wrapper {
@@ -60,7 +61,7 @@
 
 .okr-progress-item-wrapper .okr-progress-item-content__body-wrapper .okr-progress-item-content__body .okr-progress-item__content {
   font-size: 14px;
-  color: #3F4755;
+  color: #3f4755;
   line-height: 22px;
   white-space: pre-wrap;
 }
@@ -73,7 +74,7 @@
 
 .okr-progress-item-wrapper .okr-progress-item__content-bottom {
   font-size: 12px;
-  color: #A4ACB9;
+  color: #a4acb9;
   line-height: 18px;
   margin-top: 6px;
   display: flex;
@@ -88,12 +89,12 @@
 }
 
 .okr-progress-item-wrapper .okr-progress-item__content-bottom .okr-progress-item__bottom-func-btns .okr-progress-item__bottom-btn--edit:hover {
-  color: #2879FF;
+  color: #2879ff;
   cursor: pointer;
 }
 
 .okr-progress-item-wrapper .okr-progress-item__content-bottom .okr-progress-item__bottom-func-btns .okr-progress-item__bottom-btn--delete:hover {
-  color: #F05E5E;
+  color: #f05e5e;
   cursor: pointer;
 }
 
@@ -106,7 +107,7 @@
   display: inline-block;
   width: 1px;
   height: 16px;
-  background: linear-gradient(180deg, rgba(213, 219, 226, 0) 0%, #D5DBE2 49%, rgba(213, 219, 226, 0) 100%);
+  background: linear-gradient(180deg, rgba(213, 219, 226, 0) 0%, #d5dbe2 49%, rgba(213, 219, 226, 0) 100%);
   border-radius: 2px;
 }
 
@@ -129,7 +130,7 @@
   right: 0;
   font-size: 12px;
   font-weight: 400;
-  color: #A4ACB9;
+  color: #a4acb9;
   line-height: 24px;
   padding-right: 16px;
 }

package/lib/components/okr-progress-detail/utils.js

@@ -22,8 +22,8 @@ var getTimeString = function getTimeString(time, nowTime) {
   var timeYear = timeDateObj.getFullYear();
   var timeMonth = timeDateObj.getMonth() + 1;
   var timeDate = timeDateObj.getDate();
-  var timeHours = timeDateObj.getHours();
-  var timeMinutes = timeDateObj.getMinutes();
+  var timeHours = timeDateObj.getHours() < 10 ? "0".concat(timeDateObj.getHours()) : timeDateObj.getHours();
+  var timeMinutes = timeDateObj.getMinutes() < 10 ? "0".concat(timeDateObj.getMinutes()) : timeDateObj.getMinutes();
   var nowMilliSecond = nowTime.getTime();
   var nowYear = nowTime.getFullYear();
   var nowDate = nowTime.getDate();
@@ -56,11 +56,11 @@ var getTimeString = function getTimeString(time, nowTime) {
   if (timeYear === nowYear) {
     var _dateStr = months[timeMonth - 1] + (_getLocale.isEn ? " ".concat(timeDate, " ") : "".concat(timeDate, "\u65E5"));
 
-    return "".concat(_dateStr, " ").concat(timeHours < 10 ? "0".concat(timeHours) : timeHours, ":").concat(timeMinutes < 10 ? "0".concat(timeMinutes) : timeMinutes);
+    return "".concat(_dateStr, " ", "".concat(timeHours, ":").concat(timeMinutes));
   }
 
   var dateStr = (_getLocale.isEn ? "" : "".concat(timeYear, "\u5E74")) + months[timeMonth - 1] + (_getLocale.isEn ? " ".concat(timeDate, " ") : "".concat(timeDate, "\u65E5")) + (_getLocale.isEn ? ",".concat(timeYear) : "");
-  return "".concat(dateStr, " ").concat(timeHours < 10 ? "0".concat(timeHours) : timeHours, ":").concat(timeMinutes < 10 ? "0".concat(timeMinutes) : timeMinutes);
+  return "".concat(dateStr, " ", "".concat(timeHours, ":").concat(timeMinutes));
 };
 
 exports.getTimeString = getTimeString;

package/lib/components/scrollbar/index.js

@@ -1,39 +1,97 @@
 "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;
+exports["default"] = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _simplebarReact = _interopRequireDefault(require("./simplebar-react"));
 
+var _scrollMask = _interopRequireDefault(require("./scroll-mask"));
+
 require("./index.css");
 
 var _excluded = ["children", "style"];
 
 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 _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 var preCls = "titaui-scrollbar";
-
-function _default(props) {
+var ScrollBar = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var children = props.children,
-      style = props.style,
-      restProps = _objectWithoutProperties(props, _excluded); // @ts-ignore
+      _props$style = props.style,
+      style = _props$style === void 0 ? {
+    height: "100%"
+  } : _props$style,
+      restProps = _objectWithoutProperties(props, _excluded);
+
+  var _useState = (0, _react.useState)(),
+      _useState2 = _slicedToArray(_useState, 2),
+      scrollElement = _useState2[0],
+      setScrollElement = _useState2[1];
 
+  var _useState3 = (0, _react.useState)(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      contentElement = _useState4[0],
+      setContentElement = _useState4[1];
 
-  return /*#__PURE__*/_react["default"].createElement(_simplebarReact["default"], _extends({
+  var simpleBarRef = (0, _react.useRef)();
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      scrollElement: scrollElement,
+      contentElement: contentElement
+    };
+  });
+  (0, _react.useEffect)(function () {
+    // @ts-ignore
+    setScrollElement(simpleBarRef === null || simpleBarRef === void 0 ? void 0 : simpleBarRef.current.getScrollElement()); // @ts-ignore
+
+    setContentElement(simpleBarRef === null || simpleBarRef === void 0 ? void 0 : simpleBarRef.current.getContentElement());
+  }, []);
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      height: "100%"
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_simplebarReact["default"], _extends({
+    ref: simpleBarRef,
     className: (0, _classnames["default"])(preCls),
     timeout: 800,
     style: style
-  }, restProps), children);
-}
+  }, restProps), children));
+});
+ScrollBar.defaultProps = {
+  style: {
+    height: "100%"
+  }
+}; // @ts-ignore
+
+ScrollBar.Mask = _scrollMask["default"];
+var _default = ScrollBar;
+exports["default"] = _default;

package/lib/components/scrollbar/scroll-mask/index.css

@@ -0,0 +1,29 @@
+.titaui-scroll-mask {
+  width: 100%;
+  height: calc(100% - 16px);
+  position: relative;
+}
+
+.titaui-scroll-mask__top {
+  position: absolute;
+  top: 0;
+  width: 100%;
+  pointer-events: none;
+  background: linear-gradient(180deg, #ffffff 0%, rgba(255, 255, 255, 0) 100%);
+}
+
+.titaui-scroll-mask__top--hide {
+  display: none;
+}
+
+.titaui-scroll-mask__bottom {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  pointer-events: none;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #ffffff 100%);
+}
+
+.titaui-scroll-mask__bottom--hide {
+  display: none;
+}

package/lib/components/scrollbar/scroll-mask/index.js

@@ -0,0 +1,152 @@
+"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"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _scrollbar = _interopRequireDefault(require("../../scrollbar"));
+
+require("./index.css");
+
+var _excluded = ["children", "maskHeight", "style"];
+
+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 _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+var preCls = "titaui-scroll-mask";
+
+var ScrollBarMask = function ScrollBarMask(_ref) {
+  var _scrollRef$current, _scrollRef$current2;
+
+  var children = _ref.children,
+      maskHeight = _ref.maskHeight,
+      _ref$style = _ref.style,
+      style = _ref$style === void 0 ? {
+    height: "100%"
+  } : _ref$style,
+      restProps = _objectWithoutProperties(_ref, _excluded);
+
+  var _useState = (0, _react.useState)(true),
+      _useState2 = _slicedToArray(_useState, 2),
+      isScrollToTop = _useState2[0],
+      setIsScrollToTop = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      isScrollToBottom = _useState4[0],
+      setIsScrollToBottom = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(false),
+      _useState6 = _slicedToArray(_useState5, 2),
+      isOverFlow = _useState6[0],
+      setIsOverFlow = _useState6[1];
+
+  var scrollRef = (0, _react.useRef)(); // @ts-ignore
+
+  var scrollElement = (_scrollRef$current = scrollRef.current) === null || _scrollRef$current === void 0 ? void 0 : _scrollRef$current.scrollElement; // @ts-ignore
+
+  var contentElement = (_scrollRef$current2 = scrollRef.current) === null || _scrollRef$current2 === void 0 ? void 0 : _scrollRef$current2.contentElement;
+
+  var handleScroll = function handleScroll() {
+    // 判断是否滚动到顶部
+    if (!(scrollElement !== null && scrollElement !== void 0 && scrollElement.scrollTop)) {
+      setIsScrollToTop(true);
+    } else {
+      setIsScrollToTop(false);
+    } // 判断是否滚动到底部
+
+
+    if (scrollElement.scrollTop + scrollElement.offsetHeight === scrollElement.scrollHeight) {
+      setIsScrollToBottom(true);
+    } else {
+      setIsScrollToBottom(false);
+    }
+  };
+
+  (0, _react.useEffect)(function () {
+    // 判断是否出现滚动条
+    if ((scrollElement === null || scrollElement === void 0 ? void 0 : scrollElement.offsetHeight) < (scrollElement === null || scrollElement === void 0 ? void 0 : scrollElement.scrollHeight)) {
+      setIsOverFlow(true);
+    }
+  }, [scrollElement === null || scrollElement === void 0 ? void 0 : scrollElement.scrollHeight]);
+  (0, _react.useEffect)(function () {
+    var mutation;
+
+    if (contentElement) {
+      var config = {
+        characterData: true,
+        // 监听元素内的数据变动
+        childList: true,
+        // 监听子元素数量变动（子元素的属性变化不会触发事件）（只针对一级子元素，孙子元素的数量变化不会触发事件）
+        subtree: true // 将observer事件下发到目标元素的所有子元素，相当于对子元素也进行了observer
+
+      };
+
+      var recalculate = function recalculate() {
+        if (contentElement.scrollHeight > scrollElement.offsetHeight) {
+          setIsOverFlow(true);
+        } else {
+          setIsOverFlow(false);
+        }
+      };
+
+      mutation = new MutationObserver(recalculate);
+      mutation.observe(contentElement, config);
+    }
+  }, [contentElement]);
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: preCls,
+    onScroll: handleScroll
+  }, /*#__PURE__*/_react["default"].createElement(_scrollbar["default"], _extends({
+    ref: scrollRef,
+    style: style
+  }, restProps), children), isOverFlow && /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])(_defineProperty({}, "".concat(preCls, "__top--hide"), isScrollToTop), _defineProperty({}, "".concat(preCls, "__top"), !isScrollToTop)),
+    style: {
+      height: "".concat(maskHeight, "px")
+    }
+  }), isOverFlow && /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])(_defineProperty({}, "".concat(preCls, "__bottom--hide"), isScrollToBottom), _defineProperty({}, "".concat(preCls, "__bottom"), !isScrollToBottom)),
+    style: {
+      height: "".concat(maskHeight, "px")
+    }
+  }));
+};
+
+ScrollBarMask.defaultProps = {
+  style: {
+    height: "100%"
+  }
+};
+var _default = ScrollBarMask;
+exports["default"] = _default;

package/lib/components/tree/index.css

@@ -37,7 +37,7 @@
   position: absolute;
   width: 100%;
   bottom: 0;
-  content: "";
+  content: '';
   border-bottom: 2px solid #2879ff;
   z-index: 1;
 }
@@ -51,7 +51,7 @@
   position: absolute;
   width: 100%;
   top: 0;
-  content: "";
+  content: '';
   border-top: 2px solid #2879ff;
   z-index: 1;
 }
@@ -61,6 +61,7 @@
   align-items: center;
   line-height: unset;
   overflow: hidden;
+  border-radius: 8px;
 }
 
 .titaui-tree .rc-tree .rc-tree-treenode .rc-tree-node-content-wrapper {

package/lib/components/upload-photo-modal/request-api.js

@@ -3,34 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.saveUserPhoto = exports.saveUserInfo = exports.saveTenantLogo = exports.saveBrowserIcon = exports.getUserInfoFun = void 0;
-
-var _qs = _interopRequireDefault(require("qs"));
+exports.saveUserPhoto = exports.saveTenantLogo = exports.saveBrowserIcon = exports.getUserInfoFun = void 0;
 
 var _request = require("../../utils/request");
 
 var _bsGlobal = require("../../utils/bs-global");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 var getUserInfoFun = function getUserInfoFun() {
   return (0, _request.rpost)("v1")("manage/user/profile?toUserId=".concat((0, _bsGlobal.getUserInfo)().Id));
 };
 
 exports.getUserInfoFun = getUserInfoFun;
 
-var saveUserInfo = function saveUserInfo(_ref) {
-  var data = _ref.data;
-  return (0, _request.rput)("v1")("manage/user/update", data, {
-    headers: {
-      "Content-Type": "multipart/form-data"
-    },
-    transformRequest: _qs["default"].stringify
-  });
-};
-
-exports.saveUserInfo = saveUserInfo;
-
 var saveUserPhoto = function saveUserPhoto(params) {
   return (0, _request.rpost)("v1")("manage/user/avatar", params, {
     headers: {

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

@@ -214,8 +214,7 @@ var NewOkrList = function NewOkrList(props) {
     if (!relation) {
       request = (0, _requestApi.okrSearch)(params);
     } else {
-      // request = okrList(params);
-      request = (0, _requestApi.okrSearch)(params);
+      request = (0, _requestApi.okrList)(params);
     }
 
     setLoading(true);

package/lib/pages/personal-info/request-api.js

@@ -21,7 +21,7 @@ exports.getUserInfoFun = getUserInfoFun;
 
 var saveUserInfo = function saveUserInfo(_ref) {
   var data = _ref.data;
-  return (0, _request.rput)("v1")("manage/user/update", data, {
+  return (0, _request.rput)("v1")("manage/user/updatebasic", data, {
     headers: {
       "Content-Type": "application/x-www-form-urlencoded"
     },

package/package.json

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