@titaui/pc 1.11.13-beta.1 → 1.11.13-beta.11

package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/index.js

@@ -47,8 +47,6 @@ var _EditKrWightModal = _interopRequireDefault(require("../../../../../edit-kr-w
 
 var _okrProgressModal = _interopRequireDefault(require("../../../../../okr-progress-modal"));
 
-var _helper = require("../../../../helper");
-
 var _getLocale = require("../../../../../../utils/getLocale");
 
 require("./index.css");
@@ -97,12 +95,10 @@ function _default(props) {
       index = props.index,
       title = props.title,
       key = props.key;
-  console.log('props', props);
 
   var _useContext = (0, _react.useContext)(_context2.CommonContext),
       refreshAll = _useContext.refreshAll,
-      okrInfo = _useContext.okrInfo,
-      approvalSetting = _useContext.approvalSetting;
+      okrInfo = _useContext.okrInfo;
 
   var _useState = (0, _react.useState)(data.confidenceIndex),
       _useState2 = _slicedToArray(_useState, 2),
@@ -319,7 +315,7 @@ function _default(props) {
   }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-title"))
   }, /*#__PURE__*/_react["default"].createElement(_editableInput["default"], {
-    editable: krCanEdit && (0, _helper.getApprovalIsShow)(approvalSetting, 'changeOkrName', okrInfo.applyState),
+    editable: krCanEdit,
     defaultValue: krName,
     emptyMessage: "KR\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A",
     onKeyDown: onKrNameChangeHandler,
@@ -333,10 +329,10 @@ function _default(props) {
     name: user.name,
     id: user.userId,
     width: 68,
-    editable: krCanEdit && okrInfo.applyState !== _helper.EApproveStatus.UnderApproval,
+    editable: krCanEdit,
     onEditUser: onEditUserHandler,
     nameTips: function nameTips(name) {
-      return /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_Text_Owner'), name);
+      return /*#__PURE__*/_react["default"].createElement("span", null, "\u8D1F\u8D23\u4EBA\uFF1A", name);
     }
   })), showKrWeight && /*#__PURE__*/_react["default"].createElement(OkrRowColumn, {
     width: 60,
@@ -352,7 +348,7 @@ function _default(props) {
     marginLeft: 16
   }, /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
     data: data,
-    editable: krCanEdit && (0, _helper.getApprovalIsShow)(approvalSetting, 'changeOkrTime', okrInfo.applyState)
+    editable: krCanEdit
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-actions"))
   }, showHeart && /*#__PURE__*/_react["default"].createElement("div", {
@@ -381,7 +377,7 @@ function _default(props) {
     evaluateValue: evaluateValue,
     setEvaluateValue: onEvaluateChangeHanler,
     isEvaluate: isEvaluate
-  })), krCanEdit && okrInfo.applyState !== _helper.EApproveStatus.UnderApproval && /*#__PURE__*/_react["default"].createElement("div", {
+  })), krCanEdit && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-delete")),
     onClick: function onClick() {
       return setDeleteModalVisible(true);

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

@@ -29,8 +29,6 @@ var _okrShare = _interopRequireDefault(require("../../okr-share"));
 
 var _context7 = require("../context");
 
-var _constant = require("./constant");
-
 var _deleteConfirm = _interopRequireDefault(require("./delete-confirm/delete-confirm"));
 
 var _drawerManager = _interopRequireDefault(require("../../drawer-manager"));
@@ -87,8 +85,6 @@ function OkrDetailHeader(_ref) {
   var loginUserId = window.BSGlobal.loginUserInfo.Id;
   var context = (0, _react.useContext)(_context7.GeneralDataContext);
   var commonContext = (0, _react.useContext)(_context7.CommonContext);
-  var approvalSetting = commonContext.approvalSetting;
-  var approveStatusColor = (0, _constant.ApproveStatusColor)(detailInfo.applyStatus);
   var changVisiblity = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(workId, visibility) {
       var visibilityScope,
@@ -370,7 +366,6 @@ function OkrDetailHeader(_ref) {
     }
   }
 
-  (0, _react.useEffect)(function () {}, []);
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_drawer["default"].Header, {
     actions: actions,
     actionComponent: /*#__PURE__*/_react["default"].createElement(_wechatBtn["default"], {
@@ -379,8 +374,6 @@ function OkrDetailHeader(_ref) {
       name: detailInfo.workName,
       principalUser: detailInfo.principalUser
     }),
-    approvalSetting: approvalSetting,
-    detailInfo: detailInfo,
     content: parent ? /*#__PURE__*/_react["default"].createElement("span", {
       className: "okr-detail-head-parent"
     }, /*#__PURE__*/_react["default"].createElement("i", {
@@ -393,11 +386,7 @@ function OkrDetailHeader(_ref) {
           krId: parent.id
         });
       }
-    }, /*#__PURE__*/_react["default"].createElement("span", null, parent.type === 'okr' ? 'O ' : 'KR '), parent.name)) : null,
-    status: {
-      title: (0, _constant.getApproveStatusTextMap)(detailInfo.applyStatus),
-      color: approveStatusColor
-    }
+    }, /*#__PURE__*/_react["default"].createElement("span", null, parent.type === 'okr' ? 'O ' : 'KR '), parent.name)) : null
   }), /*#__PURE__*/_react["default"].createElement(_okrShare["default"], {
     visible: shareVisible,
     onClose: closeShareModal,

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

@@ -27,8 +27,6 @@ var _schedule = _interopRequireDefault(require("./schedule"));
 
 var _requestApis = require("./request-apis");
 
-var _helper = require("./helper");
-
 var _okrReview = _interopRequireDefault(require("../okr-review"));
 
 var _reportList = _interopRequireDefault(require("../eReport/eReportLists/reportList"));
@@ -175,14 +173,7 @@ function OkrDetail(props) {
   var _useState23 = (0, _react.useState)(),
       _useState24 = _slicedToArray(_useState23, 2),
       generalRoleType = _useState24[0],
-      setGeneralRoleType = _useState24[1];
-
-  var _useState25 = (0, _react.useState)({
-    isOpen: false
-  }),
-      _useState26 = _slicedToArray(_useState25, 2),
-      approvalSetting = _useState26[0],
-      setApprovalSetting = _useState26[1]; // 计算元素的ref，用于实现 tabs 吸顶，点赞吸底
+      setGeneralRoleType = _useState24[1]; // 计算元素的ref，用于实现 tabs 吸顶，点赞吸底
 
 
   var tabRef = (0, _react.useRef)();
@@ -212,18 +203,9 @@ function OkrDetail(props) {
     getData();
   };
 
-  var getApprovalShow = function getApprovalShow() {
-    (0, _requestApis.getOkrApprovalSettingInfo)().then(function (resp) {
-      if (resp.Code === 1) {
-        setApprovalSetting((0, _helper.getApprovalOpenItem)(resp.Data));
-      }
-    });
-  };
-
   (0, _react.useEffect)(function () {
     setLoading(true);
     getData();
-    getApprovalShow();
   }, []);
   (0, _react.useEffect)(function () {
     if (!okrInfo || !okrInfo.workId) return;
@@ -294,8 +276,7 @@ function OkrDetail(props) {
       changeTabActive: changeTabActive,
       refreshAll: refreshAll,
       setOkrInfo: setOkrInfo,
-      refreshKrs: refreshKrs,
-      approvalSetting: approvalSetting
+      refreshKrs: refreshKrs
     })
   }, /*#__PURE__*/_react["default"].createElement(_context.GeneralDataContext.Provider, {
     value: {

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

@@ -43,8 +43,6 @@ var _auth = require("../../../utils/auth");
 
 var _getLocale = require("../../../utils/getLocale");
 
-var _helper = require("../helper");
-
 require("./index.css");
 
 var _excluded = ["mileStoneId"];
@@ -153,8 +151,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       setShowOkrEvalute = _useContext.setShowOkrEvalute;
 
   var _useContext2 = (0, _react.useContext)(_context2.CommonContext),
-      refreshAll = _useContext2.refreshAll,
-      approvalSetting = _useContext2.approvalSetting;
+      refreshAll = _useContext2.refreshAll;
 
   var parentId = generalParent.parentId,
       parentOkr = generalParent.parentOkr,
@@ -443,11 +440,9 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       padding: "0 32px 0 18px"
     }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
       data: krs,
-      approvalSetting: approvalSetting,
-      okrInfo: okrInfo,
       draggable: canEditOkr,
       onDrop: onOkrItemDropHandler
-    }))), (canEditOkr || isInnerUser) && (0, _helper.getApprovalIsShow)(approvalSetting, "createOkr", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState) && /*#__PURE__*/_react["default"].createElement("div", {
+    }))), (canEditOkr || isInnerUser) && /*#__PURE__*/_react["default"].createElement("div", {
       ref: wrapperRef,
       className: (0, _classnames["default"])("".concat(preCls, "__addkr"))
     }, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], null, createKrShow ? /*#__PURE__*/_react["default"].createElement(_createKrItem["default"], {

package/lib/components/okr-detail/request-apis.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.workDelete = exports.updateVisibility = exports.updateTaskStatus = exports.updateTaskPrincipal = exports.updateTaskDate = exports.updateProgressDesc = exports.updateProgress = exports.updateParentId = exports.updateOkrVisibility = exports.updateOkrPrincipal = exports.updateOkrName = exports.updateOScore = exports.updateOCommitType = exports.updateOClassify = exports.updateKrProgressAndStatus = exports.updateKrPrincipal = exports.updateKrName = exports.updateKrDate = exports.updateConfidenceIndex = exports.updateClassify = exports.updateChildOkrWeight = exports.transferPrincipal = exports.start = exports.setTaskPriority = exports.saveODesc = exports.remindAction = exports.krChangeOrder = exports.getRelWorks = exports.getRelProgress = exports.getProgress = exports.getPraiseComments = exports.getOrg = exports.getOkrUsers = exports.getOkrDetail = exports.getOkrApprovalSettingInfo = exports.getKrsByCondition = exports.getKrs = exports.getFeedById = exports.deleteUser = exports.deleteProgressDesc = exports.deleteKr = exports.createNewKr = exports.close = exports.cancelRel = exports.cancelPraise = exports.cancelParentOkr = exports.addUserRelation = exports.addUser = exports.addPraise = exports.addComment = void 0;
+exports.workDelete = exports.updateVisibility = exports.updateTaskStatus = exports.updateTaskPrincipal = exports.updateTaskDate = exports.updateProgressDesc = exports.updateProgress = exports.updateParentId = exports.updateOkrVisibility = exports.updateOkrPrincipal = exports.updateOkrName = exports.updateOScore = exports.updateOCommitType = exports.updateOClassify = exports.updateKrProgressAndStatus = exports.updateKrPrincipal = exports.updateKrName = exports.updateKrDate = exports.updateConfidenceIndex = exports.updateClassify = exports.updateChildOkrWeight = exports.transferPrincipal = exports.start = exports.setTaskPriority = exports.saveODesc = exports.remindAction = exports.krChangeOrder = exports.getRelWorks = exports.getRelProgress = exports.getProgress = exports.getPraiseComments = exports.getOrg = exports.getOkrUsers = exports.getOkrDetail = exports.getKrsByCondition = exports.getKrs = exports.getFeedById = exports.deleteUser = exports.deleteProgressDesc = exports.deleteKr = exports.createNewKr = exports.close = exports.cancelRel = exports.cancelPraise = exports.cancelParentOkr = exports.addUserRelation = exports.addUser = exports.addPraise = exports.addComment = void 0;
 
 var _qs = _interopRequireDefault(require("qs"));
 
@@ -110,12 +110,6 @@ var getOkrDetail = function getOkrDetail(_ref5) {
 
 exports.getOkrDetail = getOkrDetail;
 
-var getOkrApprovalSettingInfo = function getOkrApprovalSettingInfo() {
-  return (0, _request.rget)("v1")("WorkManageSetting/GetOkrApproval");
-};
-
-exports.getOkrApprovalSettingInfo = getOkrApprovalSettingInfo;
-
 var updateClassify = function updateClassify(_ref6) {
   var okrId = _ref6.okrId,
       okrClassify = _ref6.okrClassify;

package/lib/components/okr-flow/child-node/index.css

@@ -36,11 +36,12 @@
 
 .titaui-okr-flow--node {
   position: relative;
-  padding: 12px 12px;
-  width: 340px;
+  padding: 10px 12px;
+  width: 320px;
+  height: 96px;
   background: #ffffff;
   box-shadow: 0px 4px 10px 0px rgba(127, 145, 180, 0.1);
-  border-radius: 12px;
+  border-radius: 6px;
   box-sizing: border-box;
 }
 
@@ -74,60 +75,20 @@
   white-space: unset;
 }
 
-.titaui-okr-flow--node-krs {
-  margin-top: 12px;
-}
-
-.titaui-okr-flow--node-kr {
-  display: flex;
-  line-height: 20px;
-  font-size: 12px;
-  margin-top: 8px;
-}
-
-.titaui-okr-flow--node-kr-icon {
-  color: rgba(40, 121, 255, 0.6);
-  margin-right: 8px;
-}
-
-.titaui-okr-flow--node-kr-title {
-  flex: 1;
-  font-size: 13px;
-  font-weight: 400;
-  color: #3F4755;
-}
-
-.titaui-okr-flow--node-kr-progress {
-  width: 32px;
-  text-align: right;
-  margin-left: 8px;
-  white-space: nowrap;
-}
-
-.titaui-okr-flow--node-kr-status--normal {
-  color: #2879ff;
-}
-
-.titaui-okr-flow--node-kr-status--risk {
-  color: #f6bd16;
-}
-
-.titaui-okr-flow--node-kr-status--expired {
-  color: #f05e5e;
-}
-
-.titaui-okr-flow--node-kr-status--complete {
-  color: #5ad8a6;
-}
-
 .titaui-okr-flow--node-title {
   max-width: 252px;
+  height: 44px;
   margin-right: 54px;
-  margin-bottom: 4px;
-  line-height: 24px;
+  margin-bottom: 8px;
+  line-height: 22px;
   color: #141c28;
   font-size: 14px;
-  font-weight: 600;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  text-overflow: ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
 }
 
 .titaui-okr-flow--node-desp {
@@ -157,7 +118,7 @@
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  line-height: 20px;
+  line-height: 24px;
   max-width: 96px;
 }
 
@@ -335,7 +296,7 @@
   top: 0;
   width: 50px;
   height: 32px;
-  border-radius: 0 12px 0 20px;
+  border-radius: 0 6px 0 20px;
   font-size: 13px;
   text-align: center;
   line-height: 32px;

package/lib/components/okr-flow/child-node/work-node.js

@@ -71,7 +71,6 @@ function WorkNode(_ref) {
       manualRiskLevel = data.manualRiskLevel,
       progress = data.progress,
       okrClassify = data.okrClassify,
-      Krs = data.Krs,
       cycleType = data.cycleType,
       startDate = data.startDate,
       endDate = data.endDate,
@@ -93,8 +92,6 @@ function WorkNode(_ref) {
       imgWidth = _useState6[0],
       setImgWidth = _useState6[1];
 
-  var bodyr = (0, _react.useRef)();
-
   var getOkrTypeMap = function getOkrTypeMap() {
     return {
       1: (0, _getLocale.getLocale)("OKR_MyO_Pop_Individual"),
@@ -213,13 +210,12 @@ function WorkNode(_ref) {
   }; // 1：正常 2：有风险 3：过期 4:完成 5：过期完成 ,
 
 
-  var riskLevelSuffix = ["normal", "normal", "risk", "expired", "complete", "complete_over", "normal"];
+  var riskLevelSuffix = ["normal", "normal", "risk", "expired", "complete", "complete_over"];
   if (!MapOkrVisible) return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--node"), "".concat(_precls["default"], "--node__private"))
   });
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(_precls["default"], "--node"), _defineProperty({}, "".concat(_precls["default"], "--node__search"), isSearchRes)),
-    ref: bodyr
+    className: (0, _classnames["default"])("".concat(_precls["default"], "--node"), _defineProperty({}, "".concat(_precls["default"], "--node__search"), isSearchRes))
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--node-title"))
   }, workName, /*#__PURE__*/_react["default"].createElement(_okrClassify["default"], {
@@ -234,19 +230,7 @@ function WorkNode(_ref) {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--node-type"))
   }, getOkrTypeMap()[okrType])), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--node-cycle"))
-  }, getCycleTextByType()))), !!(Krs !== null && Krs !== void 0 && Krs.length) && /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(_precls["default"], "--node-krs"))
-  }, Krs.map(function (item, key) {
-    return /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(_precls["default"], "--node-kr"))
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(_precls["default"], "--node-kr-icon"))
-    }, "KR", item.SortNum + 1), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(_precls["default"], "--node-kr-title"))
-    }, item.mileStoneName), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(_precls["default"], "--node-kr-progress ").concat(_precls["default"], "--node-kr-status--").concat(riskLevelSuffix[item.riskLevel]))
-    }, item.progress, "%"));
-  })), /*#__PURE__*/_react["default"].createElement("span", {
+  }, getCycleTextByType()))), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--node-status"), "".concat(_precls["default"], "--node-status__").concat(riskLevelSuffix[manualRiskLevel]))
   }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
     text: "".concat(progress, "%"),

