@titaui/pc 1.10.59 → 1.10.61
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/dynamic/components/obj-status/utils.js +1 -1
- package/lib/components/dynamic/dynamic-item/components/feed-operate/index.css +7 -2
- package/lib/components/dynamic/dynamic-item/components/feed-operate/index.js +27 -4
- package/lib/components/nav-top/request.apis.js +1 -1
- package/package.json +1 -1
|
@@ -9,7 +9,7 @@ var _getLocale = require("../../../../utils/getLocale");
|
|
|
9
9
|
|
|
10
10
|
var getStatusTextMapping = function getStatusTextMapping(status) {
|
|
11
11
|
var statusMapText = {
|
|
12
|
-
delay: (0, _getLocale.getLocale)("
|
|
12
|
+
delay: (0, _getLocale.getLocale)("OKR_MyO_Postoned"),
|
|
13
13
|
normal: (0, _getLocale.getLocale)("Pro_page_Mil_Normal"),
|
|
14
14
|
risk: (0, _getLocale.getLocale)("Pro_page_Mil_Existingrisk"),
|
|
15
15
|
end: (0, _getLocale.getLocale)("OKR_MyO_E_From_Completed")
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
display: flex;
|
|
7
7
|
font-size: 12px;
|
|
8
8
|
line-height: 18px;
|
|
9
|
-
margin-top:
|
|
9
|
+
margin-top: 8px;
|
|
10
10
|
position: relative;
|
|
11
11
|
}
|
|
12
12
|
|
|
@@ -41,6 +41,11 @@
|
|
|
41
41
|
cursor: pointer;
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
+
.titaui-dynamic-operation__operate-item-left {
|
|
45
|
+
display: inline-flex;
|
|
46
|
+
margin-right: 12px;
|
|
47
|
+
}
|
|
48
|
+
|
|
44
49
|
.titaui-dynamic-operation__operate-item-right {
|
|
45
50
|
flex: 1;
|
|
46
51
|
}
|
|
@@ -57,7 +62,7 @@
|
|
|
57
62
|
|
|
58
63
|
.titaui-dynamic-operation__operate-user {
|
|
59
64
|
color: #3f4755;
|
|
60
|
-
margin:
|
|
65
|
+
margin-right: 8px;
|
|
61
66
|
}
|
|
62
67
|
|
|
63
68
|
.titaui-dynamic-operation__operate-content {
|
|
@@ -46,7 +46,8 @@ var DynamicOperation = function DynamicOperation(_ref) {
|
|
|
46
46
|
});
|
|
47
47
|
} else if (feedType === _constant.EFeedType.O) {
|
|
48
48
|
_drawerManager["default"].open("okrDetail", {
|
|
49
|
-
okrId: okrId
|
|
49
|
+
okrId: okrId,
|
|
50
|
+
activeTabKey: "cooperation"
|
|
50
51
|
});
|
|
51
52
|
} else if (feedType === _constant.EFeedType.Task) {
|
|
52
53
|
window.Talent.app.vent.trigger("global-pull-screen", taskId, "task");
|
|
@@ -69,7 +70,7 @@ var DynamicOperation = function DynamicOperation(_ref) {
|
|
|
69
70
|
var createTime = comment.createTime,
|
|
70
71
|
content = comment.content; // 超过三个操作记录
|
|
71
72
|
|
|
72
|
-
if (index < 2 || index === 2 && feedOperations.total === 3) {
|
|
73
|
+
if (index > 0 && index < 2 || index === 2 && feedOperations.total === 3) {
|
|
73
74
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
74
75
|
className: "".concat(prefix, "__operate-item")
|
|
75
76
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -96,7 +97,29 @@ var DynamicOperation = function DynamicOperation(_ref) {
|
|
|
96
97
|
}
|
|
97
98
|
|
|
98
99
|
if (index === 2 && feedOperations.total > 3) {
|
|
99
|
-
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
100
|
+
return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
|
|
101
|
+
className: "".concat(prefix, "__operate-item")
|
|
102
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
103
|
+
className: "".concat(prefix, "__operate-item-left")
|
|
104
|
+
}, /*#__PURE__*/_react["default"].createElement("img", {
|
|
105
|
+
className: "".concat(prefix, "__operate-icon"),
|
|
106
|
+
src: _dynamicOperate["default"],
|
|
107
|
+
alt: ""
|
|
108
|
+
}), /*#__PURE__*/_react["default"].createElement("span", {
|
|
109
|
+
className: "".concat(prefix, "__operate-time")
|
|
110
|
+
}, createTime)), /*#__PURE__*/_react["default"].createElement("div", {
|
|
111
|
+
className: "".concat(prefix, "__operate-item-right")
|
|
112
|
+
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
113
|
+
className: "".concat(prefix, "__operate-user")
|
|
114
|
+
}, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
|
|
115
|
+
maxWidth: 98,
|
|
116
|
+
text: /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
|
|
117
|
+
name: comment.publishUser.name,
|
|
118
|
+
id: comment.publishUser.userId
|
|
119
|
+
})
|
|
120
|
+
})), /*#__PURE__*/_react["default"].createElement("span", {
|
|
121
|
+
className: "".concat(prefix, "__operate-content")
|
|
122
|
+
}, content))), /*#__PURE__*/_react["default"].createElement("div", {
|
|
100
123
|
className: "".concat(prefix, "__operate-item")
|
|
101
124
|
}, /*#__PURE__*/_react["default"].createElement("img", {
|
|
102
125
|
className: "".concat(prefix, "__operate-icon"),
|
|
@@ -109,7 +132,7 @@ var DynamicOperation = function DynamicOperation(_ref) {
|
|
|
109
132
|
className: "".concat(prefix, "__operate-item-total-num")
|
|
110
133
|
}, feedOperations.total), /*#__PURE__*/_react["default"].createElement("i", {
|
|
111
134
|
className: (0, _classnames["default"])("tu-icon-APP-xi")
|
|
112
|
-
})));
|
|
135
|
+
}))));
|
|
113
136
|
}
|
|
114
137
|
|
|
115
138
|
return null;
|
|
@@ -36,7 +36,7 @@ var getData = function getData(url, saveData) {
|
|
|
36
36
|
exports.getData = getData;
|
|
37
37
|
|
|
38
38
|
var getReplys = function getReplys(pageNum) {
|
|
39
|
-
return (0, _request.rget)("v1")("comment/messages?page_num=".concat(pageNum, "&page_size=10&status=1"));
|
|
39
|
+
return (0, _request.rget)("v1")("comment/messages?page_num=".concat(pageNum, "&page_size=10&status=1&clear=0"));
|
|
40
40
|
};
|
|
41
41
|
|
|
42
42
|
exports.getReplys = getReplys;
|