@titaui/pc 1.5.69-beta.19 → 1.5.69-beta.22

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 (45) hide show
  1. package/lib/components/communication/index.js +6 -1
  2. package/lib/components/dynamic/dynamic-item/components/header/index.js +72 -60
  3. package/lib/components/dynamic/dynamic-item/dynamic-align/index.css +1 -1
  4. package/lib/components/dynamic/dynamic-item/dynamic-align/index.js +4 -2
  5. package/lib/components/dynamic/dynamic-item/dynamic-announcement/index.css +5 -1
  6. package/lib/components/dynamic/dynamic-item/dynamic-announcement/index.js +25 -10
  7. package/lib/components/dynamic/dynamic-item/dynamic-assessment/index.css +1 -1
  8. package/lib/components/dynamic/dynamic-item/dynamic-assessment/index.js +2 -1
  9. package/lib/components/dynamic/dynamic-item/dynamic-create-o/index.css +1 -1
  10. package/lib/components/dynamic/dynamic-item/dynamic-create-o/index.js +6 -3
  11. package/lib/components/dynamic/dynamic-item/dynamic-kr/index.css +2 -1
  12. package/lib/components/dynamic/dynamic-item/dynamic-kr/index.js +7 -5
  13. package/lib/components/dynamic/dynamic-item/dynamic-milestone/index.css +1 -1
  14. package/lib/components/dynamic/dynamic-item/dynamic-milestone/index.js +4 -2
  15. package/lib/components/dynamic/dynamic-item/dynamic-progress/index.css +1 -1
  16. package/lib/components/dynamic/dynamic-item/dynamic-progress/index.js +4 -2
  17. package/lib/components/dynamic/dynamic-item/dynamic-project/index.css +1 -1
  18. package/lib/components/dynamic/dynamic-item/dynamic-project/index.js +4 -2
  19. package/lib/components/dynamic/dynamic-item/dynamic-relative/index.css +1 -1
  20. package/lib/components/dynamic/dynamic-item/dynamic-relative/index.js +4 -2
  21. package/lib/components/dynamic/dynamic-item/dynamic-replay/index.css +1 -1
  22. package/lib/components/dynamic/dynamic-item/dynamic-replay/index.js +5 -2
  23. package/lib/components/dynamic/dynamic-item/dynamic-report/index.css +1 -1
  24. package/lib/components/dynamic/dynamic-item/dynamic-report/index.js +6 -5
  25. package/lib/components/dynamic/dynamic-item/dynamic-reward/index.js +7 -6
  26. package/lib/components/dynamic/dynamic-item/dynamic-share/index.css +5 -1
  27. package/lib/components/dynamic/dynamic-item/dynamic-share/index.js +26 -11
  28. package/lib/components/dynamic/dynamic-item/dynamic-task/index.css +1 -1
  29. package/lib/components/dynamic/dynamic-item/dynamic-task/index.js +4 -2
  30. package/lib/components/dynamic/dynamic-item/index.js +71 -59
  31. package/lib/components/dynamic/dynamic-like-ranking/index.css +7 -4
  32. package/lib/components/dynamic/dynamic-list/index.js +0 -4
  33. package/lib/components/dynamic/util.js +25 -5
  34. package/lib/components/mblog/index.js +2 -2
  35. package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.js +15 -8
  36. package/lib/components/table/index.css +0 -1
  37. package/lib/pages/like-ranking/column.js +18 -7
  38. package/lib/pages/like-ranking/filter-buttons/department.js +5 -44
  39. package/lib/pages/like-ranking/filter-buttons/group.js +34 -0
  40. package/lib/pages/like-ranking/filter-buttons/index.js +8 -2
  41. package/lib/pages/like-ranking/filter-buttons/timer.js +3 -1
  42. package/lib/pages/like-ranking/index.css +3 -2
  43. package/lib/pages/like-ranking/index.js +20 -13
  44. package/lib/utils/format-time.js +9 -6
  45. package/package.json +1 -1
@@ -231,6 +231,7 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
231
231
  sentData.CommentId = 0;
232
232
  sentData.ObjId = 0;
