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

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

@@ -62,7 +62,19 @@ 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,
+      _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));
 
@@ -135,7 +147,10 @@ function _default(props) {
         keyWord: searchKey,
         startDate: startDate,
         endDate: endDate,
-        toLevel: toLevel
+        toLevel: toLevel,
+        includeWork: includeWork,
+        IncludeNoTaskKr: IncludeNoTaskKr,
+        IsDateFilter: IsDateFilter
       })
     }).then(function (krs) {
       debugger;
@@ -164,10 +179,12 @@ 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: preCls
+    className: "".concat(preCls, " ").concat(className)
   }, hasSearch && /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], null, /*#__PURE__*/_react["default"].createElement(_searchForm["default"], {
     checkedStatus: checkedStatus,
     setCheckedStatus: setCheckedStatus,
@@ -179,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"], {
@@ -188,7 +205,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,10 @@ var formatCondition = function formatCondition(_ref) {
       keyWord = _ref.keyWord,
       startDate = _ref.startDate,
       endDate = _ref.endDate,
-      toLevel = _ref.toLevel;
+      toLevel = _ref.toLevel,
+      includeWork = _ref.includeWork,
+      IncludeNoTaskKr = _ref.IncludeNoTaskKr,
+      IsDateFilter = _ref.IsDateFilter;
   var resultStatus = [];
 
   if (checkedStatus.includes("all")) {
@@ -198,6 +201,9 @@ var formatCondition = function formatCondition(_ref) {
     FilterKey: keyWord,
     startDate: startDate || '',
     endDate: endDate || '',
+    includeWork: includeWork,
+    IncludeNoTaskKr: IncludeNoTaskKr,
+    IsDateFilter: IsDateFilter,
     status: resultStatus.join(","),
     userObjects: users.map(function (user) {
       return {

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

@@ -25,7 +25,7 @@ var _utils = require("./utils");
 
 var _getLocale = require("../../utils/getLocale");
 
-var _dangerousHtml = _interopRequireDefault(require("../dynamic/components/dangerous-html"));
+var _dangerousHtml = _interopRequireDefault(require("../dangerous-html"));
 
 require("./index.css");
 

package/package.json

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