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

package/lib/components/button/rect-btn/index.css

@@ -13,7 +13,7 @@
   align-items: center;
   justify-content: center;
   min-width: 64px;
-  font-size: 13px;
+  font-size: 14px;
   padding: 0 12px;
 }
 
@@ -60,21 +60,35 @@
   background: #5c8eff;
 }
 
+.titaui-rect-btn--secondary {
+  font-size: 14px;
+  font-weight: normal;
+  color: #2879ff;
+  line-height: 28px;
+  background: rgba(40, 121, 255, 0.2);
+  margin-right: 16px;
+}
+
+.titaui-rect-btn--secondary:hover {
+  color: #fff;
+  background-color: #2879ff;
+}
+
 .titaui-rect-btn--cancel {
-  color: #6F7886;
-  border: 1px solid #DFE3EA;
-  background: #FFFFFF;
+  color: #6f7886;
+  border: 1px solid #dfe3ea;
+  background: #ffffff;
 }
 
 .titaui-rect-btn--cancel:hover {
-  color: #2879FF;
-  border: 1px solid #2879FF;
+  color: #2879ff;
+  border: 1px solid #2879ff;
 }
 
 .titaui-rect-btn--delete {
-  background: #FFFFFF;
-  color: #F05E5E;
-  border: 1px solid #F05E5E;
+  background: #ffffff;
+  color: #f05e5e;
+  border: 1px solid #f05e5e;
 }
 
 .titaui-rect-btn--delete:hover {
@@ -93,10 +107,10 @@
 }
 
 .titaui-rect-btn--primary.titaui-rect-btn--disabled {
-  background: #93BCFF;
+  background: #93bcff;
   opacity: 1;
 }
 
 .titaui-rect-btn--primary.titaui-rect-btn--disabled:hover {
-  background: #93BCFF;
+  background: #93bcff;
 }

package/lib/components/drawer/index.js

@@ -25,7 +25,9 @@ require("./index.css");
 
 var _context = _interopRequireDefault(require("../drawer-manager/context"));
 
