@titaui/pc 1.10.82-beta.14 → 1.10.82-beta.15

package/lib/components/file-list/components/single-file/index.js

@@ -39,7 +39,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var prefix = "titaui-new-file-list-single-file";
+var prefix = 'titaui-new-file-list-single-file';
 
 var SingleFile = function SingleFile(_ref) {
   var data = _ref.data,
@@ -75,24 +75,24 @@ var SingleFile = function SingleFile(_ref) {
   }, isMouseEnter && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__operate"),
     onMouseLeave: handleMouseLeave
-  }, !isImg && canPreview && data.previewUrl && /*#__PURE__*/_react["default"].createElement("a", {
+  }, showDownload && /*#__PURE__*/_react["default"].createElement("a", {
+    className: (0, _classnames["default"])("".concat(prefix, "__operate-item"), _defineProperty({}, "".concat(prefix, "__not-preview"), !canPreview || !data.previewUrl)),
+    href: data.downloadUrl
+  }, /*#__PURE__*/_react["default"].createElement("i", {
+    className: (0, _classnames["default"])('tu-icon-APP-xiazai', "".concat(prefix, "__operate-item-icon"))
+  }), (0, _getLocale.getLocale)('Mod_Download')), !isImg && canPreview && data.previewUrl && /*#__PURE__*/_react["default"].createElement("a", {
     className: (0, _classnames["default"])("".concat(prefix, "__operate-item"), _defineProperty({}, "".concat(prefix, "__operate-item--only"), !showDownload)),
     href: data.previewUrl,
     target: "_blank",
     rel: "noreferrer"
   }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("tu-icon-yulan", "".concat(prefix, "__operate-item-icon"))
-  }), (0, _getLocale.getLocale)("Mod_Preview")), isImg && data.previewUrl && /*#__PURE__*/_react["default"].createElement("a", {
+    className: (0, _classnames["default"])('tu-icon-yulan', "".concat(prefix, "__operate-item-icon"))
+  }), (0, _getLocale.getLocale)('Mod_Preview')), isImg && data.previewUrl && /*#__PURE__*/_react["default"].createElement("a", {
     className: (0, _classnames["default"])("".concat(prefix, "__operate-item"), _defineProperty({}, "".concat(prefix, "__operate-item--only"), !showDownload)),
     onClick: handlePreviewImg
   }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("tu-icon-yulan", "".concat(prefix, "__operate-item-icon"))
-  }), (0, _getLocale.getLocale)("Mod_Preview")), showDownload && /*#__PURE__*/_react["default"].createElement("a", {
-    className: (0, _classnames["default"])("".concat(prefix, "__operate-item"), _defineProperty({}, "".concat(prefix, "__not-preview"), !canPreview || !data.previewUrl)),
-    href: data.downloadUrl
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("tu-icon-APP-xiazai", "".concat(prefix, "__operate-item-icon"))
-  }), (0, _getLocale.getLocale)("Mod_Download"))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])('tu-icon-yulan', "".concat(prefix, "__operate-item-icon"))
+  }), (0, _getLocale.getLocale)('Mod_Preview'))), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(prefix, "__file-preview")),
     onMouseEnter: handleMouseEnter,
     style: {

package/lib/components/icon-button-list/index.css

@@ -16,7 +16,7 @@
   height: 30px;
   margin-left: 10px;
   border: 1px solid #e6eaef;
-  border-radius: 4px;
+  border-radius: 50%;
   box-sizing: border-box;
   cursor: pointer;
 }

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

@@ -86,6 +86,7 @@
   right: 0;
   bottom: 0;
   margin: auto;
+  cursor: move;
 }
 
 .titaui-img-viewer__body-operate-btn {

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: 16px;
+}
+
+.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;
+  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;
 }
 

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/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.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 ? 0 : 1,
+                showCardKr: showCardKr ? 0 : 1
               });
 
             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 ? 0 : 1
               });
 
             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 ? 0 : 1,
                 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 ? 1 : _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;
