@titaui/pc 1.10.82-beta.2 → 1.10.82-beta.20

package/lib/components/img-viewer/index.js

@@ -85,7 +85,18 @@ var ImgViewer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       isLoading = _useState12[0],
       setIsLoading = _useState12[1];
 
+  var _useState13 = (0, _react.useState)(0),
+      _useState14 = _slicedToArray(_useState13, 2),
+      moveX = _useState14[0],
+      setMoveX = _useState14[1];
+
+  var _useState15 = (0, _react.useState)(0),
+      _useState16 = _slicedToArray(_useState15, 2),
+      moveY = _useState16[0],
+      setMoveY = _useState16[1];
+
   var imgRef = (0, _react.useRef)(document.createElement("img"));
+  var DragRef = (0, _react.useRef)(document.createElement("div"));
 
   var showPreview = function showPreview() {
     var index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
@@ -120,6 +131,31 @@ var ImgViewer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     setCurrentRotateDeg(currentRotateDeg - 90);
   };
 
+  var handleMouseDownImg = function handleMouseDownImg(e) {
+    e.preventDefault();
+    var downX = e.clientX;
+    var downY = e.clientY; // 因为这个moveX不闭包的话在拖动的时候他就 一直累加
+
+    var beforeX = moveX;
+    var beforeY = moveY;
+
+    DragRef.current.onmousemove = function (e1) {
+      //获取x和y
+      var nx = e1.clientX;
+      var ny = e1.clientY; // //计算移动后的左偏移量和顶部的偏移量
+
+      var nl = nx - downX + beforeX;
+      var nt = ny - downY + beforeY;
+      setMoveX(nl);
+      setMoveY(nt);
+    };
+  };
+
+  var handleMouseUpImg = function handleMouseUpImg(e) {
+    e.preventDefault();
+    DragRef.current.onmousemove = null;
+  };
+
   var handleRightRotate = function handleRightRotate() {
     setCurrentRotateDeg(currentRotateDeg + 90);
   };
@@ -170,7 +206,10 @@ var ImgViewer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       className: (0, _classnames["default"])("tu-icon-close", "".concat(prefix, "__header-close")),
       onClick: hidePreview
     }))), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "".concat(prefix, "__body")
+      className: "".concat(prefix, "__body"),
+      ref: DragRef,
+      onMouseDown: handleMouseDownImg,
+      onMouseUp: handleMouseUpImg
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])("".concat(prefix, "__body-operate-btn"), "".concat(prefix, "__body-operate-btn--left"), _defineProperty({}, "".concat(prefix, "__body-operate-btn--disable"), currentIndex === 0)),
       onClick: handlePreImgClick
@@ -184,17 +223,17 @@ var ImgViewer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     })), isLoading && /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__body--loading")
     }, /*#__PURE__*/_react["default"].createElement("img", {
-      src: _loading["default"]
-    })), /*#__PURE__*/_react["default"].createElement("div", {
-      style: {
-        transform: "rotate(".concat(currentRotateDeg, "deg)")
-      }
-    }, /*#__PURE__*/_react["default"].createElement("img", {
+      src: _loading["default"],
+      alt: ""
+    })), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", {
       className: "".concat(prefix, "__body-img"),
       ref: imgRef,
+      alt: "",
       src: (currentImgData === null || currentImgData === void 0 ? void 0 : currentImgData.previewUrl) || (currentImgData === null || currentImgData === void 0 ? void 0 : currentImgData.bigImageUrl),
       style: {
-        transform: "scale(".concat(currentScale, ")")
+        transform: "scale(".concat(currentScale, ") rotate(").concat(currentRotateDeg, "deg) "),
+        left: "".concat(moveX, "px"),
+        top: "".concat(moveY, "px")
       }
     }))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__footer")

package/lib/components/menus/export-modules/demo-menus/menus.js

