@titaui/pc 1.10.5 → 1.10.6

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 (100) hide show
  1. package/lib/components/communication/CommunicationRecord.js +18 -12
  2. package/lib/components/communication/index.css +48 -9
  3. package/lib/components/communication/index.js +67 -28
  4. package/lib/components/communication/style.js +7 -5
  5. package/lib/components/dynamic/components/obj-status/index.css +2 -19
  6. package/lib/components/dynamic/components/obj-status/index.js +7 -8
  7. package/lib/components/dynamic/components/obj-status/utils.js +37 -0
  8. package/lib/components/dynamic/components/percent/index.css +1 -1
  9. package/lib/components/dynamic/components/title/index.css +21 -22
  10. package/lib/components/dynamic/components/title/index.js +20 -8
  11. package/lib/components/dynamic/dynamic-item/components/header/index.css +6 -6
  12. package/lib/components/dynamic/dynamic-item/components/header/index.js +12 -6
  13. package/lib/components/dynamic/dynamic-item/dynamic-align/img/dynamic-align-kr.png +0 -0
  14. package/lib/components/dynamic/dynamic-item/dynamic-align/img/dynamic-align-o.png +0 -0
  15. package/lib/components/dynamic/dynamic-item/dynamic-align/img/dynamic-align.png +0 -0
  16. package/lib/components/dynamic/dynamic-item/dynamic-align/index.css +35 -24
  17. package/lib/components/dynamic/dynamic-item/dynamic-align/index.js +35 -29
  18. package/lib/components/dynamic/dynamic-item/dynamic-announcement/index.css +6 -34
  19. package/lib/components/dynamic/dynamic-item/dynamic-announcement/index.js +6 -32
  20. package/lib/components/dynamic/dynamic-item/dynamic-assessment/index.css +59 -19
  21. package/lib/components/dynamic/dynamic-item/dynamic-assessment/index.js +27 -19
  22. package/lib/components/dynamic/dynamic-item/dynamic-create-o/index.css +49 -38
  23. package/lib/components/dynamic/dynamic-item/dynamic-create-o/index.js +49 -44
  24. package/lib/components/dynamic/dynamic-item/dynamic-kr/index.css +41 -29
  25. package/lib/components/dynamic/dynamic-item/dynamic-kr/index.js +23 -29
  26. package/lib/components/dynamic/dynamic-item/dynamic-milestone/index.css +33 -16
  27. package/lib/components/dynamic/dynamic-item/dynamic-milestone/index.js +11 -24
  28. package/lib/components/dynamic/dynamic-item/dynamic-okrs-communication/index.css +26 -41
  29. package/lib/components/dynamic/dynamic-item/dynamic-okrs-communication/index.js +10 -29
  30. package/lib/components/dynamic/dynamic-item/dynamic-plan-communication/index.css +26 -41
  31. package/lib/components/dynamic/dynamic-item/dynamic-plan-communication/index.js +13 -30
  32. package/lib/components/dynamic/dynamic-item/dynamic-progress/index.css +16 -54
  33. package/lib/components/dynamic/dynamic-item/dynamic-progress/index.js +31 -80
  34. package/lib/components/dynamic/dynamic-item/dynamic-progress/utils.js +72 -0
  35. package/lib/components/dynamic/dynamic-item/dynamic-project/index.css +35 -28
  36. package/lib/components/dynamic/dynamic-item/dynamic-project/index.js +10 -23
  37. package/lib/components/dynamic/dynamic-item/dynamic-relative/img/dynamic-rela-kr.png +0 -0
  38. package/lib/components/dynamic/dynamic-item/dynamic-relative/img/dynamic-rela-o.png +0 -0
  39. package/lib/components/dynamic/dynamic-item/dynamic-relative/img/dynamic-rela-project.png +0 -0
  40. package/lib/components/dynamic/dynamic-item/dynamic-relative/img/dynamic-rela-task.png +0 -0
  41. package/lib/components/dynamic/dynamic-item/dynamic-relative/img/dynamic-rela.svg +23 -0
  42. package/lib/components/dynamic/dynamic-item/dynamic-relative/index.css +45 -26
  43. package/lib/components/dynamic/dynamic-item/dynamic-relative/index.js +41 -33
  44. package/lib/components/dynamic/dynamic-item/dynamic-replay/index.css +19 -6
  45. package/lib/components/dynamic/dynamic-item/dynamic-replay/index.js +11 -17
  46. package/lib/components/dynamic/dynamic-item/dynamic-report/index.css +21 -23
  47. package/lib/components/dynamic/dynamic-item/dynamic-report/index.js +31 -27
  48. package/lib/components/dynamic/dynamic-item/dynamic-reward/index.css +4 -4
  49. package/lib/components/dynamic/dynamic-item/dynamic-reward/index.js +8 -18
  50. package/lib/components/dynamic/dynamic-item/dynamic-share/index.css +6 -21
  51. package/lib/components/dynamic/dynamic-item/dynamic-share/index.js +6 -36
  52. package/lib/components/dynamic/dynamic-item/dynamic-share-to-dynamic/img/dynamic-share-course.png +0 -0
  53. package/lib/components/dynamic/dynamic-item/dynamic-share-to-dynamic/index.css +10 -18
  54. package/lib/components/dynamic/dynamic-item/dynamic-share-to-dynamic/index.js +9 -25
  55. package/lib/components/dynamic/dynamic-item/dynamic-task/index.css +34 -30
  56. package/lib/components/dynamic/dynamic-item/dynamic-task/index.js +10 -24
  57. package/lib/components/dynamic/dynamic-item/index.css +4 -4
  58. package/lib/components/dynamic/dynamic-item/index.js +38 -8
  59. package/lib/components/dynamic/util.js +41 -81
  60. package/lib/components/file-list/components/single-file/index.css +9 -8
  61. package/lib/components/float-fixed-video-modal/img/close.png +0 -0
  62. package/lib/components/float-fixed-video-modal/img/full.svg +21 -0
  63. package/lib/components/float-fixed-video-modal/img/muted.svg +21 -0
  64. package/lib/components/float-fixed-video-modal/img/pause.svg +21 -0
  65. package/lib/components/float-fixed-video-modal/img/play.svg +22 -0
  66. package/lib/components/float-fixed-video-modal/img/small.svg +22 -0
  67. package/lib/components/float-fixed-video-modal/img/smallFaQi.png +0 -0
  68. package/lib/components/float-fixed-video-modal/img/volume.svg +21 -0
  69. package/lib/components/float-fixed-video-modal/index.css +243 -0
  70. package/lib/components/float-fixed-video-modal/index.js +334 -0
  71. package/lib/components/float-fixed-video-modal/utils.js +25 -0
  72. package/lib/components/mblog/context.js +3 -1
  73. package/lib/components/mblog/index.css +7 -0
  74. package/lib/components/mblog/index.js +31 -4
  75. package/lib/components/mblog/style.js +4 -4
  76. package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/e-empty.js +7 -4
  77. package/lib/components/progress/circle-progress/index.css +1 -0
  78. package/lib/components/progress/circle-progress/index.js +7 -2
  79. package/lib/components/search-key-handle/index.js +7 -2
  80. package/lib/components/video-modal/img/bigFaqi.png +0 -0
  81. package/lib/components/video-modal/img/muted.svg +16 -0
  82. package/lib/components/video-modal/img/not-muted.svg +16 -0
  83. package/lib/components/video-modal/img/pause.svg +17 -0
  84. package/lib/components/video-modal/img/play.png +0 -0
  85. package/lib/components/video-modal/img/play.svg +16 -0
  86. package/lib/components/video-modal/img/small.svg +22 -0
  87. package/lib/components/video-modal/index.css +213 -0
  88. package/lib/components/video-modal/index.js +322 -0
  89. package/lib/components/video-modal/utils.js +25 -0
  90. package/lib/index.js +16 -0
  91. package/package.json +1 -1
  92. package/lib/components/dynamic/dynamic-item/dynamic-align/img/dynamic-align.svg +0 -22
  93. package/lib/components/dynamic/dynamic-item/dynamic-align/img/dynamic-relative.svg +0 -22
  94. package/lib/components/dynamic/dynamic-item/dynamic-milestone/img/dynamic-milestone.png +0 -0
  95. package/lib/components/dynamic/dynamic-item/dynamic-okrs-communication/img/okrs-icon.png +0 -0
  96. package/lib/components/dynamic/dynamic-item/dynamic-plan-communication/img/plan-icon.png +0 -0
  97. package/lib/components/dynamic/dynamic-item/dynamic-project/img/dynamic-project.png +0 -0
  98. package/lib/components/dynamic/dynamic-item/dynamic-relative/img/dynamic-relative.svg +0 -22
  99. package/lib/components/dynamic/dynamic-item/dynamic-share-to-dynamic/img/guanlian.png +0 -0
  100. package/lib/components/dynamic/dynamic-item/dynamic-task/img/task-icon.png +0 -0
