@titaui/pc 1.15.46-beta.2 → 1.15.46-beta.3

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

@@ -176,7 +176,7 @@ var _default = function _default() {
           deWeightData[item.id] = item;
         });
         var result = Object.values(deWeightData);
-        setRawTreeData(_toConsumableArray(result));
+        setRawTreeData([].concat(result));
         setTreeData((0, _utils.toTree)(rawTreeData));
         resolve(true);
       });

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

@@ -247,7 +247,7 @@ var NewOkrList = function NewOkrList(props) {
     }
   };
 
-  var getOkrs = function getOkrs() {
+  var getOkrsRequest = function getOkrsRequest() {
     var params = _objectSpread(_objectSpread({
       relation: relation,
       toUserId: (0, _bsGlobal.getUserInfo)().Id,
@@ -270,7 +270,6 @@ var NewOkrList = function NewOkrList(props) {
       params.keyWords = "";
     }
 
-    setLoading(true);
     recordVisitUser();
     (0, _requestApi.okrSearch)(params).then(function (res) {
       setOkrs(res && res.works || []);
@@ -279,6 +278,17 @@ var NewOkrList = function NewOkrList(props) {
     });
   };
 
+  var getOkrs = function getOkrs() {
+    // 这个用于loading加载
+    setLoading(true);
+    getOkrsRequest();
+  };
+
+  var onRefreshOkrs = function onRefreshOkrs() {
+    // 这个不要loading，推屏出来的时候用这个
+    getOkrsRequest();
+  };
+
   (0, _react.useEffect)(function () {
     okrsRef.current = okrs;
   }, [okrs]);
@@ -401,7 +411,7 @@ var NewOkrList = function NewOkrList(props) {
   }))), okrs.length > 0 && viewType === _header.ViewType.Table && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_okrExcel["default"], {
     showCycle: query.cycleType === '-1',
     data: okrExcelData,
-    onRefresh: getOkrs
+    onRefresh: onRefreshOkrs
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_precls.precls, "__pagination")
   }, /*#__PURE__*/_react["default"].createElement(_pagination["default"], {

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

@@ -16,9 +16,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 function Loading(_ref) {
   var children = _ref.children,
       loading = _ref.loading;
-  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, children, loading && /*#__PURE__*/_react["default"].createElement("div", {
+  if (!loading) return children;
+  return /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_precls.precls, "__loading")
-  }));
+  });
 }
 
 var _default = Loading;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.15.46-beta.2",
+  "version": "1.15.46-beta.3",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",