@titaui/pc 1.6.28 → 1.6.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. package/lib/components/dynamic/constant.js +30 -30
  2. package/lib/components/dynamic/dynamic-item/components/header/index.js +1 -1
  3. package/lib/components/dynamic/dynamic-item/dynamic-relative/index.js +5 -7
  4. package/lib/components/dynamic/dynamic-item/index.js +1 -1
  5. package/lib/components/dynamic/dynamic-list/index.js +2 -2
  6. package/lib/components/dynamic/dynamic.css +2 -2
  7. package/lib/components/dynamic/dynamic.js +1 -1
  8. package/lib/components/dynamic/new-ui.css +2 -2
  9. package/lib/components/menus/components/flip-menu-card/index.css +39 -0
  10. package/lib/components/menus/components/flip-menu-card/index.js +31 -11
  11. package/lib/components/menus/components/menu-card/index.css +0 -18
  12. package/lib/components/menus/components/menu-card/index.js +6 -19
  13. package/lib/components/menus/components/menu-close-btn/index.js +2 -1
  14. package/lib/components/menus/components/menu-tree/index.css +2 -0
  15. package/lib/components/menus/components/menu-tree/tree-node/index.css +3 -3
  16. package/lib/components/menus/export-modules/appraisal-menus/index.js +21 -4
  17. package/lib/components/menus/export-modules/{depart-menus → okr-menus/depart-menus}/helper.js +0 -0
  18. package/lib/components/menus/export-modules/{depart-menus → okr-menus/depart-menus}/index.css +0 -0
  19. package/lib/components/menus/export-modules/{depart-menus → okr-menus/depart-menus}/index.js +16 -27
  20. package/lib/components/menus/export-modules/okr-menus/index.js +3 -3
  21. package/lib/components/menus/export-modules/{subordinate-menus → okr-menus/subordinate-menus}/helper.js +0 -0
  22. package/lib/components/menus/export-modules/{subordinate-menus → okr-menus/subordinate-menus}/index.js +7 -16
  23. package/lib/components/menus/index.js +2 -6
  24. package/lib/components/menus/request-apis.js +2 -3
  25. package/lib/components/nav-top/components/user-message/components/empty/index.js +1 -1
  26. package/lib/components/nav-top/components/user-message/components/inform/index.js +1 -1
  27. package/lib/components/nav-top/components/user-message/components/inform/inform-item.js +50 -31
  28. package/lib/components/nav-top/components/user-message/components/remind/index.js +1 -1
  29. package/lib/components/nav-top/components/user-message/components/reply/index.js +1 -1
  30. package/lib/components/nav-top/components/user-message/components/tab-title/index.js +1 -1
  31. package/lib/components/nav-top/components/user-message/components/todos/index.js +1 -1
  32. package/lib/components/nav-top/components/user-message/index.js +1 -1
  33. package/lib/components/okrcase-library/new-ui.css +5 -2
  34. package/lib/components/photo-card/components/card/index.js +1 -1
  35. package/lib/components/photo-card/index.css +5 -0
  36. package/lib/components/photo-card/index.js +12 -4
  37. package/lib/components/scrollbar/index.css +3 -0
  38. package/lib/components/scrollbar/index.js +29 -0
  39. package/lib/components/scrollbar/simplebar/helpers.js +59 -0
  40. package/lib/components/scrollbar/simplebar/index.js +89 -0
  41. package/lib/components/scrollbar/simplebar/scrollbar-width.js +45 -0
  42. package/lib/components/scrollbar/simplebar/simplebar.js +852 -0
  43. package/lib/components/scrollbar/simplebar-react.js +163 -0
  44. package/lib/pages/new-okr-list/header/comments.js +8 -1
  45. package/lib/pages/new-okr-list/header/create-okr.js +5 -0
  46. package/lib/pages/new-okr-list/header/filter.js +9 -3
  47. package/lib/pages/new-okr-list/header/index.css +8 -2
  48. package/lib/pages/new-okr-list/header/index.js +9 -1
  49. package/lib/pages/new-okr-list/index.js +49 -3
  50. package/lib/pages/new-okr-list/list/index.js +1 -2
  51. package/package.json +1 -1
  52. package/lib/components/dynamic/components/condition-render/index.js +0 -20