package/lib/components/okr-flow/empty/index.css

@@ -1,12 +1,5 @@
 .titaui-okr-flow--empty {
-  width: 200px;
-  height: 200px;
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  margin: auto;
+  padding-top: 125px;
   text-align: center;
 }
 

package/lib/components/okr-flow/export-modal/index.js

@@ -33,8 +33,6 @@ var _precls = _interopRequireDefault(require("../precls"));
 
 var _getLocale = require("../../../utils/getLocale");
 
-var _lodash = _interopRequireDefault(require("lodash"));
-
 require("rc-color-picker/assets/index.css");
 
 require("./index.css");
@@ -47,14 +45,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -98,7 +88,6 @@ var ExportMapModal = function ExportMapModal(props) {
       setIsExport = _useState6[1];
 
   var modalRef = (0, _react.useRef)();
-  var virtualElements = (0, _react.useRef)([]);
   (0, _react.useEffect)(function () {
     if ((0, _bsGlobal.isWx)() && window.WWOpenData) {
       if (window.WWOpenData.enableCanvasSharing) {
@@ -247,19 +236,6 @@ var ExportMapModal = function ExportMapModal(props) {
     setBgColor(colors ? colors.color : "none");
   };
 
-  var NodeDebug = function NodeDebug() {
-    var elements = (0, _reactFlowRenderer.useStoreState)(function (state) {
-      return [].concat(_toConsumableArray(state.nodes), _toConsumableArray(state.edges));
-    }, _lodash["default"].isEqual);
-    var setElements = (0, _reactFlowRenderer.useStoreActions)(function (actions) {
-      return actions.setElements;
-    });
-    var newElements = (0, _utils.getLayoutedElements)(elements, direction);
-    virtualElements = newElements;
-    setElements(newElements);
-    return null;
-  };
-
   return /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
     title: (0, _getLocale.getLocale)("OKR_Ali_Exportmap"),
     noFooterLine: true,
@@ -299,7 +275,7 @@ var ExportMapModal = function ExportMapModal(props) {
     nodesDraggable: false,
     nodesConnectable: false,
     className: (0, _classnames["default"])("".concat(_precls["default"], "__export"), _defineProperty({}, "".concat(_precls["default"], "__dark"), darkTheme)),
-    elements: dataSource,
+    elements: (0, _utils.getLayoutedElements)(dataSource, direction),
     nodeTypes: _utils.nodeTypes,
     minZoom: 0.05,
     zoomOnScroll: false,
@@ -311,7 +287,7 @@ var ExportMapModal = function ExportMapModal(props) {
       width: "100%",
       background: bgColor
     }
-  }, /*#__PURE__*/_react["default"].createElement(NodeDebug, null)))))));
+  }))))));
 };
 
 ExportMapModal.defaultProps = {

package/lib/components/okr-flow/export-modules/okr-search-panel/index.css

@@ -4,14 +4,12 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  background: #f0f4fa;
 }
 
 .titaui-okr-flow--loading-img {
-  width: 80px;
+  width: 162px;
   height: 140px;
   background: url("../../images/loading-light.gif") no-repeat;
-  background-size: 100% auto;
 }
 
 .titaui-okr-flow--loading-img__dark {

package/lib/components/okr-flow/export-modules/okr-search-panel/index.js

@@ -87,8 +87,6 @@ function OkrSearchPanel(props, ref) {
       showkr = _props$showkr === void 0 ? true : _props$showkr,
       _props$darkTheme = props.darkTheme,
       darkTheme = _props$darkTheme === void 0 ? false : _props$darkTheme,
-      _props$showCardKr = props.showCardKr,
-      showCardKr = _props$showCardKr === void 0 ? false : _props$showCardKr,
       onNodeClick = props.onNodeClick;
 
   var _useState = (0, _react.useState)(true),
@@ -113,7 +111,7 @@ function OkrSearchPanel(props, ref) {
 
 
   var getSearchData = (0, _react.useRef)((0, _helper.debounce)( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(searchType, rootId, rootName, avatar, cycleType, yqmNum, annualNum, okrType, openLevel, showkr, showCardKr) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(searchType, rootId, rootName, avatar, cycleType, yqmNum, annualNum, okrType, openLevel, showkr) {
       var _yield$searchOkrs, works, okrIds, nodes, allNodes, subTreeNodes;
 
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -157,8 +155,7 @@ function OkrSearchPanel(props, ref) {
               return (0, _requestApis.expandNodesByLevel)({
                 okrIds: okrIds,
                 level: openLevel - 1,
-                showKr: showkr ? 1 : 0,
-                showCardKr: showCardKr ? 1 : 0
+                showKr: showkr ? 0 : 1
               });
 
             case 13:
@@ -191,19 +188,19 @@ function OkrSearchPanel(props, ref) {
       }, _callee);
     }));
 
-    return function (_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9, _x10, _x11) {
+    return function (_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9, _x10) {
       return _ref.apply(this, arguments);
     };
   }(), 500)).current;
   var okrFlow = (0, _react.useRef)();
   (0, _react.useEffect)(function () {
     if (!annualNum) return;
-    getSearchData(searchType, rootId, rootName, avatar, cycleType, yqmNum, annualNum, okrType, openLevel, showkr, showCardKr);
-  }, [searchType, rootId, rootName, cycleType, yqmNum, annualNum, okrType, openLevel, showkr, showCardKr]);
+    getSearchData(searchType, rootId, rootName, avatar, cycleType, yqmNum, annualNum, okrType, openLevel, showkr);
+  }, [searchType, rootId, rootName, cycleType, yqmNum, annualNum, okrType, openLevel, showkr]);
   (0, _react.useEffect)(function () {
     var data = (0, _treeHandler.transToMapData)(treeNodes, showkr);
     setDataSource(data.length > 1 ? data : []);
-  }, [treeNodes, showkr, showCardKr]);
+  }, [treeNodes, showkr]);
 
   var handleParentExpand = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(node) {
@@ -219,8 +216,7 @@ function OkrSearchPanel(props, ref) {
                 krId: modelType == "kr" ? id : 0,
                 okrId: modelType == "kr" ? data.workId : id,
                 okrIdParent: modelType == "work" ? data.parentId : data.workId,
-                childRoot: false,
-                showCardKr: showCardKr ? 1 : 0
+                childRoot: false
               });
 
             case 3:
@@ -253,7 +249,7 @@ function OkrSearchPanel(props, ref) {
       }, _callee2);
     }));
 
-    return function handleParentExpand(_x12) {
+    return function handleParentExpand(_x11) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -272,7 +268,6 @@ function OkrSearchPanel(props, ref) {
                 okrId: modelType == "work" ? id : data.workId,
                 okrIdParent: 0,
                 childRoot: true,
-                showCardKr: showCardKr ? 1 : 0,
                 currentOkrRole: modelType == "kr" ? data.mapkrVisible : data.MapOkrVisible
               });
 
@@ -299,7 +294,7 @@ function OkrSearchPanel(props, ref) {
       }, _callee3);
     }));
 
-    return function handleChildExpand(_x13) {
+    return function handleChildExpand(_x12) {
       return _ref3.apply(this, arguments);
     };
   }();