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

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

@@ -62,7 +62,13 @@ function _default(props) {
       _props$endDate = props.endDate,
       endDate = _props$endDate === void 0 ? '' : _props$endDate,
       _props$toLevel = props.toLevel,
-      toLevel = _props$toLevel === void 0 ? 999 : _props$toLevel;
+      toLevel = _props$toLevel === void 0 ? 999 : _props$toLevel,
+      _props$hasdivider = props.hasdivider,
+      hasdivider = _props$hasdivider === void 0 ? false : _props$hasdivider,
+      className = props.className,
+      changeData = props.changeData,
+      _props$includeWork = props.includeWork,
+      includeWork = _props$includeWork === void 0 ? true : _props$includeWork;
   var loginUser = (0, _bsGlobal.getUserInfo)().Id;
   var hasCondition = hasSearch && localStorage.getItem("hasRememberCondition".concat(loginUser));
 
@@ -135,10 +141,16 @@ function _default(props) {
         keyWord: searchKey,
         startDate: startDate,
         endDate: endDate,
-        toLevel: toLevel
+        toLevel: toLevel,
+        includeWork: includeWork
       })
     }).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;
@@ -167,7 +179,7 @@ function _default(props) {
       refreshEList: getKrEsData
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: preCls
+    className: "".concat(preCls, " ").concat(className)
   }, hasSearch && /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], null, /*#__PURE__*/_react["default"].createElement(_searchForm["default"], {
     checkedStatus: checkedStatus,
     setCheckedStatus: setCheckedStatus,
@@ -188,7 +200,7 @@ function _default(props) {
       data: [kr],
       defaultExpandedKeys: expandedKrEs
     })), // kr左后一个节点 && 没有 OE 时，不显示横线
-    !(index + 1 == krList.length && oEList.length == 0) && /*#__PURE__*/_react["default"].createElement("div", {
+    !(index + 1 == krList.length && oEList.length == 0) && hasdivider && /*#__PURE__*/_react["default"].createElement("div", {
       className: "e__divider"
     }));
   }), oEList.map(function (kr) {

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

@@ -166,7 +166,8 @@ var formatCondition = function formatCondition(_ref) {
       keyWord = _ref.keyWord,
       startDate = _ref.startDate,
       endDate = _ref.endDate,
-      toLevel = _ref.toLevel;
+      toLevel = _ref.toLevel,
+      includeWork = _ref.includeWork;
   var resultStatus = [];
 
   if (checkedStatus.includes("all")) {
@@ -198,6 +199,7 @@ var formatCondition = function formatCondition(_ref) {
     FilterKey: keyWord,
     startDate: startDate || '',
     endDate: endDate || '',
+    includeWork: includeWork,
     status: resultStatus.join(","),
     userObjects: users.map(function (user) {
       return {

package/package.json

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