@titaui/pc 1.11.10 → 1.11.13-beta.1

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

@@ -0,0 +1,62 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getApprovalOpenItem = exports.getApprovalIsShow = exports.EApproveStatus = exports.EApprovalTypes = void 0;
+var EApprovalTypes;
+exports.EApprovalTypes = EApprovalTypes;
+
+(function (EApprovalTypes) {
+  EApprovalTypes[EApprovalTypes["CreateOkr"] = 53] = "CreateOkr";
+  EApprovalTypes[EApprovalTypes["ChangeOkrName"] = 54] = "ChangeOkrName";
+  EApprovalTypes[EApprovalTypes["ChangeOkrTime"] = 56] = "ChangeOkrTime";
+  EApprovalTypes[EApprovalTypes["DeleteOkr"] = 55] = "DeleteOkr";
+})(EApprovalTypes || (exports.EApprovalTypes = EApprovalTypes = {}));
+
+var EApproveStatus;
+exports.EApproveStatus = EApproveStatus;
+
+(function (EApproveStatus) {
+  EApproveStatus[EApproveStatus["None"] = 0] = "None";
+  EApproveStatus[EApproveStatus["WaitCommit"] = 6] = "WaitCommit";
+  EApproveStatus[EApproveStatus["Rejected"] = 3] = "Rejected";
+  EApproveStatus[EApproveStatus["UnderApproval"] = 1] = "UnderApproval";
+  EApproveStatus[EApproveStatus["ApproveAgree"] = 2] = "ApproveAgree";
+  EApproveStatus[EApproveStatus["WithDraw"] = 4] = "WithDraw";
+  EApproveStatus[EApproveStatus["Done"] = 5] = "Done";
+})(EApproveStatus || (exports.EApproveStatus = EApproveStatus = {}));
+
+var getApprovalOpenItem = function getApprovalOpenItem(setting) {
+  var result = {
+    isOpen: setting.isOpened === 1,
+    changeOkrName: false,
+    changeOkrTime: false,
+    deleteOkr: false,
+    createOkr: false
+  };
+
+  if (setting !== null && setting !== void 0 && setting.okrApprovalSettings) {
+    setting.okrApprovalSettings.forEach(function (item) {
+      if (item.approvalType === EApprovalTypes.ChangeOkrName) {
+        result.changeOkrName = true;
+      } else if (item.approvalType === EApprovalTypes.ChangeOkrTime) {
+        result.changeOkrTime = true;
+      } else if (item.approvalType === EApprovalTypes.CreateOkr) {
+        result.createOkr = true;
+      } else if (item.approvalType === EApprovalTypes.DeleteOkr) {
+        result.deleteOkr = true;
+      }
+    });
+  }
+
+  return result;
+};
+
+exports.getApprovalOpenItem = getApprovalOpenItem;
+
+var getApprovalIsShow = function getApprovalIsShow(approvalSetting, type, applyState) {
+  return !approvalSetting.isOpen || approvalSetting.isOpen && !(approvalSetting !== null && approvalSetting !== void 0 && approvalSetting[type]) || approvalSetting.isOpen && (approvalSetting === null || approvalSetting === void 0 ? void 0 : approvalSetting[type]) && applyState !== EApproveStatus.UnderApproval;
+};
+
+exports.getApprovalIsShow = getApprovalIsShow;

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

