@titaui/pc 1.10.6 → 1.10.8-bete.2
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/change-okr-modal/index.js +6 -2
- package/lib/components/communication/CommunicationRecord.js +9 -9
- package/lib/components/communication/index.css +2 -1
- package/lib/components/communication/style.js +3 -3
- package/lib/components/create-okr-modal/fields/okr-parent.js +1 -5
- package/lib/components/dynamic/components/obj-status/index.css +1 -0
- package/lib/components/dynamic/dynamic-item/components/header/index.css +2 -1
- package/lib/components/dynamic/dynamic-item/dynamic-align/index.css +7 -9
- package/lib/components/dynamic/dynamic-item/dynamic-align/index.js +16 -4
- package/lib/components/dynamic/dynamic-item/dynamic-create-o/index.css +2 -2
- package/lib/components/dynamic/dynamic-item/dynamic-create-o/index.js +6 -1
- package/lib/components/dynamic/dynamic-item/dynamic-progress/index.css +0 -4
- package/lib/components/dynamic/dynamic-item/dynamic-progress/index.js +5 -5
- package/lib/components/dynamic/dynamic-item/dynamic-project/index.css +1 -1
- package/lib/components/dynamic/dynamic-item/dynamic-relative/index.css +7 -9
- package/lib/components/dynamic/dynamic-item/dynamic-relative/index.js +16 -4
- package/lib/components/dynamic/dynamic-item/dynamic-replay/index.css +2 -12
- package/lib/components/dynamic/dynamic-item/dynamic-share-to-dynamic/index.css +1 -1
- package/lib/components/dynamic/dynamic-item/index.css +2 -2
- package/lib/components/dynamic/dynamic-item/index.js +1 -1
- package/lib/components/dynamic/img/dynamic-point.svg +13 -0
- package/lib/components/file-list/components/single-file/index.js +1 -1
- package/lib/components/follower-visitor/index.js +6 -4
- package/lib/components/okr-detail/okr-list/index.js +1 -5
- package/lib/components/progress/circle-progress/index.js +1 -1
- package/lib/utils/bs-global.js +8 -8
- package/lib/utils/tools.js +11 -2
- package/package.json +1 -1
|
@@ -25,6 +25,8 @@ var _constant = require("./constant");
|
|
|
25
25
|
|
|
26
26
|
var _getLocale = require("../../utils/getLocale");
|
|
27
27
|
|
|
28
|
+
var _tools = require("../../utils/tools");
|
|
29
|
+
|
|
28
30
|
require("./index.css");
|
|
29
31
|
|
|
30
32
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
@@ -298,7 +300,6 @@ var ChangeOkr = /*#__PURE__*/function (_PureComponent) {
|
|
|
298
300
|
return /*#__PURE__*/_react["default"].createElement(_Item["default"], {
|
|
299
301
|
data: d,
|
|
300
302
|
keywords: keywords,
|
|
301
|
-
key: "".concat(d.workId),
|
|
302
303
|
active: activeItem,
|
|
303
304
|
onSelect: function onSelect(data) {
|
|
304
305
|
return _this3.handleSelect(data);
|
|
@@ -527,7 +528,7 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
527
528
|
_this4.pending = true;
|
|
528
529
|
|
|
529
530
|
if (isLoading) {
|
|
530
|
-
_this4.page
|
|
531
|
+
_this4.page++;
|
|
531
532
|
|
|
532
533
|
_this4.setState({
|
|
533
534
|
loadingMore: true
|
|
@@ -575,6 +576,8 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
575
576
|
data: isRefresh ? resData : [].concat(_toConsumableArray(data), _toConsumableArray(resData)),
|
|
576
577
|
isEnd: res.Data.nextPage === 0
|
|
577
578
|
}, function () {
|
|
579
|
+
console.log(_this4.state.data);
|
|
580
|
+
|
|
578
581
|
if (isRefresh) {
|
|
579
582
|
_this4.scollListToTop();
|
|
580
583
|
}
|
|
@@ -637,6 +640,7 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
637
640
|
|
|
638
641
|
|
|
639
642
|
data.parentType = parentType;
|
|
643
|
+
data.workName = (0, _tools.htmlToText)(data.workName);
|
|
640
644
|
|
|
641
645
|
if (selected && (selected.workId || selected.mileStoneId) !== parentId) {
|
|
642
646
|
onConfirm(data);
|
|
@@ -76,7 +76,9 @@ var CommunicationRecord = function CommunicationRecord(_ref) {
|
|
|
76
76
|
}), /*#__PURE__*/_react["default"].createElement(_style.CommunicationDetail, null, /*#__PURE__*/_react["default"].createElement("p", {
|
|
77
77
|
style: {
|
|
78
78
|
color: "#3a4247",
|
|
79
|
-
wordBreak: "break-all"
|
|
79
|
+
wordBreak: "break-all",
|
|
80
|
+
display: 'flex',
|
|
81
|
+
alignItems: 'center'
|
|
80
82
|
}
|
|
81
83
|
}, communicationTrack.commentType != 2 ? /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_ConvertUserName["default"], {
|
|
82
84
|
userName: communicationTrack.publishUser.name,
|
|
@@ -103,16 +105,14 @@ var CommunicationRecord = function CommunicationRecord(_ref) {
|
|
|
103
105
|
place: "top",
|
|
104
106
|
type: "dark",
|
|
105
107
|
effect: "solid"
|
|
106
|
-
})))),
|
|
108
|
+
})))), /*#__PURE__*/_react["default"].createElement("span", {
|
|
109
|
+
className: "".concat(prefix, "__communication-content"),
|
|
110
|
+
ref: contentRef
|
|
111
|
+
}, (0, _openData.parseTag)(communicationTrack.content.trim())), communicationTrack.attachments && /*#__PURE__*/_react["default"].createElement("div", {
|
|
107
112
|
className: "".concat(prefix, "__communication-attachments")
|
|
108
113
|
}, /*#__PURE__*/_react["default"].createElement(_fileList["default"], {
|
|
109
114
|
data: communicationTrack.attachments
|
|
110
|
-
})), /*#__PURE__*/_react["default"].createElement(
|
|
111
|
-
className: "".concat(prefix, "__communication-bottom")
|
|
112
|
-
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
113
|
-
className: "".concat(prefix, "__communication-content"),
|
|
114
|
-
ref: contentRef
|
|
115
|
-
}, (0, _openData.parseTag)(communicationTrack.content.trim())), /*#__PURE__*/_react["default"].createElement(_style.CommunicationActionbar, {
|
|
115
|
+
})), /*#__PURE__*/_react["default"].createElement(_style.CommunicationActionbar, {
|
|
116
116
|
className: "communication__actionbar"
|
|
117
117
|
}, /*#__PURE__*/_react["default"].createElement(_style.ActionbarList, null, /*#__PURE__*/_react["default"].createElement(_style.ActionbarItem, {
|
|
118
118
|
onMouseDown: function onMouseDown(event) {
|
|
@@ -141,7 +141,7 @@ var CommunicationRecord = function CommunicationRecord(_ref) {
|
|
|
141
141
|
onSubmit: function onSubmit(event) {
|
|
142
142
|
return onCommunicationRecordChange(event, "delete", index);
|
|
143
143
|
}
|
|
144
|
-
}, /*#__PURE__*/_react["default"].createElement(_style.ActionbarItem, null, (0, _getLocale.getLocale)("Mod_Delete"))))))
|
|
144
|
+
}, /*#__PURE__*/_react["default"].createElement(_style.ActionbarItem, null, (0, _getLocale.getLocale)("Mod_Delete")))))), /*#__PURE__*/_react["default"].createElement(_reactTooltip["default"], {
|
|
145
145
|
id: "praise-record",
|
|
146
146
|
className: "tt-react-tooltip",
|
|
147
147
|
place: "top",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
.titaui-communication__communication-list {
|
|
59
|
-
margin-bottom:
|
|
59
|
+
margin-bottom: 12px;
|
|
60
60
|
}
|
|
61
61
|
|
|
62
62
|
.titaui-communication__communication-attachments {
|
|
@@ -81,6 +81,7 @@
|
|
|
81
81
|
|
|
82
82
|
.titaui-communication__reply-container--show-user {
|
|
83
83
|
margin-left: 40px;
|
|
84
|
+
margin-top: -12px;
|
|
84
85
|
}
|
|
85
86
|
|
|
86
87
|
.titaui-communication__reply-default-input {
|
|
@@ -35,11 +35,11 @@ var ReplyUser = _styledComponents["default"].span(_templateObject4 || (_template
|
|
|
35
35
|
|
|
36
36
|
exports.ReplyUser = ReplyUser;
|
|
37
37
|
|
|
38
|
-
var CommunicationItem = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n margin-left: -8px;\n padding: 8px
|
|
38
|
+
var CommunicationItem = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n margin-left: -8px;\n padding: 8px;\n margin-bottom: 4px;\n font-size: 12px;\n color: #83898f;\n border-radius: 8px;\n display: flex;\n position: relative;\n\n &:hover {\n background: #F7F9FB;\n .communication__actionbar {\n display: inline-block;\n }\n }\n"])));
|
|
39
39
|
|
|
40
40
|
exports.CommunicationItem = CommunicationItem;
|
|
41
41
|
|
|
42
|
-
var CommunicationDetail = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n width: calc(100% - 35px);\n margin-top: 2px;\n margin-left: 12px;\n display: flex;\n flex-direction: column;\n\n p {\n line-height: 17px;\n }\n"])));
|
|
42
|
+
var CommunicationDetail = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n width: calc(100% - 35px);\n margin-top: 2px;\n margin-left: 12px;\n display: flex;\n flex-direction: column;\n position: relative;\n\n p {\n line-height: 17px;\n }\n"])));
|
|
43
43
|
|
|
44
44
|
exports.CommunicationDetail = CommunicationDetail;
|
|
45
45
|
|
|
@@ -47,7 +47,7 @@ var CommunicationContent = _styledComponents["default"].p(_templateObject7 || (_
|
|
|
47
47
|
|
|
48
48
|
exports.CommunicationContent = CommunicationContent;
|
|
49
49
|
|
|
50
|
-
var CommunicationActionbar = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n display: none;\n position: absolute;\n right: 0;\n
|
|
50
|
+
var CommunicationActionbar = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n display: none;\n position: absolute;\n right: 0;\n top: 0;\n"])));
|
|
51
51
|
|
|
52
52
|
exports.CommunicationActionbar = CommunicationActionbar;
|
|
53
53
|
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
display: flex;
|
|
3
3
|
justify-content: space-between;
|
|
4
4
|
align-items: center;
|
|
5
|
-
margin-bottom:
|
|
5
|
+
margin-bottom: 16px;
|
|
6
6
|
padding: 26px 0 0 24px;
|
|
7
7
|
}
|
|
8
8
|
|
|
@@ -75,6 +75,7 @@
|
|
|
75
75
|
font-size: 12px;
|
|
76
76
|
color: #89919f;
|
|
77
77
|
line-height: 18px;
|
|
78
|
+
margin-top: 4px;
|
|
78
79
|
}
|
|
79
80
|
|
|
80
81
|
.titaui-dynamic-item-header-desc-avatar:hover {
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
@charset "UTF-8";
|
|
2
|
-
|
|
3
1
|
.titaui-dynamic-align-item {
|
|
4
2
|
position: relative;
|
|
5
3
|
font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
|
|
@@ -15,6 +13,10 @@
|
|
|
15
13
|
flex-direction: column;
|
|
16
14
|
}
|
|
17
15
|
|
|
16
|
+
.titaui-dynamic-align-item__obj-other-info {
|
|
17
|
+
line-height: 18px;
|
|
18
|
+
}
|
|
19
|
+
|
|
18
20
|
.titaui-dynamic-align-item__obj-base-info {
|
|
19
21
|
display: flex;
|
|
20
22
|
align-items: center;
|
|
@@ -26,7 +28,7 @@
|
|
|
26
28
|
height: 40px;
|
|
27
29
|
min-width: 40px;
|
|
28
30
|
border-radius: 50%;
|
|
29
|
-
margin-right:
|
|
31
|
+
margin-right: 12px;
|
|
30
32
|
display: flex;
|
|
31
33
|
align-items: center;
|
|
32
34
|
justify-content: center;
|
|
@@ -69,18 +71,14 @@
|
|
|
69
71
|
font-size: 12px;
|
|
70
72
|
color: #89919f;
|
|
71
73
|
line-height: 18px;
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
.titaui-dynamic-align-item__obj-principal-user::after {
|
|
75
|
-
content: '·';
|
|
76
|
-
display: inline-block;
|
|
77
|
-
margin: 0 4px;
|
|
74
|
+
margin-right: 4px;
|
|
78
75
|
}
|
|
79
76
|
|
|
80
77
|
.titaui-dynamic-align-item__obj-cycle {
|
|
81
78
|
font-size: 12px;
|
|
82
79
|
color: #89919f;
|
|
83
80
|
line-height: 18px;
|
|
81
|
+
margin-left: 4px;
|
|
84
82
|
}
|
|
85
83
|
|
|
86
84
|
.titaui-dynamic-align-item__align-img {
|
|
@@ -33,6 +33,8 @@ var _dynamicAlignO = _interopRequireDefault(require("./img/dynamic-align-o.png")
|
|
|
33
33
|
|
|
34
34
|
var _dynamicAlignKr = _interopRequireDefault(require("./img/dynamic-align-kr.png"));
|
|
35
35
|
|
|
36
|
+
var _dynamicPoint = _interopRequireDefault(require("../../img/dynamic-point.svg"));
|
|
37
|
+
|
|
36
38
|
require("./index.css");
|
|
37
39
|
|
|
38
40
|
var _excluded = ["data"];
|
|
@@ -134,12 +136,17 @@ var DynamicAlign = function DynamicAlign(_ref) {
|
|
|
134
136
|
str: parentObjName,
|
|
135
137
|
keyWord: searchKeyWord
|
|
136
138
|
})
|
|
137
|
-
})), /*#__PURE__*/_react["default"].createElement("div",
|
|
139
|
+
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
140
|
+
className: "".concat(prefix, "__obj-other-info")
|
|
141
|
+
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
138
142
|
className: "".concat(prefix, "__obj-principal-user")
|
|
139
143
|
}, parentPrincipalUser && /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
|
|
140
144
|
id: parentPrincipalUser.userId,
|
|
141
145
|
name: parentPrincipalUser.name
|
|
142
|
-
})), /*#__PURE__*/_react["default"].createElement("
|
|
146
|
+
})), /*#__PURE__*/_react["default"].createElement("img", {
|
|
147
|
+
src: _dynamicPoint["default"],
|
|
148
|
+
alt: ""
|
|
149
|
+
}), /*#__PURE__*/_react["default"].createElement("span", {
|
|
143
150
|
className: "".concat(prefix, "__obj-cycle")
|
|
144
151
|
}, parentcycleName))))), /*#__PURE__*/_react["default"].createElement("img", {
|
|
145
152
|
className: "".concat(prefix, "__align-img"),
|
|
@@ -167,12 +174,17 @@ var DynamicAlign = function DynamicAlign(_ref) {
|
|
|
167
174
|
}, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
|
|
168
175
|
isPercent: true,
|
|
169
176
|
text: okrName
|
|
170
|
-
})), /*#__PURE__*/_react["default"].createElement("div",
|
|
177
|
+
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
178
|
+
className: "".concat(prefix, "__obj-other-info")
|
|
179
|
+
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
171
180
|
className: "".concat(prefix, "__obj-principal-user")
|
|
172
181
|
}, principalUser && /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
|
|
173
182
|
id: principalUser.userId,
|
|
174
183
|
name: principalUser.name
|
|
175
|
-
})), /*#__PURE__*/_react["default"].createElement("
|
|
184
|
+
})), /*#__PURE__*/_react["default"].createElement("img", {
|
|
185
|
+
src: _dynamicPoint["default"],
|
|
186
|
+
alt: ""
|
|
187
|
+
}), /*#__PURE__*/_react["default"].createElement("span", {
|
|
176
188
|
className: "".concat(prefix, "__obj-cycle")
|
|
177
189
|
}, cycleName)))))));
|
|
178
190
|
};
|
|
@@ -67,13 +67,13 @@
|
|
|
67
67
|
}
|
|
68
68
|
|
|
69
69
|
.titaui-dynamic-create-o-item__okr-krs {
|
|
70
|
-
margin-top:
|
|
70
|
+
margin-top: 12px;
|
|
71
71
|
}
|
|
72
72
|
|
|
73
73
|
.titaui-dynamic-create-o-item__kr {
|
|
74
74
|
display: flex;
|
|
75
75
|
align-items: center;
|
|
76
|
-
margin-top:
|
|
76
|
+
margin-top: 6px;
|
|
77
77
|
}
|
|
78
78
|
|
|
79
79
|
.titaui-dynamic-create-o-item__kr-order {
|
|
@@ -29,6 +29,8 @@ var _progress = _interopRequireDefault(require("../../../progress"));
|
|
|
29
29
|
|
|
30
30
|
var _util = require("../../util");
|
|
31
31
|
|
|
32
|
+
var _dynamicPoint = _interopRequireDefault(require("../../img/dynamic-point.svg"));
|
|
33
|
+
|
|
32
34
|
require("./index.css");
|
|
33
35
|
|
|
34
36
|
var _excluded = ["data"];
|
|
@@ -160,7 +162,10 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
|
|
|
160
162
|
className: "".concat(prefix, "__okr")
|
|
161
163
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
162
164
|
className: "".concat(prefix, "__okr-type")
|
|
163
|
-
}, okrTypeInfo.text), /*#__PURE__*/_react["default"].createElement("
|
|
165
|
+
}, okrTypeInfo.text), /*#__PURE__*/_react["default"].createElement("img", {
|
|
166
|
+
src: _dynamicPoint["default"],
|
|
167
|
+
alt: ""
|
|
168
|
+
}), /*#__PURE__*/_react["default"].createElement("span", {
|
|
164
169
|
className: "".concat(prefix, "__okr-cycle")
|
|
165
170
|
}, cycleName)), krs && krs.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
|
|
166
171
|
className: "".concat(prefix, "__okr-krs")
|
|
@@ -144,19 +144,19 @@ var DynamicProgress = function DynamicProgress(_ref) {
|
|
|
144
144
|
}, /*#__PURE__*/_react["default"].createElement(_title["default"], _extends({
|
|
145
145
|
content: obj === null || obj === void 0 ? void 0 : obj.objName,
|
|
146
146
|
onClickTitle: handleClickTitle
|
|
147
|
-
}, (0, _utils.getDynamicTitleProps)(obj)))), /*#__PURE__*/_react["default"].createElement(
|
|
148
|
-
condition: obj && obj.objType === _constant.EObjType.O
|
|
149
|
-
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
147
|
+
}, (0, _utils.getDynamicTitleProps)(obj)))), /*#__PURE__*/_react["default"].createElement("div", {
|
|
150
148
|
className: "".concat(prefix, "__status")
|
|
149
|
+
}, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
|
|
150
|
+
condition: obj && obj.objType !== _constant.EObjType.Task && obj.objType !== _constant.EObjType.Project
|
|
151
151
|
}, /*#__PURE__*/_react["default"].createElement(_objStatus["default"], {
|
|
152
152
|
oStatus: 1,
|
|
153
153
|
riskLevel: riskLevel,
|
|
154
154
|
extraClass: "".concat(prefix, "__status-text")
|
|
155
|
-
}), /*#__PURE__*/_react["default"].createElement(_percent["default"], {
|
|
155
|
+
})), /*#__PURE__*/_react["default"].createElement(_percent["default"], {
|
|
156
156
|
percent: progress,
|
|
157
157
|
growPercent: progressGrow,
|
|
158
158
|
extraClass: "".concat(prefix, "__status-percent")
|
|
159
|
-
}))
|
|
159
|
+
})), progressDescription && /*#__PURE__*/_react["default"].createElement("div", {
|
|
160
160
|
className: "".concat(prefix, "__description")
|
|
161
161
|
}, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", {
|
|
162
162
|
className: "".concat(prefix, "__description-text")
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
@charset "UTF-8";
|
|
2
|
-
|
|
3
1
|
.titaui-dynamic-relative-item {
|
|
4
2
|
position: relative;
|
|
5
3
|
font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
|
|
@@ -15,6 +13,10 @@
|
|
|
15
13
|
flex-direction: column;
|
|
16
14
|
}
|
|
17
15
|
|
|
16
|
+
.titaui-dynamic-relative-item__obj-other-info {
|
|
17
|
+
line-height: 18px;
|
|
18
|
+
}
|
|
19
|
+
|
|
18
20
|
.titaui-dynamic-relative-item__obj-base-info {
|
|
19
21
|
display: flex;
|
|
20
22
|
align-items: center;
|
|
@@ -26,7 +28,7 @@
|
|
|
26
28
|
height: 40px;
|
|
27
29
|
min-width: 40px;
|
|
28
30
|
border-radius: 50%;
|
|
29
|
-
margin-right:
|
|
31
|
+
margin-right: 12px;
|
|
30
32
|
display: flex;
|
|
31
33
|
align-items: center;
|
|
32
34
|
justify-content: center;
|
|
@@ -77,18 +79,14 @@
|
|
|
77
79
|
font-size: 12px;
|
|
78
80
|
color: #89919f;
|
|
79
81
|
line-height: 18px;
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
.titaui-dynamic-relative-item__obj-principal-user::after {
|
|
83
|
-
content: '·';
|
|
84
|
-
display: inline-block;
|
|
85
|
-
margin: 0 4px;
|
|
82
|
+
margin-right: 4px;
|
|
86
83
|
}
|
|
87
84
|
|
|
88
85
|
.titaui-dynamic-relative-item__obj-cycle {
|
|
89
86
|
font-size: 12px;
|
|
90
87
|
color: #89919f;
|
|
91
88
|
line-height: 18px;
|
|
89
|
+
margin-left: 4px;
|
|
92
90
|
}
|
|
93
91
|
|
|
94
92
|
.titaui-dynamic-relative-item__rela-img {
|
|
@@ -37,6 +37,8 @@ var _dynamicRelaProject = _interopRequireDefault(require("./img/dynamic-rela-pro
|
|
|
37
37
|
|
|
38
38
|
var _dynamicRelaTask = _interopRequireDefault(require("./img/dynamic-rela-task.png"));
|
|
39
39
|
|
|
40
|
+
var _dynamicPoint = _interopRequireDefault(require("../../img/dynamic-point.svg"));
|
|
41
|
+
|
|
40
42
|
require("./index.css");
|
|
41
43
|
|
|
42
44
|
var _excluded = ["data"];
|
|
@@ -147,12 +149,17 @@ var DynamicRelative = function DynamicRelative(_ref) {
|
|
|
147
149
|
str: relateObjName,
|
|
148
150
|
keyWord: searchKeyWord
|
|
149
151
|
})
|
|
150
|
-
})), /*#__PURE__*/_react["default"].createElement("div",
|
|
152
|
+
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
153
|
+
className: "".concat(prefix, "__obj-other-info")
|
|
154
|
+
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
151
155
|
className: "".concat(prefix, "__obj-principal-user")
|
|
152
156
|
}, rObjprincipalUser && /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
|
|
153
157
|
id: rObjprincipalUser.userId,
|
|
154
158
|
name: rObjprincipalUser.name
|
|
155
|
-
})), /*#__PURE__*/_react["default"].createElement("
|
|
159
|
+
})), /*#__PURE__*/_react["default"].createElement("img", {
|
|
160
|
+
src: _dynamicPoint["default"],
|
|
161
|
+
alt: ""
|
|
162
|
+
}), /*#__PURE__*/_react["default"].createElement("span", {
|
|
156
163
|
className: "".concat(prefix, "__obj-cycle")
|
|
157
164
|
}, rObjCycleName))))), /*#__PURE__*/_react["default"].createElement("img", {
|
|
158
165
|
className: "".concat(prefix, "__rela-img"),
|
|
@@ -180,12 +187,17 @@ var DynamicRelative = function DynamicRelative(_ref) {
|
|
|
180
187
|
}, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
|
|
181
188
|
isPercent: true,
|
|
182
189
|
text: objName
|
|
183
|
-
})), /*#__PURE__*/_react["default"].createElement("div",
|
|
190
|
+
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
191
|
+
className: "".concat(prefix, "__obj-other-info")
|
|
192
|
+
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
184
193
|
className: "".concat(prefix, "__obj-principal-user")
|
|
185
194
|
}, objPrincipalUser && /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
|
|
186
195
|
id: objPrincipalUser.userId,
|
|
187
196
|
name: objPrincipalUser.name
|
|
188
|
-
})), /*#__PURE__*/_react["default"].createElement("
|
|
197
|
+
})), /*#__PURE__*/_react["default"].createElement("img", {
|
|
198
|
+
src: _dynamicPoint["default"],
|
|
199
|
+
alt: ""
|
|
200
|
+
}), /*#__PURE__*/_react["default"].createElement("span", {
|
|
189
201
|
className: "".concat(prefix, "__obj-cycle")
|
|
190
202
|
}, objCycleName)))))));
|
|
191
203
|
};
|
|
@@ -52,25 +52,15 @@
|
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
.titaui-dynamic-reply-item__detail-block-title {
|
|
55
|
-
font-size:
|
|
55
|
+
font-size: 16px;
|
|
56
56
|
font-weight: 600;
|
|
57
57
|
color: #3f4755;
|
|
58
|
-
line-height:
|
|
58
|
+
line-height: 24px;
|
|
59
59
|
display: flex;
|
|
60
60
|
align-items: center;
|
|
61
61
|
margin-bottom: 8px;
|
|
62
62
|
}
|
|
63
63
|
|
|
64
|
-
.titaui-dynamic-reply-item__detail-block-title::before {
|
|
65
|
-
content: '';
|
|
66
|
-
display: inline-block;
|
|
67
|
-
width: 4px;
|
|
68
|
-
height: 12px;
|
|
69
|
-
background: #2879ff;
|
|
70
|
-
border-radius: 2px;
|
|
71
|
-
margin-right: 4px;
|
|
72
|
-
}
|
|
73
|
-
|
|
74
64
|
.titaui-dynamic-reply-item__detail-block-title--sub {
|
|
75
65
|
display: flex;
|
|
76
66
|
align-items: center;
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
.titaui-dynamic-item__footer {
|
|
39
|
-
margin:
|
|
39
|
+
margin: 8px 24px 0 88px;
|
|
40
40
|
height: 54px;
|
|
41
41
|
border-radius: 0px 0px 6px 6px;
|
|
42
42
|
display: flex;
|
|
@@ -116,7 +116,7 @@
|
|
|
116
116
|
}
|
|
117
117
|
|
|
118
118
|
.titaui-dynamic-item__communication {
|
|
119
|
-
padding: 8px 20px
|
|
119
|
+
padding: 8px 20px 24px 88px;
|
|
120
120
|
}
|
|
121
121
|
|
|
122
122
|
.titaui-dynamic-item__upvote-btn {
|
|
@@ -298,7 +298,7 @@ var DynamicItem = function DynamicItem(_ref) {
|
|
|
298
298
|
|
|
299
299
|
(0, _react.useEffect)(function () {
|
|
300
300
|
setTimeout(function () {
|
|
301
|
-
if (dynamicContentRef.current && dynamicContentRef.current.offsetHeight >
|
|
301
|
+
if (dynamicContentRef.current && dynamicContentRef.current.offsetHeight > 334) {
|
|
302
302
|
setContentIsOverflow(true);
|
|
303
303
|
}
|
|
304
304
|
}, 0);
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<svg width="3px" height="3px" viewBox="0 0 3 3" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
|
3
|
+
<title>椭圆形</title>
|
|
4
|
+
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
|
5
|
+
<g id="动态-OKR" transform="translate(-214.000000, -342.000000)" fill="#8791A0">
|
|
6
|
+
<g id="新建目标-负责目标" transform="translate(16.000000, 196.000000)">
|
|
7
|
+
<g id="编组-9" transform="translate(88.000000, 94.000000)">
|
|
8
|
+
<circle id="椭圆形" cx="111.5" cy="53.5" r="1.5"></circle>
|
|
9
|
+
</g>
|
|
10
|
+
</g>
|
|
11
|
+
</g>
|
|
12
|
+
</g>
|
|
13
|
+
</svg>
|
|
@@ -110,7 +110,7 @@ var SingleFile = function SingleFile(_ref) {
|
|
|
110
110
|
className: "".concat(prefix, "__file-name")
|
|
111
111
|
}, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
|
|
112
112
|
text: data.fileName,
|
|
113
|
-
maxWidth:
|
|
113
|
+
maxWidth: 120
|
|
114
114
|
})));
|
|
115
115
|
};
|
|
116
116
|
|
|
@@ -9,6 +9,8 @@ exports["default"] = void 0;
|
|
|
9
9
|
|
|
10
10
|
var _react = _interopRequireWildcard(require("react"));
|
|
11
11
|
|
|
12
|
+
var _classnames = _interopRequireDefault(require("classnames"));
|
|
13
|
+
|
|
12
14
|
var _requestApi = require("./request-api");
|
|
13
15
|
|
|
14
16
|
var _openData = require("../../utils/open-data");
|
|
@@ -19,9 +21,9 @@ var _followerVisitorFollower = _interopRequireDefault(require("./img/follower-vi
|
|
|
19
21
|
|
|
20
22
|
var _followerVisitorVisitor = _interopRequireDefault(require("./img/follower-visitor-visitor.png"));
|
|
21
23
|
|
|
22
|
-
require("
|
|
24
|
+
var _getLocale = require("../../utils/getLocale");
|
|
23
25
|
|
|
24
|
-
|
|
26
|
+
require("./index.css");
|
|
25
27
|
|
|
26
28
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
27
29
|
|
|
@@ -135,14 +137,14 @@ var FollowerVisitor = function FollowerVisitor() {
|
|
|
135
137
|
}, /*#__PURE__*/_react["default"].createElement("img", {
|
|
136
138
|
className: (0, _classnames["default"])("".concat(prefix, "__follower-icon")),
|
|
137
139
|
src: _followerVisitorFollower["default"]
|
|
138
|
-
}), renderPerson(followerInofs), getPrefixStrDesc(followerInofs),
|
|
140
|
+
}), renderPerson(followerInofs), getPrefixStrDesc(followerInofs), (0, _getLocale.getLocale)('OKR_MyO_Followedyou'))), /*#__PURE__*/_react["default"].createElement("div", {
|
|
139
141
|
className: "".concat(prefix, "__info-wrapper")
|
|
140
142
|
}, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
|
|
141
143
|
condition: visitorInofs && visitorInofs.length > 0
|
|
142
144
|
}, /*#__PURE__*/_react["default"].createElement("img", {
|
|
143
145
|
className: (0, _classnames["default"])("".concat(prefix, "__visitor-icon")),
|
|
144
146
|
src: _followerVisitorVisitor["default"]
|
|
145
|
-
}), renderPerson(visitorInofs), getPrefixStrDesc(visitorInofs),
|
|
147
|
+
}), renderPerson(visitorInofs), getPrefixStrDesc(visitorInofs), (0, _getLocale.getLocale)('OKR_MyO_Visitedyou'))), /*#__PURE__*/_react["default"].createElement("span", {
|
|
146
148
|
className: (0, _classnames["default"])("tu-icon-canceled", "".concat(prefix, "__close")),
|
|
147
149
|
onClick: handleCloseMessage
|
|
148
150
|
}));
|
|
@@ -345,11 +345,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
345
345
|
avatar: SuperiorUser.UserAvatar
|
|
346
346
|
});
|
|
347
347
|
} else {
|
|
348
|
-
setToUser({
|
|
349
|
-
name: Name,
|
|
350
|
-
userId: Id,
|
|
351
|
-
avatar: UserAvatar
|
|
352
|
-
});
|
|
348
|
+
setToUser({});
|
|
353
349
|
}
|
|
354
350
|
|
|
355
351
|
parenOkrtRef.current && parenOkrtRef.current.show(document.body, 0);
|
|
@@ -19,7 +19,7 @@ function CircleProgress(props) {
|
|
|
19
19
|
_props$color = props.color,
|
|
20
20
|
color = _props$color === void 0 ? "#419BFF" : _props$color,
|
|
21
21
|
_props$percent = props.percent,
|
|
22
|
-
percent = _props$percent === void 0 ?
|
|
22
|
+
percent = _props$percent === void 0 ? 0 : _props$percent,
|
|
23
23
|
_props$width = props.width,
|
|
24
24
|
width = _props$width === void 0 ? 8 : _props$width,
|
|
25
25
|
_props$backgroundColo = props.backgroundColor,
|
package/lib/utils/bs-global.js
CHANGED
|
@@ -95,15 +95,15 @@ exports.formatNum = formatNum;
|
|
|
95
95
|
|
|
96
96
|
var hasWebHead = function hasWebHead(webHeadName) {
|
|
97
97
|
var webHeadMap = {
|
|
98
|
-
task: 1,
|
|
99
|
-
okr: 113,
|
|
100
|
-
project: 112,
|
|
101
|
-
apply: 907,
|
|
102
|
-
kaohe: 403
|
|
98
|
+
task: '1',
|
|
99
|
+
okr: '113',
|
|
100
|
+
project: '112',
|
|
101
|
+
apply: '907',
|
|
102
|
+
kaohe: '403'
|
|
103
103
|
};
|
|
104
|
-
var webHead = window.BSGlobal.
|
|
105
|
-
return webHead.findIndex(function (
|
|
106
|
-
return
|
|
104
|
+
var webHead = window.BSGlobal.WebHead.AppHead;
|
|
105
|
+
return webHead.findIndex(function (a) {
|
|
106
|
+
return a.AppId === webHeadMap[webHeadName];
|
|
107
107
|
}) !== -1;
|
|
108
108
|
};
|
|
109
109
|
|
package/lib/utils/tools.js
CHANGED
|
@@ -10,7 +10,7 @@ exports.htmlDecodeByHtmlRegExp = htmlDecodeByHtmlRegExp;
|
|
|
10
10
|
exports.htmlDecodeByRegExp = htmlDecodeByRegExp;
|
|
11
11
|
exports.htmlEncodeByRegExp = htmlEncodeByRegExp;
|
|
12
12
|
exports.htmlEncodeToHtmlByRegExp = htmlEncodeToHtmlByRegExp;
|
|
13
|
-
exports.unHighLight = exports.openPage = void 0;
|
|
13
|
+
exports.unHighLight = exports.openPage = exports.htmlToText = void 0;
|
|
14
14
|
|
|
15
15
|
var _platform = require("./platform");
|
|
16
16
|
|
|
@@ -274,4 +274,13 @@ function htmlDecodeByHtmlRegExp(str) {
|
|
|
274
274
|
temp = temp.replace(/"/g, "\"");
|
|
275
275
|
temp = temp.replace(/<br\/>/g, "\n");
|
|
276
276
|
return temp;
|
|
277
|
-
}
|
|
277
|
+
}
|
|
278
|
+
|
|
279
|
+
var htmlToText = function htmlToText(text) {
|
|
280
|
+
var div = document.createElement("div");
|
|
281
|
+
div.innerHTML = text;
|
|
282
|
+
var newtext = div.innerText || div.textContent;
|
|
283
|
+
return newtext;
|
|
284
|
+
};
|
|
285
|
+
|
|
286
|
+
exports.htmlToText = htmlToText;
|