@titaui/pc 1.5.69-beta.18 → 1.5.69-beta.21
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 +5 -1
- package/lib/components/communication/style.js +1 -1
- package/lib/components/create-okr/index.css +4 -0
- package/lib/components/create-okr/index.js +17 -8
- package/lib/components/dynamic/dynamic-item/components/header/index.js +78 -61
- package/lib/components/dynamic/dynamic-item/dynamic-align/index.js +4 -2
- package/lib/components/dynamic/dynamic-item/dynamic-announcement/index.css +4 -0
- package/lib/components/dynamic/dynamic-item/dynamic-announcement/index.js +25 -10
- package/lib/components/dynamic/dynamic-item/dynamic-assessment/index.js +2 -1
- package/lib/components/dynamic/dynamic-item/dynamic-create-o/index.css +3 -1
- package/lib/components/dynamic/dynamic-item/dynamic-create-o/index.js +8 -5
- package/lib/components/dynamic/dynamic-item/dynamic-kr/index.css +11 -29
- package/lib/components/dynamic/dynamic-item/dynamic-kr/index.js +11 -41
- package/lib/components/dynamic/dynamic-item/dynamic-milestone/constant.js +16 -0
- package/lib/components/dynamic/dynamic-item/dynamic-milestone/img/milestone.png +0 -0
- package/lib/components/dynamic/dynamic-item/dynamic-milestone/index.css +111 -0
- package/lib/components/dynamic/dynamic-item/dynamic-milestone/index.js +158 -0
- package/lib/components/dynamic/dynamic-item/dynamic-progress/index.js +4 -2
- package/lib/components/dynamic/dynamic-item/dynamic-project/index.js +4 -2
- package/lib/components/dynamic/dynamic-item/dynamic-relative/index.js +4 -2
- package/lib/components/dynamic/dynamic-item/dynamic-replay/index.js +5 -2
- package/lib/components/dynamic/dynamic-item/dynamic-report/index.css +59 -0
- 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 +4 -0
- package/lib/components/dynamic/dynamic-item/dynamic-share/index.js +26 -11
- package/lib/components/dynamic/dynamic-item/dynamic-task/index.js +4 -2
- package/lib/components/dynamic/dynamic-item/index.css +13 -6
- package/lib/components/dynamic/dynamic-item/index.js +76 -57
- 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/dynamic.css +2 -0
- package/lib/components/dynamic/quick-operation/index.css +3 -1
- package/lib/components/dynamic/request-api.js +7 -7
- package/lib/components/file-list/components/single-file/index.css +3 -3
- package/lib/components/img-viewer/index.css +1 -1
- package/lib/components/mblog/index.js +2 -2
- package/lib/components/mblog/style.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/components/upload/style.js +1 -1
- package/lib/components/upvote/index.js +1 -1
- package/lib/index.js +5 -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
|
@@ -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"], {
|
|
@@ -86,6 +86,7 @@
|
|
|
86
86
|
font-size: 20px;
|
|
87
87
|
display: inline-flex;
|
|
88
88
|
align-items: center;
|
|
89
|
+
color: #a4acb9;
|
|
89
90
|
}
|
|
90
91
|
|
|
91
92
|
.titaui-dynamic-item__footer-icon:last-of-type {
|
|
@@ -96,10 +97,6 @@
|
|
|
96
97
|
color: #2879ff;
|
|
97
98
|
}
|
|
98
99
|
|
|
99
|
-
.titaui-dynamic-item__footer-icon:first-of-type:hover {
|
|
100
|
-
color: #89919F;
|
|
101
|
-
}
|
|
102
|
-
|
|
103
100
|
.titaui-dynamic-item__footer-number {
|
|
104
101
|
margin-left: 8px;
|
|
105
102
|
font-size: 14px;
|
|
@@ -108,14 +105,24 @@
|
|
|
108
105
|
|
|
109
106
|
.titaui-dynamic-item__icon {
|
|
110
107
|
margin-left: 4px;
|
|
111
|
-
|
|
108
|
+
margin-bottom: 4px;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
.titaui-dynamic-item__icon-up {
|
|
112
|
+
transform: rotate(180deg);
|
|
113
|
+
margin-bottom: 0;
|
|
112
114
|
}
|
|
113
115
|
|
|
114
116
|
.titaui-dynamic-item__communication {
|
|
115
117
|
padding: 12px 20px 20px 68px;
|
|
116
|
-
box-shadow: inset 0px
|
|
118
|
+
box-shadow: inset 0px 12px 12px -12px rgba(127, 145, 180, 0.14);
|
|
117
119
|
}
|
|
118
120
|
|
|
119
121
|
.titaui-dynamic-item__upvote-btn {
|
|
122
|
+
color: #a4acb9;
|
|
120
123
|
font-size: 20px;
|
|
121
124
|
}
|
|
125
|
+
|
|
126
|
+
.titaui-dynamic-item__upvote-btn:hover {
|
|
127
|
+
color: #2879ff;
|
|
128
|
+
}
|
|
@@ -45,6 +45,8 @@ var _dynamicKr = _interopRequireDefault(require("./dynamic-kr"));
|
|
|
45
45
|
|
|
46
46
|
var _dynamicReward = _interopRequireDefault(require("./dynamic-reward"));
|
|
47
47
|
|
|
48
|
+
var _dynamicMilestone = _interopRequireDefault(require("./dynamic-milestone"));
|
|
49
|
+
|
|
48
50
|
var _bsGlobal = require("../../../utils/bs-global");
|
|
49
51
|
|
|
50
52
|
var _avatar = require("../../avatar");
|
|
@@ -53,9 +55,9 @@ var _context = require("../context");
|
|
|
53
55
|
|
|
54
56
|
var _conditionRender = _interopRequireDefault(require("../components/condition-render"));
|
|
55
57
|
|
|
56
|
-
require("
|
|
58
|
+
var _auth = require("../../../utils/auth");
|
|
57
59
|
|
|
58
|
-
|
|
60
|
+
require("./index.css");
|
|
59
61
|
|
|
60
62
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
61
63
|
|
|
@@ -63,8 +65,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
63
65
|
|
|
64
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; }
|
|
65
67
|
|
|
66
|
-
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); }
|
|
67
|
-
|
|
68
68
|
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
69
69
|
|
|
70
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."); }
|
|
@@ -85,16 +85,11 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
|
|
|
85
85
|
|
|
86
86
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
87
87
|
|
|
88
|
-
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; }
|
|
89
|
-
|
|
90
|
-
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; }
|
|
91
|
-
|
|
92
88
|
var prefix = "titaui-dynamic-item";
|
|
93
89
|
|
|
94
90
|
var DynamicItem = function DynamicItem(_ref) {
|
|
95
91
|
var data = _ref.data,
|
|
96
|
-
|
|
97
|
-
|
|
92
|
+
onDeleteFeed = _ref.onDeleteFeed;
|
|
98
93
|
var feedId = data.feedId,
|
|
99
94
|
feedComments = data.feedComments,
|
|
100
95
|
praiseType = data.praiseType,
|
|
@@ -128,6 +123,7 @@ var DynamicItem = function DynamicItem(_ref) {
|
|
|
128
123
|
var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
|
|
129
124
|
searchKeyWord = _useContext.searchKeyWord;
|
|
130
125
|
|
|
126
|
+
var hasDynamicOpereateAuth = new _auth.DynamicManagerAuth().hasAuth();
|
|
131
127
|
var dynamicContentRef = (0, _react.useRef)();
|
|
132
128
|
var communicationRef = (0, _react.useRef)();
|
|
133
129
|
|
|
@@ -170,69 +166,90 @@ var DynamicItem = function DynamicItem(_ref) {
|
|
|
170
166
|
var renderContent = (0, _react.useMemo)(function () {
|
|
171
167
|
switch (data.feedType) {
|
|
172
168
|
case _constant.EFeedType.O:
|
|
173
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicCreateO["default"],
|
|
174
|
-
data: data
|
|
175
|
-
|
|
169
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicCreateO["default"], {
|
|
170
|
+
data: data,
|
|
171
|
+
onDeleteFeed: onDeleteFeed
|
|
172
|
+
});
|
|
176
173
|
|
|
177
174
|
case _constant.EFeedType.Progress:
|
|
178
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicProgress["default"],
|
|
179
|
-
data: data
|
|
180
|
-
|
|
175
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicProgress["default"], {
|
|
176
|
+
data: data,
|
|
177
|
+
onDeleteFeed: onDeleteFeed
|
|
178
|
+
});
|
|
181
179
|
|
|
182
180
|
case _constant.EFeedType.Task:
|
|
183
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicTask["default"],
|
|
184
|
-
data: data
|
|
185
|
-
|
|
181
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicTask["default"], {
|
|
182
|
+
data: data,
|
|
183
|
+
onDeleteFeed: onDeleteFeed
|
|
184
|
+
});
|
|
186
185
|
|
|
187
186
|
case _constant.EFeedType.Project:
|
|
188
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicProject["default"],
|
|
189
|
-
data: data
|
|
190
|
-
|
|
187
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicProject["default"], {
|
|
188
|
+
data: data,
|
|
189
|
+
onDeleteFeed: onDeleteFeed
|
|
190
|
+
});
|
|
191
191
|
|
|
192
192
|
case _constant.EFeedType.Align:
|
|
193
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicAlign["default"],
|
|
194
|
-
data: data
|
|
195
|
-
|
|
193
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicAlign["default"], {
|
|
194
|
+
data: data,
|
|
195
|
+
onDeleteFeed: onDeleteFeed
|
|
196
|
+
});
|
|
196
197
|
|
|
197
198
|
case _constant.EFeedType.Relative:
|
|
198
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicRelative["default"],
|
|
199
|
-
data: data
|
|
200
|
-
|
|
199
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicRelative["default"], {
|
|
200
|
+
data: data,
|
|
201
|
+
onDeleteFeed: onDeleteFeed
|
|
202
|
+
});
|
|
201
203
|
|
|
202
204
|
case _constant.EFeedType.Kr:
|
|
203
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicKr["default"],
|
|
204
|
-
data: data
|
|
205
|
-
|
|
205
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicKr["default"], {
|
|
206
|
+
data: data,
|
|
207
|
+
onDeleteFeed: onDeleteFeed
|
|
208
|
+
});
|
|
206
209
|
|
|
207
210
|
case _constant.EFeedType.Report:
|
|
208
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicReport["default"],
|
|
209
|
-
data: data
|
|
210
|
-
|
|
211
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicReport["default"], {
|
|
212
|
+
data: data,
|
|
213
|
+
onDeleteFeed: onDeleteFeed
|
|
214
|
+
});
|
|
211
215
|
|
|
212
216
|
case _constant.EFeedType.Reply:
|
|
213
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicReplay["default"],
|
|
214
|
-
data: data
|
|
215
|
-
|
|
217
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicReplay["default"], {
|
|
218
|
+
data: data,
|
|
219
|
+
onDeleteFeed: onDeleteFeed
|
|
220
|
+
});
|
|
216
221
|
|
|
217
222
|
case _constant.EFeedType.Share:
|
|
218
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicShare["default"],
|
|
219
|
-
data: data
|
|
220
|
-
|
|
223
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicShare["default"], {
|
|
224
|
+
data: data,
|
|
225
|
+
onDeleteFeed: onDeleteFeed,
|
|
226
|
+
hasDynamicOpereateAuth: hasDynamicOpereateAuth
|
|
227
|
+
});
|
|
221
228
|
|
|
222
229
|
case _constant.EFeedType.Assessment:
|
|
223
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicAssessment["default"],
|
|
224
|
-
data: data
|
|
225
|
-
|
|
230
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicAssessment["default"], {
|
|
231
|
+
data: data,
|
|
232
|
+
onDeleteFeed: onDeleteFeed
|
|
233
|
+
});
|
|
226
234
|
|
|
227
235
|
case _constant.EFeedType.Announcement:
|
|
228
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicAnnouncement["default"],
|
|
229
|
-
data: data
|
|
230
|
-
|
|
236
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicAnnouncement["default"], {
|
|
237
|
+
data: data,
|
|
238
|
+
onDeleteFeed: onDeleteFeed,
|
|
239
|
+
hasDynamicOpereateAuth: hasDynamicOpereateAuth
|
|
240
|
+
});
|
|
231
241
|
|
|
232
242
|
case _constant.EFeedType.Reward:
|
|
233
|
-
return /*#__PURE__*/_react["default"].createElement(_dynamicReward["default"],
|
|
234
|
-
data: data
|
|
235
|
-
|
|
243
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicReward["default"], {
|
|
244
|
+
data: data,
|
|
245
|
+
onDeleteFeed: onDeleteFeed
|
|
246
|
+
});
|
|
247
|
+
|
|
248
|
+
case _constant.EFeedType.MileStone:
|
|
249
|
+
return /*#__PURE__*/_react["default"].createElement(_dynamicMilestone["default"], {
|
|
250
|
+
data: data,
|
|
251
|
+
onDeleteFeed: onDeleteFeed
|
|
252
|
+
});
|
|
236
253
|
|
|
237
254
|
default:
|
|
238
255
|
return null;
|
|
@@ -262,16 +279,17 @@ var DynamicItem = function DynamicItem(_ref) {
|
|
|
262
279
|
className: prefix + "__footer"
|
|
263
280
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
264
281
|
className: prefix + "__footer-left"
|
|
265
|
-
}, praiseData.map(function (item,
|
|
266
|
-
if (
|
|
282
|
+
}, praiseData.map(function (item, index) {
|
|
283
|
+
if (index >= 8) return;
|
|
267
284
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
268
|
-
className: prefix + "__footer-left-item"
|
|
285
|
+
className: prefix + "__footer-left-item",
|
|
286
|
+
key: item.userId
|
|
269
287
|
}, /*#__PURE__*/_react["default"].createElement(_avatar.IconAvatar, {
|
|
270
288
|
name: item.name,
|
|
271
289
|
userId: item.userId,
|
|
272
290
|
avatar: item.avatar,
|
|
273
291
|
type: item.praiseType,
|
|
274
|
-
key:
|
|
292
|
+
key: index,
|
|
275
293
|
size: {
|
|
276
294
|
width: 28,
|
|
277
295
|
textNum: 1,
|
|
@@ -279,12 +297,12 @@ var DynamicItem = function DynamicItem(_ref) {
|
|
|
279
297
|
}
|
|
280
298
|
}));
|
|
281
299
|
}), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
|
|
282
|
-
condition: praiseData && praiseData.length >
|
|
300
|
+
condition: praiseData && praiseData.length > 8
|
|
283
301
|
}, /*#__PURE__*/_react["default"].createElement(_avatar.NumAvatar, {
|
|
284
302
|
onClick: function onClick() {
|
|
285
303
|
return setUpvoteModalVisible(true);
|
|
286
304
|
},
|
|
287
|
-
num: praiseData.length -
|
|
305
|
+
num: praiseData.length - 8
|
|
288
306
|
}))), /*#__PURE__*/_react["default"].createElement("div", {
|
|
289
307
|
className: prefix + "__footer-right"
|
|
290
308
|
}, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
|
|
@@ -293,7 +311,7 @@ var DynamicItem = function DynamicItem(_ref) {
|
|
|
293
311
|
className: prefix + "__footer-fold",
|
|
294
312
|
onClick: handleFold
|
|
295
313
|
}, "\u6536\u8D77", /*#__PURE__*/_react["default"].createElement("i", {
|
|
296
|
-
className: (0, _classnames["default"])("tu-icon-arrow-
|
|
314
|
+
className: (0, _classnames["default"])("tu-icon-arrow-down", "".concat(prefix, "__icon"), "".concat(prefix, "__icon-up"))
|
|
297
315
|
}))), /*#__PURE__*/_react["default"].createElement("span", {
|
|
298
316
|
onClick: handleCommentClick,
|
|
299
317
|
className: (0, _classnames["default"])("tu-icon-pinglun-m", prefix + "__footer-icon")
|
|
@@ -325,7 +343,8 @@ var DynamicItem = function DynamicItem(_ref) {
|
|
|
325
343
|
feedId: feedId,
|
|
326
344
|
commentCount: 3,
|
|
327
345
|
ref: communicationRef,
|
|
328
|
-
highLightKeyWord: searchKeyWord
|
|
346
|
+
highLightKeyWord: searchKeyWord,
|
|
347
|
+
autoFocus: feedComments.total === 0
|
|
329
348
|
}))));
|
|
330
349
|
};
|
|
331
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
|
})));
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
.titaui-pc-dynamic-quick-operation {
|
|
2
2
|
width: 278px;
|
|
3
3
|
height: 126px;
|
|
4
|
+
padding: 0 5px;
|
|
5
|
+
box-sizing: border-box;
|
|
4
6
|
display: flex;
|
|
5
7
|
align-items: center;
|
|
6
8
|
background: #ffffff;
|
|
7
9
|
box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
|
|
8
10
|
border-radius: 12px;
|
|
9
11
|
font-size: 12px;
|
|
10
|
-
color: #
|
|
12
|
+
color: #3f4755;
|
|
11
13
|
font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
|
|
12
14
|
}
|
|
13
15
|
|
|
@@ -14,7 +14,7 @@ var topDynamic = function topDynamic(_ref) {
|
|
|
14
14
|
var feedId = _ref.feedId,
|
|
15
15
|
_ref$titaObj_type = _ref.titaObj_type,
|
|
16
16
|
titaObj_type = _ref$titaObj_type === void 0 ? 2 : _ref$titaObj_type;
|
|
17
|
-
return (0, _request.rpost)("v2")("
|
|
17
|
+
return (0, _request.rpost)("v2")("user/feed/Top?feed_id=".concat(feedId, "&titaObj_type=").concat(titaObj_type, "&titaObj_id="));
|
|
18
18
|
};
|
|
19
19
|
|
|
20
20
|
exports.topDynamic = topDynamic;
|
|
@@ -23,28 +23,28 @@ var cancelTopDynamic = function cancelTopDynamic(_ref2) {
|
|
|
23
23
|
var feedId = _ref2.feedId,
|
|
24
24
|
_ref2$titaObj_type = _ref2.titaObj_type,
|
|
25
25
|
titaObj_type = _ref2$titaObj_type === void 0 ? 2 : _ref2$titaObj_type;
|
|
26
|
-
return (0, _request.rdelete)("v2")("
|
|
26
|
+
return (0, _request.rdelete)("v2")("user/feed/CancelTop?feed_id=".concat(feedId, "&titaObj_type=").concat(titaObj_type, "&titaObj_id="));
|
|
27
27
|
};
|
|
28
28
|
|
|
29
29
|
exports.cancelTopDynamic = cancelTopDynamic;
|
|
30
30
|
|
|
31
31
|
var collectDynamic = function collectDynamic(_ref3) {
|
|
32
32
|
var feedId = _ref3.feedId;
|
|
33
|
-
return (0, _request.rput)("v2")("
|
|
33
|
+
return (0, _request.rput)("v2")("user/feed/Collect?feed_id=".concat(feedId));
|
|
34
34
|
};
|
|
35
35
|
|
|
36
36
|
exports.collectDynamic = collectDynamic;
|
|
37
37
|
|
|
38
38
|
var cancelCollectDynamic = function cancelCollectDynamic(_ref4) {
|
|
39
39
|
var feedId = _ref4.feedId;
|
|
40
|
-
return (0, _request.rdelete)("v2")("
|
|
40
|
+
return (0, _request.rdelete)("v2")("user/feed/CancelCollect?feed_id=".concat(feedId));
|
|
41
41
|
};
|
|
42
42
|
|
|
43
43
|
exports.cancelCollectDynamic = cancelCollectDynamic;
|
|
44
44
|
|
|
45
45
|
var deleteDynamic = function deleteDynamic(_ref5) {
|
|
46
46
|
var feedId = _ref5.feedId;
|
|
47
|
-
return (0, _request.rdelete)("v2")("
|
|
47
|
+
return (0, _request.rdelete)("v2")("user/feed/Delete?feed_id=".concat(feedId));
|
|
48
48
|
};
|
|
49
49
|
|
|
50
50
|
exports.deleteDynamic = deleteDynamic;
|
|
@@ -57,7 +57,7 @@ var getPraise = function getPraise(_ref6) {
|
|
|
57
57
|
count = _ref6$count === void 0 ? 5 : _ref6$count,
|
|
58
58
|
_ref6$objType = _ref6.objType,
|
|
59
59
|
objType = _ref6$objType === void 0 ? 10 : _ref6$objType;
|
|
60
|
-
return (0, _request.rget)("v1")("
|
|
60
|
+
return (0, _request.rget)("v1")("praise/get?objId=".concat(objId, "&start=&count=").concat(count, "&objType=").concat(objType));
|
|
61
61
|
};
|
|
62
62
|
|
|
63
63
|
exports.getPraise = getPraise;
|
|
@@ -75,7 +75,7 @@ var getLeastPariseInfo = function getLeastPariseInfo() {
|
|
|
75
75
|
exports.getLeastPariseInfo = getLeastPariseInfo;
|
|
76
76
|
|
|
77
77
|
var getMenu = function getMenu() {
|
|
78
|
-
return (0, _request.rget)("v2")("
|
|
78
|
+
return (0, _request.rget)("v2")("feed/FeedTabMenus");
|
|
79
79
|
};
|
|
80
80
|
|
|
81
81
|
exports.getMenu = getMenu;
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
.titaui-new-file-list-single-file__file-preview {
|
|
7
7
|
width: 180px;
|
|
8
8
|
height: 180px;
|
|
9
|
-
border-radius:
|
|
9
|
+
border-radius: 8px;
|
|
10
10
|
display: flex;
|
|
11
11
|
align-items: center;
|
|
12
12
|
justify-content: center;
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
.titaui-new-file-list-single-file__file-preview-img {
|
|
17
17
|
width: 180px;
|
|
18
18
|
height: 180px;
|
|
19
|
-
border-radius:
|
|
19
|
+
border-radius: 8px;
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
.titaui-new-file-list-single-file__file-preview-other-img {
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
width: 180px;
|
|
38
38
|
height: 180px;
|
|
39
39
|
background: rgba(20, 28, 40, 0.3);
|
|
40
|
-
border-radius:
|
|
40
|
+
border-radius: 8px;
|
|
41
41
|
display: flex;
|
|
42
42
|
align-items: center;
|
|
43
43
|
justify-content: center;
|
|
@@ -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) {
|
|
@@ -13,12 +13,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
|
|
|
13
13
|
|
|
14
14
|
function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
|
|
15
15
|
|
|
16
|
-
var MBlogBox = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n position: relative;\n\n .uploadFile__preview__list {\n padding-bottom: 10px;\n background: #ffffff;\n display: flex;\n flex-wrap: wrap;\n max-height: 300px;\n overflow-y: auto;\n\n .preview__content {\n margin-top: 10px;\n margin-right: 10px;\n border-radius:
|
|
16
|
+
var MBlogBox = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n position: relative;\n\n .uploadFile__preview__list {\n padding-bottom: 10px;\n background: #ffffff;\n display: flex;\n flex-wrap: wrap;\n max-height: 300px;\n overflow-y: auto;\n\n .preview__content {\n margin-top: 10px;\n margin-right: 10px;\n border-radius: 8px;\n }\n }\n"]))); // MblogContent
|
|
17
17
|
|
|
18
18
|
|
|
19
19
|
exports.MBlogBox = MBlogBox;
|
|
20
20
|
|
|
21
|
-
var DivMblogContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n padding: 8px 10px 6px;\n border: 1px solid #E9ECF0;\n border-radius: 4px;\n background-color: #fff;\n position: relative;\n transition: all .2s ease-in-out;\n height: 124px;\n box-sizing: border-box;\n\n &.input_default-active {\n box-shadow: 0px 0px 4px 0px rgba(40, 121, 255, 0.3);\n border-color: #2879ff;\n }\n"])));
|
|
21
|
+
var DivMblogContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n padding: 8px 10px 6px;\n border: 1px solid #E9ECF0;\n border-radius: 4px;\n background-color: #fff;\n position: relative;\n transition: all .2s ease-in-out;\n height: 124px;\n box-sizing: border-box;\n\n &.input_default-active {\n box-shadow: inset 0px 0px 4px 0px rgba(40, 121, 255, 0.3);\n border-color: #2879ff;\n }\n"])));
|
|
22
22
|
|
|
23
23
|
exports.DivMblogContent = DivMblogContent;
|
|
24
24
|
|
|
@@ -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
|
}
|