@titaui/pc 1.11.4-0 → 1.11.4-0.beta-2

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

@@ -72,7 +72,7 @@ function OkrSearchPanel(props, ref) {
       _props$rootId = props.rootId,
       rootId = _props$rootId === void 0 ? 0 : _props$rootId,
       _props$rootName = props.rootName,
-      rootName = _props$rootName === void 0 ? "" : _props$rootName,
+      rootName = _props$rootName === void 0 ? '' : _props$rootName,
       _props$avatar = props.avatar,
       avatar = _props$avatar === void 0 ? {} : _props$avatar,
       direction = props.direction,
@@ -80,13 +80,15 @@ function OkrSearchPanel(props, ref) {
       yqmNum = props.yqmNum,
       annualNum = props.annualNum,
       _props$okrType = props.okrType,
-      okrType = _props$okrType === void 0 ? "" : _props$okrType,
+      okrType = _props$okrType === void 0 ? '' : _props$okrType,
       _props$openLevel = props.openLevel,
       openLevel = _props$openLevel === void 0 ? 2 : _props$openLevel,
       _props$showkr = props.showkr,
       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) {
@@ -125,12 +127,12 @@ function OkrSearchPanel(props, ref) {
                 cycleType: cycleType,
                 yqmNum: yqmNum,
                 annualNum: annualNum,
-                userIds: searchType == "user" ? rootId : "",
-                departmentIds: searchType == "depart" ? rootId : "",
-                groupIds: searchType == "group" ? rootId : "",
+                userIds: searchType == 'user' ? rootId : '',
+                departmentIds: searchType == 'depart' ? rootId : '',
+                groupIds: searchType == 'group' ? rootId : '',
                 orderType: 2,
                 // 排序
-                okrType: _config.OkrTypeSetting ? searchType == "user" ? "" : okrType : "",
+                okrType: _config.OkrTypeSetting ? searchType == 'user' ? '' : okrType : '',
                 status: 0
               });
 
@@ -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:
@@ -165,7 +168,7 @@ function OkrSearchPanel(props, ref) {
               subTreeNodes = (0, _treeHandler.buildTreeNodes)(allNodes, openLevel, showkr);
               setTreeNodes({
                 id: 0,
-                modelType: "root",
+                modelType: 'root',
                 data: _defineProperty({
                   searchType: searchType,
                   rootName: rootName,
@@ -173,7 +176,8 @@ function OkrSearchPanel(props, ref) {
                   avatar: {
                     hasAvatar: avatar.HasAvatar || avatar.hasAvatar,
                     color: avatar.Color || avatar.color,
-                    small: avatar.Small || avatar.small
+                    small: avatar.Small || avatar.small,
+                    big: avatar.Original || avatar.original || avatar.large || avatar.big || avatar.Large
                   }
                 }, "searchType", searchType),
                 children: subTreeNodes
@@ -188,19 +192,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) {
@@ -213,10 +217,11 @@ function OkrSearchPanel(props, ref) {
               id = node.id, modelType = node.modelType, data = node.data;
               _context2.next = 3;
               return (0, _requestApis.expandNode)({
-                krId: modelType == "kr" ? id : 0,
-                okrId: modelType == "kr" ? data.workId : id,
-                okrIdParent: modelType == "work" ? data.parentId : data.workId,
-                childRoot: false
+                krId: modelType == 'kr' ? id : 0,
+                okrId: modelType == 'kr' ? data.workId : id,
+                okrIdParent: modelType == 'work' ? data.parentId : data.workId,
+                childRoot: false,
+                showCardKr: showCardKr ? 1 : 0
               });
 
             case 3:
@@ -249,7 +254,7 @@ function OkrSearchPanel(props, ref) {
       }, _callee2);
     }));
 
-    return function handleParentExpand(_x11) {
+    return function handleParentExpand(_x12) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -264,11 +269,12 @@ function OkrSearchPanel(props, ref) {
               id = node.id, modelType = node.modelType, data = node.data;
               _context3.next = 3;
               return (0, _requestApis.expandNode)({
-                krId: modelType == "kr" ? id : 0,
-                okrId: modelType == "work" ? id : data.workId,
+                krId: modelType == 'kr' ? id : 0,
+                okrId: modelType == 'work' ? id : data.workId,
                 okrIdParent: 0,
                 childRoot: true,
-                currentOkrRole: modelType == "kr" ? data.mapkrVisible : data.MapOkrVisible
+                showCardKr: showCardKr ? 1 : 0,
+                currentOkrRole: modelType == 'kr' ? data.mapkrVisible : data.MapOkrVisible
               });
 
             case 3:
@@ -294,7 +300,7 @@ function OkrSearchPanel(props, ref) {
       }, _callee3);
     }));
 
