@titaui/pc 1.12.94 → 1.12.95-beta.1

package/lib/components/dynamic/dynamic-item/components/table-row-okr/index.js

@@ -54,7 +54,9 @@ var TableRowOKR = function TableRowOKR(_ref) {
     onClick: handleClickTitle
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "tu-icon-H5-".concat(isO ? "O" : "KR", "-s ").concat(prefix, "__common-icon")
-  }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _openData.parseString)(text))), !isFirstLevel && /*#__PURE__*/_react["default"].createElement("div", {
+  }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _openData.parseString)(text)), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__common-time")
+  }, "\u7B2C\u4E00\u5B63\u5EA6")), !isFirstLevel && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(prefix, "__kr")),
     onClick: handleClickTitle
   }, /*#__PURE__*/_react["default"].createElement("span", {

package/lib/components/dynamic/dynamic-item/dynamic-new-report/components/remind-user-view/index.css

@@ -27,11 +27,12 @@
   height: 32px;
   background: #f0f4fa;
   border-radius: 16px;
-  padding: 5px 8px 5px 4px;
+  padding: 5px 12px 5px 4px;
   box-sizing: border-box;
   font-size: 14px;
   color: #3f4755;
   line-height: 22px;
+  position: relative;
 }
 
 .titaui-dynamic-summary__remind-view__user-avatar {
@@ -41,3 +42,17 @@
 .titaui-dynamic-summary__remind-view__user-name {
   margin-left: 6px;
 }
+
+.titaui-dynamic-summary__remind-view__user-name-icon {
+  position: absolute;
+  right: 8px;
+  top: 8px;
+  width: 4px;
+  height: 4px;
+  border-radius: 50%;
+  background-color: #A4ACB9;
+}
+
+.titaui-dynamic-summary__remind-view__user-name .hasRead {
+  background-color: #5AD8A6;
+}

package/lib/components/dynamic/dynamic-item/dynamic-new-report/components/remind-user-view/index.js

@@ -20,13 +20,14 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 var preCls = 'titaui-dynamic-summary__remind-view';
 
 var RemindUserView = function RemindUserView(props) {
-  var data = props.data;
+  var data = props.data,
+      curAtUser = props.curAtUser;
   if (!data || !data.length) return null;
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__title")
-  }, (0, _getLocale.getLocale)('OKR_MyO_himher')), /*#__PURE__*/_react["default"].createElement("div", {
+  }, (0, _getLocale.getLocale)("OKR_MyO_himher")), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__list")
   }, data.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement("div", {
@@ -41,6 +42,8 @@ var RemindUserView = function RemindUserView(props) {
     }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
       name: item.name,
       id: item.userId
+    }), /*#__PURE__*/_react["default"].createElement("i", {
+      className: "".concat(preCls, "__user-name-icon ").concat((item.userId === curAtUser || item.hasRead) && "hasRead")
     })));
   })));
 };

package/lib/components/dynamic/dynamic-item/dynamic-new-report/index.js