@@ -10,19 +10,19 @@ var _ObjTypeMapText;
10
10
  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; }
11
11
 
12
12
  var OkrRiskMapping = {
13
- 0: 'normal',
13
+ 0: "normal",
14
14
  // 正常推进
15
- 1: 'normal',
15
+ 1: "normal",
16
16
  // 正常推进
17
- 2: 'risk',
17
+ 2: "risk",
18
18
  // 注意风险
19
- 3: 'delay',
19
+ 3: "delay",
20
20
  // 已有风险
21
- 4: 'end',
21
+ 4: "end",
22
22
  // kr及o全都完成
23
- 5: 'delay',
23
+ 5: "delay",
24
24
  // 延期完成
25
- 6: 'normal' // 正常推进
25
+ 6: "normal" // 正常推进
26
26
 
27
27
  };
28
28
  exports.OkrRiskMapping = OkrRiskMapping;
@@ -66,33 +66,33 @@ exports.EObjType = EObjType;
66
66
  EObjType[EObjType["KanBan"] = 66] = "KanBan";
67
67
  })(EObjType || (exports.EObjType = EObjType = {}));
68
68
 
69
- var ObjTypeMapText = (_ObjTypeMapText = {}, _defineProperty(_ObjTypeMapText, EObjType.Project, '项目'), _defineProperty(_ObjTypeMapText, EObjType.Task, '任务'), _defineProperty(_ObjTypeMapText, EObjType.O, '目标'), _defineProperty(_ObjTypeMapText, EObjType.Kr, '关键成果'), _defineProperty(_ObjTypeMapText, EObjType.MileStone, '里程碑'), _defineProperty(_ObjTypeMapText, EObjType.KanBan, '看板'), _ObjTypeMapText);
69
+ var ObjTypeMapText = (_ObjTypeMapText = {}, _defineProperty(_ObjTypeMapText, EObjType.Project, "项目"), _defineProperty(_ObjTypeMapText, EObjType.Task, "任务"), _defineProperty(_ObjTypeMapText, EObjType.O, "目标"), _defineProperty(_ObjTypeMapText, EObjType.Kr, "关键成果"), _defineProperty(_ObjTypeMapText, EObjType.MileStone, "里程碑"), _defineProperty(_ObjTypeMapText, EObjType.KanBan, "看板"), _ObjTypeMapText);
70
70
  exports.ObjTypeMapText = ObjTypeMapText;
71
71
  var ObjectType = {
72
- 1: '公告/分享',
73
- 4: '项目',
74
- 5: '绩效考核表',
75
- 6: '绩效目标',
76
- 7: '任务',
77
- 8: '日报(总结)',
78
- 10: 'Feed',
79
- 11: '计划',
80
- 12: '计划表的操作记录',
81
- 62: '目标',
82
- 65: '关键成果',
83
- 70: '复盘',
84
- 79: '关键成果进展',
85
- 80: '公告',
86
- 42: '打赏'
72
+ 1: "公告/分享",
73
+ 4: "项目",
74
+ 5: "绩效考核表",
75
+ 6: "绩效目标",
76
+ 7: "任务",
77
+ 8: "日报(总结)",
78
+ 10: "Feed",
79
+ 11: "计划",
80
+ 12: "计划表的操作记录",
81
+ 62: "目标",
82
+ 65: "关键成果",
83
+ 70: "复盘",
84
+ 79: "关键成果进展",
85
+ 80: "公告",
86
+ 42: "打赏"
87
87
  };
88
88
  exports.ObjectType = ObjectType;
89
89
  var EStatusStatus2ClassType = {
90
- 2: 'tu-icon-finished',
91
- 1: 'tu-icon-running',
92
- 4: 'tu-icon-canceled',
93
- 3: 'tu-icon-deferred',
94
- 6: 'tu-icon-paused',
95
- 0: 'tu-icon-notstart',
96
- 5: 'tu-icon-jiantou-right'
90
+ 2: "tu-icon-finished",
91
+ 1: "tu-icon-running",
92
+ 4: "tu-icon-canceled",
93
+ 3: "tu-icon-deferred",
94
+ 6: "tu-icon-paused",
95
+ 0: "tu-icon-notstart",
96
+ 5: "tu-icon-jiantou-right"
97
97
  };
