@titaui/pc 1.9.29 → 1.9.33

package/lib/components/dialog/index.css

@@ -84,6 +84,8 @@
   font-weight: 400;
   line-height: 20px;
   text-align: center;
+  display: flex;
+  align-items: center;
   box-sizing: border-box;
 }
 
@@ -93,6 +95,7 @@
   border: 1px solid #2879ff;
   color: #ffffff;
   transition: 0.2s all;
+  user-select: none;
 }
 
 .titaui-dialog__btn-ok:hover {
@@ -102,9 +105,19 @@
 }
 
 .titaui-dialog__btn-ok-not-allowed {
+  background-color: #5C8EFF;
   cursor: not-allowed;
 }
 
+.titaui-dialog__btn-ok-loading-icon {
+  width: 14px;
+  margin-right: 6px;
+  animation-name: spin;
+  animation-timing-function: linear;
+  animation-iteration-count: infinite;
+  animation-duration: 1s;
+}
+
 .titaui-dialog__btn-cancel {
   border: 1px solid #DFE3EA;
   color: #6f7886;
@@ -131,3 +144,13 @@
 .titaui-dialog.titaui-dialog-no-footer .rc-dialog-footer {
   display: none;
 }
+
+@keyframes spin {
+  from {
+    transform: rotate(0deg);
+  }
+
+  to {
+    transform: rotate(360deg);
+  }
+}

package/lib/components/dialog/index.js

@@ -1,26 +1,34 @@
 "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 _rcDialog = _interopRequireDefault(require("rc-dialog"));
 
+var _loading = _interopRequireDefault(require("./loading.png"));
+
 var _getLocale = require("../../utils/getLocale");
 
 require("rc-dialog/assets/index.css");
 
 require("./index.css");
 
-var _excluded = ["onOk", "onCancel", "okText", "cancelText", "footer", "noFooter", "noHeadLine", "noCloseIcon", "noFooterLine", "visible", "extraClass", "extendFooterBtn", "disabled"];
+var _excluded = ["onOk", "onCancel", "okText", "cancelText", "footer", "noFooter", "noHeadLine", "noCloseIcon", "noFooterLine", "visible", "extraClass", "extendFooterBtn", "disabled", "confirmLoading"];
 
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -69,8 +77,15 @@ var _default = function _default(props) {
       extendFooterBtn = props.extendFooterBtn,
       _props$disabled = props.disabled,
       disabled = _props$disabled === void 0 ? false : _props$disabled,
+      _props$confirmLoading = props.confirmLoading,
+      confirmLoading = _props$confirmLoading === void 0 ? false : _props$confirmLoading,
       restProps = _objectWithoutProperties(props, _excluded);
 
+  var handleOK = function handleOK() {
+    if (confirmLoading) return;
+    onOk && onOk();
+  };
+
   var baseFooter = [extendFooterBtn, /*#__PURE__*/_react["default"].createElement("span", {
     key: "cancel",
     className: (0, _classnames["default"])("".concat(preCls, "__btn"), "".concat(preCls, "__btn-cancel")),
@@ -79,9 +94,14 @@ var _default = function _default(props) {
     className: (0, _classnames["default"])("".concat(preCls, "__btn-cancel-text"))
   }, cancelText)), /*#__PURE__*/_react["default"].createElement("span", {
     key: "ok",
-    className: (0, _classnames["default"])("".concat(preCls, "__btn"), "".concat(preCls, "__btn-ok"), _defineProperty({}, "".concat(preCls, "__btn-ok-not-allowed"), disabled)),
-    onClick: onOk
-  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(preCls, "__btn"), "".concat(preCls, "__btn-ok"), _defineProperty({}, "".concat(preCls, "__btn-ok-not-allowed"), disabled || confirmLoading)),
+    onClick: handleOK
+  }, confirmLoading ? /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(preCls, "__btn-ok-loading"))
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    className: (0, _classnames["default"])("".concat(preCls, "__btn-ok-loading-icon")),
+    src: _loading["default"]
+  }), (0, _getLocale.getLocale)('Mod_loading')) : /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(preCls, "__btn-ok-text"))
   }, okText))];
   return /*#__PURE__*/_react["default"].createElement(_rcDialog["default"], _extends({

package/lib/components/hr-header/index.js

@@ -15,7 +15,7 @@ var _axios = _interopRequireDefault(require("axios"));
 
 var _popup = _interopRequireDefault(require("../popup"));
 
-var _helpers = require("&/utils/helpers");
+var _helpers = require("../../utils/helpers");
 
 require("./index.css");
 

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

@@ -76,11 +76,16 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       isHideTopRightIcon = _useState8[0],
       setIsHideTopRightIcon = _useState8[1];
 
-  var _useState9 = (0, _react.useState)(false),
+  var _useState9 = (0, _react.useState)(true),
       _useState10 = _slicedToArray(_useState9, 2),
       showMore = _useState10[0],
       setShowMore = _useState10[1];
 
+  var _useState11 = (0, _react.useState)(true),
+      _useState12 = _slicedToArray(_useState11, 2),
+      showFrontMore = _useState12[0],
+      setShowFrontMore = _useState12[1];
+
   var hideFloatRef = (0, _react.useRef)();
   var flipCardRef = (0, _react.useRef)();
   var flipFrontRef = (0, _react.useRef)();
@@ -189,7 +194,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   };
 
   (0, _react.useEffect)(function () {
-    var targetNode = document.getElementsByClassName("simplebar-content-wrapper")[0];
+    var targetNode = document.querySelector(".".concat(_precls["default"], "__inner-back-content"));
     var config = {
       attributes: true,
       childList: true,
@@ -197,16 +202,22 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     };
 
     var callback = function callback(_mutationsList, _observer) {
-      var scrollArea = document.getElementsByClassName("simplebar-content-wrapper")[0];
+      var scrollArea = _simplebar["default"].instances.get(document.querySelector(".".concat(_precls["default"], "__inner-back [data-simplebar]")));
+
+      var el = scrollArea === null || scrollArea === void 0 ? void 0 : scrollArea.getScrollElement();
 
-      if (scrollArea && scrollArea.scrollHeight > scrollArea.offsetHeight) {
-        setShowMore(true);
+      if (el && el.scrollHeight > el.offsetHeight) {
+        if (el.scrollHeight - el.offsetHeight == el.scrollTop) {
+          setShowFrontMore(false);
+        } else {
+          setShowFrontMore(true);
+        }
       } else {
         setShowMore(false);
       }
 
-      scrollArea.addEventListener('scroll', function () {
-        if (scrollArea.scrollHeight - scrollArea.offsetHeight == scrollArea.scrollTop) {
+      el === null || el === void 0 ? void 0 : el.addEventListener("scroll", function () {
+        if (el.scrollHeight - el.offsetHeight == el.scrollTop) {
           setShowMore(false);
         } else {
           setShowMore(true);
@@ -219,13 +230,63 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     return function () {
       observer.disconnect();
     };
-  }, []);
+  }, [isBack]);
+  (0, _react.useEffect)(function () {
+    if (isBack) return;
+    var targetNode = document.querySelector(".".concat(_precls["default"], "__inner-front-content"));
+    var config = {
+      attributes: true,
+      childList: true,
+      subtree: true
+    };
+
+    var callback = function callback(_mutationsList, _observer) {
+      var scrollArea = _simplebar["default"].instances.get(document.querySelector(".".concat(_precls["default"], "__inner-front [data-simplebar]")));
+
+      var el = scrollArea === null || scrollArea === void 0 ? void 0 : scrollArea.getScrollElement();
+
+      if (el && el.scrollHeight > el.offsetHeight) {
+        if (el.scrollHeight - el.offsetHeight == el.scrollTop) {
+          setShowFrontMore(false);
+        } else {
+          setShowFrontMore(true);
+        }
+      } else {
+        setShowFrontMore(false);
+      }
+
+      el === null || el === void 0 ? void 0 : el.addEventListener("scroll", function () {
+        if (el.scrollHeight - el.offsetHeight == el.scrollTop) {
+          setShowFrontMore(false);
+        } else {
+          setShowFrontMore(true);
+        }
+      });
+    };
+
+    var observer = new MutationObserver(callback);
+    targetNode && observer.observe(targetNode, config);
+    return function () {
+      observer.disconnect();
+    };
+  }, [isBack]);
 
   var onClickShowMore = function onClickShowMore() {
-    var instance = _simplebar["default"].instances.get(document.querySelector(".".concat(_precls["default"], "__inner [data-simplebar]")));
+    var _instance;
+
+    var instance = null;
+
+    if (isBack) {
+      instance = _simplebar["default"].instances.get(document.querySelector(".".concat(_precls["default"], "__inner-back [data-simplebar]")));
+    } else {
+      instance = _simplebar["default"].instances.get(document.querySelector(".".concat(_precls["default"], "__inner-front [data-simplebar]")));
+    }
 
-    var el = instance.getScrollElement();
-    el.scrollTop = el.scrollTop + 150;
+    var el = (_instance = instance) === null || _instance === void 0 ? void 0 : _instance.getScrollElement();
+
+    if (el) {
+      el.scrollTop = el.scrollTop + 150;
+    }
   };
 
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
@@ -248,7 +309,10 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     style: {
       padding: "28px 12px 28px 12px"
     }
-  }, children[0]))), /*#__PURE__*/_react["default"].createElement("div", {
+  }, children[0])), showFrontMore && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(_precls["default"], "__has-more"),
+    onClick: onClickShowMore
+  })), /*#__PURE__*/_react["default"].createElement("div", {
     ref: flipBackRef,
     className: (0, _classnames["default"])("".concat(_precls["default"], "__inner-back"))
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -259,10 +323,10 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   }, /*#__PURE__*/_react["default"].createElement(_flipBackHeader["default"], {
     onClick: goBackHandler
-  }), children[1]))), showMore && /*#__PURE__*/_react["default"].createElement("div", {
+  }), children[1])), showMore && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_precls["default"], "__has-more"),
     onClick: onClickShowMore
