@titaui/pc 1.15.48 → 1.15.49
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.
|
@@ -59,7 +59,9 @@ var Avatar = function Avatar(props) {
|
|
|
59
59
|
showNameTips = _props$showNameTips === void 0 ? false : _props$showNameTips,
|
|
60
60
|
color = props.color,
|
|
61
61
|
canDelUser = props.canDelUser,
|
|
62
|
-
onDelUser = props.onDelUser
|
|
62
|
+
onDelUser = props.onDelUser,
|
|
63
|
+
_props$isDept = props.isDept,
|
|
64
|
+
isDept = _props$isDept === void 0 ? false : _props$isDept;
|
|
63
65
|
|
|
64
66
|
var _useState = (0, _react.useState)(false),
|
|
65
67
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -124,7 +126,10 @@ var Avatar = function Avatar(props) {
|
|
|
124
126
|
lineHeight: "".concat(size.width, "px"),
|
|
125
127
|
borderRadius: '50%'
|
|
126
128
|
}
|
|
127
|
-
}, /*#__PURE__*/_react["default"].createElement(_openData.
|
|
129
|
+
}, isDept && /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
|
|
130
|
+
name: name,
|
|
131
|
+
id: userId
|
|
132
|
+
}), !isDept && /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
|
|
128
133
|
name: name,
|
|
129
134
|
id: userId
|
|
130
135
|
})));
|
package/lib/components/dynamic/dynamic-item/dynamic-new-report/components/remind-user-view/index.js
CHANGED
|
@@ -62,7 +62,8 @@ var RemindUserView = function RemindUserView(props) {
|
|
|
62
62
|
}, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
|
|
63
63
|
userId: item.Id,
|
|
64
64
|
name: item === null || item === void 0 ? void 0 : item.Name,
|
|
65
|
-
color: "#3296fa"
|
|
65
|
+
color: "#3296fa",
|
|
66
|
+
isDept: true
|
|
66
67
|
}), /*#__PURE__*/_react["default"].createElement("span", {
|
|
67
68
|
className: "".concat(preCls, "__user-name")
|
|
68
69
|
}, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
|
|
@@ -53,7 +53,9 @@ var RichEditorAtAvatar = function RichEditorAtAvatar(props) {
|
|
|
53
53
|
textClass = props.textClass,
|
|
54
54
|
renderRightTopCmp = props.renderRightTopCmp,
|
|
55
55
|
_props$avatarTips = props.avatarTips,
|
|
56
|
-
avatarTips = _props$avatarTips === void 0 ? '' : _props$avatarTips
|
|
56
|
+
avatarTips = _props$avatarTips === void 0 ? '' : _props$avatarTips,
|
|
57
|
+
_props$isDept = props.isDept,
|
|
58
|
+
isDept = _props$isDept === void 0 ? false : _props$isDept;
|
|
57
59
|
var hasAvatar = src && !src.match(/default\w*.jpg$/);
|
|
58
60
|
|
|
59
61
|
var _useState = (0, _react.useState)(false),
|
|
@@ -106,7 +108,10 @@ var RichEditorAtAvatar = function RichEditorAtAvatar(props) {
|
|
|
106
108
|
overflow: 'hidden',
|
|
107
109
|
whiteSpace: 'nowrap'
|
|
108
110
|
}
|
|
109
|
-
}, /*#__PURE__*/_react["default"].createElement(_openData.
|
|
111
|
+
}, isDept && /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
|
|
112
|
+
name: name,
|
|
113
|
+
id: userId
|
|
114
|
+
}), !isDept && /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
|
|
110
115
|
name: name,
|
|
111
116
|
id: userId
|
|
112
117
|
})));
|
|
@@ -169,7 +174,10 @@ var RichEditorAtAvatar = function RichEditorAtAvatar(props) {
|
|
|
169
174
|
}
|
|
170
175
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
171
176
|
ref: textRef
|
|
172
|
-
}, /*#__PURE__*/_react["default"].createElement(_openData.
|
|
177
|
+
}, isDept && /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
|
|
178
|
+
name: name,
|
|
179
|
+
id: userId
|
|
180
|
+
}), !isDept && /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
|
|
173
181
|
name: name,
|
|
174
182
|
id: userId
|
|
175
183
|
})))) : /*#__PURE__*/_react["default"].createElement("span", {
|
|
@@ -179,7 +187,10 @@ var RichEditorAtAvatar = function RichEditorAtAvatar(props) {
|
|
|
179
187
|
}
|
|
180
188
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
181
189
|
ref: textRef
|
|
182
|
-
}, /*#__PURE__*/_react["default"].createElement(_openData.
|
|
190
|
+
}, isDept && /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
|
|
191
|
+
name: name,
|
|
192
|
+
id: userId
|
|
193
|
+
}), !isDept && /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
|
|
183
194
|
name: name,
|
|
184
195
|
id: userId
|
|
185
196
|
}))));
|
|
@@ -144,7 +144,9 @@ var RichEditorAt = function RichEditorAt(_ref) {
|
|
|
144
144
|
return handleDeleteDepart(item);
|
|
145
145
|
},
|
|
146
146
|
color: '#3296fa',
|
|
147
|
-
name: item.name
|
|
147
|
+
name: item.name,
|
|
148
|
+
userId: item.id,
|
|
149
|
+
isDept: true
|
|
148
150
|
}));
|
|
149
151
|
}), selectGroups && selectGroups.map(function (item) {
|
|
150
152
|
return /*#__PURE__*/_react["default"].createElement("span", {
|