-    return function handleChildExpand(_x12) {
+    return function handleChildExpand(_x13) {
       return _ref3.apply(this, arguments);
     };
   }();
@@ -319,7 +325,7 @@ function OkrSearchPanel(props, ref) {
                 break;
               }
 
-              _toast["default"].Warning("暂无OKR");
+              _toast["default"].Warning('暂无OKR');
 
               return _context4.abrupt("return");
 

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 _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+
 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."); }
@@ -53,7 +63,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$direction = props.direction,
-      direction = _props$direction === void 0 ? "horizontal" : _props$direction,
+      direction = _props$direction === void 0 ? 'horizontal' : _props$direction,
       _props$darkTheme = props.darkTheme,
       darkTheme = _props$darkTheme === void 0 ? false : _props$darkTheme,
       _props$showkr = props.showkr,
@@ -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);
 
@@ -85,30 +91,42 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var _element$data = element.data,
         data = _element$data === void 0 ? {} : _element$data,
         type = element.type;
-    if (type == "default" || type == "RootNode") return;
+    if (type == 'default' || type == 'RootNode' || (data === null || data === void 0 ? void 0 : data.modelType) == 'work') return;
     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") {
+    if (direction == 'horizontal') {
       var targetY = containerHeight / 2;
       return [-160, targetY - rootNode.position.y];
     }
 
     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));
+    }, _isEqual["default"]);
+    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(),
@@ -152,10 +170,13 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var panelMouseUpHandler = function panelMouseUpHandler() {
     isMoving.current = false; // drawerWrapper.close()
-  }; // const closeOkrDrawer = () => {
-  //   drawerWrapper.close()
-  // }
+  };
 