@@ -109,29 +109,7 @@ var DemoMenuData = /*#__PURE__*/function () {
         key: PAGE_DUEDATE_ORDER,
         href: "#/demofree/recharge/order",
         isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager
-      } // {
-      //   icon: "",
-      //   label: "续费状态",
-      //   key: PAGE_RECHARGE_STATUS,
-      //   href: "#/demofree/recharge/status",
-      //   isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager,
-      // },
-      // {
-      //   icon: "",
-      //   label: "数据统计",
-      //   key: PAGE_RECHARGE_STATISTICS,
-      //   href: "#/demofree/recharge/statistics",
-      //   isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager,
-      // },
-      ]
-    }, {
-      icon: "KH-help",
-      label: "预约演示报表",
-      key: "charts",
-      href: "#/demofree/charts",
-      isShow: this.isManager === EManagerType.Manager,
-      children: [],
-      type: _index.MENU_ITEM_NOE
+      }]
     }];
   }
 

package/lib/components/menus/export-modules/okr-menus/menu-highlight.js

@@ -31,6 +31,8 @@ var _default = /*#__PURE__*/function () {
           cb(_menus.PAGE_MY_PART_OKR);
         } else if (this.isMyTargetOkr()) {
           cb(_menus.PAGE_MY_TARGET_OKR);
+        } else if (this.isTargetUser()) {
+          return null;
         } else {
           cb(_menus.PAGE_MY_OWNER_OKR);
         }
@@ -43,6 +45,8 @@ var _default = /*#__PURE__*/function () {
       } else if (this.isOkrCases()) {
         cb(_menus.PAGE_OKR_CASES);
       }
+
+      return null;
     }
   }, {
     key: "isMyOkr",
@@ -62,6 +66,12 @@ var _default = /*#__PURE__*/function () {
       var search = this.history.location.search;
       return !!search.match(/relation[\s]*?=[\s]*?3/);
     }
+  }, {
+    key: "isTargetUser",
+    value: function isTargetUser() {
+      var search = this.history.location.search;
+      return !!search.match(/toUserId[\s]*?=[\d]+/);
+    }
   }, {
     key: "isOkr",
     value: function isOkr() {

package/lib/components/nav-top/index.js

@@ -15,6 +15,8 @@ var _bsGlobal = require("../../utils/bs-global");
 
 var _userOwnMenu = _interopRequireDefault(require("./components/user-own-menu"));
 
+var _useGlobalValue = _interopRequireDefault(require("./useGlobalValue"));
+
 var _menu = _interopRequireDefault(require("./components/menu"));
 
 var _userMessage = _interopRequireDefault(require("./components/user-message"));
@@ -170,5 +172,7 @@ var NavTop = function NavTop() {
   }, /*#__PURE__*/_react["default"].createElement(_userOwnMenu["default"], null)));
 };
 
-var _default = NavTop;
-exports["default"] = _default;
+var _default = NavTop; // @ts-ignore
+
+exports["default"] = _default;
+NavTop.useGlobalValue = _useGlobalValue["default"];

package/lib/components/okr-detail/components/okr-tree/tree-node/o-child-node/index.css