@@ -100,6 +100,7 @@ var DynamicReply = function DynamicReply(_ref) {
       attachments = data.attachments,
       evaluates = data.evaluates,
       canEvaluate = data.canEvaluate;
+  var curAtUser = restProps.curAtUser;
   var files = (0, _util.formatAttachments)(attachments);
 
   var _useState = (0, _react.useState)(),
@@ -258,7 +259,8 @@ var DynamicReply = function DynamicReply(_ref) {
     editable: false,
     enableDelete: false
   })), /*#__PURE__*/_react["default"].createElement(_remindUserView["default"], {
-    data: atUsers
+    data: atUsers,
+    curAtUser: curAtUser
   }), currentEvalutes && currentEvalutes.length !== 0 && /*#__PURE__*/_react["default"].createElement(_evalute["default"], {
     evaluation: currentEvalutes[0],
     feedId: feedId,

package/lib/components/dynamic/dynamic-item/index.js

@@ -79,7 +79,9 @@ var _dynamicNewReport = _interopRequireDefault(require("./dynamic-new-report"));
 
 var _dynamicDiscovery = _interopRequireDefault(require("./dynamic-discovery"));
 
-var _excluded = ["data", "onDeleteFeed", "dynamicShareIsShowToping"];
+var _requestApi = require("../request-api");
+
+var _excluded = ["data", "onDeleteFeed", "dynamicShareIsShowToping", "detailCurAtUser"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -120,6 +122,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 var prefix = "titaui-dynamic-item";
+var loginUserId = (0, _bsGlobal.getUserInfo)().Id;
 
 var DynamicItem = function DynamicItem(_ref) {
   var _getBSGlobal, _JSON$parse;
@@ -127,6 +130,7 @@ var DynamicItem = function DynamicItem(_ref) {
   var data = _ref.data,
       onDeleteFeed = _ref.onDeleteFeed,
       dynamicShareIsShowToping = _ref.dynamicShareIsShowToping,
+      detailCurAtUser = _ref.detailCurAtUser,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
   var feedId = data.feedId,
@@ -167,6 +171,11 @@ var DynamicItem = function DynamicItem(_ref) {
       upvoteModalVisible = _useState12[0],
       setUpvoteModalVisible = _useState12[1];
 
+  var _useState13 = (0, _react.useState)(detailCurAtUser),
+      _useState14 = _slicedToArray(_useState13, 2),
+      curAtUser = _useState14[0],
+      setCurAtUser = _useState14[1];
+
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord,
       atAllText = _useContext.atAllText,
@@ -205,6 +214,16 @@ var DynamicItem = function DynamicItem(_ref) {
       });
     }
 
+    if (data.feedType === _constant.EFeedType.Report && data.newSummary) {
+      (0, _requestApi.setSummaryAlreadyRead)({
+        feedId: feedId
+      }).then(function (res) {
+        if (res.Code === 1) {
+          setCurAtUser(+loginUserId);
+        }
+      });
+    }
+
     setIsFold(false);
   };
 
@@ -294,7 +313,8 @@ var DynamicItem = function DynamicItem(_ref) {
         if (data.newSummary) {
           return /*#__PURE__*/_react["default"].createElement(_dynamicNewReport["default"], _extends({
             data: data,
-            onDeleteFeed: onDeleteFeed
+            onDeleteFeed: onDeleteFeed,
+            curAtUser: curAtUser
           }, restProps));
         }
 
@@ -380,7 +400,7 @@ var DynamicItem = function DynamicItem(_ref) {
       default:
         return null;
     }
-  }, [data]);
+  }, [data, curAtUser]);
 
   var renderUpvoteCount = function renderUpvoteCount(type, count) {
     if (count === 0) {

package/lib/components/dynamic/request-api.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.topDynamic = exports.deleteDynamic = exports.collectDynamic = exports.cancelTopDynamic = exports.cancelCollectDynamic = void 0;
+exports.topDynamic = exports.setSummaryAlreadyRead = exports.deleteDynamic = exports.collectDynamic = exports.cancelTopDynamic = exports.cancelCollectDynamic = void 0;
 
 var _request = require("../../utils/request");
 
@@ -43,4 +43,11 @@ var deleteDynamic = function deleteDynamic(_ref5) {
   return (0, _request.rdelete)('v2')("user/feed/Delete?feed_id=".concat(feedId));
 };
 
-exports.deleteDynamic = deleteDynamic;
+exports.deleteDynamic = deleteDynamic;
+
+var setSummaryAlreadyRead = function setSummaryAlreadyRead(_ref6) {
+  var feedId = _ref6.feedId;
+  return (0, _request.rpost)('v1')("summary/setSummaryAlreadyRead/".concat(feedId));
+};
+
+exports.setSummaryAlreadyRead = setSummaryAlreadyRead;

package/lib/components/rich-editor-at/index.js

@@ -36,47 +36,107 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var prefix = "titaui-rich-editor-at";
 
 var RichEditorAt = function RichEditorAt(_ref) {
+  var _users$users;
+
   var _ref$users = _ref.users,
-      users = _ref$users === void 0 ? [] : _ref$users,
+      users = _ref$users === void 0 ? {
+    users: [],
+    departments: [],
+    groups: []
+  } : _ref$users,
       onChange = _ref.onChange,
       _ref$text = _ref.text,
-      text = _ref$text === void 0 ? "" : _ref$text;
-
-  var _useState = (0, _react.useState)(users),
+      text = _ref$text === void 0 ? "" : _ref$text,
+      _ref$isOnlySelectUser = _ref.isOnlySelectUser,
+      isOnlySelectUser = _ref$isOnlySelectUser === void 0 ? true : _ref$isOnlySelectUser;
+  console.log(users);
+
+  var _useState = (0, _react.useState)((_users$users = users.users) === null || _users$users === void 0 ? void 0 : _users$users.map(function (item) {
+    return item.user;
+  })),
       _useState2 = _slicedToArray(_useState, 2),
-      seleceUsers = _useState2[0],
+      selectUsers = _useState2[0],
       setSelectUsers = _useState2[1];
 
+  var _useState3 = (0, _react.useState)(users.departments),
+      _useState4 = _slicedToArray(_useState3, 2),
+      selectDepartments = _useState4[0],
+      setSelectDepartments = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(users.groups),
+      _useState6 = _slicedToArray(_useState5, 2),
+      selectGroups = _useState6[0],
+      setSelectGroups = _useState6[1];
+
   var handleSelectUser = function handleSelectUser(_ref2) {
-    var users = _ref2.users;
+    var users = _ref2.users,
+        departments = _ref2.departments,
+        groups = _ref2.groups;
     setSelectUsers(users);
+    console.log(users, 'usersusers');
+    setSelectDepartments(departments);
+    setSelectGroups(groups);
 
     if (onChange) {
-      onChange(users);
+      onChange(users, departments, groups);
     }
   };
 
   var handleDeleteUser = function handleDeleteUser(info) {
-    var newData = seleceUsers.filter(function (user) {
+    var newData = selectUsers.filter(function (user) {
       return user.userId !== info.userId;
     });
     setSelectUsers(newData);
 
     if (onChange) {
-      onChange(newData);
+      onChange(newData, selectDepartments, selectGroups);
+    }
+  };
+
+  var handleDeleteDepart = function handleDeleteDepart(info) {
+    var newData = selectDepartments.filter(function (item) {
+      return item.id !== info.id;
+    });
+    setSelectDepartments(newData);
+
+    if (onChange) {
+      onChange(selectUsers, newData, selectGroups);
+    }
+  };
+
+  var handleDeleteGroup = function handleDeleteGroup(info) {
+    var newData = selectGroups.filter(function (item) {
+      return item.id !== info.id;
+    });
+    setSelectGroups(newData);
+
+    if (onChange) {
+      onChange(selectUsers, selectDepartments, newData);
     }
   };
 
   (0, _react.useEffect)(function () {
-    setSelectUsers(users);
+    if (users && users.users && users.users[0].user) {
+      var _users$users2;
+
+      setSelectUsers((_users$users2 = users.users) === null || _users$users2 === void 0 ? void 0 : _users$users2.map(function (item) {
+        return item.user;
+      }));
+    } else {
+      setSelectUsers(users.users);
+    }
+
+    setSelectDepartments(users.departments);
+    setSelectGroups(users.groups);
   }, [users]);
+  console.log(selectUsers, 'selectUsers');
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
   }, text && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__title")
   }, text), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
-  }, users.map(function (item) {
+  }, selectUsers === null || selectUsers === void 0 ? void 0 : selectUsers.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__content-user")
     }, /*#__PURE__*/_react["default"].createElement(_components["default"], {
@@ -90,16 +150,44 @@ var RichEditorAt = function RichEditorAt(_ref) {
       },
       color: item.avatar.color
     }));