@@ -9,26 +9,18 @@ exports["default"] = void 0;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
12
- var _classnames = _interopRequireDefault(require("classnames"));
13
-
14
- var _dynamicLeftQuoto = _interopRequireDefault(require("../../img/dynamic-left-quoto.svg"));
15
-
16
- var _dynamicRightQuoto = _interopRequireDefault(require("../../img/dynamic-right-quoto.svg"));
17
-
18
12
  var _fileList = _interopRequireDefault(require("../../../file-list"));
19
13
 
20
14
  var _context = require("../../context");
21
15
 
22
16
  var _header = _interopRequireDefault(require("../components/header"));
23
17
 
24
- var _dangerousHtml = _interopRequireDefault(require("../../components/dangerous-html"));
25
-
26
- var _util = require("../../util");
27
-
28
18
  var _tools = require("../../../../utils/tools");
29
19
 
30
20
  var _getLocale = require("../../../../utils/getLocale");
31
21
 
22
+ var _openData = require("../../../../utils/open-data");
23
+
32
24
  require("./index.css");
33
25
 
34
26
  var _excluded = ["data", "dynamicShareIsShowToping", "hasDynamicOpereateAuth"];
@@ -39,8 +31,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
39
31
 
40
32
  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; }
41
33
 
42
- function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
43
-
44
34
  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); }