@@ -54,7 +54,7 @@
 }
 
 .tita-okrdt-tree__o-child-node-prefix::before {
-  content: "";
+  content: '';
   width: 9px;
   height: 12px;
   background: url(../../images/O.svg) transparent no-repeat 50% 50%;
@@ -73,11 +73,12 @@
 
 .child-okrs-weight__content {
   padding: 10px 32px 8px;
+  max-height: 300px;
   min-height: 90px;
+  overflow: auto;
   box-sizing: border-box;
   display: flex;
   flex-direction: column;
-  justify-content: center;
 }
 
 .child-okrs-weight__item {
@@ -105,7 +106,7 @@
 }
 
 .child-okrs-weight__item-precls:before {
-  content: "";
+  content: '';
   width: 10px;
   height: 8px;
   border-radius: 50%;

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

@@ -0,0 +1,53 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getApproveStatusTextMap = exports.ApproveStatusColor = exports.ApproveStatus = void 0;
+
+var _getLocale = require("../../../utils/getLocale");
+
+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; }
+
+var ApproveStatus;
+exports.ApproveStatus = ApproveStatus;
+
+(function (ApproveStatus) {
+  ApproveStatus[ApproveStatus["None"] = 0] = "None";
+  ApproveStatus[ApproveStatus["WaitCommit"] = 6] = "WaitCommit";
+  ApproveStatus[ApproveStatus["Rejected"] = 3] = "Rejected";
+  ApproveStatus[ApproveStatus["UnderApproval"] = 1] = "UnderApproval";
+  ApproveStatus[ApproveStatus["ApproveAgree"] = 2] = "ApproveAgree";
+  ApproveStatus[ApproveStatus["WithDraw"] = 4] = "WithDraw";
+  ApproveStatus[ApproveStatus["Done"] = 5] = "Done";
+})(ApproveStatus || (exports.ApproveStatus = ApproveStatus = {}));
+
+var getApproveStatusTextMap = function getApproveStatusTextMap(status) {
+  var _ApproveStatusTextMap;
+
+  var ApproveStatusTextMap = (_ApproveStatusTextMap = {}, _defineProperty(_ApproveStatusTextMap, ApproveStatus.WaitCommit, (0, _getLocale.getLocale)('OKR_MyO_Tobesubmitted')), _defineProperty(_ApproveStatusTextMap, ApproveStatus.Rejected, (0, _getLocale.getLocale)('OKR_MyO_Tobesubmitted')), _defineProperty(_ApproveStatusTextMap, ApproveStatus.UnderApproval, (0, _getLocale.getLocale)('Pro_detail_Approval')), _defineProperty(_ApproveStatusTextMap, ApproveStatus.ApproveAgree, ''), _defineProperty(_ApproveStatusTextMap, ApproveStatus.WithDraw, ''), _defineProperty(_ApproveStatusTextMap, ApproveStatus.None, ''), _defineProperty(_ApproveStatusTextMap, ApproveStatus.Done, ''), _ApproveStatusTextMap);
+  return ApproveStatusTextMap[status];
+};
+
+exports.getApproveStatusTextMap = getApproveStatusTextMap;
+
+var ApproveStatusColor = function ApproveStatusColor(status) {
+  var _ApprovalStatusColorM;
+
+  var ApprovalStatusColorMap = (_ApprovalStatusColorM = {}, _defineProperty(_ApprovalStatusColorM, ApproveStatus.WaitCommit, {
+    color: '#F0A326',
+    bgColor: 'rgba(240, 163, 38, 0.1)'
+  }), _defineProperty(_ApprovalStatusColorM, ApproveStatus.Rejected, {
+    color: '#F0A326',
+    bgColor: 'rgba(240, 163, 38, 0.1)'
+  }), _defineProperty(_ApprovalStatusColorM, ApproveStatus.UnderApproval, {
+    color: '#2879FF',
+    bgColor: 'rgba(40, 121, 255, 0.1)'
+  }), _defineProperty(_ApprovalStatusColorM, ApproveStatus.ApproveAgree, {
+    color: '#ffffff',
+    bgColor: '#ffffff'
+  }), _ApprovalStatusColorM);
+  return ApprovalStatusColorMap[status];
+};
+
+exports.ApproveStatusColor = ApproveStatusColor;

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

@@ -29,6 +29,8 @@ 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"));
@@ -85,6 +87,7 @@ function OkrDetailHeader(_ref) {
   var loginUserId = window.BSGlobal.loginUserInfo.Id;
   var context = (0, _react.useContext)(_context7.GeneralDataContext);
   var commonContext = (0, _react.useContext)(_context7.CommonContext);
+  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,
@@ -366,12 +369,14 @@ 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"], {
       id: detailInfo.workId,
       objType: 62,
-      name: detailInfo.workName
+      name: detailInfo.workName,
+      principalUser: detailInfo.principalUser
     }),
     content: parent ? /*#__PURE__*/_react["default"].createElement("span", {
       className: "okr-detail-head-parent"
@@ -385,7 +390,11 @@ function OkrDetailHeader(_ref) {
           krId: parent.id
         });
       }
-    }, /*#__PURE__*/_react["default"].createElement("span", null, parent.type === 'okr' ? 'O ' : 'KR '), parent.name)) : null
+    }, /*#__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(_okrShare["default"], {
     visible: shareVisible,
     onClose: closeShareModal,

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);
     };
   }();