@@ -27,6 +27,8 @@ 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"));
@@ -173,7 +175,14 @@ function OkrDetail(props) {
   var _useState23 = (0, _react.useState)(),
       _useState24 = _slicedToArray(_useState23, 2),
       generalRoleType = _useState24[0],
-      setGeneralRoleType = _useState24[1]; // 计算元素的ref，用于实现 tabs 吸顶，点赞吸底
+      setGeneralRoleType = _useState24[1];
+
+  var _useState25 = (0, _react.useState)({
+    isOpen: false
+  }),
+      _useState26 = _slicedToArray(_useState25, 2),
+      approvalSetting = _useState26[0],
+      setApprovalSetting = _useState26[1]; // 计算元素的ref，用于实现 tabs 吸顶，点赞吸底
 
 
   var tabRef = (0, _react.useRef)();
@@ -203,9 +212,18 @@ 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;
@@ -276,7 +294,8 @@ function OkrDetail(props) {
       changeTabActive: changeTabActive,
       refreshAll: refreshAll,
       setOkrInfo: setOkrInfo,
-      refreshKrs: refreshKrs
+      refreshKrs: refreshKrs,
+      approvalSetting: approvalSetting
     })
   }, /*#__PURE__*/_react["default"].createElement(_context.GeneralDataContext.Provider, {
     value: {

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

@@ -43,6 +43,8 @@ var _auth = require("../../../utils/auth");
 
 var _getLocale = require("../../../utils/getLocale");
 
+var _helper = require("../helper");
+
 require("./index.css");
 
 var _excluded = ["mileStoneId"];
@@ -151,7 +153,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       setShowOkrEvalute = _useContext.setShowOkrEvalute;
 
   var _useContext2 = (0, _react.useContext)(_context2.CommonContext),
-      refreshAll = _useContext2.refreshAll;
+      refreshAll = _useContext2.refreshAll,
+      approvalSetting = _useContext2.approvalSetting;
 
   var parentId = generalParent.parentId,
       parentOkr = generalParent.parentOkr,
@@ -440,9 +443,11 @@ 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) && /*#__PURE__*/_react["default"].createElement("div", {
+    }))), (canEditOkr || isInnerUser) && (0, _helper.getApprovalIsShow)(approvalSetting, "createOkr", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState) && /*#__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.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.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;
 
 var _qs = _interopRequireDefault(require("qs"));
 
@@ -110,6 +110,12 @@ 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,12 +36,11 @@
 
 .titaui-okr-flow--node {
   position: relative;
-  padding: 10px 12px;
-  width: 320px;
-  height: 96px;
+  padding: 12px 12px;
+  width: 340px;
   background: #ffffff;
   box-shadow: 0px 4px 10px 0px rgba(127, 145, 180, 0.1);
-  border-radius: 6px;
+  border-radius: 12px;
   box-sizing: border-box;
 }
 
@@ -75,20 +74,60 @@
   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: 8px;
-  line-height: 22px;
+  margin-bottom: 4px;
+  line-height: 24px;
   color: #141c28;
   font-size: 14px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  text-overflow: ellipsis;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
+  font-weight: 600;
 }
 
 .titaui-okr-flow--node-desp {
@@ -118,7 +157,7 @@
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  line-height: 24px;
+  line-height: 20px;
   max-width: 96px;
 }
 
@@ -296,7 +335,7 @@
   top: 0;
   width: 50px;
   height: 32px;
-  border-radius: 0 6px 0 20px;
+  border-radius: 0 12px 0 20px;
   font-size: 13px;
   text-align: center;
   line-height: 32px;

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

@@ -71,6 +71,7 @@ function WorkNode(_ref) {
       manualRiskLevel = data.manualRiskLevel,
       progress = data.progress,
       okrClassify = data.okrClassify,
+      Krs = data.Krs,
       cycleType = data.cycleType,
       startDate = data.startDate,
       endDate = data.endDate,
@@ -92,6 +93,8 @@ 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"),
@@ -210,12 +213,13 @@ function WorkNode(_ref) {
   }; // 1：正常 2：有风险 3：过期 4:完成 5：过期完成 ,
 
 
-  var riskLevelSuffix = ["normal", "normal", "risk", "expired", "complete", "complete_over"];
+  var riskLevelSuffix = ["normal", "normal", "risk", "expired", "complete", "complete_over", "normal"];
   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))
+    className: (0, _classnames["default"])("".concat(_precls["default"], "--node"), _defineProperty({}, "".concat(_precls["default"], "--node__search"), isSearchRes)),
+    ref: bodyr
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--node-title"))
   }, workName, /*#__PURE__*/_react["default"].createElement(_okrClassify["default"], {
@@ -230,7 +234,19 @@ 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()))), /*#__PURE__*/_react["default"].createElement("span", {
+  }, 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", {
     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,5 +1,12 @@
 .titaui-okr-flow--empty {
-  padding-top: 125px;
+  width: 200px;
+  height: 200px;
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  margin: auto;
   text-align: center;
 }
 

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

@@ -33,6 +33,8 @@ 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");
@@ -45,6 +47,14 @@ 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); }); }; }
@@ -88,6 +98,7 @@ 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) {
@@ -236,6 +247,19 @@ 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,
@@ -275,7 +299,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: (0, _utils.getLayoutedElements)(dataSource, direction),
+    elements: dataSource,
     nodeTypes: _utils.nodeTypes,
     minZoom: 0.05,
     zoomOnScroll: false,
@@ -287,7 +311,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,12 +4,14 @@
   display: flex;
   justify-content: center;
   align-items: center;
+  background: #f0f4fa;
 }
 
 .titaui-okr-flow--loading-img {
-  width: 162px;
+  width: 80px;
   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,6 +87,8 @@ 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),
