@titaui/pc 1.11.5-beta.2 → 1.11.6

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

@@ -37,7 +37,8 @@
 .titaui-okr-flow--node {
   position: relative;
   padding: 10px 12px;
-  width: 340px;
+  width: 320px;
+  height: 96px;
   background: #ffffff;
   box-shadow: 0px 4px 10px 0px rgba(127, 145, 180, 0.1);
   border-radius: 6px;
@@ -74,57 +75,20 @@
   white-space: unset;
 }
 
-.titaui-okr-flow--node-krs {
-  margin-top: 12px;
-}
-
-.titaui-okr-flow--node-kr {
-  display: flex;
-  line-height: 20px;
-}
-
-.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;
-}
-
-.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: 24px;
+  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 {

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/export-modal/index.js

@@ -0,0 +1,297 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _html2canvas = _interopRequireDefault(require("html2canvas"));
+
+var _rcColorPicker = _interopRequireDefault(require("rc-color-picker"));
+
+var _reactFlowRenderer = _interopRequireWildcard(require("@titaui/react-flow-renderer"));
+
+var _toast = _interopRequireDefault(require("../../toast"));
+
+var _dialog = _interopRequireDefault(require("../../dialog"));
+
+var _utils = require("../utils");
+
+var _context2 = require("../context");
+
+var _bsGlobal = require("../../../utils/bs-global");
+
+var _requestApis = require("../../okr-share/request-apis");
+
+var _precls = _interopRequireDefault(require("../precls"));
+
+var _getLocale = require("../../../utils/getLocale");
+
+require("rc-color-picker/assets/index.css");
+
+require("./index.css");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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 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); }); }; }
+
+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."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+var ExportMapModal = function ExportMapModal(props) {
+  var _props$visible = props.visible,
+      visible = _props$visible === void 0 ? false : _props$visible,
+      onCloseHandler = props.onCloseHandler,
+      _props$dataSource = props.dataSource,
+      dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
+      _props$darkTheme = props.darkTheme,
+      darkTheme = _props$darkTheme === void 0 ? false : _props$darkTheme,
+      direction = props.direction,
+      showkr = props.showkr;
+
+  var _useState = (0, _react.useState)(null),
+      _useState2 = _slicedToArray(_useState, 2),
+      mapInstance = _useState2[0],
+      setMapInstance = _useState2[1];
+
+  var _useState3 = (0, _react.useState)("none"),
+      _useState4 = _slicedToArray(_useState3, 2),
+      bgColor = _useState4[0],
+      setBgColor = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(false),
+      _useState6 = _slicedToArray(_useState5, 2),
+      isExport = _useState6[0],
+      setIsExport = _useState6[1];
+
+  var modalRef = (0, _react.useRef)();
+  (0, _react.useEffect)(function () {
+    if ((0, _bsGlobal.isWx)() && window.WWOpenData) {
+      if (window.WWOpenData.enableCanvasSharing) {
+        window.WWOpenData.enableCanvasSharing();
+      }
+
+      if (window.WWOpenData.initCanvas) {
+        window.WWOpenData.initCanvas();
+      }
+    }
+  }, []);
+  (0, _react.useEffect)(function () {
+    if (visible && mapInstance) {
+      mapInstance.fitView();
+    }
+  }, [visible, mapInstance]);
+
+  var downloadImg = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+      var okrMapRef, width, height, canvas, scale, opts;
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              okrMapRef = document.querySelector(".titaui-okr-flow__export") || document.createElement("div");
+              width = okrMapRef.clientWidth; // 获取dom 宽度
+
+              height = okrMapRef.clientHeight; // 获取dom 高度
+
+              canvas = document.createElement("canvas"); // 创建一个canvas节点
+
+              scale = 20; // 定义任意放大倍数 支持小数
+
+              canvas.width = width * scale; // 定义canvas 宽度 * 缩放
+
+              canvas.height = height * scale; // 定义canvas高度 *缩放
+
+              canvas.style.width = "".concat(width, "px");
+              canvas.style.height = "".concat(height, "px");
+              opts = {
+                backgroundColor: bgColor,
+                // 背景透明
+                scale: scale,
+                // 添加的scale 参数
+                canvas: canvas,
+                // 自定义 canvas
+                logging: false,
+                // 日志开关，便于查看html2canvas的内部执行流程
+                width: width,
+                // dom 原始宽度
+                height: height,
+                useCORS: true // 【重要】开启跨域配置
+
+              };
+              _context.next = 12;
+              return (0, _html2canvas["default"])(okrMapRef, opts).then(function (result) {
+                if ((0, _bsGlobal.isWx)() && window.WWOpenData) {
+                  if (window.WWOpenData.enableCanvasSharing) {
+                    window.WWOpenData.enableCanvasSharing();
+                  }
+
+                  if (window.WWOpenData.initCanvas) {
+                    window.WWOpenData.initCanvas();
+                  }
+                }
+
+                var imgUrl = result.toDataURL("image/png"); // 得到图片的base64编码数据
+
+                // 得到图片的base64编码数据
+                (0, _requestApis.getBase64DownloadUrl)(imgUrl.split(",")[1]).then(function (url) {
+                  var image = new Image();
+                  image.setAttribute("crossOrigin", "anonymous");
+
+                  image.onload = function () {
+                    if (!url.Data.obj) {
+                      _toast["default"].Error("导出失败，请稍后重试", {
+                        canClose: false
+                      });
+                    }
+
+                    var a = document.createElement("a"); // 生成一个a元素
+
+                    // 生成一个a元素
+                    var event = new MouseEvent("click"); // 创建一个单击事件
+
+                    // 创建一个单击事件
+                    a.download = "okr地图"; // 设置图片名称
+
+                    // 设置图片名称
+                    a.href = url.Data.obj; // 将生成的URL设置为a.href属性
+
+                    // 将生成的URL设置为a.href属性
+                    a.dispatchEvent(event); // 触发a的单击事件
+
+                    // 触发a的单击事件
+                    _toast["default"].Success("导出成功");
+
+                    setIsExport(false);
+
+                    if (onCloseHandler) {
+                      onCloseHandler();
+                    }
+                  };
+
+                  image.src = imgUrl;
+                });
+              })["catch"](function (err) {
+                setIsExport(false);
+
+                _toast["default"].Error(err, {
+                  canClose: false
+                });
+              });
+
+            case 12:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function downloadImg() {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  var confirmHandler = function confirmHandler() {
+    if (isExport) {
+      _toast["default"].Warning("正在导出中", {
+        canClose: true
+      });
+
+      return;
+    }
+
+    setIsExport(true);
+    downloadImg();
+  };
+
+  var fitViewHandler = function fitViewHandler(instance) {
+    setMapInstance(instance);
+  };
+
+  var colorChangeHandler = function colorChangeHandler(colors) {
+    setBgColor(colors ? colors.color : "none");
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
+    title: (0, _getLocale.getLocale)("OKR_Ali_Exportmap"),
+    noFooterLine: true,
+    visible: visible,
+    width: "1000px",
+    onClose: onCloseHandler,
+    onOk: confirmHandler,
+    onCancel: onCloseHandler,
+    ref: modalRef,
+    className: "export-map-modal titaui-dialog",
+    forceRender: true
+  }, /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "export-map-modal__setting"
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    style: {
+      marginRight: 10
+    }
+  }, (0, _getLocale.getLocale)("OKR_Ali_Selectbackground")), /*#__PURE__*/_react["default"].createElement(_rcColorPicker["default"], {
+    animation: "slide-up",
+    color: "#FFFFFF",
+    onChange: colorChangeHandler,
+    className: "titaui-color-picker",
+    mode: "HSB"
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "export-map-modal__color-trigger"
+  })), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "export-map-modal__color-trans",
+    onClick: colorChangeHandler
+  })), /*#__PURE__*/_react["default"].createElement("div", null, visible && /*#__PURE__*/_react["default"].createElement(_context2.CommonContext.Provider, {
+    value: {
+      direction: direction,
+      showkr: showkr,
+      darkTheme: darkTheme
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_reactFlowRenderer.ReactFlowProvider, null, /*#__PURE__*/_react["default"].createElement(_reactFlowRenderer["default"], {
+    onLoad: fitViewHandler,
+    nodesDraggable: false,
+    nodesConnectable: false,
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__export"), _defineProperty({}, "".concat(_precls["default"], "__dark"), darkTheme)),
+    elements: (0, _utils.getLayoutedElements)(dataSource, direction),
+    nodeTypes: _utils.nodeTypes,
+    minZoom: 0.05,
+    zoomOnScroll: false,
+    zoomOnPinch: false,
+    zoomOnDoubleClick: false,
+    paneMoveable: false,
+    style: {
+      height: 600,
+      width: "100%",
+      background: bgColor
+    }
+  }))))));
+};
+
+ExportMapModal.defaultProps = {
+  onCloseHandler: function onCloseHandler() {}
+};
+var _default = ExportMapModal;
+exports["default"] = _default;

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 ? 0 : 1,
-                showCardKr: showCardKr ? 0 : 1
+                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 ? 0 : 1
+                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 ? 0 : 1,
                 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);
     };
   }();

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