+  }), selectDepartments && selectDepartments.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement("span", {
+      className: "".concat(prefix, "__content-user")
+    }, /*#__PURE__*/_react["default"].createElement(_components["default"], {
+      showNameTips: true,
+      canDelUser: true,
+      onDelUser: function onDelUser() {
+        return handleDeleteDepart(item);
+      },
+      color: '#3296fa',
+      name: item.name
+    }));
+  }), selectGroups && selectGroups.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement("span", {
+      className: "".concat(prefix, "__content-user")
+    }, /*#__PURE__*/_react["default"].createElement(_components["default"], {
+      showNameTips: true,
+      canDelUser: true,
+      onDelUser: function onDelUser() {
+        return handleDeleteGroup(item);
+      },
+      color: 'rgba(90, 216, 166)',
+      name: item.name
+    }));
   }), /*#__PURE__*/_react["default"].createElement(_userSelector["default"], {
     multiple: true,
     position: "right",
     onOk: handleSelectUser,
-    disabledDepartSelect: true,
+    disabledDepartSelect: isOnlySelectUser,
     panes: {
-      depart: true
+      depart: true,
+      group: !isOnlySelectUser,
+      subordinate: !isOnlySelectUser
     },
     selectNodes: {
-      users: seleceUsers
+      users: selectUsers,
+      departments: selectDepartments,
+      groups: selectGroups
     },
     trigger: /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__import")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.94",
+  "version": "1.12.95-beta.1",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",