@@ -111,7 +113,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) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(searchType, rootId, rootName, avatar, cycleType, yqmNum, annualNum, okrType, openLevel, showkr, showCardKr) {
       var _yield$searchOkrs, works, okrIds, nodes, allNodes, subTreeNodes;
 
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -155,7 +157,8 @@ function OkrSearchPanel(props, ref) {
               return (0, _requestApis.expandNodesByLevel)({
                 okrIds: okrIds,
                 level: openLevel - 1,
-                showKr: showkr ? 0 : 1
+                showKr: showkr ? 1 : 0,
+                showCardKr: showCardKr ? 1 : 0
               });
 
             case 13:
@@ -188,19 +191,19 @@ function OkrSearchPanel(props, ref) {
       }, _callee);
     }));
 
-    return function (_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9, _x10) {
+    return function (_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9, _x10, _x11) {
       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);
-  }, [searchType, rootId, rootName, cycleType, yqmNum, annualNum, okrType, openLevel, showkr]);
+    getSearchData(searchType, rootId, rootName, avatar, cycleType, yqmNum, annualNum, okrType, openLevel, showkr, showCardKr);
+  }, [searchType, rootId, rootName, cycleType, yqmNum, annualNum, okrType, openLevel, showkr, showCardKr]);
   (0, _react.useEffect)(function () {
     var data = (0, _treeHandler.transToMapData)(treeNodes, showkr);
     setDataSource(data.length > 1 ? data : []);
-  }, [treeNodes, showkr]);
+  }, [treeNodes, showkr, showCardKr]);
 
   var handleParentExpand = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(node) {
@@ -216,7 +219,8 @@ function OkrSearchPanel(props, ref) {
                 krId: modelType == "kr" ? id : 0,
                 okrId: modelType == "kr" ? data.workId : id,
                 okrIdParent: modelType == "work" ? data.parentId : data.workId,
-                childRoot: false
+                childRoot: false,
+                showCardKr: showCardKr ? 1 : 0
               });
 
             case 3:
@@ -249,7 +253,7 @@ function OkrSearchPanel(props, ref) {
       }, _callee2);
     }));
 
-    return function handleParentExpand(_x11) {
+    return function handleParentExpand(_x12) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -268,6 +272,7 @@ 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
               });
 
@@ -294,7 +299,7 @@ function OkrSearchPanel(props, ref) {
       }, _callee3);
     }));
 
-    return function handleChildExpand(_x12) {
+    return function handleChildExpand(_x13) {
       return _ref3.apply(this, arguments);
     };
   }();

package/lib/components/okr-flow/okr-map/index.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactFlowRenderer = _interopRequireWildcard(require("@titaui/react-flow-renderer"));
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _html2canvas = _interopRequireDefault(require("html2canvas"));
@@ -39,6 +41,14 @@ 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -68,16 +78,12 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       onChildClose = _props$onChildClose === void 0 ? function () {} : _props$onChildClose,
       _props$dataSource = props.dataSource,
       dataSource = _props$dataSource === void 0 ? [] : _props$dataSource;
+  var virtualElements = (0, _react.useRef)([]);
 
-  var _useState = (0, _react.useState)([]),
+  var _useState = (0, _react.useState)(),
       _useState2 = _slicedToArray(_useState, 2),
-      elements = _useState2[0],
-      setElements = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(),
-      _useState4 = _slicedToArray(_useState3, 2),
-      flowInstance = _useState4[0],
-      setFlowInstance = _useState4[1];
+      flowInstance = _useState2[0],
+      setFlowInstance = _useState2[1];
 
   var isMoving = (0, _react.useRef)(false);
 