45
35
 
46
36
  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; }
@@ -61,21 +51,11 @@ var DynamicShare = function DynamicShare(_ref) {
61
51
  searchKeyWord = _useContext.searchKeyWord;
62
52
 
63
53
  var contentRef = (0, _react.useRef)();
64
-
65
- var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(data.feedType),
66
- feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
67
- feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
68
-
69
54
  var isPublisher = data.publishUser.userId === window.BSGlobal.loginUserInfo.Id;
70
55
  var renderDesc = (0, _react.useMemo)(function () {
71
- return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
56
+ return /*#__PURE__*/_react["default"].createElement("span", {
72
57
  className: "".concat(prefix, "__operate-desc")
73
- }, (0, _getLocale.getLocale)("Mod_postedshare")), /*#__PURE__*/_react["default"].createElement("span", {
74
- className: "".concat(prefix, "-desc-operate-type"),
75
- style: {
76
- background: feedTypeColor
77
- }
78
- }, feedTypeText));
58
+ }, (0, _getLocale.getLocale)("Mod_postedshare"));
79
59
  }, []);
80
60
  (0, _react.useEffect)(function () {
81
61
  (0, _tools.highLightWord)({
@@ -93,19 +73,9 @@ var DynamicShare = function DynamicShare(_ref) {
93
73
  user: data.publishUser
94
74
  }, restProps)), /*#__PURE__*/_react["default"].createElement("div", {
95
75
  className: "".concat(prefix, "__content")
96
- }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", _defineProperty({
97
- className: (0, _classnames["default"])("".concat(prefix, "__content-quoto"), "".concat(prefix, "__content-quoto--left")),
98
- alt: "",
99
- src: _dynamicLeftQuoto["default"]
100
- }, "alt", "left"))), /*#__PURE__*/_react["default"].createElement("div", {
76
+ }, /*#__PURE__*/_react["default"].createElement("div", {
101
77
  ref: contentRef
102
- }, /*#__PURE__*/_react["default"].createElement(_dangerousHtml["default"], {
103
- htmlText: data.content
104
- }), /*#__PURE__*/_react["default"].createElement("img", _defineProperty({
105
- className: (0, _classnames["default"])("".concat(prefix, "__content-quoto"), "".concat(prefix, "__content-quoto--right")),
106
- alt: "",
107
- src: _dynamicRightQuoto["default"]
108
- }, "alt", "right")))), data.attachments && /*#__PURE__*/_react["default"].createElement("div", {
78
+ }, (0, _openData.parseTag)(data.content))), data.attachments && /*#__PURE__*/_react["default"].createElement("div", {
109
79
  className: "".concat(prefix, "__files")
110
80
  }, /*#__PURE__*/_react["default"].createElement(_fileList["default"], {
111
81
  data: data.attachments
@@ -1,15 +1,13 @@
1
1
  .titaui-dynamic-share-to-dynamic__operate-desc {
2
2
  margin-left: 4px;
3
- font-size: 14px;
3
+ font-size: 16px;
4
4
  font-weight: normal;
5
5
  color: #89919f;
6
- line-height: 22px;
6
+ line-height: 24px;
7
7
  }
8
8
 
9
9
  .titaui-dynamic-share-to-dynamic__content {
10
- height: 24px;
11
10
  display: flex;
12
- padding: 0 50px;
13
11
  box-sizing: border-box;
14
12
  margin-top: 16px;
15
13
  font-size: 14px;
@@ -20,14 +18,7 @@
20
18
  overflow: hidden;
21
19
  text-overflow: ellipsis;
22
20
  white-space: nowrap;
23
- }
24
-
25
- .titaui-dynamic-share-to-dynamic__content-quoto {
26
- vertical-align: text-top;
27
- margin-right: 6px;
28
- width: 12px;
29
- width: 12px;
30
- height: 12px;
21
+ margin-left: 88px;
31
22
  }
32
23
 
33
24
  .titaui-dynamic-share-to-dynamic__content-title {
@@ -37,7 +28,8 @@
37
28
  white-space: nowrap;
38
29
  }
39
30
 
40
- .titaui-dynamic-share-to-dynamic__content-title a, .titaui-dynamic-share-to-dynamic__content-title b {
31
+ .titaui-dynamic-share-to-dynamic__content-title a,
32
+ .titaui-dynamic-share-to-dynamic__content-title b {
41
33
  color: #2879ff;
42
34
  }
43
35
 
@@ -49,16 +41,16 @@
49
41
  background: rgba(240, 244, 250, 0.5);
50
42
  padding: 12px;
51
43
  box-sizing: border-box;
52
- margin-left: 68px;
44
+ margin-left: 88px;
53
45
  margin-top: 12px;
54
46
  }
55
47
 
56
48
  .titaui-dynamic-share-to-dynamic__share-img {
57
49
  width: 80px;
58
50
  height: 80px;
59
- border-radius: 8px;
51
+ border-radius: 12px;
60
52
  margin-right: 12px;
61
- background-color: #E9F1FF;
53
+ background-color: #ffffff;
62
54
  box-sizing: border-box;
63
55
  padding: 16px;
64
56
  }
@@ -75,10 +67,10 @@
75
67
  .titaui-dynamic-share-to-dynamic__share-right-title {
76
68
  display: block;
77
69
  font-size: 16px;
78
- font-weight: 700;
70
+ font-weight: 600;
79
71
  color: #141c28;
80
72
  line-height: 24px;
81
- margin-bottom: 8px;
73
+ margin-bottom: 6px;
82
74
  }
83
75
 
84
76
  .titaui-dynamic-share-to-dynamic__share-right-content {
@@ -11,21 +11,17 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _classnames = _interopRequireDefault(require("classnames"));
13
13
 
14
- var _dynamicLeftQuoto = _interopRequireDefault(require("../../img/dynamic-left-quoto.svg"));
15
-
16
14
  var _context = require("../../context");
17
15
 
18
16
  var _header = _interopRequireDefault(require("../components/header"));
19
17
 
20
18
  var _dangerousHtml = _interopRequireDefault(require("../../components/dangerous-html"));
21
19
 
22
- var _util = require("../../util");
23
-
24
20
  var _tools = require("../../../../utils/tools");
25
21
 
26
22
  var _bsGlobal = require("../../../../utils/bs-global");
27
23
 
28
- var _guanlian = _interopRequireDefault(require("./img/guanlian.png"));
24
+ var _dynamicShareCourse = _interopRequireDefault(require("./img/dynamic-share-course.png"));
29
25
 
30
26
  var _getLocale = require("../../../../utils/getLocale");
31
27
 
@@ -70,11 +66,6 @@ var DynamicShare = function DynamicShare(_ref) {
70
66
  searchKeyWord = _useContext.searchKeyWord;
71
67
 
72
68
  var contentRef = (0, _react.useRef)();
73
-
74
- var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(data.feedType),
75
- feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
76
- feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
77
-
78
69
  var isPublisher = data.publishUser.userId === window.BSGlobal.loginUserInfo.Id;
79
70
 
80
71
  var _useState = (0, _react.useState)(),
@@ -82,27 +73,22 @@ var DynamicShare = function DynamicShare(_ref) {
82
73
  title = _useState2[0],
83
74
  setTitle = _useState2[1];
84
75
 
85
- var _useState3 = (0, _react.useState)(),
76
+ var _useState3 = (0, _react.useState)(""),
86
77
  _useState4 = _slicedToArray(_useState3, 2),
87
78
  content = _useState4[0],
88
79
  setContent = _useState4[1];
89
80
 
90
81
  var renderDesc = (0, _react.useMemo)(function () {
91
- return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
82
+ return /*#__PURE__*/_react["default"].createElement("span", {
92
83
  className: "".concat(prefix, "__operate-desc")
93
- }, (0, _getLocale.getLocale)("Feed_sharedexcelle")), /*#__PURE__*/_react["default"].createElement("span", {
94
- className: "".concat(prefix, "-desc-operate-type"),
95
- style: {
96
- background: feedTypeColor
97
- }
98
- }));
84
+ }, (0, _getLocale.getLocale)("Feed_sharedexcelle"));
99
85
  }, []);
100
86
 
101
87
  var htmlToText = function htmlToText(text) {
102
88
  var div = document.createElement("div");
103
89
  div.innerHTML = text;
104
- text = div.innerText || div.textContent;
105
- return text;
90
+ var result = div.innerText || div.textContent || "";
91
+ return result;
106
92
  };
107
93
 
108
94
  var handleClick = function handleClick() {
@@ -131,10 +117,7 @@ var DynamicShare = function DynamicShare(_ref) {
131
117
  user: data.publishUser
132
118
  }, restProps)), /*#__PURE__*/_react["default"].createElement("div", {
133
119
  className: "".concat(prefix, "__content")
134
- }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", {
135
- className: (0, _classnames["default"])("".concat(prefix, "__content-quoto"), "".concat(prefix, "__content-quoto--left")),
136
- src: _dynamicLeftQuoto["default"]
137
- })), /*#__PURE__*/_react["default"].createElement("div", {
120
+ }, /*#__PURE__*/_react["default"].createElement("div", {
138
121
  ref: contentRef,
139
122
  className: "".concat(prefix, "__content-title")
140
123
  }, /*#__PURE__*/_react["default"].createElement(_dangerousHtml["default"], {
@@ -145,7 +128,8 @@ var DynamicShare = function DynamicShare(_ref) {
145
128
  }, /*#__PURE__*/_react["default"].createElement("div", {
146
129
  className: (0, _classnames["default"])("".concat(prefix, "__share-img"))
147
130
  }, /*#__PURE__*/_react["default"].createElement("img", {
148
- src: _guanlian["default"]
131
+ src: _dynamicShareCourse["default"],
132
+ alt: ""
149
133
  })), /*#__PURE__*/_react["default"].createElement("div", {
150
134
  className: (0, _classnames["default"])("".concat(prefix, "__share-right"))
151
135
  }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -8,30 +8,27 @@
8
8
  }
9
9
 
10
10
  .titaui-dynamic-task-item__content {
11
- height: 78px;
11
+ height: 64px;
12
+ background: rgba(40, 121, 255, 0.06);
13
+ border-radius: 12px;
12
14
  display: flex;
13
15
  align-items: center;
14
- border-radius: 8px;
15
- background: rgba(240, 244, 250, 0.5);
16
- padding: 16px 12px 16px 16px;
16
+ padding: 8px 12px;
17
17
  box-sizing: border-box;
18
- margin-left: 69px;
19
- }
20
-
21
- .titaui-dynamic-task-item__content-img {
22
- display: inline-block;
23
- width: 36px;
24
- border-radius: 6px;
18
+ margin-left: 88px;
25
19
  }
26
20
 
27
21
  .titaui-dynamic-task-item__content-info {
28
22
  flex: 1;
29
23
  display: flex;
30
24
  flex-direction: column;
31
- margin-left: 16px;
32
25
  overflow: hidden;
33
26
  }
34
27
 
28
+ .titaui-dynamic-task-item__content-status-icon {
29
+ font-size: 14px;
30
+ }
31
+
35
32
  .titaui-dynamic-task-item__content-status-and-time-range {
36
33
  display: flex;
37
34
  align-items: center;
@@ -59,10 +56,30 @@
59
56
  font-weight: 600;
60
57
  color: #3f4755;
61
58
  line-height: 24px;
59
+ display: flex;
60
+ margin-bottom: 4px;
61
+ align-items: center;
62
+ }
63
+
64
+ .titaui-dynamic-task-item__content-title-type {
65
+ border-radius: 18px;
66
+ background: rgba(92, 142, 255, 0.5);
67
+ color: #ffffff;
68
+ margin-right: 8px;
69
+ font-size: 14px;
70
+ line-height: 20px;
71
+ display: flex;
72
+ align-items: center;
73
+ justify-content: center;
74
+ padding: 0 6px;
75
+ font-weight: 400;
76
+ height: 20px;
62
77
  }
63
78
 
64
79
  .titaui-dynamic-task-item__content-title-text {
80
+ flex: 1;
65
81
  cursor: pointer;
82
+ overflow: hidden;
66
83
  }
67
84
 
68
85
  .titaui-dynamic-task-item__content-title-text:hover {
@@ -76,9 +93,9 @@
76
93
  }
77
94
 
78
95
  .titaui-dynamic-task-item__object-name {
79
- font-size: 14px;
96
+ font-size: 16px;
80
97
  color: #2879ff;
81
- line-height: 22px;
98
+ line-height: 24px;
82
99
  margin: 0 4px;
83
100
  overflow: hidden;
84
101
  }
@@ -89,27 +106,14 @@
89
106
  }
90
107
 
91
108
  .titaui-dynamic-task-item__operate-desc {
92
- font-size: 14px;
109
+ font-size: 16px;
93
110
  font-weight: 400;
94
111
  color: #89919f;
95
- line-height: 22px;
96
- margin: 0 8px 0 4px;
112
+ line-height: 24px;
113
+ margin-left: 4px;
97
114
  overflow: hidden;
98
115
  }
99
116
 
100
117
  .titaui-dynamic-task-item__operate-desc-wrapper {
101
118
  display: flex;
102
119
  }
103
-
104
- .titaui-dynamic-task-item-desc-operate-type {
105
- display: inline-flex;
106
- align-items: center;
107
- justify-content: center;
108
- padding: 0 6px;
109
- height: 18px;
110
- min-width: 40px;
111
- border-radius: 10px 10px 10px 2px;
112
- font-size: 12px;
113
- color: #ffffff;
114
- line-height: 18px;
115
- }
@@ -15,8 +15,6 @@ var _header = _interopRequireDefault(require("../components/header"));
15
15
 
16
16
  var _constant = require("./constant");
17
17
 
18
- var _taskIcon = _interopRequireDefault(require("./img/task-icon.png"));
19
-
20
18
  var _constant2 = require("../../constant");
21
19
 
22
20
  var _context = require("../../context");
@@ -25,8 +23,6 @@ var _searchKeyHandle = _interopRequireDefault(require("../../../search-key-handl
25
23
 
26
24
  var _tooltip = _interopRequireDefault(require("../../../tooltip"));
27
25
 
28
- var _util = require("../../util");
29
-
30
26
  var _drawerManager = _interopRequireDefault(require("../../../drawer-manager"));
31
27
 
32
28
  var _getLocale = require("../../../../utils/getLocale");
@@ -59,7 +55,6 @@ var DynamicTask = function DynamicTask(_ref) {
59
55
  taskName = data.taskName,
60
56
  startDate = data.startDate,
61
57
  deadline = data.deadline,
62
- feedType = data.feedType,
63
58
  obj = data.obj,
64
59
  principalUser = data.principalUser,
65
60
  workId = data.workId;
@@ -67,10 +62,6 @@ var DynamicTask = function DynamicTask(_ref) {
67
62
  var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
68
63
  searchKeyWord = _useContext.searchKeyWord;
69
64
 
70
- var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(feedType),
71
- feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
72
- feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
73
-
74
65
  var handleClickTaskTitle = function handleClickTaskTitle() {
75
66
  window.Talent.app.vent.trigger("global-pull-screen", data.taskId, "task");
76
67
  };
@@ -132,14 +123,9 @@ var DynamicTask = function DynamicTask(_ref) {
132
123
  })), (0, _getLocale.getLocale)("Mod_stask"));
133
124
  }
134
125
 
135
- return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
126
+ return /*#__PURE__*/_react["default"].createElement("span", {
136
127
  className: "".concat(prefix, "__operate-desc")
137
- }, dom), /*#__PURE__*/_react["default"].createElement("span", {
138
- className: "".concat(prefix, "-desc-operate-type"),
139
- style: {
140
- background: feedTypeColor
141
- }
142
- }, feedTypeText));
128
+ }, dom);
143
129
  }, []);