98
98
  exports.EStatusStatus2ClassType = EStatusStatus2ClassType;
@@ -23,7 +23,7 @@ var _popDownNotification = require("../../../../pop-down-notification");
23
23
 
24
24
  var _openData = require("../../../../../utils/open-data");
25
25
 
26
- var _conditionRender = _interopRequireDefault(require("../../../components/condition-render"));
26
+ var _conditionRender = _interopRequireDefault(require("../../../../condition-render"));
27
27
 
28
28
  var _tooltip = require("../../../../tooltip");
29
29
 
@@ -21,7 +21,7 @@ var _constant = require("../../constant");
21
21
 
22
22
  var _dynamicRelative = _interopRequireDefault(require("./img/dynamic-relative.svg"));
23
23
 
24
- var _conditionRender = _interopRequireDefault(require("../../components/condition-render"));
24
+ var _conditionRender = _interopRequireDefault(require("../../../condition-render"));
25
25
 
26
26
  var _manager = _interopRequireDefault(require("../../../drawer/manager"));
27
27
 
@@ -41,8 +41,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
41
41
 
42
42
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
43
43
 
44
- 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; }
45
-
46
44
  function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
47
45
 
48
46
  function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -52,8 +50,6 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
52
50
  var prefix = "titaui-dynamic-relative-item";
53
51
 