233
233
  sentData.ObjType = 0;
234
+ sentData.Content = sentData.Content || ' ';
234
235
 
235
236
  if (isShowReplyToUser) {
236
237
  sentData.CommentId = replyUserCommentId;
@@ -350,7 +351,9 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
350
351
  _this$props8$submitTe = _this$props8.submitText,
351
352
  submitText = _this$props8$submitTe === void 0 ? "回复" : _this$props8$submitTe,
352
353
  _this$props8$highLigh = _this$props8.highLightKeyWord,
353
- highLightKeyWord = _this$props8$highLigh === void 0 ? '' : _this$props8$highLigh;
354
+ highLightKeyWord = _this$props8$highLigh === void 0 ? '' : _this$props8$highLigh,
355
+ _this$props8$autoFocu = _this$props8.autoFocus,
356
+ autoFocus = _this$props8$autoFocu === void 0 ? false : _this$props8$autoFocu;
354
357
  return /*#__PURE__*/_react["default"].createElement(_style.CommunicationWrapper, {
355
358
  className: "communcation-wrapper ".concat(className)
356
359
  }, /*#__PURE__*/_react["default"].createElement("div", null, communicationTrackTotal > 0 && /*#__PURE__*/_react["default"].createElement(_style.CommunicationRecordTotal, null, /*#__PURE__*/_react["default"].createElement("div", {
@@ -408,6 +411,8 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
408
411
  submitStatus: submitStatus,
409
412
  userSelectorPopAlign: userSelectorPopAlign,
410
413
  emotionsSelectorPopAlign: emotionsSelectorPopAlign,
414
+ autoFocus: autoFocus,
415
+ autoResizing: false,
411
416
  onMblogSubmit: function onMblogSubmit(submitType, sentData) {
412
417
  return _this2.handlerReply(submitType, sentData);
413
418
  }
@@ -17,8 +17,6 @@ var _dropdownLayer = _interopRequireWildcard(require("../../../../dropdown-layer
17
17
 
18
18
  var _requestApi = require("../../../request-api");
19
19
 
20
- var _constant = require("../../../constant");
21
-
22
20
  var _dialogConfirm = _interopRequireWildcard(require("../../../../dialog-confirm"));
23
21
 
24
22
  var _popDownNotification = require("../../../../pop-down-notification");
@@ -54,15 +52,16 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
54
52
  var prefix = "titaui-dynamic-item-header";
55
53
 
56
54
  var DynamicItemHeader = function DynamicItemHeader(_ref) {
57
- var _ref$hasDynamicOperea = _ref.hasDynamicOpereateAuth,
58
- hasDynamicOpereateAuth = _ref$hasDynamicOperea === void 0 ? false : _ref$hasDynamicOperea,
59
- _ref$onDeleteFeed = _ref.onDeleteFeed,
55
+ var _ref$onDeleteFeed = _ref.onDeleteFeed,
60
56
  onDeleteFeed = _ref$onDeleteFeed === void 0 ? function () {} : _ref$onDeleteFeed,
57
+ _ref$showDelete = _ref.showDelete,
58
+ showDelete = _ref$showDelete === void 0 ? false : _ref$showDelete,
59
+ _ref$showTopping = _ref.showTopping,
60
+ showTopping = _ref$showTopping === void 0 ? false : _ref$showTopping,
61
61
  data = _ref.data,
62
- desc = _ref.desc;
63
- var publishUser = data.publishUser,
64
- createDate = data.createDate,
65
- feedType = data.feedType,
62
+ desc = _ref.desc,
63
+ user = _ref.user;
64
+ var createDate = data.createDate,
66
65
  feedId = data.feedId,
67
66
  _data$isTop = data.isTop,
68
67
  isTop = _data$isTop === void 0 ? false : _data$isTop,
@@ -84,50 +83,18 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
84
83
  showDialogConfirm = _useState6[0],
85
84
  setShowDialogConfirm = _useState6[1];
86
85
 
87
- var isShareOrAnnouncement = feedType === _constant.EFeedType.Share; // const url = getUrlForUserPage({
86
+ var _useState7 = (0, _react.useState)(false),
87
+ _useState8 = _slicedToArray(_useState7, 2),
88
+ selectVisible = _useState8[0],
89
+ setSelectVisible = _useState8[1]; // const url = getUrlForUserPage({
88
90
  // userId: publishUser.id || publishUser.userId,
89
91
  // userType: publishUser.userType || 2,
90
92
  // });
91
93
 
92
- var url = '';
93
-
94
- var onChangeHandler = function onChangeHandler(name, _) {
95
- if (name === "top") {
96
- if (nowIsTop) {
97
- (0, _requestApi.cancelTopDynamic)({
98
- feedId: feedId
99
- }).then(function (resp) {
100
- if (resp.Code === 1) {
101
- setNowIsTop(!nowIsTop);
102
94
 
103
- _popDownNotification.Toast.Success("操作成功", {
104
- canClose: false
105
- });
106
- } else {
107
- _popDownNotification.Toast.Error(resp.Message, {
108
- canClose: false
109
- });
110
- }
111
- });
112
- } else {
113
- (0, _requestApi.topDynamic)({
114
- feedId: feedId
115
- }).then(function (resp) {
116
- if (resp.Code === 1) {
117
- setNowIsTop(!nowIsTop);
118
-
119
- _popDownNotification.Toast.Success("操作成功", {
120
- canClose: false
121
- });
122
- } else {
123
- _popDownNotification.Toast.Error(resp.Message, {
124
- canClose: false
125
- });
126
- }
127
- });
128
- }
129
- }
95
+ var url = "";
130
96
 
97
+ var onChangeHandler = function onChangeHandler(name, _) {
131
98
  if (name === "collect") {
132
99
  if (nowIsCollect) {
133
100
  (0, _requestApi.cancelCollectDynamic)({
@@ -163,12 +130,49 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
163
130
  });
164
131
  }
165
132
  }
133
+ };
166
134
 
167
- if (name === "delete") {
168
- setShowDialogConfirm(true);
135
+ var handleTopOperateClick = function handleTopOperateClick() {
136
+ if (nowIsTop) {
137
+ (0, _requestApi.cancelTopDynamic)({
138
+ feedId: feedId
139
+ }).then(function (resp) {
140
+ if (resp.Code === 1) {
141
+ setNowIsTop(!nowIsTop);
142
+
143
+ _popDownNotification.Toast.Success("操作成功", {
144
+ canClose: false
145
+ });
146
+ } else {
147
+ _popDownNotification.Toast.Error(resp.Message, {
148
+ canClose: false
149
+ });
150
+ }
151
+ });
152
+ } else {
153
+ (0, _requestApi.topDynamic)({
154
+ feedId: feedId
155
+ }).then(function (resp) {
156
+ if (resp.Code === 1) {
157
+ setNowIsTop(!nowIsTop);
158
+
159
+ _popDownNotification.Toast.Success("操作成功", {
160
+ canClose: false
161
+ });
162
+ } else {
163
+ _popDownNotification.Toast.Error(resp.Message, {
164
+ canClose: false
165
+ });
166
+ }
167
+ });
169
168
  }
170
169
  };
171
170
 
171
+ var handleDeleteClick = function handleDeleteClick() {
172
+ setShowDialogConfirm(true);
173
+ setSelectVisible(false);
174
+ };
175
+
172
176
  var enSureDeleteDynamic = function enSureDeleteDynamic() {
173
177
  (0, _requestApi.deleteDynamic)({
174
178
  feedId: feedId
@@ -188,6 +192,10 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
188
192
  setShowDialogConfirm(false);
189
193
  };
190
194
 
195
+ var handleShowDropSelector = function handleShowDropSelector() {
196
+ setSelectVisible(true);
197
+ };
198
+
191
199
  var handleOpenUserPage = function handleOpenUserPage() {
192
200
  if (!url) return;
193
201
  window.open(url, "_blank");
@@ -215,10 +223,10 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
215
223
  className: (0, _classnames["default"])(prefix + "-desc-avatar", _defineProperty({}, prefix + "-desc-avatar--not-link", !url)),
216
224
  onClick: handleOpenUserPage
217
225
  }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
218
- name: publishUser.name,
219
- userId: publishUser.id || publishUser.userId,
220
- src: publishUser.avatar.medium,
221
- color: publishUser.avatar.color,
226
+ name: user.name,
227
+ userId: user.id || user.userId,
228
+ src: user.avatar.medium,
229
+ color: user.avatar.color,
222
230
  size: {
223
231
  width: 40,
224
232
  textNum: 1,
@@ -234,8 +242,8 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
234
242
  }, /*#__PURE__*/_react["default"].createElement(_tooltip.TooltipText, {
235
243
  maxWidth: 98,
236
244
  text: /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
237
- name: publishUser.name,
238
- id: publishUser.userId
245
+ name: user.name,
246
+ id: user.userId
239
247
  })
240
248
  })), desc), /*#__PURE__*/_react["default"].createElement("div", {
241
249
  className: prefix + "-desc-time"
@@ -246,8 +254,10 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
246
254
  checked: ["collect"],
247
255
  onChange: onChangeHandler,
248
256
  multi: false,
257
+ visible: selectVisible,
249
258
  trigger: /*#__PURE__*/_react["default"].createElement("span", {
250
- className: (0, _classnames["default"])(prefix + "-right", "tu-icon-more1")
259
+ className: (0, _classnames["default"])(prefix + "-right", "tu-icon-more1"),
260
+ onClick: handleShowDropSelector
251
261
  })
252
262
  }, /*#__PURE__*/_react["default"].createElement(_dropdownLayer.Item, {
253
263
  name: "collect"
@@ -256,17 +266,19 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
256
266
  }, /*#__PURE__*/_react["default"].createElement("i", {
257
267
  className: (0, _classnames["default"])("tu-icon-APP-shoucang", prefix + "__more-operate-selection-icon")
258
268
  }), nowIsCollect ? "取消收藏" : "收藏")), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
259
- condition: hasDynamicOpereateAuth && isShareOrAnnouncement
269
+ condition: showTopping
260
270
  }, /*#__PURE__*/_react["default"].createElement(_dropdownLayer.Item, {
261
- name: "top"
271
+ name: "top",
272
+ onClick: handleTopOperateClick
262
273
  }, /*#__PURE__*/_react["default"].createElement("div", {
263
274
  className: prefix + "__more-operate-selection"
264
275
  }, /*#__PURE__*/_react["default"].createElement("i", {
265
276
  className: (0, _classnames["default"])("tu-icon-zhiding", prefix + "__more-operate-selection-icon")
266
277
  }), nowIsTop ? "取消置顶" : "置顶"))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
267
- condition: hasDynamicOpereateAuth && isShareOrAnnouncement
278
+ condition: showDelete
268
279
  }, /*#__PURE__*/_react["default"].createElement(_dropdownLayer.Item, {
269
- name: "delete"
280
+ name: "delete",
281
+ onClick: handleDeleteClick
270
282
  }, /*#__PURE__*/_react["default"].createElement("div", {
271
283
  className: prefix + "__more-operate-selection"
272
284
  }, /*#__PURE__*/_react["default"].createElement("i", {
@@ -83,7 +83,7 @@
83
83
  display: inline-flex;
84
84
  align-items: center;
85
85
  justify-content: center;
86
- width: 40px;
86
+ padding: 0 2px;
87
87
  height: 18px;
88
88
  min-width: 40px;
89
89
  clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);
@@ -60,7 +60,8 @@ var DynamicAlign = function DynamicAlign(_ref) {
60
60
  parentPrincipalUser = data.parentPrincipalUser,
61
61
  parentcycleName = data.parentcycleName,
62
62
  cycleName = data.cycleName,
63
- feedType = data.feedType;
63
+ feedType = data.feedType,
64
+ publishUser = data.publishUser;
64
65
 
65
66
  var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
66
67
  searchKeyWord = _useContext.searchKeyWord;
@@ -108,7 +109,8 @@ var DynamicAlign = function DynamicAlign(_ref) {
108
109
  }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
109
110
  data: data
110
111
  }, restProps, {
111
- desc: renderDesc
112
+ desc: renderDesc,
113
+ user: publishUser
112
114
  })), /*#__PURE__*/_react["default"].createElement("div", {
113
115
  className: "".concat(prefix, "__content")
114
116
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -38,7 +38,7 @@
38
38
  display: inline-flex;
39
39
  align-items: center;
40
40
  justify-content: center;
41
- width: 40px;
41
+ padding: 0 2px;
42
42
  height: 18px;
43
43
  min-width: 40px;
44
44
  clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);
@@ -48,3 +48,7 @@
48
48
  color: #ffffff;
49
49
  line-height: 18px;
50
50
  }
51
+
52
+ .titaui-dynamic-announcement-item .highlight {
53
+ color: #f05e5e;
54
+ }
@@ -19,15 +19,17 @@ var _fileList = _interopRequireDefault(require("../../../file-list"));
19
19
 
20
20
  var _context = require("../../context");
21
21
 
22
- var _searchKeyHandle = _interopRequireDefault(require("../../../search-key-handle"));
22
+ var _tools = require("../../../../utils/tools");
23
23
 
24
24
  var _header = _interopRequireDefault(require("../components/header"));
25
25
 
26
26
  var _util = require("../../util");
27
27
 
28
+ var _dangerousHtml = _interopRequireDefault(require("../../components/dangerous-html"));
29
+
28
30
  require("./index.css");
29
31
 
30
- var _excluded = ["data"];
32
+ var _excluded = ["data", "hasDynamicOpereateAuth"];
31
33
 
32
34
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
33
35
 
@@ -45,11 +47,15 @@ var prefix = "titaui-dynamic-announcement-item";
45
47
 
46
48
  var DynamicAnnouncement = function DynamicAnnouncement(_ref) {
47
49
  var data = _ref.data,
50
+ _ref$hasDynamicOperea = _ref.hasDynamicOpereateAuth,
51
+ hasDynamicOpereateAuth = _ref$hasDynamicOperea === void 0 ? false : _ref$hasDynamicOperea,
48
52
  restProps = _objectWithoutProperties(_ref, _excluded);
49
53
 
50
54
  var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
51
55
  searchKeyWord = _useContext.searchKeyWord;
52
56
 
57
+ var contentRef = (0, _react.useRef)();
58
+
53
59
  var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(data.feedType),
54
60
  feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
55
61
  feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
@@ -57,27 +63,36 @@ var DynamicAnnouncement = function DynamicAnnouncement(_ref) {
57
63
  var renderDesc = (0, _react.useMemo)(function () {
58
64
  return /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
59
65
  className: prefix + "__operate-desc"
60
- }, "\u53D1\u5E03\u7684\u5206\u4EAB"), /*#__PURE__*/_react["default"].createElement("span", {
66
+ }, "\u53D1\u5E03\u7684\u516C\u544A"), /*#__PURE__*/_react["default"].createElement("span", {
61
67
  className: prefix + "-desc-operate-type",
62
68
  style: {
63
69
  background: feedTypeColor
64
70
  }
65
71
  }, feedTypeText));
66
72
  }, []);
73
+ (0, _react.useEffect)(function () {
74
+ (0, _tools.highLightWord)({
75
+ parentDom: contentRef.current,
76
+ keyWord: searchKeyWord
77
+ });
78
+ }, [data, searchKeyWord]);
67
79
  return /*#__PURE__*/_react["default"].createElement("div", {
68
80
  className: prefix
69
81
  }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
70
- data: data
71
- }, restProps, {
72
- desc: renderDesc
73
- })), /*#__PURE__*/_react["default"].createElement("div", {
82
+ data: data,
83
+ desc: renderDesc,
84
+ showDelete: hasDynamicOpereateAuth,
85
+ showTopping: hasDynamicOpereateAuth,
86
+ user: data.publishUser
87
+ }, restProps)), /*#__PURE__*/_react["default"].createElement("div", {
74
88
  className: prefix + "__content"
75
89
  }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", {
76
90
  className: (0, _classnames["default"])(prefix + "__content-quoto", prefix + "__content-quoto--left"),
77
91
  src: _dynamicLeftQuoto["default"]
78
- })), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
79
- str: data.content,
80
- keyWord: searchKeyWord
92
+ })), /*#__PURE__*/_react["default"].createElement("div", {
93
+ ref: contentRef
94
+ }, /*#__PURE__*/_react["default"].createElement(_dangerousHtml["default"], {
95
+ htmlText: data.content
81
96
  }), /*#__PURE__*/_react["default"].createElement("img", {
82
97
  className: (0, _classnames["default"])(prefix + "__content-quoto", prefix + "__content-quoto--right"),
83
98
  src: _dynamicRightQuoto["default"]
@@ -36,7 +36,7 @@
36
36
  display: inline-flex;
37
37
  align-items: center;
38
38
  justify-content: center;
39
- width: 40px;
39
+ padding: 0 2px;
40
40
  height: 18px;
41
41
  min-width: 40px;
42
42
  clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);
@@ -67,7 +67,8 @@ var DynamicShare = function DynamicShare(_ref) {
67
67
  }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
68
68
  data: data
69
69
  }, restProps, {
70
- desc: renderDesc
70
+ desc: renderDesc,
71
+ user: data.principalUser
71
72
  })), /*#__PURE__*/_react["default"].createElement("div", {
72
73
  className: "".concat(prefix, "__content")
73
74
  }, /*#__PURE__*/_react["default"].createElement(_title["default"], {
@@ -84,7 +84,7 @@
84
84
  display: inline-flex;
85
85
  align-items: center;
86
86
  justify-content: center;
87
- width: 40px;
87
+ padding: 0 2px;
88
88
  height: 18px;
89
89
  min-width: 40px;
90
90
  clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);
@@ -56,7 +56,8 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
56
56
  cycleName = data.cycleName,
57
57
  okrTypeName = data.okrTypeName,
58
58
  okrTypeId = data.okrTypeId,
59
- classify = data.classify;
59
+ classify = data.classify,
60
+ principalUser = data.principalUser;
60
61
 
61
62
  var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
62
63
  searchKeyWord = _useContext.searchKeyWord;
@@ -130,7 +131,8 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
130
131
  }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
131
132
  data: data
132
133
  }, restProps, {
133
- desc: renderDesc
134
+ desc: renderDesc,
135
+ user: principalUser
134
136
  })), /*#__PURE__*/_react["default"].createElement("div", {
135
137
  className: prefix + "__content"
136
138
  }, /*#__PURE__*/_react["default"].createElement(_title["default"], {
@@ -149,7 +151,8 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
149
151
  className: "".concat(prefix, "__okr-krs")
150
152
  }, krs.map(function (kr, index) {
151
153
  return /*#__PURE__*/_react["default"].createElement("div", {
152
- className: "".concat(prefix, "__kr")
154
+ className: "".concat(prefix, "__kr"),
155
+ key: kr.krId
153
156
  }, /*#__PURE__*/_react["default"].createElement("span", {
154
157
  className: "".concat(prefix, "__kr-order")
155
158
  }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
@@ -12,6 +12,7 @@
12
12
  font-size: 12px;
13
13
  color: #89919f;
14
14
  line-height: 18px;
15
+ margin-top: 8px;
15
16
  }
16
17
 
17
18
  .titaui-dynamic-kr-item__content-time-range-icon {
@@ -54,7 +55,7 @@
54
55
  display: inline-flex;
55
56
  align-items: center;
56
57
  justify-content: center;
57
- width: 40px;
58
+ padding: 0 2px;
58
59
  height: 18px;
59
60
  min-width: 40px;
60
61
  clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);
@@ -45,10 +45,11 @@ var DynamicKr = function DynamicKr(_ref) {
45
45
  var data = _ref.data,
46
46
  restProps = _objectWithoutProperties(_ref, _excluded);
47
47
 
48
- var deadline = data.deadline,
48
+ var endDate = data.endDate,
49
49
  startDate = data.startDate,
50
50
  name = data.name,
51
- krId = data.krId;
51
+ krId = data.krId,
52
+ principalUser = data.principalUser;
52
53
 
53
54
  var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(data.feedType),
54
55
  feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
@@ -89,7 +90,8 @@ var DynamicKr = function DynamicKr(_ref) {
89
90
  }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
90
91
  data: data
91
92
  }, restProps, {
92
- desc: renderDesc
93
+ desc: renderDesc,
94
+ user: principalUser
93
95
  })), /*#__PURE__*/_react["default"].createElement("div", {
94
96
  className: prefix + "__content"
95
97
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -97,11 +99,11 @@ var DynamicKr = function DynamicKr(_ref) {
97
99
  }, /*#__PURE__*/_react["default"].createElement(_title["default"], {
98
100
  content: "KR\uFF1A".concat(name),
99
101
  onClickTitle: handleClickKrTitle
100
- }), /*#__PURE__*/_react["default"].createElement("div", {
102
+ })), /*#__PURE__*/_react["default"].createElement("div", {
101
103
  className: "".concat(prefix, "__content-time-range")
102
104
  }, /*#__PURE__*/_react["default"].createElement("i", {
103
105
  className: (0, _classnames["default"])("tu-icon-deferred", "".concat(prefix, "__content-time-range-icon"))
104
- }), /*#__PURE__*/_react["default"].createElement("span", null, startDate, "-", deadline)))));
106
+ }), /*#__PURE__*/_react["default"].createElement("span", null, startDate, "-", endDate))));
105
107
  };