144
130
  return /*#__PURE__*/_react["default"].createElement("div", {
145
131
  className: prefix
@@ -150,26 +136,26 @@ var DynamicTask = function DynamicTask(_ref) {
150
136
  user: principalUser
151
137
  })), /*#__PURE__*/_react["default"].createElement("div", {
152
138
  className: "".concat(prefix, "__content")
153
- }, /*#__PURE__*/_react["default"].createElement("img", {
154
- className: "".concat(prefix, "__content-img"),
155
- src: _taskIcon["default"],
156
- alt: ""
157
- }), /*#__PURE__*/_react["default"].createElement("div", {
139
+ }, /*#__PURE__*/_react["default"].createElement("div", {
158
140
  className: "".concat(prefix, "__content-info")
159
141
  }, /*#__PURE__*/_react["default"].createElement("div", {
160
142
  className: "".concat(prefix, "__content-title")
143
+ }, /*#__PURE__*/_react["default"].createElement("span", {
144
+ className: "".concat(prefix, "__content-title-type")
145
+ }, (0, _getLocale.getLocale)("Feed_Tab_Title_Task")), /*#__PURE__*/_react["default"].createElement("span", {
146
+ className: "".concat(prefix, "__content-title-text")
161
147
  }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
162
148
  isPercent: true,
163
149
  text: renderName,
164
150
  minusWidth: 30
165
- })), /*#__PURE__*/_react["default"].createElement("div", {
151
+ }))), /*#__PURE__*/_react["default"].createElement("div", {
166
152
  className: "".concat(prefix, "__content-status-and-time-range")
167
153
  }, /*#__PURE__*/_react["default"].createElement("i", {
168
- className: (0, _classnames["default"])(_constant2.EStatusStatus2ClassType[status])
154
+ className: (0, _classnames["default"])(_constant2.EStatusStatus2ClassType[status], "".concat(prefix, "__content-status-icon"))
169
155
  }), /*#__PURE__*/_react["default"].createElement("span", {
170
156
  className: "".concat(prefix, "__content-status-text")
171
157
  }, (0, _constant.getEStatusClass2StatusTypeText)()[status]), /*#__PURE__*/_react["default"].createElement("i", {
172
- className: (0, _classnames["default"])("tu-icon-deferred")
158
+ className: (0, _classnames["default"])("tu-icon-deferred", "".concat(prefix, "__content-status-icon"))
173
159
  }), /*#__PURE__*/_react["default"].createElement("span", {
174
160
  className: "".concat(prefix, "__content-time-range")
175
161
  }, startDate, "-", deadline)))));