@@ -89,12 +95,10 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     onNodeClick & onNodeClick(data);
   };
 
-  var layoutedElements = (0, _utils.getLayoutedElements)(dataSource, direction);
-
   var getDefaultPos = function getDefaultPos() {
     var containerHeight = document.body.clientHeight - 200 - 96;
     var containerWidth = document.body.clientWidth - 180 - 320;
-    var rootNode = layoutedElements[0];
+    var rootNode = virtualElements[0];
 
     if (direction == "horizontal") {
       var targetY = containerHeight / 2;
@@ -102,13 +106,27 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
 
     var targetX = containerWidth / 2;
-    return [targetX - rootNode.position.x, -48];
+    return [targetX - rootNode.position.x, -48]; // debugger
+    // return [0, 0]
   };
 
   var onLoad = function onLoad(reactFlowInstance) {
     setFlowInstance(reactFlowInstance);
   };
 
+  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;
+  };
+
   (0, _react.useEffect)(function () {
     if (flowInstance) {
       var _getDefaultPos = getDefaultPos(),
@@ -174,7 +192,7 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   }, /*#__PURE__*/_react["default"].createElement(_reactFlowRenderer.ReactFlowProvider, null, dataSource.length == 0 ? /*#__PURE__*/_react["default"].createElement(_empty["default"], null) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_reactFlowRenderer["default"], {
     onLoad: onLoad,
-    elements: layoutedElements,
+    elements: dataSource,
     nodesDraggable: false,
     nodesConnectable: false,
     nodeTypes: _utils.nodeTypes,
@@ -182,7 +200,7 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     minZoom: 0.25,
     maxZoom: 1.5,
     panOnScroll: true
-  }), /*#__PURE__*/_react["default"].createElement(_miniMap["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(NodeDebug, null)), /*#__PURE__*/_react["default"].createElement(_miniMap["default"], {
     onMoveStart: function onMoveStart() {
       return isMoving.current = true;
     }

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

@@ -78,7 +78,9 @@ var expandNode = function expandNode(params) {
       _params$okrIdParent = params.okrIdParent,
       okrIdParent = _params$okrIdParent === void 0 ? 0 : _params$okrIdParent,
       _params$currentOkrRol = params.currentOkrRole,
-      currentOkrRole = _params$currentOkrRol === void 0 ? true : _params$currentOkrRol;
+      currentOkrRole = _params$currentOkrRol === void 0 ? true : _params$currentOkrRol,
+      _params$showCardKr = params.showCardKr,
+      showCardKr = _params$showCardKr === void 0 ? 1 : _params$showCardKr;
   return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/okr/map/expand"), {
     params: {
       okrId: okrId,
@@ -87,7 +89,9 @@ var expandNode = function expandNode(params) {
       // true: 展开子节点, false: 展开父节点
       okrIdParent: okrIdParent,
       //  当前选中okr 或 当前选中kr 的okrId（kr的父节点是所属okr）
-      currentOkrRole: currentOkrRole // 查看权限
+      currentOkrRole: currentOkrRole,
+      // 查看权限
+      showCardKr: showCardKr // o带上kr
 
     }
   }).then(function (res) {
@@ -103,12 +107,15 @@ var expandNodesByLevel = function expandNodesByLevel(_ref2) {
       _ref2$okrIds = _ref2.okrIds,
       okrIds = _ref2$okrIds === void 0 ? [] : _ref2$okrIds,
       _ref2$showKr = _ref2.showKr,
-      showKr = _ref2$showKr === void 0 ? 0 : _ref2$showKr;
+      showKr = _ref2$showKr === void 0 ? 0 : _ref2$showKr,
+      _ref2$showCardKr = _ref2.showCardKr,
+      showCardKr = _ref2$showCardKr === void 0 ? 0 : _ref2$showCardKr;
   return (// const queryStr = qs.stringify({ okrIds, level }, { arrayFormat: 'repeat' });
     _axios["default"].post("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/okr/map/generalview"), {
       okrIds: okrIds,
       level: level,
-      showKr: showKr
+      showKr: showKr,
+      showCardKr: showCardKr
     }).then(function (res) {
       return res.data.Data;
     })