-var _excluded = ["visible", "placement", "children", "mask", "width", "className", "contentWrapperStyle", "onClose", "style", "afterVisibleChange", "destroyOnClose", "bodyStyle", "zIndex"];
+var _dom = require("./utils/dom");
+
+var _excluded = ["visible", "placement", "children", "mask", "width", "className", "contentWrapperStyle", "onClose", "style", "afterVisibleChange", "destroyOnClose", "bodyStyle", "zIndex", "autoClosable"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -54,7 +56,7 @@ var Drawer = function Drawer(props) {
 
   var visible = props.visible,
       _props$placement = props.placement,
-      placement = _props$placement === void 0 ? "right" : _props$placement,
+      placement = _props$placement === void 0 ? 'right' : _props$placement,
       children = props.children,
       _props$mask = props.mask,
       mask = _props$mask === void 0 ? false : _props$mask,
@@ -70,6 +72,8 @@ var Drawer = function Drawer(props) {
       bodyStyle = props.bodyStyle,
       _props$zIndex = props.zIndex,
       zIndex = _props$zIndex === void 0 ? 1200 : _props$zIndex,
+      _props$autoClosable = props.autoClosable,
+      autoClosable = _props$autoClosable === void 0 ? false : _props$autoClosable,
       rest = _objectWithoutProperties(props, _excluded);
 
   var handleAfterVisibleChange = (0, _react.useCallback)(function (opened) {
@@ -89,6 +93,20 @@ var Drawer = function Drawer(props) {
     return children;
   }
 
+  var autoClose = function autoClose(e) {
+    if ((0, _dom.hasAncestorElement)(e.target, 'document-mouse-event-ignore,rc-tooltip,titaui-popup,rc-dialog-root,common-modal,in-modal,task-hot-add')) return;
+    onClose();
+  };
+
+  (0, _react.useEffect)(function () {
+    if (autoClosable) {
+      document.addEventListener('mousedown', autoClose);
+    }
+
+    return function () {
+      document.removeEventListener('mousedown', autoClose);
+    };
+  }, []);
   return /*#__PURE__*/_react["default"].createElement(DrawerContext.Provider, {
     value: {
       close: function close() {
@@ -96,7 +114,7 @@ var Drawer = function Drawer(props) {
       }
     }
   }, /*#__PURE__*/_react["default"].createElement(_rcDrawer["default"], _extends({
-    className: (0, _classnames["default"])("titaui-drawer", "document-mouse-event-ignore", className),
+    className: (0, _classnames["default"])('titaui-drawer', 'document-mouse-event-ignore', className),
     style: _objectSpread(_objectSpread({}, style), {}, {
       zIndex: zIndex
     })
@@ -145,7 +163,7 @@ function DrawerHeader(_ref) {
     onClick: manager && manager.goBack
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "tu-icon-fanhui"
-  }), (0, _getLocale.getLocale)("Mod_Back")), showBackBtn && hasContent && /*#__PURE__*/_react["default"].createElement("div", {
+  }), (0, _getLocale.getLocale)('Mod_Back')), showBackBtn && hasContent && /*#__PURE__*/_react["default"].createElement("div", {
     className: "titaui-drawer-header-divider"
   }), hasContent && content, /*#__PURE__*/_react["default"].createElement("div", {
     style: {
@@ -154,7 +172,7 @@ function DrawerHeader(_ref) {
   }), displayActions.map(function (action) {
     return /*#__PURE__*/_react["default"].createElement(_headerAction["default"], action);
   }), !!collapsedActions.length && /*#__PURE__*/_react["default"].createElement(_headerAction["default"], {
-    title: (0, _getLocale.getLocale)("Mod_MoreOperate"),
+    title: (0, _getLocale.getLocale)('Mod_MoreOperate'),
     icon: "tu-icon-10",
     children: collapsedActions
   }), showClose && /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -18,12 +18,14 @@ var _popup = _interopRequireDefault(require("../popup"));
 
 var _checkbox = _interopRequireDefault(require("../checkbox"));
 
+var _radio = _interopRequireDefault(require("../radio"));
+
 require("./index.css");
 
 var _iconItem = _interopRequireDefault(require("./icon-item"));
 
 var _excluded = ["name", "multi", "children", "onClick", "className"],
-    _excluded2 = ["trigger", "triggerIcon", "destroyPopupOnHide", "popupPlacement", "hideOnChange", "onChange", "canEdit", "popAction", "onPopupVisibleChange"];
+    _excluded2 = ["trigger", "triggerIcon", "destroyPopupOnHide", "popupPlacement", "hideOnChange", "onChange", "canEdit"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -55,7 +57,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-var preCls = 'titaui-drop-selector';
+var preCls = "titaui-drop-selector";
 var IconItem = _iconItem["default"];
 exports.IconItem = IconItem;
 
@@ -96,7 +98,7 @@ function DropSelectorLayer(props) {
   var _classNames;
 
   var _props$className = props.className,
-      className = _props$className === void 0 ? '' : _props$className,
+      className = _props$className === void 0 ? "" : _props$className,
       _props$multi = props.multi,
       multi = _props$multi === void 0 ? false : _props$multi,
       onItemClick = props.onItemClick,
@@ -133,15 +135,12 @@ function DropSelector(props) {
       _props$destroyPopupOn = props.destroyPopupOnHide,
       destroyPopupOnHide = _props$destroyPopupOn === void 0 ? true : _props$destroyPopupOn,
       _props$popupPlacement = props.popupPlacement,
-      popupPlacement = _props$popupPlacement === void 0 ? 'bottom' : _props$popupPlacement,
+      popupPlacement = _props$popupPlacement === void 0 ? "bottom" : _props$popupPlacement,
       _props$hideOnChange = props.hideOnChange,
       hideOnChange = _props$hideOnChange === void 0 ? true : _props$hideOnChange,
       onChange = props.onChange,
       _props$canEdit = props.canEdit,
       canEdit = _props$canEdit === void 0 ? true : _props$canEdit,
-      _props$popAction = props.popAction,
-      popAction = _props$popAction === void 0 ? ['click'] : _props$popAction,
-      onPopupVisibleChange = props.onPopupVisibleChange,
       restProps = _objectWithoutProperties(props, _excluded2);
 
   var _useState3 = (0, _react.useState)(false),
@@ -149,21 +148,6 @@ function DropSelector(props) {
       visible = _useState4[0],
       setVisible = _useState4[1];
 
-  var realVisible = visible;
-
-  if ('visible' in props) {
-    realVisible = props.visible;
-  }
-
-  var handlePopVisibleChange = (0, _react.useCallback)(function (visible) {
-    console.log('visible' in props);
-
-    if (!('visible' in props)) {
-      setVisible(visible);
-    }
-
-    onPopupVisibleChange === null || onPopupVisibleChange === void 0 ? void 0 : onPopupVisibleChange(visible);
-  }, [props.visible === undefined]);
   (0, _react.useEffect)(function () {
     setVisible(props.visible);
   }, [props.visible]);
@@ -177,11 +161,12 @@ function DropSelector(props) {
   };
 
   return /*#__PURE__*/_react["default"].createElement(_popup["default"], {
-    popupVisible: canEdit && realVisible,
+    popupVisible: canEdit && visible,
     popupPlacement: popupPlacement,
-    onPopupVisibleChange: handlePopVisibleChange,
+    onPopupVisibleChange: function onPopupVisibleChange(visible) {
+      return setVisible(visible);
+    },
     destroyPopupOnHide: destroyPopupOnHide,
-    action: popAction,
     popup: /*#__PURE__*/_react["default"].createElement(DropSelectorLayer, _extends({}, restProps, {
       onItemClick: onMenuClickHandler
     }))

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

@@ -80,6 +80,13 @@
 
 .titaui-img-viewer__body-img {
   max-width: 800px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  margin: auto;
+  cursor: move;
 }
 
 .titaui-img-viewer__body-operate-btn {

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

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

package/lib/components/menus/index.js

@@ -15,8 +15,6 @@ var _appraisalMenus = _interopRequireDefault(require("./export-modules/appraisal
 
 var _manageMenus = _interopRequireDefault(require("./export-modules/manage-menus"));
 
-var _interviewMenus = _interopRequireDefault(require("./export-modules/interview-menus"));
-
 require("./index.css");
 
 var _demoMenus = _interopRequireDefault(require("./export-modules/demo-menus"));
@@ -29,33 +27,29 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-var preCls = 'titaui-menus';
+var preCls = "titaui-menus";
 
 var Menus = function Menus(props) {
   var type = props.type,
       restProps = _objectWithoutProperties(props, _excluded);
 
   var renderMenuByType = function renderMenuByType() {
-    if (type === 'okr') {
+    if (type === "okr") {
       return /*#__PURE__*/_react["default"].createElement(_okrMenus["default"], restProps);
     }
 
-    if (type === 'appraisal') {
+    if (type === "appraisal") {
       return /*#__PURE__*/_react["default"].createElement(_appraisalMenus["default"], restProps);
     }
 
-    if (type === 'manage') {
+    if (type === "manage") {
       return /*#__PURE__*/_react["default"].createElement(_manageMenus["default"], restProps);
     }
 
-    if (type === 'demofree') {
+    if (type === "demofree") {
       return /*#__PURE__*/_react["default"].createElement(_demoMenus["default"], restProps);
     }
 
-    if (type === 'interview') {
-      return /*#__PURE__*/_react["default"].createElement(_interviewMenus["default"], restProps);
-    }
-
     return undefined;
   };
 

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

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

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

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

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