@@ -10,7 +10,7 @@
10
10
  .titaui-dynamic-item__content {
11
11
  position: relative;
12
12
  overflow: hidden;
13
- margin-right: 20px;
13
+ margin-right: 24px;
14
14
  }
15
15
 
16
16
  .titaui-dynamic-item__content-show-more {
@@ -36,7 +36,7 @@
36
36
  }
37
37
 
38
38
  .titaui-dynamic-item__footer {
39
- margin: 12px 20px 0 68px;
39
+ margin: 12px 24px 0 88px;
40
40
  height: 54px;
41
41
  border-radius: 0px 0px 6px 6px;
42
42
  display: flex;
@@ -44,6 +44,7 @@
44
44
  align-items: center;
45
45
  color: #89919f;
46
46
  position: relative;
47
+ border-bottom: 1px solid #F0F4FA;
47
48
  }
48
49
 
49
50
  .titaui-dynamic-item__footer-left {
@@ -115,8 +116,7 @@
115
116
  }
116
117
 
117
118
  .titaui-dynamic-item__communication {
118
- padding: 12px 20px 20px 68px;
119
- box-shadow: inset 0px 12px 12px -12px rgba(127, 145, 180, 0.14);
119
+ padding: 8px 20px 20px 88px;
120
120
  }