106
108
 
107
109
  var _default = DynamicKr;
@@ -99,7 +99,7 @@
99
99
  display: inline-flex;
100
100
  align-items: center;
101
101
  justify-content: center;
102
- width: 40px;
102
+ padding: 0 6px;
103
103
  height: 18px;
104
104
  min-width: 40px;
105
105
  clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);
@@ -58,7 +58,8 @@ var DynamicMilestone = function DynamicMilestone(_ref) {
58
58
  startDate = data.startDate,
59
59
  deadline = data.deadline,
60
60
  feedType = data.feedType,
61
- obj = data.obj;
61
+ obj = data.obj,
62
+ principalUser = data.principalUser;
62
63
 
63
64
  var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
64
65
  searchKeyWord = _useContext.searchKeyWord;
@@ -124,7 +125,8 @@ var DynamicMilestone = function DynamicMilestone(_ref) {
124
125
  }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
125
126
  data: data
126
127
  }, restProps, {
127
- desc: renderDesc
128
+ desc: renderDesc,
129
+ user: principalUser
128
130
  })), /*#__PURE__*/_react["default"].createElement("div", {
129
131
  className: "".concat(prefix, "__content")
130
132
  }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
@@ -83,7 +83,7 @@
83
83
  display: inline-flex;
84
84
  align-items: center;
85
85
  justify-content: center;
86
- width: 40px;
86
+ padding: 0 2px;
87
87
  height: 18px;
88
88
  min-width: 40px;
89
89
  clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);