+  background: rgba(255, 255, 255, 0.6);
   border-radius: 16px;
   color: #89919f;
 }

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"]
@@ -23,43 +29,77 @@ 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 {};
-  });
-  dagreGraph.setGraph({
+  var isHorizontal = direction === "horizontal"; // const dagreGraph = new dagre.graphlib.Graph();
+  // dagreGraph.setDefaultEdgeLabel(() => ({}));
+  // dagreGraph.setGraph({ rankdir: isHorizontal ? "LR" : "TB", ranksep: 80,nodesep:12});
+  // elements.forEach((el) => {
+  //   if (isNode(el)) {
+  //     // debugger
+  //     // let krsLength = el?.data?.data?.Krs?.length || 0
+  //     // if(krsLength){
+  //     //   debugger
+  //     //   nodeHeight = nodeHeight + (krsLength*20)
+  //     // }
+  //     // const nodeElement = document.querySelector(`.react-flow__node[data-id="${Number(el.id)}"]`);
+  //     console.log(el.__rf)
+  //     dagreGraph.setNode(el.id, { width: el.__rf?.width || 0, height:el.__rf?.height || 0 });
+  //   } else {
+  //     dagreGraph.setEdge(el.source, el.target)
+  //   }
+  // });
+  // dagre.layout(dagreGraph);
+  // return elements.map((el) => {
+  //   if (isNode(el)) {
+  //     const nodeWithPosition = dagreGraph.node(el.id);
+  //     el.targetPosition = isHorizontal ? "left" : "top";
+  //     el.sourcePosition = isHorizontal ? "right" : "bottom";
+  //     el.position = {
+  //       x: nodeWithPosition.x  ,
+  //       y: nodeWithPosition.y ,
+  //     };
+  //   }
+  //   return el;
+  // });
+
+  var g = new _dagre["default"].graphlib.Graph();
+  g.setGraph({
     rankdir: isHorizontal ? "LR" : "TB",
-    ranksep: 80,
-    nodesep: 12
+    nodesep: 12,
+    ranksep: 80
   });
-  elements.forEach(function (el) {
-    if ((0, _reactFlowRenderer.isNode)(el)) {
-      dagreGraph.setNode(el.id, {
-        width: nodeWidth,
-        height: nodeHeight
+  g.setDefaultEdgeLabel(function () {
+    return {};
+  });
+  elements.forEach(function (element) {
+    if ((0, _reactFlowRenderer.isNode)(element)) {
+      var _element$__rf, _element$__rf2;
+
+      g.setNode(element.id, {
+        label: 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.x - node.width / 2,
+          y: node.y - node.height / 2
+        }
+      });
     }
 
-    return el;
+    return element;
   });
 };
 

package/lib/components/okr-flow/utils/tree-handler.js

@@ -142,7 +142,11 @@ var flatTree = function flatTree(current, elements, showkr) {
     elements.push({
       id: "".concat(id),
       type: "RootNode",
-      data: data
+      data: data,
+      position: {
+        x: 0,
+        y: 0
+      }
     });
   } else {
     var isChildExpand = false;
@@ -164,6 +168,10 @@ var flatTree = function flatTree(current, elements, showkr) {
     elements.push({
       id: "".concat(id),
       type: "ChildNode",
+      position: {
+        x: 0,
+        y: 0
+      },
       data: {
         id: id,
         data: data,

package/lib/components/period-selector/index.js

@@ -73,6 +73,8 @@ function PeriodSelector(_ref) {
       wrapperStyle = _ref.wrapperStyle,
       popClass = _ref.popClass,
       style = _ref.style,
+      _ref$buttonClass = _ref.buttonClass,
+      buttonClass = _ref$buttonClass === void 0 ? "" : _ref$buttonClass,
       _ref$noBorder = _ref.noBorder,
       noBorder = _ref$noBorder === void 0 ? false : _ref$noBorder;
 
@@ -174,6 +176,7 @@ function PeriodSelector(_ref) {
     className: className
   }, children || /*#__PURE__*/_react["default"].createElement(_button["default"], {
     type: "default",
+    className: buttonClass,
     style: noBorder ? {
       padding: "0",
       border: "none"

package/lib/pages/okr-map/export-modules/okr-map/header/index.css

@@ -6,6 +6,10 @@
   border-bottom: 1px solid #e9ecf0;
 }
 
+.titapage-okr-map__header-period {
+  border-radius: 18px;
+}
+
 .titapage-okr-map__header__folded {
   height: 0;
 }
@@ -93,13 +97,14 @@
 }
 
 .titapage-okr-map__header-action-showkr .titaui-switch {
-  width: 136px;
+  width: 158px;
   position: relative;
 }
 
 .titapage-okr-map__header-action-showkr .titaui-switch-label {
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   font-size: 14px;
+  font-weight: unset;
 }
 
 .titapage-okr-map__header-action-showkr .titaui-switch .tui-switch {

package/lib/pages/okr-map/export-modules/okr-map/header/index.js

@@ -25,6 +25,8 @@ var _periodSelector = _interopRequireDefault(require("../../../../../components/
 
 var _iconButtonList = _interopRequireDefault(require("../../../../../components/icon-button-list"));
 
+var _toast = _interopRequireDefault(require("../../../../../components/toast"));
+
 var _showKrConfirm = _interopRequireDefault(require("./show-kr-confirm"));
 
 var _numberSelect = _interopRequireDefault(require("../../../number-select"));
@@ -57,6 +59,7 @@ var preCls = "titapage-okr-map";
 
 function _default(props) {
   var onShowKrClick = props.onShowKrClick,
+      onShowCardKr = props.onShowCardKr,
       onSearchChange = props.onSearchChange,
       onBtnClick = props.onBtnClick,
       onPeriodChange = props.onPeriodChange,
@@ -68,6 +71,7 @@ function _default(props) {
       darkTheme = props.darkTheme,
       period = props.period,
       showkr = props.showkr,
+      showCardKr = props.showCardKr,
       openLevel = props.openLevel;
 
   var _useState = (0, _react.useState)(false),
@@ -75,6 +79,11 @@ function _default(props) {
       visible = _useState2[0],
       setVisible = _useState2[1];
 
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      ovisible = _useState4[0],
+      setOVisible = _useState4[1];
+
   var iconButtons = [{
     icon: "export",
     overlay: (0, _getLocale.getLocale)("Mod_Export")
@@ -90,16 +99,40 @@ function _default(props) {
     placement: "topRight"
   }];
 
+  var onConfirmHandler = function onConfirmHandler(checked) {
+    onShowKrClick(checked);
+
+    if (showCardKr) {
+      _toast["default"].Warning('仅允许开启一项');
+
+      onShowCardKr(false);
+    }
+  };
+
+  var onhandleShowCardKr = function onhandleShowCardKr(checked) {
+    onShowCardKr(checked);
+
+    if (showkr) {
+      _toast["default"].Warning('仅允许开启一项');
+
+      onShowKrClick(false);
+    }
+  };
+
   var popup = /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__show-more-popup"))
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__header-action-showkr"))
+  }, /*#__PURE__*/_react["default"].createElement(_switch["default"], {
+    label: '目标展示 KR 详情',
+    checked: showCardKr,
+    onChange: onhandleShowCardKr
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__header-action-showkr"))
   }, /*#__PURE__*/_react["default"].createElement(_switch["default"], {
     label: (0, _getLocale.getLocale)("OKR_Ali_Butt_ExhibitionKRs"),
     checked: showkr,
-    onChange: function onChange() {
-      return setVisible(true);
-    }
+    onChange: onConfirmHandler
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__header-action-level"))
   }, /*#__PURE__*/_react["default"].createElement(_numberSelect["default"], {
@@ -112,15 +145,10 @@ function _default(props) {
     defaultValue: openLevel
   })));
 
-  var onConfirmHandler = function onConfirmHandler(checked) {
-    onShowKrClick(checked);
-    setVisible(false);
-  };
-
-  var _useState3 = (0, _react.useState)(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      fold = _useState4[0],
-      setFold = _useState4[1];
+  var _useState5 = (0, _react.useState)(false),
+      _useState6 = _slicedToArray(_useState5, 2),
+      fold = _useState6[0],
+      setFold = _useState6[1];
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__header"), _defineProperty({}, "".concat(preCls, "__header__folded"), fold))
@@ -137,7 +165,8 @@ function _default(props) {
     align: "bottomRight",
     onChange: onPeriodChange,
     selected: period,
-    yearsRange: [2018, 2030]
+    yearsRange: [2018, 2030],
+    buttonClass: "".concat(preCls, "__header-period")
   }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__header-action"))
   }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -178,5 +207,10 @@ function _default(props) {
     setVisible: setVisible,
     onConfirmHandler: onConfirmHandler,
     showkr: showkr
+  }), /*#__PURE__*/_react["default"].createElement(_showKrConfirm["default"], {
+    visible: ovisible,
+    setVisible: setOVisible,
+    onConfirmHandler: onhandleShowCardKr,
+    showkr: showCardKr
   }));
 }

package/lib/pages/okr-map/export-modules/okr-map/okr-map.js

@@ -27,7 +27,7 @@ var _level2Search = _interopRequireDefault(require("../../level2-search"));
 
 var _requestApis = require("../../request-apis");
 
-var _useStorage13 = _interopRequireDefault(require("../../hooks/useStorage"));
+var _useStorage15 = _interopRequireDefault(require("../../hooks/useStorage"));
 
 var _drawerManager = _interopRequireDefault(require("../../../../components/drawer-manager"));
 
@@ -75,7 +75,7 @@ function _default(props) {
   _objectDestructuringEmpty(props); // 使用存储的State
 
 
-  var _useStorage = (0, _useStorage13["default"])("period", {
+  var _useStorage = (0, _useStorage15["default"])("period", {
     annualNum: "".concat(new Date().getFullYear()),
     cycleType: "2",
     yqmNum: "".concat((0, _dayjs["default"])().quarter())
@@ -84,30 +84,35 @@ function _default(props) {
       period = _useStorage2[0],
       setPeriod = _useStorage2[1];
 
-  var _useStorage3 = (0, _useStorage13["default"])("showkr", false),
+  var _useStorage3 = (0, _useStorage15["default"])("showkr", false),
       _useStorage4 = _slicedToArray(_useStorage3, 2),
       showkr = _useStorage4[0],
       setShowKr = _useStorage4[1];
 
-  var _useStorage5 = (0, _useStorage13["default"])("searchType", "company"),
+  var _useStorage5 = (0, _useStorage15["default"])("showCardKr", false),
       _useStorage6 = _slicedToArray(_useStorage5, 2),
-      searchType = _useStorage6[0],
-      setSearchType = _useStorage6[1];
+      showCardKr = _useStorage6[0],
+      setShowCardKr = _useStorage6[1];
 
-  var _useStorage7 = (0, _useStorage13["default"])("level2Selected", {}),
+  var _useStorage7 = (0, _useStorage15["default"])("searchType", "company"),
       _useStorage8 = _slicedToArray(_useStorage7, 2),
-      level2Selected = _useStorage8[0],
-      setLevel2Selected = _useStorage8[1];
+      searchType = _useStorage8[0],
+      setSearchType = _useStorage8[1];
 
-  var _useStorage9 = (0, _useStorage13["default"])("rootNode", {
+  var _useStorage9 = (0, _useStorage15["default"])("level2Selected", {}),
+      _useStorage10 = _slicedToArray(_useStorage9, 2),
+      level2Selected = _useStorage10[0],
+      setLevel2Selected = _useStorage10[1];
+
+  var _useStorage11 = (0, _useStorage15["default"])("rootNode", {
     rootId: 0,
     rootName: ""
   }, {
     noLocal: true
   }),
-      _useStorage10 = _slicedToArray(_useStorage9, 2),
-      rootNode = _useStorage10[0],
-      setRootNode = _useStorage10[1];
+      _useStorage12 = _slicedToArray(_useStorage11, 2),
+      rootNode = _useStorage12[0],
+      setRootNode = _useStorage12[1];
 
   var _useState = (0, _react.useState)(true),
       _useState2 = _slicedToArray(_useState, 2),
@@ -152,10 +157,10 @@ function _default(props) {
       showMask = _useState16[0],
       setShowMask = _useState16[1];
 
-  var _useStorage11 = (0, _useStorage13["default"])("openLevel", 2),
-      _useStorage12 = _slicedToArray(_useStorage11, 2),
-      openLevel = _useStorage12[0],
-      setOpenLevel = _useStorage12[1];
+  var _useStorage13 = (0, _useStorage15["default"])("openLevel", 2),
+      _useStorage14 = _slicedToArray(_useStorage13, 2),
+      openLevel = _useStorage14[0],
+      setOpenLevel = _useStorage14[1];
 
   var _useState17 = (0, _react.useState)(false),
       _useState18 = _slicedToArray(_useState17, 2),
@@ -430,6 +435,9 @@ function _default(props) {
       onShowKrClick: function onShowKrClick(val) {
         return setShowKr(val);
       },
+      onShowCardKr: function onShowCardKr(val) {
+        return setShowCardKr(val);
+      },
       onSearchChange: onSearchChangeHandler,
       onPeriodChange: function onPeriodChange(period) {
         return setPeriod(period);
@@ -446,6 +454,7 @@ function _default(props) {
       darkTheme: darkTheme,
       direction: direction,
       showkr: showkr,
+      showCardKr: showCardKr,
       period: period
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])("".concat(_precls["default"], "__content"))
@@ -469,6 +478,7 @@ function _default(props) {
         return /*#__PURE__*/_react["default"].createElement(OkrSearchPanel, _extends({
           ref: okrMapRef,
           showkr: showkr,
+          showCardKr: showCardKr,
           direction: direction,
           darkTheme: darkTheme,
           openLevel: openLevel,

package/lib/pages/okr-map/number-select/index.css

@@ -2,7 +2,6 @@
   font-size: 14px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #3F4755;
-  width: 136px;
   position: relative;
 }
 
@@ -39,6 +38,10 @@
   user-select: none;
 }
 
+.titaui-number-select--action-icon-right {
+  line-height: 12px;
+}
+
 .titaui-number-select--action-icon:hover {
   background: #2879FF;
 }

package/lib/pages/okr-map/number-select/index.js

@@ -72,7 +72,7 @@ function NumberSelect(props) {
   }, "-"), /*#__PURE__*/React.createElement("span", {
     className: (0, _classnames["default"])("".concat(preCls, "--value"))
   }, num), /*#__PURE__*/React.createElement("span", {
-    className: (0, _classnames["default"])("".concat(preCls, "--action-icon"), _defineProperty({}, "".concat(preCls, "--action-icon__disable"), num == max)),
+    className: (0, _classnames["default"])("".concat(preCls, "--action-icon"), "".concat(preCls, "--action-icon-right"), _defineProperty({}, "".concat(preCls, "--action-icon__disable"), num == max)),
     onClick: addHandler
   }, "+")));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.10.82-beta.14",
+  "version": "1.10.82-beta.15",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",