121
121
 
122
122
  .titaui-dynamic-item__upvote-btn {
@@ -274,11 +274,38 @@ var DynamicItem = function DynamicItem(_ref) {
274
274
  return null;
275
275
  }
276
276
  }, [data]);
277
- (0, _react.useEffect)(function () {
278
- if (dynamicContentRef.current && dynamicContentRef.current.offsetHeight > 288) {
279
- setContentIsOverflow(true);
277
+
278
+ var renderUpvoteCount = function renderUpvoteCount(type, count) {
279
+ if (count === 0) {
280
+ return "";
280
281
  }
281
- }, []);
282
+
283
+ return count || type;
284
+ }; // const handlePayReward = () => {
285
+ // const data = {
286
+ // multi: false,
287
+ // toUserInfo: publishUser,
288
+ // objId: feedId,
289
+ // objType: feedType,
290
+ // };
291
+ // if (window.util) {
292
+ // window.util.rewardGetFile((myReward) => {
293
+ // myReward.renderPayReward(data);
294
+ // });
295
+ // }
296
+ // };
297
+
298
+
299
+ (0, _react.useEffect)(function () {
300
+ setTimeout(function () {
301
+ if (dynamicContentRef.current && dynamicContentRef.current.offsetHeight > 288) {
302
+ setContentIsOverflow(true);
303
+ }
304
+ }, 0);
305
+ }, [data]);
306
+ (0, _react.useEffect)(function () {
307
+ setShowComment(feedComments.total > 0);
308
+ }, [feedComments]);
282
309
  return /*#__PURE__*/_react["default"].createElement("div", {
283
310
  className: prefix
284
311
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -295,7 +322,7 @@ var DynamicItem = function DynamicItem(_ref) {
295
322
  }, (0, _getLocale.getLocale)("Tasks_Tab_MyS_Butt_Seemoral"), /*#__PURE__*/_react["default"].createElement("i", {
296
323
  className: (0, _classnames["default"])("tu-icon-arrow-down", "".concat(prefix, "__icon"))
297
324
  })))), /*#__PURE__*/_react["default"].createElement("div", {
298
- className: "".concat(prefix, "__footer")
325
+ className: (0, _classnames["default"])("".concat(prefix, "__footer"))
299
326
  }, /*#__PURE__*/_react["default"].createElement("div", {
300
327
  className: "".concat(prefix, "__footer-left")
301
328
  }, praiseData.map(function (item, index) {
@@ -346,7 +373,8 @@ var DynamicItem = function DynamicItem(_ref) {
346
373
  marginLeft: 30
347
374
  },
348
375
  buttonType: "tu-icon-tyle-column",
349
- customUpvoteBtnCls: "".concat(prefix, "__upvote-btn")
376
+ customUpvoteBtnCls: "".concat(prefix, "__upvote-btn"),
377
+ renderCount: renderUpvoteCount
350
378
  }), /*#__PURE__*/_react["default"].createElement(_upvoteListModal["default"], {
351
379
  feedId: feedId,
352
380
  visible: upvoteModalVisible,
@@ -356,7 +384,7 @@ var DynamicItem = function DynamicItem(_ref) {
356
384
  }))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
357
385
  condition: showComment
358
386
  }, /*#__PURE__*/_react["default"].createElement("div", {
359
- className: "".concat(prefix, "__communication")
387
+ className: (0, _classnames["default"])("".concat(prefix, "__communication"))
360
388
  }, /*#__PURE__*/_react["default"].createElement(_communication["default"], {
361
389
  feedId: feedId,
362
390
  commentCount: 3,
@@ -365,7 +393,9 @@ var DynamicItem = function DynamicItem(_ref) {
365
393
  autoFocus: feedComments.total === 0,
366
394
  usePropsComment: usePropsComment,
367
395
  communication: feedComments.comments,
368
- totalCommunicationNum: feedComments.total
396
+ totalCommunicationNum: feedComments.total,
397
+ showUser: true,
398
+ showDefaultInput: true
369
399
  }))));
370
400
  };
371
401