+  var closeOkrDrawer = function closeOkrDrawer() {
+    var mousedown = document.createEvent('MouseEvents');
+    mousedown.initMouseEvent('mousedown', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+    window.parent.document.body.dispatchEvent(mousedown); // drawerWrapper.close()
+  };
 
   return /*#__PURE__*/_react["default"].createElement(_context.CommonContext.Provider, {
     value: {
@@ -170,11 +191,11 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"]), _defineProperty({}, "".concat(_precls["default"], "__dark"), darkTheme)),
     onMouseMove: mapMovingHandler,
-    onMouseUp: panelMouseUpHandler // onClick={closeOkrDrawer}
-
+    onMouseUp: panelMouseUpHandler,
+    onClick: closeOkrDrawer
   }, /*#__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 +203,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

@@ -27,8 +27,8 @@ var userId = window.BSGlobal && window.BSGlobal.loginUserInfo.Id || 0;
 exports.userId = userId;
 
 var requestDomain = function requestDomain() {
-  if (!window.location.hostname.match(/dev/)) return "";
-  return "https://www.tita.gift";
+  if (!window.location.hostname.match(/dev/)) return '';
+  return 'https://www.tita.gift';
 };
 
 var checkTenantOkrExist = /*#__PURE__*/function () {
@@ -70,15 +70,17 @@ exports.searchOkrs = searchOkrs;
 
 var expandNode = function expandNode(params) {
   var _params$okrId = params.okrId,
-      okrId = _params$okrId === void 0 ? "" : _params$okrId,
+      okrId = _params$okrId === void 0 ? '' : _params$okrId,
       _params$krId = params.krId,
-      krId = _params$krId === void 0 ? "" : _params$krId,
+      krId = _params$krId === void 0 ? '' : _params$krId,
       _params$childRoot = params.childRoot,
       childRoot = _params$childRoot === void 0 ? true : _params$childRoot,
       _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;
     })

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

@@ -1,6 +1,6 @@
 .titaui-okr-flow--root-node {
-  padding: 5px 12px;
-  background: #f0f2f5;
+  padding: 4px 12px;
+  background: rgba(255, 255, 255, 0.6);
   border-radius: 16px;
   color: #89919f;
 }

package/lib/components/okr-flow/root-node/index.js

@@ -50,19 +50,19 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function RootNode(props) {
   var _props$data = props.data,
       _props$data$rootName = _props$data.rootName,
-      rootName = _props$data$rootName === void 0 ? "" : _props$data$rootName,
+      rootName = _props$data$rootName === void 0 ? '' : _props$data$rootName,
       _props$data$rootId = _props$data.rootId,
       rootId = _props$data$rootId === void 0 ? 0 : _props$data$rootId,
       _props$data$avatar = _props$data.avatar,
       avatar = _props$data$avatar === void 0 ? {} : _props$data$avatar,
       searchType = _props$data.searchType;
 
-  var _useState = (0, _react.useState)(""),
+  var _useState = (0, _react.useState)(''),
       _useState2 = _slicedToArray(_useState, 2),
       normalRootImg = _useState2[0],
       setNormalRootImg = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(""),
+  var _useState3 = (0, _react.useState)(''),
       _useState4 = _slicedToArray(_useState3, 2),
       whiteRootImg = _useState4[0],
       setWhiteImg = _useState4[1];
@@ -80,19 +80,19 @@ function RootNode(props) {
       darkTheme = context.darkTheme;
 
   var getRootIcon = function getRootIcon() {
-    if (searchType == "company") {
+    if (searchType == 'company') {
       return /*#__PURE__*/_react["default"].createElement("span", {
         className: (0, _classnames["default"])("".concat(_precls["default"], "--root-node-icon__company"))
       });
     }
 
-    if (searchType == "user") {
+    if (searchType == 'user') {
       if (hasAvatar) {
         return /*#__PURE__*/_react["default"].createElement("img", {
-          src: avatar.small,
+          src: avatar.big ? avatar.big : avatar.small,
           width: 24,
           style: {
-            borderRadius: "50%"
+            borderRadius: '50%'
           }
         });
       }
@@ -118,7 +118,7 @@ function RootNode(props) {
       })));
     }
 
-    if (searchType == "depart") {
+    if (searchType == 'depart') {
       return /*#__PURE__*/_react["default"].createElement("span", {
         className: (0, _classnames["default"])("".concat(_precls["default"], "--root-node-icon__normal"))
       }, rootName[0]);
@@ -147,15 +147,15 @@ function RootNode(props) {
               return (0, _openDataPainter.getOpenData)({
                 id: rootId,
                 name: rootName,
-                type: searchType == "user" ? "userName" : "departmentName"
+                type: searchType == 'user' ? 'userName' : 'departmentName'
               });
 
             case 4:
               wxRootName = _context.sent;
 
             case 5:
-              generalCanvas("normal", wxRootName);
-              generalCanvas("white", wxRootName);
+              generalCanvas('normal', wxRootName);
+              generalCanvas('white', wxRootName);
 
             case 7:
             case "end":
@@ -171,11 +171,11 @@ function RootNode(props) {
   }();
 
   var generalCanvas = function generalCanvas() {
-    var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "normal";
+    var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'normal';
     var rootName = arguments.length > 1 ? arguments[1] : undefined;
-    var canvas = document.createElement("canvas");
-    var font = "normal 14px/24px Arial,Verdana,Helvetica Neue,Helvetica,sans-serif,PingFang SC,Microsoft YaHei";
-    var ctx = canvas.getContext("2d");
+    var canvas = document.createElement('canvas');
+    var font = 'normal 14px/24px Arial,Verdana,Helvetica Neue,Helvetica,sans-serif,PingFang SC,Microsoft YaHei';
+    var ctx = canvas.getContext('2d');
     ctx.font = font; // const fitStr = fittingString(ctx, rootName, 268);
 
     var _ctx$measureText = ctx.measureText(rootName),
@@ -185,41 +185,42 @@ function RootNode(props) {
     (0, _openDataPainter.setSize)(canvas, ctx, actualWidth, 24); // 设置画布尺寸
 
     setImgWidth(actualWidth);
-    ctx.textBaseline = "middle";
+    ctx.textBaseline = 'middle';
     ctx.font = font;
-    ctx.fillStyle = type == "normal" ? "#6f7886" : "#FFFFFF";
+    ctx.fillStyle = type == 'normal' ? '#6f7886' : '#FFFFFF';
     ctx.fillText(rootName, 0, 12);
-    type == "normal" ? setNormalRootImg(canvas.toDataURL()) : setWhiteImg(canvas.toDataURL());
+    type == 'normal' ? setNormalRootImg(canvas.toDataURL()) : setWhiteImg(canvas.toDataURL());
   };
 
   (0, _react.useEffect)(function () {
-    (searchType == "user" || searchType == "depart") && rootName.length && getRootName();
+    ;
+    (searchType == 'user' || searchType == 'depart') && rootName.length && getRootName();
   }, [rootName, rootId]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--root-node-wrapper"), "".concat(_precls["default"], "--root-node-wrapper__").concat(direction))
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--root-node"))
-  }, getRootIcon(), searchType !== "user" && searchType !== "depart" && /*#__PURE__*/_react["default"].createElement("span", {
+  }, getRootIcon(), searchType !== 'user' && searchType !== 'depart' && /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--root-node-text"))
-  }, rootName), (searchType == "user" || searchType == "depart") && /*#__PURE__*/_react["default"].createElement("img", {
+  }, rootName), (searchType == 'user' || searchType == 'depart') && /*#__PURE__*/_react["default"].createElement("img", {
     src: darkTheme ? whiteRootImg : normalRootImg,
     style: {
       maxWidth: 268,
       marginLeft: 4
     },
     width: imgWidth
-  })), direction === "horizontal" && /*#__PURE__*/_react["default"].createElement(_reactFlowRenderer.Handle, {
+  })), direction === 'horizontal' && /*#__PURE__*/_react["default"].createElement(_reactFlowRenderer.Handle, {
     type: "source",
     position: "right",
     style: {
-      visibility: "hidden",
+      visibility: 'hidden',
       right: 0
     }
-  }), direction === "vertical" && /*#__PURE__*/_react["default"].createElement(_reactFlowRenderer.Handle, {
+  }), direction === 'vertical' && /*#__PURE__*/_react["default"].createElement(_reactFlowRenderer.Handle, {
     type: "source",
     position: "bottom",
     style: {
-      visibility: "hidden",
+      visibility: 'hidden',
       bottom: 0
     }
   }));

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

@@ -15,6 +15,12 @@ var _rootNode = _interopRequireDefault(require("../root-node"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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 nodeTypes = {
   ChildNode: _childNode["default"],
   RootNode: _rootNode["default"]
@@ -22,44 +28,54 @@ var nodeTypes = {
 exports.nodeTypes = nodeTypes;
 
 var getLayoutedElements = function getLayoutedElements(elements) {
-  var direction = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "horizontal";
-  var isHorizontal = direction === "horizontal";
-  var nodeWidth = 320;
-  var nodeHeight = 96;
-  var dagreGraph = new _dagre["default"].graphlib.Graph();
-  dagreGraph.setDefaultEdgeLabel(function () {
-    return {};
+  var direction = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'horizontal';
+  var isHorizontal = direction === 'horizontal'; // const g = new dagre.graphlib.Graph({compound: true });
+
+  var g = new _dagre["default"].graphlib.Graph();
+  g.setGraph({
+    rankdir: isHorizontal ? 'LR' : 'TB',
+    nodesep: 12,
+    ranksep: 80
   });
-  dagreGraph.setGraph({
-    rankdir: isHorizontal ? "LR" : "TB",
-    ranksep: 80,
-    nodesep: 12
+  g.setDefaultEdgeLabel(function () {
+    return {};
   });
-  elements.forEach(function (el) {
-    if ((0, _reactFlowRenderer.isNode)(el)) {
-      dagreGraph.setNode(el.id, {
-        width: nodeWidth,
-        height: nodeHeight
+  elements.forEach(function (element) {
+    if ((0, _reactFlowRenderer.isNode)(element)) {
+      var _element$__rf, _element$__rf2;
+
+      // const { data,id } = element
+      // if(id!=="0"){
+      //   const {parentId} = data
+      //   if(parentId===0||parentId){
+      //     g.setParent(id, parentId+"");
+      //   }
+      // }
+      g.setNode(element.id, {
+        width: (_element$__rf = element.__rf) === null || _element$__rf === void 0 ? void 0 : _element$__rf.width,
+        height: (_element$__rf2 = element.__rf) === null || _element$__rf2 === void 0 ? void 0 : _element$__rf2.height
       });
     } else {
-      dagreGraph.setEdge(el.source, el.target);
+      g.setEdge(element.source, element.target);
     }
   });
 
-  _dagre["default"].layout(dagreGraph);
-
-  return elements.map(function (el) {
-    if ((0, _reactFlowRenderer.isNode)(el)) {
-      var nodeWithPosition = dagreGraph.node(el.id);
-      el.targetPosition = isHorizontal ? "left" : "top";
-      el.sourcePosition = isHorizontal ? "right" : "bottom";
-      el.position = {
-        x: nodeWithPosition.x,
-        y: nodeWithPosition.y
-      };
+  _dagre["default"].layout(g);
+
+  return elements.map(function (element) {
+    if ((0, _reactFlowRenderer.isNode)(element)) {
+      var node = g.node(element.id);
+      return _objectSpread(_objectSpread({}, element), {}, {
+        targetPosition: isHorizontal ? 'left' : 'top',
+        sourcePosition: isHorizontal ? 'right' : 'bottom',
+        position: {
+          x: node ? (node === null || node === void 0 ? void 0 : node.x) - (node === null || node === void 0 ? void 0 : node.width) / 2 : 0,
+          y: node ? (node === null || node === void 0 ? void 0 : node.y) - (node === null || node === void 0 ? void 0 : node.height) / 2 : 0
+        }
+      });
     }
 
-    return el;
+    return element;
   });
 };