-  }))), !isHideTopRightIcon && /*#__PURE__*/_react["default"].createElement(_menuCloseBtn["default"], {
+  })))), !isHideTopRightIcon && /*#__PURE__*/_react["default"].createElement(_menuCloseBtn["default"], {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__top-right-hide-icon")),
     isAutoShow: true,
     onClick: onMenuHideHandler

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

@@ -13,7 +13,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _reactRouter = require("react-router");
 
-var _resizeObserver = require("@juggle/resize-observer");
+var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
 
 var _flipMenuCard = _interopRequireDefault(require("../../components/flip-menu-card"));
 
@@ -59,7 +59,7 @@ var AppraisalMenus = function AppraisalMenus(props) {
       history = props.history;
 
   var _useState = (0, _react.useState)(function () {
-    return document.body.offsetHeight - 220;
+    return document.body.offsetHeight - 170;
   }),
       _useState2 = _slicedToArray(_useState, 2),
       maxHeight = _useState2[0],
@@ -116,7 +116,7 @@ var AppraisalMenus = function AppraisalMenus(props) {
   };
 
   (0, _react.useEffect)(function () {
-    var obs = new _resizeObserver.ResizeObserver(function (entries) {
+    var obs = new _resizeObserverPolyfill["default"](function (entries) {
       var _iterator = _createForOfIteratorHelper(entries),
           _step;
 
@@ -124,7 +124,7 @@ var AppraisalMenus = function AppraisalMenus(props) {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var entry = _step.value;
           var cr = entry.contentRect;
-          setMaxHeight(cr.height - 220);
+          setMaxHeight(cr.height - 170);
         }
       } catch (err) {
         _iterator.e(err);

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

@@ -13,7 +13,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _i18n = require("../../../i18n");
 
-var _resizeObserver = require("@juggle/resize-observer");
+var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
 
 var _menuTree = _interopRequireDefault(require("../../../components/menu-tree"));
 
@@ -25,6 +25,8 @@ var _utils = require("../../../utils");
 
 var _precls = _interopRequireDefault(require("../../../precls"));
 
+var _scrollbar = _interopRequireDefault(require("../../../../scrollbar"));
+
 require("../../../index.css");
 
 require("./index.css");
@@ -118,7 +120,7 @@ var _default = function _default() {
   }, []); // 因为要实现虚拟列表的功能，所有要动态的计算出一个菜单的高度
 
   (0, _react.useEffect)(function () {
-    setHeight(document.body.offsetHeight - 240);
+    setHeight(document.body.offsetHeight - 210);
   }, []);
   (0, _react.useEffect)(function () {
     location.href = "#/okr/manage?departmentName=\u516C\u53F8\u5168\u90E8&departmentId=0";
@@ -160,7 +162,7 @@ var _default = function _default() {
   };
 
   (0, _react.useEffect)(function () {
-    var obs = new _resizeObserver.ResizeObserver(function (entries) {
+    var obs = new _resizeObserverPolyfill["default"](function (entries) {
       var _iterator = _createForOfIteratorHelper(entries),
           _step;
 
@@ -168,7 +170,7 @@ var _default = function _default() {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var entry = _step.value;
           var cr = entry.contentRect;
-          setHeight(cr.height - 240);
+          setHeight(cr.height - 210);
         }
       } catch (err) {
         _iterator.e(err);
@@ -182,22 +184,24 @@ var _default = function _default() {
     };
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(_precls["default"], "__depart-menus")),
-    style: {
-      'height': "".concat(height, "px")
-    }
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__depart-menus")) // style={{ 'height': `${height}px` }}
+
   }, loading ? /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__depart-menus--loading"))
-  }, /*#__PURE__*/_react["default"].createElement("span", null)) : /*#__PURE__*/_react["default"].createElement(_menuTree["default"], {
+  }, /*#__PURE__*/_react["default"].createElement("span", null)) : /*#__PURE__*/_react["default"].createElement(_scrollbar["default"], {
+    style: {
+      'maxHeight': height
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_menuTree["default"], {
     data: treeData,
-    itemHeight: itemHeight,
-    height: height,
+    itemHeight: itemHeight // height={height}
+    ,
     virtual: true,
     onSelect: onSelectHandler,
     defaultExpandedKeys: ["0"],
     selectedKeys: selectedMenuKeys,
     loadData: onLoadTreeNodeDataHandler
-  }));
+  })));
 };
 
 exports["default"] = _default;

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

@@ -9,7 +9,7 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _resizeObserver = require("@juggle/resize-observer");
+var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
 
 var _scrollbar = _interopRequireDefault(require("../../../scrollbar"));
 
@@ -55,7 +55,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       history = props.history;
 
   var _useState = (0, _react.useState)(function () {
-    return document.body.offsetHeight - 220;
+    return document.body.offsetHeight - 210;
   }),
       _useState2 = _slicedToArray(_useState, 2),
       maxHeight = _useState2[0],
@@ -202,7 +202,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     };
   });
   (0, _react.useEffect)(function () {
-    var obs = new _resizeObserver.ResizeObserver(function (entries) {
+    var obs = new _resizeObserverPolyfill["default"](function (entries) {
       var _iterator = _createForOfIteratorHelper(entries),
           _step;
 
@@ -210,7 +210,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var entry = _step.value;
           var cr = entry.contentRect;
-          setMaxHeight(cr.height - 220);
+          setMaxHeight(cr.height - 210);
         }
       } catch (err) {
         _iterator.e(err);

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

@@ -11,7 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _resizeObserver = require("@juggle/resize-observer");
+var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
 
 var _menuTree = _interopRequireDefault(require("../../../components/menu-tree"));
 
@@ -82,7 +82,7 @@ var _default = function _default(props) {
       loginUserId = _useState12[0];
 
   var _useState13 = (0, _react.useState)(function () {
-    return document.body.offsetHeight - 220;
+    return document.body.offsetHeight - 200;
   }),
       _useState14 = _slicedToArray(_useState13, 2),
       maxHeight = _useState14[0],
@@ -139,7 +139,7 @@ var _default = function _default(props) {
   };
 
   (0, _react.useEffect)(function () {
-    var obs = new _resizeObserver.ResizeObserver(function (entries) {
+    var obs = new _resizeObserverPolyfill["default"](function (entries) {
       var _iterator = _createForOfIteratorHelper(entries),
           _step;
 

package/lib/components/scrollbar/simplebar/simplebar.js

@@ -11,7 +11,7 @@ var _lodash2 = _interopRequireDefault(require("lodash.debounce"));
 
 var _lodash3 = _interopRequireDefault(require("lodash.memoize"));
 
-var _resizeObserver = require("@juggle/resize-observer");
+var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
 
 var _canUseDom = _interopRequireDefault(require("can-use-dom"));
 
@@ -419,7 +419,7 @@ var SimpleBar = /*#__PURE__*/function () {
       elWindow.addEventListener('resize', this.onWindowResize); // Hack for https://github.com/WICG/ResizeObserver/issues/38
 
       var resizeObserverStarted = false;
-      var resizeObserver = elWindow.ResizeObserver || _resizeObserver.ResizeObserver;
+      var resizeObserver = elWindow.ResizeObserver || _resizeObserverPolyfill["default"];
       this.resizeObserver = new resizeObserver(function () {
         if (!resizeObserverStarted) return;
 

package/lib/components/table/index.css

@@ -50,6 +50,7 @@
 .tita-pc__table .rc-table td {
   font-size: 14px;
   padding: 13px 4px;
+  overflow: hidden;
 }
 
 .tita-pc__table .rc-table-content {

package/lib/components/user-selector/export-modules/duties-selector/index.js

@@ -162,7 +162,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     asyncData: false,
     onSelect: onSelectHandler,
     virtual: true,
-    height: height - 44
+    height: height,
+    switcherIcon: ""
   }))) : /*#__PURE__*/_react["default"].createElement(_context.TreeNodeContext.Provider, {
     value: {}
   }, /*#__PURE__*/_react["default"].createElement(_chooseTree["default"], {
@@ -171,8 +172,9 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     multiple: false,
     getTreeData: onGetTreeData,
     itemHeight: itemHeight,
-    height: height - 44,
-    virtual: true
+    height: height,
+    virtual: true,
+    switcherIcon: ""
   }))));
 
   return /*#__PURE__*/_react["default"].createElement(_context.CommonContext.Provider, {

package/lib/components/user-selector/select-tree/choose-tree/index.js

@@ -29,6 +29,8 @@ var _loading = _interopRequireDefault(require("../../loading"));
 
 require("./index.css");
 
+var _excluded = ["onSelect", "selected", "multiple", "getTreeData", "loadNodes", "expandedKeys", "asyncData", "itemHeight", "height", "virtual", "isGetRoot", "renderEmpty"];
+
 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); }
@@ -49,6 +51,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 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 _default = function _default(props) {
   var onSelect = props.onSelect,
       _props$selected = props.selected,
@@ -65,7 +71,9 @@ var _default = function _default(props) {
       _props$renderEmpty = props.renderEmpty,
       renderEmpty = _props$renderEmpty === void 0 ? function () {
     return /*#__PURE__*/_react["default"].createElement(_empty["default"], null);
-  } : _props$renderEmpty;
+  } : _props$renderEmpty,
+      restProps = _objectWithoutProperties(props, _excluded);
+
   var loadedNode = (0, _react.useRef)([]);
 
   var _useState = (0, _react.useState)(true),
@@ -180,7 +188,7 @@ var _default = function _default(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "perspm-tree"
-  }, /*#__PURE__*/_react["default"].createElement(_tree["default"], _extends({
+  }, /*#__PURE__*/_react["default"].createElement(_tree["default"], _extends({}, restProps, {
     multiple: multiple,
     selectNodeHighlight: false,
     defaultExpandedKeys: getDefaultExpandedKeys(),

package/lib/pages/aha2021/index.js

@@ -62,7 +62,7 @@ var ContentTemplate = function ContentTemplate(props) {
 
 var PageLayout = function PageLayout(props) {
   var children = props.children;
-  var isTrial = window.BSGlobal.tenantAuthentication.Version !== 1 && (0, _platform.isOfficialSite)();
+  var isTrial = window.BSGlobal.tenantAuthentication.Version == 1 && (0, _platform.isOfficialSite)();
 
   var onClickKefu = function onClickKefu() {
     var kefuUrl = isTrial ? "https://wpa1.qq.com/vZYKN3kT?_type=wpa&qidian=true" : "https://wpa1.qq.com/o6X4XD1n?_type=wpa&qidian=true";

package/lib/pages/home/components/data-list/index.css

@@ -1,8 +1,6 @@
 .homepage-datalist {
-  background-color: #f7f9fb;
   height: calc(100vh - 41px);
   overflow: auto;
-  padding: 14px 20px;
   box-sizing: border-box;
   padding-bottom: 20px;
   box-sizing: border-box;

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

@@ -178,7 +178,7 @@ var NewOkrList = function NewOkrList(props) {
 
   (0, _react.useEffect)(function () {
     setPageNum(1);
-  }, [relation, toUserId, departmentId]);
+  }, [relation, toUserId, departmentId, query]);
   (0, _react.useEffect)(function () {
     getOkrs();
   }, [pageNum, pageSize, query, relation, toUserId, departmentId]); // 记录访问者数据

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.9.29",
+  "version": "1.9.33",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",

package/src/components/dialog/index.js

@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import classNames from 'classnames';
 import Dialog from 'rc-dialog';
+import loading from './loading.png';
 import { getLocale } from '../../utils/getLocale'
 
 import 'rc-dialog/assets/index.css';
@@ -20,25 +21,38 @@ export default props => {
     noCloseIcon,
     noFooterLine,
     visible,
-    extraClass=[],
+    extraClass = [],
     extendFooterBtn,
     disabled = false,
+    confirmLoading = false,
     ...restProps
   } = props;
 
+  const handleOK = () => {
+    if (confirmLoading) return
+    onOk && onOk()
+  }
+
   const baseFooter = [
     extendFooterBtn,
     <span key="cancel" className={classNames(`${preCls}__btn`, `${preCls}__btn-cancel`)} onClick={onCancel}>
       <span className={classNames(`${preCls}__btn-cancel-text`)}>{cancelText}</span>
     </span>,
-    <span key="ok" className={classNames(`${preCls}__btn`, `${preCls}__btn-ok`, {[`${preCls}__btn-ok-not-allowed`]:disabled})} onClick={onOk}>
-      <span className={classNames(`${preCls}__btn-ok-text`)}>{okText}</span>
+    <span key="ok" className={classNames(`${preCls}__btn`, `${preCls}__btn-ok`, { [`${preCls}__btn-ok-not-allowed`]: disabled || confirmLoading })} onClick={handleOK}>
+      {confirmLoading ?
+        <span className={classNames(`${preCls}__btn-ok-loading`)}>
+          <img className={classNames(`${preCls}__btn-ok-loading-icon`)} src={loading} />
+          {getLocale('Mod_loading')}
+        </span>
+        :
+        <span className={classNames(`${preCls}__btn-ok-text`)}>{okText}</span>
+      }
     </span>
   ];
 
   return <Dialog
     visible={visible}
-    className={classNames(preCls,[...extraClass], { 
+    className={classNames(preCls, [...extraClass], {
       [`${preCls}-no-head-line`]: noHeadLine,
       [`${preCls}-no-footer-line`]: noFooterLine,
       [`${preCls}-no-close`]: noCloseIcon,