@@ -11,8 +11,6 @@ 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"));
@@ -41,14 +39,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 _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."); }
@@ -78,12 +68,16 @@ 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),
-      flowInstance = _useState2[0],
-      setFlowInstance = _useState2[1];
+      elements = _useState2[0],
+      setElements = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      flowInstance = _useState4[0],
+      setFlowInstance = _useState4[1];
 
   var isMoving = (0, _react.useRef)(false);
 
@@ -95,10 +89,12 @@ 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 = virtualElements[0];
+    var rootNode = layoutedElements[0];
 
     if (direction == "horizontal") {
       var targetY = containerHeight / 2;
@@ -106,27 +102,13 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
 
     var targetX = containerWidth / 2;
-    return [targetX - rootNode.position.x, -48]; // debugger
-    // return [0, 0]
+    return [targetX - rootNode.position.x, -48];
   };
 
   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(),
@@ -192,7 +174,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: dataSource,
+    elements: layoutedElements,
     nodesDraggable: false,
     nodesConnectable: false,
     nodeTypes: _utils.nodeTypes,
@@ -200,7 +182,7 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     minZoom: 0.25,
     maxZoom: 1.5,
     panOnScroll: true
-  }, /*#__PURE__*/_react["default"].createElement(NodeDebug, null)), /*#__PURE__*/_react["default"].createElement(_miniMap["default"], {
+  }), /*#__PURE__*/_react["default"].createElement(_miniMap["default"], {
     onMoveStart: function onMoveStart() {
       return isMoving.current = true;
     }

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

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