54
52
  var DynamicRelative = function DynamicRelative(_ref) {
55
- var _classNames;
56
-
57
53
  var data = _ref.data,
58
54
  restProps = _objectWithoutProperties(_ref, _excluded);
59
55
 
@@ -64,7 +60,6 @@ var DynamicRelative = function DynamicRelative(_ref) {
64
60
  relateObjName = data.relateObjName,
65
61
  relateObjId = data.relateObjId,
66
62
  objCycleName = data.objCycleName,
67
- status = data.status,
68
63
  objPrincipalUser = data.objPrincipalUser,
69
64
  rObjprincipalUser = data.rObjprincipalUser,
70
65
  rObjCycleName = data.rObjCycleName,
@@ -167,7 +162,10 @@ var DynamicRelative = function DynamicRelative(_ref) {
167
162
  }, /*#__PURE__*/_react["default"].createElement("div", {
168
163
  className: prefix + "__obj-base-info"
169
164
  }, /*#__PURE__*/_react["default"].createElement("i", {
170
- className: (0, _classnames["default"])(prefix + "__obj-base-info-icon", (_classNames = {}, _defineProperty(_classNames, _constant.EStatusStatus2ClassType[status], objType === _constant.EObjType.Task), _defineProperty(_classNames, "tu-icon-project-s", objType === _constant.EObjType.Project), _classNames))
165
+ className: (0, _classnames["default"])(prefix + "__obj-base-info-icon", {
166
+ "tu-icon-renwu-s": objType === _constant.EObjType.Task,
167
+ "tu-icon-project-s": objType === _constant.EObjType.Project
168
+ })
171
169
  }), /*#__PURE__*/_react["default"].createElement("span", {
172
170
  className: prefix + "__obj-title",
173
171
  onClick: function onClick() {
@@ -53,7 +53,7 @@ var _avatar = require("../../avatar");
53
53
 
54
54
  var _context = require("../context");
55
55
 
56
- var _conditionRender = _interopRequireDefault(require("../components/condition-render"));
56
+ var _conditionRender = _interopRequireDefault(require("../../condition-render"));
57
57
 
58
58
  var _auth = require("../../../utils/auth");
59
59
 
@@ -13,7 +13,7 @@ var _dynamicItem = _interopRequireDefault(require("../dynamic-item"));
13
13
 
14
14
  var _dynamicEmpty = _interopRequireDefault(require("../img/dynamic-empty.png"));
15
15
 
16
- var _conditionRender = _interopRequireDefault(require("../components/condition-render"));
16
+ var _conditionRender = _interopRequireDefault(require("../../condition-render"));
17
17
 
18
18
  require("./index.css");
19
19
 
@@ -49,7 +49,7 @@ var DynamicList = function DynamicList(_ref) {
49
49
  }, "\u6682\u65E0\u52A8\u6001\u4FE1\u606F"))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
50
50
  condition: data.length !== 0
51
51
  }, /*#__PURE__*/_react["default"].createElement(_rcQueueAnim["default"], {
52
- type: 'bottom',
52
+ type: "bottom",
53
53
  delay: 0,
54
54
  duration: 500
55
55
  }, data.map(function (item, index) {
@@ -188,8 +188,8 @@
188
188
  display: flex;
189
189
  align-items: center;
190
190
  justify-content: center;
191
- width: 52px;
192
- height: 52px;
191
+ width: 42px;
192
+ height: 42px;
193
193
  background: rgba(255, 255, 255, 0.86);
194
194
  box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
195
195
  border-radius: 50%;
@@ -29,7 +29,7 @@ var _dynamicLiking = _interopRequireDefault(require("./dynamic-liking"));
29
29
 
30
30
  var _dynamicLoading = _interopRequireDefault(require("./img/dynamic-loading.gif"));
31
31
 
32
- var _conditionRender = _interopRequireDefault(require("./components/condition-render"));
32
+ var _conditionRender = _interopRequireDefault(require("../condition-render"));
33
33
 
34
34
  var _util = require("./util");
35
35
 
@@ -192,8 +192,8 @@
192
192
  display: flex;
193
193
  align-items: center;
194
194
  justify-content: center;
195
- width: 52px;
196
- height: 52px;
195
+ width: 42px;
196
+ height: 42px;
197
197
  background: rgba(255, 255, 255, 0.86);
198
198
  box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
199
199
  border-radius: 50%;
@@ -6,6 +6,21 @@
6
6
  transition: all 0.2s cubic-bezier(0.785, 0.135, 0.15, 0.86) 0s;
7
7
  will-change: opacity;
8
8
  opacity: 1;
9
+ border-radius: 12px;
10
+ }
11
+
12
+ .titaui-flip-card__top-right-hide-icon {
13
+ position: absolute;
14
+ right: -14px;
15
+ top: 6px;
16
+ }
17
+
18
+ .titaui-flip-card__top-right-hide-icon--none {
19
+ display: none;
20
+ }
21
+
22
+ .titaui-flip-card:hover .titaui-flip-card__top-right-hide-icon {
23
+ opacity: 1;
9
24
  }
10
25
 
11
26
  .titaui-flip-card__fixed-hide-icon {
@@ -64,12 +79,36 @@
64
79
  z-index: 1;
65
80
  }
66
81
 
82
+ .titaui-flip-card__inner-front-content {
83
+ border-radius: 12px;
84
+ }
85
+
86
+ .titaui-flip-card__inner-front-content--is-float {
87
+ box-shadow: 0 1px 10px #cccccc66;
88
+ }
89
+
90
+ .titaui-flip-card__inner-front-content--is-float-hide {
91
+ box-shadow: none;
92
+ }
93
+
67
94
  .titaui-flip-card__inner-back {
68
95
  display: none;
69
96
  transform: rotateY(180deg);
70
97
  z-index: 10;
71
98
  }
72
99
 
100
+ .titaui-flip-card__inner-back-content {
101
+ border-radius: 12px;
102
+ }
103
+
104
+ .titaui-flip-card__inner-back-content--is-float {
105
+ box-shadow: 0 1px 10px #cccccc66;
106
+ }
107
+
108
+ .titaui-flip-card__inner-back-content--is-float-hide {
109
+ box-shadow: none;
110
+ }
111
+
73
112
  .titaui-flip-card__inner-back-action {
74
113
  position: absolute;
75
114
  display: flex;
@@ -46,7 +46,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
46
46
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
47
47
 
48
48
  var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
49
- var _classNames;
49
+ var _classNames, _classNames2, _classNames3;
50
50
 
51
51
  var children = props.children,
52
52
  defaultWidth = props.defaultWidth,
@@ -67,31 +67,49 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
67
67
  isFloatHide = _useState6[0],
68
68
  setIsFloatHide = _useState6[1];
69
69
 
70
+ var _useState7 = (0, _react.useState)(false),
71
+ _useState8 = _slicedToArray(_useState7, 2),
72
+ isHideTopRightIcon = _useState8[0],
73
+ setIsHideTopRightIcon = _useState8[1];
74
+
70
75
  var hideFloatRef = (0, _react.useRef)();
71
76
  var flipCardRef = (0, _react.useRef)();
72
77
  var flipFrontRef = (0, _react.useRef)();
73
78
  var flipBackRef = (0, _react.useRef)();
74
79
 
75
80
  var goBackHandler = function goBackHandler() {
81
+ setMenuHideIcon(true);
76
82
  flipBackRef.current.style.position = 'absolute';
77
83
  flipFrontRef.current.style.display = 'block';
78
84
  setTimeout(function () {
79
85
  flipFrontRef.current.style.position = 'relative';
80
86
  flipBackRef.current.style.display = 'none';
87
+ setMenuHideIcon(false);
81
88
  }, 600);
82
89
  setIsBack(false);
83
90
  };
84
91
 
85
92
  var nextHandler = function nextHandler() {
93
+ setMenuHideIcon(true);
86
94
  flipFrontRef.current.style.position = 'absolute';
87
95
  flipBackRef.current.style.display = 'block';
88
96
  setTimeout(function () {
89
97
  flipBackRef.current.style.position = 'relative';
90
98
  flipFrontRef.current.style.display = 'none';
99
+ setMenuHideIcon(false);
91
100
  }, 600);
92
101
  setIsBack(true);
93
102
  };
94
103
 
104
+ var setMenuHideIcon = function setMenuHideIcon(isHide) {
105
+ if (isHide === false && isFloat) return; // 如果是浮动状态则不能显示隐藏按钮
106
+
107
+ setIsHideTopRightIcon(isHide);
108
+ };
109
+
110
+ (0, _react.useEffect)(function () {
111
+ setMenuHideIcon(isFloat);
112
+ }, [isFloat]);
95
113
  (0, _react.useImperativeHandle)(ref, function () {
96
114
  return {
97
115
  'next': nextHandler,
@@ -172,26 +190,28 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
172
190
  }, /*#__PURE__*/_react["default"].createElement("div", {
173
191
  ref: flipFrontRef,
174
192
  className: (0, _classnames["default"])("".concat(_precls["default"], "__inner-front"))
193
+ }, /*#__PURE__*/_react["default"].createElement("div", {
194
+ className: (0, _classnames["default"])("".concat(_precls["default"], "__inner-front-content"), (_classNames2 = {}, _defineProperty(_classNames2, "".concat(_precls["default"], "__inner-front-content--is-float"), isFloat), _defineProperty(_classNames2, "".concat(_precls["default"], "__inner-front-content--is-float-hide"), isFloatHide), _classNames2))
175
195
  }, /*#__PURE__*/_react["default"].createElement(_menuCard["default"], {
176
- isFloat: isFloat,
177
- isFloatHide: isFloatHide,
178
196
  style: {
179
197
  'padding': '28px 12px 28px 12px'
180
- },
181
- onMenuHide: onMenuHideHandler
182
- }, children[0])), /*#__PURE__*/_react["default"].createElement("div", {
198
+ }
199
+ }, children[0]))), /*#__PURE__*/_react["default"].createElement("div", {
183
200
  ref: flipBackRef,
184
201
  className: (0, _classnames["default"])("".concat(_precls["default"], "__inner-back"))
202
+ }, /*#__PURE__*/_react["default"].createElement("div", {
203
+ className: (0, _classnames["default"])("".concat(_precls["default"], "__inner-back-content"), (_classNames3 = {}, _defineProperty(_classNames3, "".concat(_precls["default"], "__inner-back-content--is-float"), isFloat), _defineProperty(_classNames3, "".concat(_precls["default"], "__inner-back-content--is-float-hide"), isFloatHide), _classNames3))
185
204
  }, /*#__PURE__*/_react["default"].createElement(_menuCard["default"], {
186
- isFloat: isFloat,
187
- isFloatHide: isFloatHide,
188
205
  style: {
189
206
  'padding': '42px 12px 28px 12px'
190
- },
191
- onMenuHide: onMenuHideHandler
207
+ }
192
208
  }, /*#__PURE__*/_react["default"].createElement(_flipBackHeader["default"], {
193
209
  onClick: goBackHandler
194
- }), children[1]))))), isFloat && /*#__PURE__*/_reactDom["default"].createPortal( /*#__PURE__*/_react["default"].createElement("span", {
210
+ }), children[1]))))), !isHideTopRightIcon && /*#__PURE__*/_react["default"].createElement(_menuCloseBtn["default"], {
211
+ className: (0, _classnames["default"])("".concat(_precls["default"], "__top-right-hide-icon")),
212
+ isAutoShow: true,
213
+ onClick: onMenuHideHandler
214
+ })), isFloat && /*#__PURE__*/_reactDom["default"].createPortal( /*#__PURE__*/_react["default"].createElement("span", {
195
215
  className: (0, _classnames["default"])("".concat(_precls["default"], "__fixed-hide-icon"))
196
216
  }, /*#__PURE__*/_react["default"].createElement(_menuCloseBtn["default"], {
197
217
  isClose: true,
@@ -9,21 +9,3 @@
9
9
  border-radius: 12px;
10
10
  box-sizing: border-box;
11
11
  }
12
-
13
- .titaui-menus__menu-card--is-float {
14
- box-shadow: 0 1px 10px #cccccc66;
15
- }
16
-
17
- .titaui-menus__menu-card--is-float-hide {
18
- box-shadow: none;
19
- }
20
-
21
- .titaui-menus__menu-card .titaui-menus--hide-icon {
22
- position: absolute;
23
- right: -14px;
24
- top: 6px;
25
- }
26
-
27
- .titaui-menus__menu-card:hover .titaui-menus--hide-icon {
28
- opacity: 1;
29
- }
@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  var _classnames = _interopRequireDefault(require("classnames"));
11
11
 
12
- var _menuCloseBtn = _interopRequireDefault(require("../menu-close-btn"));
13
-
14
12
  var _precls = _interopRequireDefault(require("../../precls"));
15
13
 
16
14
  require("./index.css");
@@ -24,25 +22,14 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
24
22
  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; }
25
23
 
26
24
  var _default = function _default(props) {
27
- var _classNames;
28
-
29
25
  var children = props.children,
30
- style = props.style,
31
- onMenuHide = props.onMenuHide,
32
- isFloat = props.isFloat,
33
- isFloatHide = props.isFloatHide;
34
-
35
- var onHideHandler = function onHideHandler() {
36
- onMenuHide();
37
- };
38
-
26
+ style = props.style;
39
27
  return /*#__PURE__*/_react["default"].createElement("div", {
40
- className: (0, _classnames["default"])("".concat(_precls["default"], "__menu-card"), (_classNames = {}, _defineProperty(_classNames, "".concat(_precls["default"], "__menu-card--is-float"), isFloat), _defineProperty(_classNames, "".concat(_precls["default"], "__menu-card--is-float-hide"), isFloatHide), _classNames)),
41
- style: _objectSpread({}, style)
42
- }, children, !isFloat && /*#__PURE__*/_react["default"].createElement(_menuCloseBtn["default"], {
43
- isAutoShow: true,
44
- onClick: onHideHandler
45
- }));
28
+ className: (0, _classnames["default"])("".concat(_precls["default"], "__menu-card")),
29
+ style: _objectSpread({
30
+ 'height': 'auto'
31
+ }, style)
32
+ }, children);
46
33
  };
