@titaui/pc 1.11.14-beta.1 → 1.11.16

package/lib/components/change-okr-modal/Item.js

@@ -166,7 +166,7 @@ var Item = /*#__PURE__*/function (_PureComponent) {
           return (0, _constant2.getMonth)()[data.yqmnum - 1];
 
         case 4:
-          return "".concat((0, _constant2.getMonth)()[data.yqmnum - 1], "-").concat((0, _constant2.getMonth)()[((data.yqmnum + 1) % 12 || 12) - 1], "\u6708");
+          return "".concat((0, _constant2.getMonth)()[data.yqmnum - 1], "-").concat((0, _constant2.getMonth)()[((data.yqmnum + 1) % 12 || 12) - 1]);
 
         case 5:
           return data.yqmnum === 1 ? (0, _getLocale.getLocale)("OKR_MyO_Pop_Firsthalf") : (0, _getLocale.getLocale)("OKR_MyO_Pop_Secondhalf");

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

@@ -81,6 +81,7 @@
 }
 
 .titaui-okr-flow--node-kr {
+  cursor: pointer;
   display: flex;
   line-height: 20px;
   font-size: 12px;
@@ -130,11 +131,13 @@
   color: #141c28;
   font-size: 14px;
   font-weight: 600;
+  cursor: pointer;
 }
 
 .titaui-okr-flow--node-desp {
   font-family: PingFangSC-Regular, PingFang SC;
   position: relative;
+  cursor: pointer;
 }
 
 .titaui-okr-flow--node-right {
@@ -332,6 +335,7 @@
 }
 
 .titaui-okr-flow--node-status {
+  cursor: pointer;
   position: absolute;
   right: 0;
   top: 0;

package/lib/components/okr-flow/child-node/work-node.js

@@ -33,6 +33,8 @@ var _getLocale = require("../../../utils/getLocale");
 
 var _tools = require("../../../utils/tools");
 
+var _drawerManager = _interopRequireDefault(require("../../../components/drawer-manager"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -181,6 +183,18 @@ function WorkNode(_ref) {
     }
   }, []);
 
+  var openODetail = function openODetail(id) {
+    _drawerManager["default"].open("okrDetail", {
+      okrId: workId
+    });
+  };
+
+  var openKr = function openKr(id) {
+    _drawerManager["default"].open("krDetail", {
+      krId: id
+    });
+  };
+
   var getCycleTextByType = function getCycleTextByType() {
     var cycleType = data.cycleType,
         yqmnum = data.yqmnum,
@@ -223,11 +237,13 @@ function WorkNode(_ref) {
     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"))
+    className: (0, _classnames["default"])("".concat(_precls["default"], "--node-title")),
+    onClick: openODetail
   }, (0, _tools.htmlDecodeByRegExp)(workName), /*#__PURE__*/_react["default"].createElement(_okrClassify["default"], {
     classify: okrClassify
   })), /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(_precls["default"], "--node-desp"))
+    className: (0, _classnames["default"])("".concat(_precls["default"], "--node-desp")),
+    onClick: openODetail
   }, /*#__PURE__*/_react["default"].createElement(_creator["default"], {
     creator: principalUser || {}
   }), /*#__PURE__*/_react["default"].createElement("div", {
@@ -240,7 +256,10 @@ function WorkNode(_ref) {
     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"))
+      className: (0, _classnames["default"])("".concat(_precls["default"], "--node-kr")),
+      onClick: function onClick() {
+        return openKr(item.mileStoneId);
+      }
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])("".concat(_precls["default"], "--node-kr-icon"))
     }, "KR", item.SortNum + 1), /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -176,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

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

@@ -91,7 +91,7 @@ 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);
   };
 
@@ -170,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: {
@@ -188,8 +191,8 @@ 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: dataSource,

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

@@ -89,7 +89,7 @@ function RootNode(props) {
     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%"

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

@@ -207,11 +207,23 @@ function _default(props) {
 
       case "fullscreen":
         // 全屏
+        var cardFlat = document.querySelector('.titaui-menus__menu-card');
+
+        if (cardFlat) {
+          cardFlat.style.display = 'none';
+        }
+
         setFullScreen(true);
         break;
 
       case "quit-fullscreen":
         // 退出全屏
+        var cardFlat = document.querySelector('.titaui-menus__menu-card');
+
+        if (cardFlat) {
+          cardFlat.style.display = 'flex';
+        }
+
         setFullScreen(false);
         break;
 
@@ -282,7 +294,8 @@ function _default(props) {
         var userAvatar = {
           color: UserAvatar.Color,
           small: UserAvatar.Small,
-          hasAvatar: UserAvatar.HasAvatar
+          hasAvatar: UserAvatar.HasAvatar,
+          big: UserAvatar.Original || UserAvatar.original || UserAvatar.Big || UserAvatar.Large
         };
         setLevel2Selected({
           id: Id,

package/package.json

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