@@ -64,7 +64,8 @@ var DynamicProgress = function DynamicProgress(_ref) {
64
64
  obj = data.obj,
65
65
  classify = data.classify,
66
66
  relationParentName = data.relationParentName,
67
- relationParentId = data.relationParentId;
67
+ relationParentId = data.relationParentId,
68
+ publishUser = data.publishUser;
68
69
 
69
70
  var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
70
71
  searchKeyWord = _useContext.searchKeyWord;
@@ -178,7 +179,8 @@ var DynamicProgress = function DynamicProgress(_ref) {
178
179
  }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
179
180
  data: data
180
181
  }, restProps, {
181
- desc: renderDesc
182
+ desc: renderDesc,
183
+ user: publishUser
182
184
  })), /*#__PURE__*/_react["default"].createElement("div", {
183
185
  className: prefix + "__content"
184
186
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -79,7 +79,7 @@
79
79
  display: inline-flex;
80
80
  align-items: center;
81
81
  justify-content: center;
82
- width: 40px;
82
+ padding: 0 2px;
83
83
  height: 18px;
84
84
  min-width: 40px;
85
85
  clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);
@@ -54,7 +54,8 @@ var DynamicProject = function DynamicProject(_ref) {
54
54
  var status = data.status,
55
55
  workName = data.workName,
56
56
  startDate = data.startDate,
57
- deadline = data.deadline;
57
+ deadline = data.deadline,
58
+ principalUser = data.principalUser;
58
59
 
59
60
  var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
60
61
  searchKeyWord = _useContext.searchKeyWord;
@@ -91,7 +92,8 @@ var DynamicProject = function DynamicProject(_ref) {
91
92
  }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
92
93
  data: data
93
94
  }, restProps, {
94
- desc: renderDesc
95
+ desc: renderDesc,
96
+ user: principalUser
95
97
  })), /*#__PURE__*/_react["default"].createElement("div", {
96
98
  className: "".concat(prefix, "__content")
97
99
  }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
@@ -83,7 +83,7 @@
83
83
  display: inline-flex;
84
84
  align-items: center;
85
85
  justify-content: center;
86
- width: 40px;
86
+ padding: 0 2px;
87
87
  height: 18px;
88
88
  min-width: 40px;
89
89
  clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);
