@titaui/pc 1.7.90 → 1.7.94
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.
|
@@ -90,7 +90,7 @@ var Inform = function Inform(props) {
|
|
|
90
90
|
} // 处理合并的消息
|
|
91
91
|
|
|
92
92
|
|
|
93
|
-
var isMessageMerging = [83,
|
|
93
|
+
var isMessageMerging = [83, 94, 95, 96, 97, 98, 99, 100, 131, 136, 13018, 30362].includes(messageType);
|
|
94
94
|
|
|
95
95
|
if (!isMessageMerging) {
|
|
96
96
|
if (messageType === _constant.informType.details) {
|
|
@@ -17,6 +17,8 @@ var _tooltipText = _interopRequireDefault(require("../../../tooltip/tooltip-text
|
|
|
17
17
|
|
|
18
18
|
var _conditionRender = _interopRequireDefault(require("../../../condition-render"));
|
|
19
19
|
|
|
20
|
+
var _openData = require("../../../../utils/open-data");
|
|
21
|
+
|
|
20
22
|
var _request = require("../../request.apis");
|
|
21
23
|
|
|
22
24
|
var _add13x = _interopRequireDefault(require("../../images/add1@3x.png"));
|
|
@@ -134,7 +136,10 @@ var Card = function Card(props) {
|
|
|
134
136
|
className: (0, _classnames["default"])("".concat(preCls, "__header-name"))
|
|
135
137
|
}, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
|
|
136
138
|
overlayClassName: "".concat(preCls, "__header-name-tooltip"),
|
|
137
|
-
text:
|
|
139
|
+
text: /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
|
|
140
|
+
name: userInfo.name,
|
|
141
|
+
id: userInfo.userId
|
|
142
|
+
}),
|
|
138
143
|
maxWidth: 228,
|
|
139
144
|
mouseEnterDelay: 0.8
|
|
140
145
|
})), /*#__PURE__*/_react["default"].createElement("span", {
|
|
@@ -246,7 +246,7 @@ var _default = function _default(props) {
|
|
|
246
246
|
onClick: function onClick() {
|
|
247
247
|
return setRowSelected([]);
|
|
248
248
|
}
|
|
249
|
-
}, "\u6E05\u7A7A\u6240\u9009"))), /*#__PURE__*/_react["default"].createElement(_pagination["default"], {
|
|
249
|
+
}, "\u6E05\u7A7A\u6240\u9009"))), !!total && /*#__PURE__*/_react["default"].createElement(_pagination["default"], {
|
|
250
250
|
pageSize: pageSize,
|
|
251
251
|
total: total,
|
|
252
252
|
current: pageNum,
|