47
34
 
48
35
  exports["default"] = _default;
@@ -23,13 +23,14 @@ var _default = function _default(props) {
23
23
  isAutoShow = _props$isAutoShow === void 0 ? true : _props$isAutoShow,
24
24
  _props$isClose = props.isClose,
25
25
  isClose = _props$isClose === void 0 ? false : _props$isClose,
26
+ className = props.className,
26
27
  onMouseEnter = props.onMouseEnter,
27
28
  onMouseLeave = props.onMouseLeave;
28
29
  return /*#__PURE__*/_react["default"].createElement("div", {
29
30
  onClick: onClick,
30
31
  onMouseEnter: onMouseEnter,
31
32
  onMouseLeave: onMouseLeave,
32
- className: (0, _classnames["default"])("".concat(_precls["default"], "--hide-icon"), _defineProperty({}, "".concat(_precls["default"], "--hide-icon--show"), !isAutoShow))
33
+ className: (0, _classnames["default"])("".concat(_precls["default"], "--hide-icon"), className, _defineProperty({}, "".concat(_precls["default"], "--hide-icon--show"), !isAutoShow))
33
34
  }, /*#__PURE__*/_react["default"].createElement("span", {
34
35
  className: (0, _classnames["default"])("".concat(_precls["default"], "--hide-icon--hover"))
35
36
  }), /*#__PURE__*/_react["default"].createElement("span", {
@@ -5,10 +5,12 @@
5
5
  .titaui-menus-tree .rc-tree-treenode-selected {
6
6
  background: #e9f1ff;
7
7
  border-radius: 12px;
8
+ font-weight: 500;
8
9
  }
9
10
 
10
11
  .titaui-menus-tree .rc-tree-treenode-selected .titaui-menus-tree__menu-item-node-title {
11
12
  color: #2879ff;
13
+ font-weight: 500;
12
14
  }
13
15
 
14
16
  .titaui-menus-tree .rc-tree-indent {
@@ -131,7 +131,7 @@
131
131
  font-size: 14px;
132
132
  color: #3f4755;
133
133
  line-height: 22px;
134
- font-weight: 500;
134
+ font-weight: 400;
135
135
  }
136
136
 
137
137
  .titaui-menus-tree__menu-node-icon {
@@ -292,7 +292,7 @@
292
292
  font-size: 14px;
293
293
  color: #3f4755;
294
294
  line-height: 22px;
295
- font-weight: 500;
295
+ font-weight: 400;
296
296
  }
297
297
 
298
298
  .titaui-menus-tree__company-all-node-icon {
@@ -385,7 +385,7 @@
385
385
  font-size: 14px;
386
386
  color: #3f4755;
387
387
  line-height: 22px;
388
- font-weight: 500;
388
+ font-weight: 400;
389
389
  }
390
390
 
391
391
  .titaui-menus-tree__user-concern-node-icon {
@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _classnames = _interopRequireDefault(require("classnames"));
13
13
 
14
+ var _reactRouter = require("react-router");
15
+
14
16
  var _flipMenuCard = _interopRequireDefault(require("../../components/flip-menu-card"));
15
17
 
16
18
  var _menuTree = _interopRequireDefault(require("../../components/menu-tree"));
@@ -41,9 +43,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
41
43
 
42
44
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
43
45
 
44
- var _default = function _default(props) {
46
+ var AppraisalMenus = function AppraisalMenus(props) {
45
47
  var _props$onSelect = props.onSelect,
46
- onSelect = _props$onSelect === void 0 ? function () {} : _props$onSelect;
48
+ onSelect = _props$onSelect === void 0 ? function () {} : _props$onSelect,
49
+ history = props.history;
47
50
 
48
51
  var _useState = (0, _react.useState)([]),
49
52
  _useState2 = _slicedToArray(_useState, 2),
@@ -62,7 +65,18 @@ var _default = function _default(props) {
62
65
  return okrMenusData.current.getMenus();
63
66
  }),
64
67
  _useState4 = _slicedToArray(_useState3, 1),
65
- menus = _useState4[0];
68
+ menus = _useState4[0]; // 判断路由是 我的评价
69
+
70
+
71
+ (0, _react.useEffect)(function () {
72
+ var _history$location = history.location,
73
+ pathname = _history$location.pathname,
74
+ search = _history$location.search;
75
+
76
+ if (pathname.match(/performance/) && (!search || search.match(/reactRouterName[\s]*?=[\s]*?self/))) {
77
+ setSelectedMenuKeys(['my-appraisal']);
78
+ }
79
+ }, [history.location.pathname, history.location.search]);
66
80
 
67
81
  var onSelectHandler = function onSelectHandler(selectedKyes, _ref) {
68
82
  var node = _ref.node;
@@ -94,6 +108,9 @@ var _default = function _default(props) {
94
108
  selectedKeys: selectedMenuKeys,
95
109
  onSelect: onSelectHandler
96
110
  }))), /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null)));
97
- };
111
+ }; // @ts-ignore
112
+
113
+
114
+ var _default = (0, _reactRouter.withRouter)(AppraisalMenus);
98
115
 