@@ -67,7 +67,8 @@ var DynamicRelative = function DynamicRelative(_ref) {
67
67
  status = data.status,
68
68
  objPrincipalUser = data.objPrincipalUser,
69
69
  rObjprincipalUser = data.rObjprincipalUser,
70
- rObjCycleName = data.rObjCycleName;
70
+ rObjCycleName = data.rObjCycleName,
71
+ publishUser = data.publishUser;
71
72
 
72
73
  var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
73
74
  searchKeyWord = _useContext.searchKeyWord;
@@ -123,7 +124,8 @@ var DynamicRelative = function DynamicRelative(_ref) {
123
124
  }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
124
125
  data: data
125
126
  }, restProps, {
126
- desc: renderDesc
127
+ desc: renderDesc,
128
+ user: publishUser
127
129
  })), /*#__PURE__*/_react["default"].createElement("div", {
128
130
  className: "".concat(prefix, "__content")
129
131
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -126,7 +126,7 @@
126
126
  display: inline-flex;
127
127
  align-items: center;
128
128
  justify-content: center;
129
- width: 40px;
129
+ padding: 0 2px;
130
130
  height: 18px;
131
131
  min-width: 40px;
132
132
  clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);
@@ -53,7 +53,8 @@ var DynamicReply = function DynamicReply(_ref) {
53
53
  searchKeyWord = _useContext.searchKeyWord;
54
54
 
55
55
  var replayObjType = data.replayObjType,
56
- feedType = data.feedType;
56
+ feedType = data.feedType,
57
+ publishUser = data.publishUser;
57
58
 
58
59
  var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(feedType),
59
60
  feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
@@ -116,7 +117,8 @@ var DynamicReply = function DynamicReply(_ref) {
116
117
  }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
117
118
  data: data
118
119
  }, restProps, {
119
- desc: renderDesc
120
+ desc: renderDesc,
121
+ user: publishUser
120
122
  })), /*#__PURE__*/_react["default"].createElement("div", {
121
123
  className: prefix + "__content"
122
124
  }, /*#__PURE__*/_react["default"].createElement(_title["default"], {
@@ -165,6 +167,7 @@ var DynamicReply = function DynamicReply(_ref) {
165
167
  className: prefix + "__detail-block-title"
166
168
  }, "\u884C\u52A8\u8BA1\u5212"), data.tasks && data.tasks.map(function (task) {
167
169
  return /*#__PURE__*/_react["default"].createElement("div", {
170
+ key: task.taskId,
168
171
  className: prefix + "__detail-tasks-item",
169
172
  onClick: function onClick() {
170
173
  handleShowTaskDrawer(task.taskId);
@@ -141,7 +141,7 @@
141
141
  display: inline-flex;
142
142
  align-items: center;
143
143
  justify-content: center;
144
- width: 40px;
144
+ padding: 0 2px;
145
145
  height: 18px;
146
146
  min-width: 40px;
147
147
  clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);