@titaui/pc 1.10.6-3.beta-4 → 1.10.6-3.beta-5

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

@@ -68,7 +68,13 @@ function _default(props) {
       className = props.className,
       changeData = props.changeData,
       _props$includeWork = props.includeWork,
-      includeWork = _props$includeWork === void 0 ? true : _props$includeWork;
+      includeWork = _props$includeWork === void 0 ? true : _props$includeWork,
+      _props$IncludeNoTaskK = props.IncludeNoTaskKr,
+      IncludeNoTaskKr = _props$IncludeNoTaskK === void 0 ? true : _props$IncludeNoTaskK,
+      _props$hasLoading = props.hasLoading,
+      hasLoading = _props$hasLoading === void 0 ? true : _props$hasLoading,
+      _props$IsDateFilter = props.IsDateFilter,
+      IsDateFilter = _props$IsDateFilter === void 0 ? false : _props$IsDateFilter;
   var loginUser = (0, _bsGlobal.getUserInfo)().Id;
   var hasCondition = hasSearch && localStorage.getItem("hasRememberCondition".concat(loginUser));
 
@@ -142,15 +148,12 @@ function _default(props) {
         startDate: startDate,
         endDate: endDate,
         toLevel: toLevel,
-        includeWork: includeWork
+        includeWork: includeWork,
+        IncludeNoTaskKr: IncludeNoTaskKr,
+        IsDateFilter: IsDateFilter
       })
     }).then(function (krs) {
       debugger;
-
-      if (!krs || !krs.length) {
-        changeData(true);
-      }
-
       var formatKrs = formatEList(krs, okrId, (0, _util.getIfInitCondition)(selectName, checkedStatus, selectUsers, searchKey));
       var expandedKrEs = (formatKrs.krsEList || []).map(function (it) {
         return it.key;
@@ -176,7 +179,9 @@ function _default(props) {
   }, [krList, oEList]);
   return /*#__PURE__*/_react["default"].createElement(_context.EListContext.Provider, {
     value: {
-      refreshEList: getKrEsData
+      refreshEList: function refreshEList() {
+        return getKrEsData(formatTree);
+      }
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, " ").concat(className)
@@ -191,7 +196,7 @@ function _default(props) {
     selectUsers: selectUsers,
     setSelectUsers: setSelectUsers,
     okrId: okrId
-  })), !loading ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+  })), !loading || !hasLoading ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: totalDataNum !== 0
   }, krList.map(function (kr, index) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], {

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

@@ -167,7 +167,9 @@ var formatCondition = function formatCondition(_ref) {
       startDate = _ref.startDate,
       endDate = _ref.endDate,
       toLevel = _ref.toLevel,
-      includeWork = _ref.includeWork;
+      includeWork = _ref.includeWork,
+      IncludeNoTaskKr = _ref.IncludeNoTaskKr,
+      IsDateFilter = _ref.IsDateFilter;
   var resultStatus = [];
 
   if (checkedStatus.includes("all")) {
@@ -200,6 +202,8 @@ var formatCondition = function formatCondition(_ref) {
     startDate: startDate || '',
     endDate: endDate || '',
     includeWork: includeWork,
+    IncludeNoTaskKr: IncludeNoTaskKr,
+    IsDateFilter: IsDateFilter,
     status: resultStatus.join(","),
     userObjects: users.map(function (user) {
       return {

package/package.json

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