@titaui/pc 1.12.95-beta.4 → 1.12.95-beta.5

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.
@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _userSelector = _interopRequireDefault(require("../user-selector"));
13
13
 
14
+ var _components = _interopRequireDefault(require("./components"));
15
+
14
16
  require("./index.css");
15
17
 
16
18
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -34,6 +36,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
34
36
  var prefix = "titaui-rich-editor-at";
35
37
 
36
38
  var RichEditorAt = function RichEditorAt(_ref) {
39
+ var _users$users;
40
+
37
41
  var _ref$users = _ref.users,
38
42
  users = _ref$users === void 0 ? {
39
43
  users: [],
@@ -47,7 +51,9 @@ var RichEditorAt = function RichEditorAt(_ref) {
47
51
  isOnlySelectUser = _ref$isOnlySelectUser === void 0 ? true : _ref$isOnlySelectUser;
48
52
  console.log(users);
49
53
 
50
- var _useState = (0, _react.useState)([]),
54
+ var _useState = (0, _react.useState)((_users$users = users.users) === null || _users$users === void 0 ? void 0 : _users$users.map(function (item) {
55
+ return item.user;
56
+ })),
51
57
  _useState2 = _slicedToArray(_useState, 2),
52
58
  selectUsers = _useState2[0],
53
59
  setSelectUsers = _useState2[1];
@@ -110,7 +116,11 @@ var RichEditorAt = function RichEditorAt(_ref) {
110
116
 
111
117
  (0, _react.useEffect)(function () {
112
118
  if (users && users.users && users.users[0].user) {
113
- setSelectUsers([]);
119
+ var _users$users2;
120
+
121
+ setSelectUsers((_users$users2 = users.users) === null || _users$users2 === void 0 ? void 0 : _users$users2.map(function (item) {
122
+ return item.user;
123
+ }));
114
124
  } else {
115
125
  setSelectUsers(users.users);
116
126
  }
@@ -124,7 +134,45 @@ var RichEditorAt = function RichEditorAt(_ref) {
124
134
  className: "".concat(prefix, "__title")
125
135
  }, text), /*#__PURE__*/_react["default"].createElement("div", {
126
136
  className: "".concat(prefix, "__content")
127
- }, /*#__PURE__*/_react["default"].createElement(_userSelector["default"], {
137
+ }, selectUsers && selectUsers.map(function (item) {
138
+ return /*#__PURE__*/_react["default"].createElement("span", {
139
+ className: "".concat(prefix, "__content-user")
140
+ }, /*#__PURE__*/_react["default"].createElement(_components["default"], {
141
+ src: item.avatar.original,
142
+ name: item.name,
143
+ userId: item.userId,
144
+ showNameTips: true,
145
+ canDelUser: true,
146
+ onDelUser: function onDelUser() {
147
+ return handleDeleteUser(item);
148
+ },
149
+ color: item.avatar.color
150
+ }));
151
+ }), selectDepartments && selectDepartments.map(function (item) {
152
+ return /*#__PURE__*/_react["default"].createElement("span", {
153
+ className: "".concat(prefix, "__content-user")
154
+ }, /*#__PURE__*/_react["default"].createElement(_components["default"], {
155
+ showNameTips: true,
156
+ canDelUser: true,
157
+ onDelUser: function onDelUser() {
158
+ return handleDeleteDepart(item);
159
+ },
160
+ color: '#3296fa',
161
+ name: item.name
162
+ }));
163
+ }), selectGroups && selectGroups.map(function (item) {
164
+ return /*#__PURE__*/_react["default"].createElement("span", {
165
+ className: "".concat(prefix, "__content-user")
166
+ }, /*#__PURE__*/_react["default"].createElement(_components["default"], {
167
+ showNameTips: true,
168
+ canDelUser: true,
169
+ onDelUser: function onDelUser() {
170
+ return handleDeleteGroup(item);
171
+ },
172
+ color: 'rgba(90, 216, 166)',
173
+ name: item.name
174
+ }));
175
+ }), /*#__PURE__*/_react["default"].createElement(_userSelector["default"], {
128
176
  multiple: true,
129
177
  position: "right",
130
178
  onOk: handleSelectUser,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@titaui/pc",
3
- "version": "1.12.95-beta.4",
3
+ "version": "1.12.95-beta.5",
4
4
  "nameCN": "",
5
5
  "description": "",
6
6
  "main": "lib/index.js",