@titaui/pc 1.10.78 → 1.10.81

package/lib/components/edit-kr-wight/style/index.js

@@ -13,7 +13,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
-var EditWightContent = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background-color: #fff;\n  padding-top: 21px;\n  padding: 32px 32px 0 32px;\n  max-height: 600px;\n  overflow-y: scroll;\n"])));
+var EditWightContent = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background-color: #fff;\n  padding-top: 21px;\n  padding: 32px 32px 0 32px;\n  max-height: 300px;\n  overflow-y: scroll;\n"])));
 
 exports.EditWightContent = EditWightContent;
 

package/lib/components/menus/export-modules/okr-menus/subordinate-menus/index.js

@@ -97,9 +97,13 @@ function _default(props) {
     }, {
       disabledDottedSubordinatesDig: true
     }).then(function (users) {
-      var rawTreeData = (0, _helper.transToTreeNode)(users);
-      setRawTreeData(rawTreeData);
-      setTreeData((0, _utils.toTree)(rawTreeData));
+      var rawTreeData = (0, _helper.transToTreeNode)(users); // 要过滤掉那些既是登录者的虚线下级，又是登录者下属的下级，让他默认展开的时候重新获取
+
+      var newRawTreeData = rawTreeData.filter(function (item) {
+        return item.pid === loginUserId;
+      });
+      setRawTreeData(newRawTreeData);
+      setTreeData((0, _utils.toTree)(newRawTreeData));
       setLoading(false);
     });
   }, []);
@@ -112,14 +116,15 @@ function _default(props) {
     });
   };
 
-  var filterData = function filterData(childNode, grandNode) {
+  var filterData = function filterData(newNode, oldNode) {
     var mark = {};
-    childNode.forEach(function (item) {
-      mark[item.id] = true;
+    newNode.forEach(function (item) {
+      mark[item.userId] = true;
     });
-    return grandNode.filter(function (item) {
-      !mark[item.userId];
+    var newArry = oldNode.filter(function (item) {
+      return !mark[item.id];
     });
+    return newArry;
   };
 
   var onLoadTreeNodeDataHandler = function onLoadTreeNodeDataHandler(treeNode) {
@@ -130,16 +135,18 @@ function _default(props) {
       promise.then(function (nodes) {
         var _treeNode$children;
 
+        if (!nodes.length) return null;
+        var oldRawTreeData = rawTreeData;
+
         if (treeNode !== null && treeNode !== void 0 && (_treeNode$children = treeNode.children) !== null && _treeNode$children !== void 0 && _treeNode$children.length) {
-          nodes = filterData(treeNode.children, nodes);
+          oldRawTreeData = filterData(nodes, oldRawTreeData);
         }
 
-        if (!nodes.length) return null;
         (0, _helper.transToTreeNode)(nodes).forEach(function (it) {
-          return rawTreeData.push(it);
+          return oldRawTreeData.push(it);
         });
-        setRawTreeData(rawTreeData);
-        setTreeData((0, _utils.toTree)(rawTreeData));
+        setRawTreeData(oldRawTreeData);
+        setTreeData((0, _utils.toTree)(oldRawTreeData));
         return true;
       });
       resolve(true);

package/lib/components/okr-detail/detail-header/index.js

@@ -414,7 +414,9 @@ function OkrDetailHeader(_ref) {
                 case 2:
                   _toast["default"].Success((0, _getLocale.getLocale)("Pro_detail_Deletsuccess"));
 
-                  commonContext.refreshAll();
+                  setTimeout(function () {
+                    commonContext.refreshAll();
+                  }, 500);
 
                 case 4:
                 case "end":

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/pages/group-management/tree/group-form/index.js

@@ -183,7 +183,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }), /*#__PURE__*/_react["default"].createElement("label", {
     htmlFor: "total",
     className: "text"
-  }, (0, _getLocale.getLocale)("Pro_page_Plan_Allpersonnel"))), /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_titaUi.Radio, {
+  }, (0, _getLocale.getLocale)("Backst_Visibletoall"))), /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_titaUi.Radio, {
     id: "scope",
     checked: scopeChecked == 1,
     onChange: function onChange() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.10.78",
+  "version": "1.10.81",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -77,6 +77,7 @@
     "@titaui/rc-tree2": "4.1.23",
     "@titaui/rc-trigger": "5.2.5",
     "@titaui/react-flow-renderer": "9.5.4",
+    "@titaui/request": "^1.0.1",
     "@titaui/toast": "1.0.0",
     "@types/color": "3.0.3",
     "@types/prosemirror-commands": "1.0.4",