99
116
  exports["default"] = _default;
@@ -9,15 +9,13 @@ exports["default"] = void 0;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
12
- var _reactRouter = require("react-router");
12
+ var _menuTree = _interopRequireDefault(require("../../../components/menu-tree"));
13
13
 
14
- var _menuTree = _interopRequireDefault(require("../../components/menu-tree"));
14
+ var _requestApis = require("../../../request-apis");
15
15
 
16
- var _requestApis = require("../../request-apis");
16
+ var _utils = require("../../../utils");
17
17
 
18
- var _utils = require("../../utils");
19
-
20
- require("../../index.css");
18
+ require("../../../index.css");
21
19
 
22
20
  require("./index.css");
23
21
 
@@ -47,8 +45,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
47
45
 
48
46
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
49
47
 
50
- var _default = (0, _reactRouter.withRouter)(function (_ref) {
51
- var history = _ref.history;
48
+ var _default = function _default() {
52
49
  var loadedNode = (0, _react.useRef)([]);
53
50
 
54
51
  var _useState = (0, _react.useState)([]),
@@ -68,17 +65,17 @@ var _default = (0, _reactRouter.withRouter)(function (_ref) {
68
65
  (0, _react.useEffect)(function () {
69
66
  (0, _requestApis.getDepsAndUsers)(-1, isGetUser).then(function (rawTreeData) {
70
67
  var rootNode = {
71
- async: true,
72
- data: {
68
+ 'async': true,
69
+ 'data': {
73
70
  id: 0,
74
71
  name: "公司全部"
75
72
  },
76
- id: "0",
77
- isLeaf: true,
78
- key: 0,
79
- nodeType: "depart-node",
80
- pid: -1,
81
- title: "公司全部"
73
+ 'id': "0",
74
+ 'isLeaf': true,
75
+ 'key': 0,
76
+ 'nodeType': "depart-node",
77
+ 'pid': -1,
78
+ 'title': "公司全部"
82
79
  };
83
80
  setRawTreeData([rootNode].concat(_toConsumableArray(rawTreeData)));
84
81
  setTreeData((0, _utils.toTree)([rootNode].concat(_toConsumableArray(rawTreeData))));
@@ -104,22 +101,14 @@ var _default = (0, _reactRouter.withRouter)(function (_ref) {
104
101
  });
105
102
  };
106
103
 
107
- var onSelectHandler = function onSelectHandler(_id, _ref2) {
108
- var node = _ref2.node;
104
+ var onSelectHandler = function onSelectHandler(_id, _ref) {
105
+ var node = _ref.node;
109
106
  var nodeType = node.nodeType,
110
107
  data = node.data;
111
108
 
112
109
  if (nodeType == "user") {
113
- // history.push({
114
- // pathname: `/okr/manage?toUserId=${data.userId}`,
115
- // });
116
- // history.go();
117
110
  location.href = "#/okr/manage?toUserId=".concat(data.userId);
118
111
  } else if (nodeType == "depart-node") {
119
- // history.push({
120
- // pathname: `/okr/manage?departmentName=${data.name}&departmentId=${data.id}`,
121
- // });
122
- // history.go();
123
112
  location.href = "#/okr/manage?departmentName=".concat(data.name, "&departmentId=").concat(data.id);
124
113
  }
125
114
  };
@@ -130,6 +119,6 @@ var _default = (0, _reactRouter.withRouter)(function (_ref) {
130
119
  defaultExpandedKeys: ["0"],
131
120
  loadData: onLoadTreeNodeDataHandler
132
121
  });
133
- });
122
+ };
134
123
 
135
124
  exports["default"] = _default;
@@ -13,9 +13,9 @@ var _classnames = _interopRequireDefault(require("classnames"));
13
13
 
14
14
  var _reactRouter = require("react-router");
15
15
 
16
- var _departMenus = _interopRequireDefault(require("../depart-menus"));
16
+ var _departMenus = _interopRequireDefault(require("./depart-menus"));
17
17
 
18
- var _subordinateMenus = _interopRequireDefault(require("../subordinate-menus"));
18
+ var _subordinateMenus = _interopRequireDefault(require("./subordinate-menus"));
19
19
 
20
20
  var _flipMenuCard = _interopRequireDefault(require("../../components/flip-menu-card"));
21
21
 
@@ -222,7 +222,7 @@ var OkrMenus = function OkrMenus(props) {
222
222
  defaultWidth: 180
223
223
  }, /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
224
224
  style: {
225
- marginBottom: 12
225
+ 'marginBottom': 12
226
226
  }
227
227
  }, /*#__PURE__*/_react["default"].createElement(_searchColleague["default"], {
228
228
  onSelect: onUserSelectHandler