@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.
- package/lib/components/communication/index.js +6 -1
- package/lib/components/dynamic/dynamic-item/components/header/index.js +72 -60
- package/lib/components/dynamic/dynamic-item/dynamic-align/index.css +1 -1
- package/lib/components/dynamic/dynamic-item/dynamic-align/index.js +4 -2
- package/lib/components/dynamic/dynamic-item/dynamic-announcement/index.css +5 -1
- package/lib/components/dynamic/dynamic-item/dynamic-announcement/index.js +25 -10
- package/lib/components/dynamic/dynamic-item/dynamic-assessment/index.css +1 -1
- package/lib/components/dynamic/dynamic-item/dynamic-assessment/index.js +2 -1
- package/lib/components/dynamic/dynamic-item/dynamic-create-o/index.css +1 -1
- package/lib/components/dynamic/dynamic-item/dynamic-create-o/index.js +6 -3
- package/lib/components/dynamic/dynamic-item/dynamic-kr/index.css +2 -1
- package/lib/components/dynamic/dynamic-item/dynamic-kr/index.js +7 -5
- package/lib/components/dynamic/dynamic-item/dynamic-milestone/index.css +1 -1
- package/lib/components/dynamic/dynamic-item/dynamic-milestone/index.js +4 -2
- package/lib/components/dynamic/dynamic-item/dynamic-progress/index.css +1 -1
- package/lib/components/dynamic/dynamic-item/dynamic-progress/index.js +4 -2
- package/lib/components/dynamic/dynamic-item/dynamic-project/index.css +1 -1
- package/lib/components/dynamic/dynamic-item/dynamic-project/index.js +4 -2
- package/lib/components/dynamic/dynamic-item/dynamic-relative/index.css +1 -1
- package/lib/components/dynamic/dynamic-item/dynamic-relative/index.js +4 -2
- package/lib/components/dynamic/dynamic-item/dynamic-replay/index.css +1 -1
- package/lib/components/dynamic/dynamic-item/dynamic-replay/index.js +5 -2
- package/lib/components/dynamic/dynamic-item/dynamic-report/index.css +1 -1
- package/lib/components/dynamic/dynamic-item/dynamic-report/index.js +6 -5
- package/lib/components/dynamic/dynamic-item/dynamic-reward/index.js +7 -6
- package/lib/components/dynamic/dynamic-item/dynamic-share/index.css +5 -1
- package/lib/components/dynamic/dynamic-item/dynamic-share/index.js +26 -11
- package/lib/components/dynamic/dynamic-item/dynamic-task/index.css +1 -1
- package/lib/components/dynamic/dynamic-item/dynamic-task/index.js +4 -2
- package/lib/components/dynamic/dynamic-item/index.js +71 -59
- package/lib/components/dynamic/dynamic-like-ranking/index.css +7 -4
- package/lib/components/dynamic/dynamic-list/index.js +0 -4
- package/lib/components/dynamic/util.js +25 -5
- package/lib/components/mblog/index.js +2 -2
- package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.js +15 -8
- package/lib/components/table/index.css +0 -1
- package/lib/pages/like-ranking/column.js +18 -7
- package/lib/pages/like-ranking/filter-buttons/department.js +5 -44
- package/lib/pages/like-ranking/filter-buttons/group.js +34 -0
- package/lib/pages/like-ranking/filter-buttons/index.js +8 -2
- package/lib/pages/like-ranking/filter-buttons/timer.js +3 -1
- package/lib/pages/like-ranking/index.css +3 -2
- package/lib/pages/like-ranking/index.js +20 -13
- package/lib/utils/format-time.js +9 -6
- package/package.json +1 -1
|
@@ -52,16 +52,16 @@ var DynamicReply = function DynamicReply(_ref) {
|
|
|
52
52
|
var data = _ref.data,
|
|
53
53
|
restProps = _objectWithoutProperties(_ref, _excluded);
|
|
54
54
|
|
|
55
|
+
var submitState = data.submitState,
|
|
56
|
+
feedId = data.feedId,
|
|
57
|
+
feedType = data.feedType,
|
|
58
|
+
publishUser = data.publishUser;
|
|
55
59
|
var contentRichTextRef = (0, _react.useRef)();
|
|
56
60
|
var workPlanRichTextRef = (0, _react.useRef)();
|
|
57
61
|
|
|
58
62
|
var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
|
|
59
63
|
searchKeyWord = _useContext.searchKeyWord;
|
|
60
64
|
|
|
61
|
-
var submitState = data.submitState,
|
|
62
|
-
feedId = data.feedId,
|
|
63
|
-
feedType = data.feedType;
|
|
64
|
-
|
|
65
65
|
var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(feedType),
|
|
66
66
|
feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
|
|
67
67
|
feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
|
|
@@ -105,7 +105,8 @@ var DynamicReply = function DynamicReply(_ref) {
|
|
|
105
105
|
}, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
|
|
106
106
|
data: data
|
|
107
107
|
}, restProps, {
|
|
108
|
-
desc: renderDesc
|
|
108
|
+
desc: renderDesc,
|
|
109
|
+
user: publishUser
|
|
109
110
|
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
110
111
|
className: prefix + "__content"
|
|
111
112
|
}, /*#__PURE__*/_react["default"].createElement(_title["default"], {
|
|
@@ -62,7 +62,8 @@ var DynamicReward = function DynamicReward(_ref) {
|
|
|
62
62
|
obj = data.obj,
|
|
63
63
|
classify = data.classify,
|
|
64
64
|
feedType = data.feedType,
|
|
65
|
-
rewardUser = data.rewardUser
|
|
65
|
+
rewardUser = data.rewardUser,
|
|
66
|
+
publishUser = data.publishUser;
|
|
66
67
|
|
|
67
68
|
var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
|
|
68
69
|
searchKeyWord = _useContext.searchKeyWord;
|
|
@@ -139,7 +140,7 @@ var DynamicReward = function DynamicReward(_ref) {
|
|
|
139
140
|
});
|
|
140
141
|
}, [classify]);
|
|
141
142
|
var renderDesc = (0, _react.useMemo)(function () {
|
|
142
|
-
var url =
|
|
143
|
+
var url = ""; // const url = getUrlForUserPage({
|
|
143
144
|
// userId: rewardUser.name,
|
|
144
145
|
// userType: rewardUser.userType,
|
|
145
146
|
// });
|
|
@@ -169,10 +170,10 @@ var DynamicReward = function DynamicReward(_ref) {
|
|
|
169
170
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
170
171
|
className: prefix
|
|
171
172
|
}, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
|
|
172
|
-
data: data
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
173
|
+
data: data,
|
|
174
|
+
desc: renderDesc,
|
|
175
|
+
user: publishUser
|
|
176
|
+
}, restProps)), /*#__PURE__*/_react["default"].createElement("div", {
|
|
176
177
|
className: prefix + "__content"
|
|
177
178
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
178
179
|
className: prefix + "__title"
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
display: inline-flex;
|
|
39
39
|
align-items: center;
|
|
40
40
|
justify-content: center;
|
|
41
|
-
|
|
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-share-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"));
|
|
23
|
-
|
|
24
22
|
var _header = _interopRequireDefault(require("../components/header"));
|
|
25
23
|
|
|
26
|
-
require("
|
|
24
|
+
var _dangerousHtml = _interopRequireDefault(require("../../components/dangerous-html"));
|
|
27
25
|
|
|
28
26
|
var _util = require("../../util");
|
|
29
27
|
|
|
30
|
-
var
|
|
28
|
+
var _tools = require("../../../../utils/tools");
|
|
29
|
+
|
|
30
|
+
require("./index.css");
|
|
31
|
+
|
|
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-share-item";
|
|
|
45
47
|
|
|
46
48
|
var DynamicShare = function DynamicShare(_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;
|
|
@@ -64,20 +70,29 @@ var DynamicShare = function DynamicShare(_ref) {
|
|
|
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
|
-
|
|
72
|
-
|
|
73
|
-
|
|
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",
|
|
79
|
-
|
|
80
|
-
|
|
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"]
|
|
@@ -56,7 +56,8 @@ var DynamicTask = function DynamicTask(_ref) {
|
|
|
56
56
|
startDate = data.startDate,
|
|
57
57
|
deadline = data.deadline,
|
|
58
58
|
feedType = data.feedType,
|
|
59
|
-
obj = data.obj
|
|
59
|
+
obj = data.obj,
|
|
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 DynamicTask = function DynamicTask(_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: "".concat(prefix, "__content")
|
|
136
138
|
}, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
|
|
@@ -55,9 +55,9 @@ var _context = require("../context");
|
|
|
55
55
|
|
|
56
56
|
var _conditionRender = _interopRequireDefault(require("../components/condition-render"));
|
|
57
57
|
|
|
58
|
-
require("
|
|
58
|
+
var _auth = require("../../../utils/auth");
|
|
59
59
|
|
|
60
|
-
|
|
60
|
+
require("./index.css");
|
|
61
61
|
|
|
62
62
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
63
63
|
|
|
@@ -65,8 +65,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
65
65
|
|
|
66
66
|
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; }
|
|
67
67
|
|
|
68
|
-
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); }
|
|
69
|
-
|
|
70
68
|
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
71
69
|
|
|
72
70
|
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
@@ -87,16 +85,11 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
|
|
|
87
85
|
|
|
88
86
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
89
87
|
|
|
90
|
-
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; }
|
|
91
|
-
|
|
92
|
-
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; }
|
|
93
|
-
|
|
94
88
|
var prefix = "titaui-dynamic-item";
|
|
95
89
|
|
|
96
90
|
var DynamicItem = function DynamicItem(_ref) {
|
|
97
91
|
var data = _ref.data,
|
|
98
|
-
|
|
99
|
-
|
|
92
|
+
onDeleteFeed = _ref.onDeleteFeed;
|
|
100
93
|
var feedId = data.feedId,
|
|
101
94
|
feedComments = data.feedComments,
|
|
102
95
|
praiseType = data.praiseType,
|
|
@@ -130,6 +123,7 @@ var DynamicItem = function DynamicItem(_ref) {
|
|
|
130
123
|
var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
|
|
131
124
|
searchKeyWord = _useContext.searchKeyWord;
|
|
132
125
|
|
|
126
|
+
var hasDynamicOpereateAuth = new _auth.DynamicManagerAuth().hasAuth();
|
|
133
127
|
var dynamicContentRef = (0, _react.useRef)();
|
|
134
128
|
var communicationRef = (0, _react.useRef)();
|
|
135
129
|
|
|
@@ -172,74 +166,90 @@ var DynamicItem = function DynamicItem(_ref) {
|
|
|
172
166
|
var renderContent = (0, _react.useMemo)(function () {
|
|
173
167
|
switch (data.feedType) {
|
|
174
168
|
case _constant.EFeedType.O:
|
|
175
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicCreateO["default"],
|
|
176
|
-
data: data
|
|
177
|
-
|
|
169
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicCreateO["default"], {
|
|
170
|
+
data: data,
|
|
171
|
+
onDeleteFeed: onDeleteFeed
|
|
172
|
+
});
|
|
178
173
|
|
|
179
174
|
case _constant.EFeedType.Progress:
|
|
180
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicProgress["default"],
|
|
181
|
-
data: data
|
|
182
|
-
|
|
175
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicProgress["default"], {
|
|
176
|
+
data: data,
|
|
177
|
+
onDeleteFeed: onDeleteFeed
|
|
178
|
+
});
|
|
183
179
|
|
|
184
180
|
case _constant.EFeedType.Task:
|
|
185
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicTask["default"],
|
|
186
|
-
data: data
|
|
187
|
-
|
|
181
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicTask["default"], {
|
|
182
|
+
data: data,
|
|
183
|
+
onDeleteFeed: onDeleteFeed
|
|
184
|
+
});
|
|
188
185
|
|
|
189
186
|
case _constant.EFeedType.Project:
|
|
190
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicProject["default"],
|
|
191
|
-
data: data
|
|
192
|
-
|
|
187
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicProject["default"], {
|
|
188
|
+
data: data,
|
|
189
|
+
onDeleteFeed: onDeleteFeed
|
|
190
|
+
});
|
|
193
191
|
|
|
194
192
|
case _constant.EFeedType.Align:
|
|
195
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicAlign["default"],
|
|
196
|
-
data: data
|
|
197
|
-
|
|
193
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicAlign["default"], {
|
|
194
|
+
data: data,
|
|
195
|
+
onDeleteFeed: onDeleteFeed
|
|
196
|
+
});
|
|
198
197
|
|
|
199
198
|
case _constant.EFeedType.Relative:
|
|
200
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicRelative["default"],
|
|
201
|
-
data: data
|
|
202
|
-
|
|
199
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicRelative["default"], {
|
|
200
|
+
data: data,
|
|
201
|
+
onDeleteFeed: onDeleteFeed
|
|
202
|
+
});
|
|
203
203
|
|
|
204
204
|
case _constant.EFeedType.Kr:
|
|
205
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicKr["default"],
|
|
206
|
-
data: data
|
|
207
|
-
|
|
205
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicKr["default"], {
|
|
206
|
+
data: data,
|
|
207
|
+
onDeleteFeed: onDeleteFeed
|
|
208
|
+
});
|
|
208
209
|
|
|
209
210
|
case _constant.EFeedType.Report:
|
|
210
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicReport["default"],
|
|
211
|
-
data: data
|
|
212
|
-
|
|
211
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicReport["default"], {
|
|
212
|
+
data: data,
|
|
213
|
+
onDeleteFeed: onDeleteFeed
|
|
214
|
+
});
|
|
213
215
|
|
|
214
216
|
case _constant.EFeedType.Reply:
|
|
215
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicReplay["default"],
|
|
216
|
-
data: data
|
|
217
|
-
|
|
217
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicReplay["default"], {
|
|
218
|
+
data: data,
|
|
219
|
+
onDeleteFeed: onDeleteFeed
|
|
220
|
+
});
|
|
218
221
|
|
|
219
222
|
case _constant.EFeedType.Share:
|
|
220
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicShare["default"],
|
|
221
|
-
data: data
|
|
222
|
-
|
|
223
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicShare["default"], {
|
|
224
|
+
data: data,
|
|
225
|
+
onDeleteFeed: onDeleteFeed,
|
|
226
|
+
hasDynamicOpereateAuth: hasDynamicOpereateAuth
|
|
227
|
+
});
|
|
223
228
|
|
|
224
229
|
case _constant.EFeedType.Assessment:
|
|
225
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicAssessment["default"],
|
|
226
|
-
data: data
|
|
227
|
-
|
|
230
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicAssessment["default"], {
|
|
231
|
+
data: data,
|
|
232
|
+
onDeleteFeed: onDeleteFeed
|
|
233
|
+
});
|
|
228
234
|
|
|
229
235
|
case _constant.EFeedType.Announcement:
|
|
230
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicAnnouncement["default"],
|
|
231
|
-
data: data
|
|
232
|
-
|
|
236
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicAnnouncement["default"], {
|
|
237
|
+
data: data,
|
|
238
|
+
onDeleteFeed: onDeleteFeed,
|
|
239
|
+
hasDynamicOpereateAuth: hasDynamicOpereateAuth
|
|
240
|
+
});
|
|
233
241
|
|
|
234
242
|
case _constant.EFeedType.Reward:
|
|
235
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicReward["default"],
|
|
236
|
-
data: data
|
|
237
|
-
|
|
243
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicReward["default"], {
|
|
244
|
+
data: data,
|
|
245
|
+
onDeleteFeed: onDeleteFeed
|
|
246
|
+
});
|
|
238
247
|
|
|
239
248
|
case _constant.EFeedType.MileStone:
|
|
240
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicMilestone["default"],
|
|
241
|
-
data: data
|
|
242
|
-
|
|
249
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicMilestone["default"], {
|
|
250
|
+
data: data,
|
|
251
|
+
onDeleteFeed: onDeleteFeed
|
|
252
|
+
});
|
|
243
253
|
|
|
244
254
|
default:
|
|
245
255
|
return null;
|
|
@@ -269,16 +279,17 @@ var DynamicItem = function DynamicItem(_ref) {
|
|
|
269
279
|
className: prefix + "__footer"
|
|
270
280
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
271
281
|
className: prefix + "__footer-left"
|
|
272
|
-
}, praiseData.map(function (item,
|
|
273
|
-
if (
|
|
282
|
+
}, praiseData.map(function (item, index) {
|
|
283
|
+
if (index >= 8) return;
|
|
274
284
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
275
|
-
className: prefix + "__footer-left-item"
|
|
285
|
+
className: prefix + "__footer-left-item",
|
|
286
|
+
key: item.userId
|
|
276
287
|
}, /*#__PURE__*/_react["default"].createElement(_avatar.IconAvatar, {
|
|
277
288
|
name: item.name,
|
|
278
289
|
userId: item.userId,
|
|
279
290
|
avatar: item.avatar,
|
|
280
291
|
type: item.praiseType,
|
|
281
|
-
key:
|
|
292
|
+
key: index,
|
|
282
293
|
size: {
|
|
283
294
|
width: 28,
|
|
284
295
|
textNum: 1,
|
|
@@ -286,12 +297,12 @@ var DynamicItem = function DynamicItem(_ref) {
|
|
|
286
297
|
}
|
|
287
298
|
}));
|
|
288
299
|
}), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
|
|
289
|
-
condition: praiseData && praiseData.length >
|
|
300
|
+
condition: praiseData && praiseData.length > 8
|
|
290
301
|
}, /*#__PURE__*/_react["default"].createElement(_avatar.NumAvatar, {
|
|
291
302
|
onClick: function onClick() {
|
|
292
303
|
return setUpvoteModalVisible(true);
|
|
293
304
|
},
|
|
294
|
-
num: praiseData.length -
|
|
305
|
+
num: praiseData.length - 8
|
|
295
306
|
}))), /*#__PURE__*/_react["default"].createElement("div", {
|
|
296
307
|
className: prefix + "__footer-right"
|
|
297
308
|
}, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
|
|
@@ -332,7 +343,8 @@ var DynamicItem = function DynamicItem(_ref) {
|
|
|
332
343
|
feedId: feedId,
|
|
333
344
|
commentCount: 3,
|
|
334
345
|
ref: communicationRef,
|
|
335
|
-
highLightKeyWord: searchKeyWord
|
|
346
|
+
highLightKeyWord: searchKeyWord,
|
|
347
|
+
autoFocus: feedComments.total === 0
|
|
336
348
|
}))));
|
|
337
349
|
};
|
|
338
350
|
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
|
|
6
6
|
border-radius: 12px;
|
|
7
7
|
padding: 12px 16px;
|
|
8
|
+
padding-bottom: 20px;
|
|
8
9
|
box-sizing: border-box;
|
|
9
10
|
}
|
|
10
11
|
|
|
@@ -48,7 +49,7 @@
|
|
|
48
49
|
display: flex;
|
|
49
50
|
justify-content: space-between;
|
|
50
51
|
align-items: center;
|
|
51
|
-
margin-bottom:
|
|
52
|
+
margin-bottom: 16px;
|
|
52
53
|
}
|
|
53
54
|
|
|
54
55
|
.danamic-like-ranking__item:last-of-type {
|
|
@@ -66,7 +67,7 @@
|
|
|
66
67
|
}
|
|
67
68
|
|
|
68
69
|
.danamic-like-ranking__item-medal {
|
|
69
|
-
width:
|
|
70
|
+
width: 20px;
|
|
70
71
|
}
|
|
71
72
|
|
|
72
73
|
.danamic-like-ranking__item-num {
|
|
@@ -76,8 +77,10 @@
|
|
|
76
77
|
.danamic-like-ranking__item-avatar {
|
|
77
78
|
cursor: pointer;
|
|
78
79
|
margin-left: 9px;
|
|
79
|
-
|
|
80
|
-
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
.danamic-like-ranking__item-avatar .titaui-pc-avator-container {
|
|
83
|
+
display: inline-flex !important;
|
|
81
84
|
}
|
|
82
85
|
|
|
83
86
|
.danamic-like-ranking__item-name {
|
|
@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
9
9
|
|
|
10
10
|
var _dynamicItem = _interopRequireDefault(require("../dynamic-item"));
|
|
11
11
|
|
|
12
|
-
var _auth = require("../../../utils/auth");
|
|
13
|
-
|
|
14
12
|
var _dynamicEmpty = _interopRequireDefault(require("../img/dynamic-empty.png"));
|
|
15
13
|
|
|
16
14
|
var _conditionRender = _interopRequireDefault(require("../components/condition-render"));
|
|
@@ -27,7 +25,6 @@ var DynamicList = function DynamicList(_ref) {
|
|
|
27
25
|
onDeleteFeed = _ref.onDeleteFeed,
|
|
28
26
|
_ref$height = _ref.height,
|
|
29
27
|
height = _ref$height === void 0 ? -1 : _ref$height;
|
|
30
|
-
var hasDynamicOpereateAuth = new _auth.DynamicManagerAuth().hasAuth();
|
|
31
28
|
|
|
32
29
|
var handleDeleteFeed = function handleDeleteFeed(feedId) {
|
|
33
30
|
onDeleteFeed && onDeleteFeed(feedId);
|
|
@@ -55,7 +52,6 @@ var DynamicList = function DynamicList(_ref) {
|
|
|
55
52
|
key: item.feedId + index
|
|
56
53
|
}, /*#__PURE__*/_react["default"].createElement(_dynamicItem["default"], {
|
|
57
54
|
data: item,
|
|
58
|
-
hasDynamicOpereateAuth: hasDynamicOpereateAuth,
|
|
59
55
|
onDeleteFeed: handleDeleteFeed
|
|
60
56
|
}));
|
|
61
57
|
})));
|
|
@@ -43,8 +43,8 @@ var getFeedTypeAndTypeColor = function getFeedTypeAndTypeColor(feedType) {
|
|
|
43
43
|
}
|
|
44
44
|
|
|
45
45
|
if (feedType === _constant.EFeedType.Progress) {
|
|
46
|
-
feedTypeText = "
|
|
47
|
-
feedTypeColor = "linear-gradient(90deg, #
|
|
46
|
+
feedTypeText = "进展";
|
|
47
|
+
feedTypeColor = "linear-gradient(90deg, #FFAB67 0%, #FFD5A0 100%)";
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
if (feedType === _constant.EFeedType.Relative) {
|
|
@@ -52,9 +52,29 @@ var getFeedTypeAndTypeColor = function getFeedTypeAndTypeColor(feedType) {
|
|
|
52
52
|
feedTypeColor = "linear-gradient(270deg, #FFE18B 0%, #F6BD16 100%)";
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
-
if (feedType === _constant.EFeedType.
|
|
56
|
-
feedTypeText =
|
|
57
|
-
feedTypeColor =
|
|
55
|
+
if (feedType === _constant.EFeedType.O) {
|
|
56
|
+
feedTypeText = 'OKRs';
|
|
57
|
+
feedTypeColor = 'linear-gradient(90deg, #2879FF 0%, #9FBFFF 100%)';
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
if (feedType === _constant.EFeedType.Kr) {
|
|
61
|
+
feedTypeText = 'KR';
|
|
62
|
+
feedTypeColor = 'linear-gradient(90deg, #2879FF 0%, #9FBFFF 100%)';
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
if (feedType === _constant.EFeedType.Project) {
|
|
66
|
+
feedTypeText = '项目';
|
|
67
|
+
feedTypeColor = 'linear-gradient(90deg, #624DFF 0%, #CDC7FF 100%)';
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
if (feedType === _constant.EFeedType.MileStone) {
|
|
71
|
+
feedTypeText = '里程碑';
|
|
72
|
+
feedTypeColor = 'linear-gradient(90deg, #624DFF 0%, #CDC7FF 100%)';
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
if (feedType === _constant.EFeedType.Task) {
|
|
76
|
+
feedTypeText = '任务';
|
|
77
|
+
feedTypeColor = 'linear-gradient(90deg, #BB4DFF 0%, #EAC7FF 100%)';
|
|
58
78
|
}
|
|
59
79
|
|
|
60
80
|
return {
|
|
@@ -175,7 +175,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
|
|
|
175
175
|
|
|
176
176
|
_this.setState({
|
|
177
177
|
textareaValue: textareaValue,
|
|
178
|
-
isAllowSubmit: textareaValue.trim().length > 0 && textareaValue.trim().length <= (_this.props.maxLength || 2000),
|
|
178
|
+
isAllowSubmit: textareaValue.trim().length > 0 && textareaValue.trim().length <= (_this.props.maxLength || 2000) || successFilesPath.length > 0,
|
|
179
179
|
uploadSuccessFilesPath: successFilesPath,
|
|
180
180
|
dragFilesList: []
|
|
181
181
|
});
|
|
@@ -190,7 +190,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
|
|
|
190
190
|
};
|
|
191
191
|
|
|
192
192
|
_this.allowSubmit = function (content) {
|
|
193
|
-
return content.trim().length > 0 && content.trim().length <= _this.props.maxLength;
|
|
193
|
+
return content.trim().length > 0 && content.trim().length <= _this.props.maxLength || _this.state.uploadSuccessFilesPath.length > 0;
|
|
194
194
|
};
|
|
195
195
|
|
|
196
196
|
_this.onActionSubmit = function (submitType) {
|
|
@@ -70,20 +70,27 @@ var _default = function _default(props) {
|
|
|
70
70
|
|
|
71
71
|
var openCreate = (0, _react.useCallback)( /*#__PURE__*/function () {
|
|
72
72
|
var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(name) {
|
|
73
|
+
var params;
|
|
73
74
|
return regeneratorRuntime.wrap(function _callee$(_context) {
|
|
74
75
|
while (1) {
|
|
75
76
|
switch (_context.prev = _context.next) {
|
|
76
77
|
case 0:
|
|
77
78
|
if (name == "addTask") {
|
|
79
|
+
params = {
|
|
80
|
+
'objId': data.workId,
|
|
81
|
+
'objType': 4,
|
|
82
|
+
'AppId': 1,
|
|
83
|
+
'AppType': 1,
|
|
84
|
+
'TaskType': 0,
|
|
85
|
+
'WorkMileStoneId': data.mileStoneId
|
|
86
|
+
};
|
|
87
|
+
|
|
88
|
+
if (data.mileStoneId > 0) {
|
|
89
|
+
params.WorkMileStoneName = data.mileStoneName;
|
|
90
|
+
}
|
|
91
|
+
|
|
78
92
|
window.openCreateTaskPop(btnRef.current, {
|
|
79
|
-
"createParams":
|
|
80
|
-
"objId": data.workId,
|
|
81
|
-
"objType": 4,
|
|
82
|
-
"AppId": 1,
|
|
83
|
-
"AppType": 1,
|
|
84
|
-
"TaskType": 0,
|
|
85
|
-
"WorkMileStoneId": data.mileStoneId
|
|
86
|
-
},
|
|
93
|
+
"createParams": params,
|
|
87
94
|
"createTaskOption": {
|
|
88
95
|
"allowObjectOptions": false
|
|
89
96
|
}
|
|
@@ -51,6 +51,7 @@ var columns = function columns() {
|
|
|
51
51
|
return [{
|
|
52
52
|
title: "排名",
|
|
53
53
|
dataIndex: "rankNum",
|
|
54
|
+
width: 100,
|
|
54
55
|
key: "rankNum",
|
|
55
56
|
className: "".concat(preCls, "__td ").concat(preCls, "__td-raking"),
|
|
56
57
|
render: function render(text, data) {
|
|
@@ -60,6 +61,7 @@ var columns = function columns() {
|
|
|
60
61
|
title: "姓名",
|
|
61
62
|
dataIndex: "name",
|
|
62
63
|
key: "name",
|
|
64
|
+
width: 100,
|
|
63
65
|
className: "".concat(preCls, "__td"),
|
|
64
66
|
render: function render(text, data) {
|
|
65
67
|
var user = data.user; // const url = getUrlForUserPage({
|
|
@@ -81,13 +83,17 @@ var columns = function columns() {
|
|
|
81
83
|
userId: user.userId
|
|
82
84
|
})), /*#__PURE__*/_react["default"].createElement("span", {
|
|
83
85
|
className: "".concat(preCls, "__td-name-text")
|
|
84
|
-
}, /*#__PURE__*/_react["default"].createElement(
|
|
85
|
-
|
|
86
|
-
|
|
86
|
+
}, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
|
|
87
|
+
text: /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
|
|
88
|
+
id: user.userId,
|
|
89
|
+
name: user.name
|
|
90
|
+
}),
|
|
91
|
+
isPercent: true
|
|
87
92
|
})));
|
|
88
93
|
}
|
|
89
94
|
}, {
|
|
90
95
|
title: "所属部门",
|
|
96
|
+
width: 100,
|
|
91
97
|
dataIndex: "departmentName",
|
|
92
98
|
key: "departmentName",
|
|
93
99
|
className: "".concat(preCls, "__td"),
|
|
@@ -98,22 +104,27 @@ var columns = function columns() {
|
|
|
98
104
|
id: user.departmentId,
|
|
99
105
|
name: user.departmentName
|
|
100
106
|
}),
|
|
101
|
-
|
|
107
|
+
isPercent: true
|
|
102
108
|
});
|
|
103
109
|
}
|
|
104
110
|
}, {
|
|
105
111
|
title: "一级部门",
|
|
112
|
+
width: 100,
|
|
106
113
|
dataIndex: "oneLevelDepName",
|
|
107
114
|
key: "oneLevelDepName",
|
|
108
115
|
className: "".concat(preCls, "__td"),
|
|
109
116
|
render: function render(text, data) {
|
|
110
|
-
return /*#__PURE__*/_react["default"].createElement(
|
|
111
|
-
|
|
112
|
-
|
|
117
|
+
return /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
|
|
118
|
+
text: /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
|
|
119
|
+
id: data.oneLevelDepName,
|
|
120
|
+
name: data.oneLevelDepName
|
|
121
|
+
}),
|
|
122
|
+
isPercent: true
|
|
113
123
|
});
|
|
114
124
|
}
|
|
115
125
|
}, {
|
|
116
126
|
title: "点赞数",
|
|
127
|
+
width: 100,
|
|
117
128
|
dataIndex: "pariseNums",
|
|
118
129
|
key: "pariseNums",
|
|
119
130
|
className: "".concat(preCls, "__td"),
|