@titaui/pc 1.12.96 → 1.12.99-beta.1

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

@@ -111,7 +111,8 @@ var OkrProgress = function OkrProgress(_ref) {
         return /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_tableRowOkr["default"], {
           text: item.Name,
           isO: true,
-          id: item.Id
+          id: item.Id,
+          data: item
         })), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_progress["default"], {
           type: "o",
           status: _constant.OkrRiskMapping[item.RiskLevel],

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

@@ -20,6 +20,18 @@
   margin-top: 4px;
 }
 
+.titaui-dynamic-summary-table-row-okr__common-time {
+  white-space: nowrap;
+  padding: 1px 8px;
+  background-color: rgba(40, 121, 255, 0.16);
+  border-radius: 12px;
+  font-size: 12px;
+  font-weight: 400;
+  color: #3F4755;
+  line-height: 18px;
+  margin-left: 4px;
+}
+
 .titaui-dynamic-summary-table-row-okr__kr {
   margin-left: 24px;
   overflow: hidden;

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

@@ -13,6 +13,8 @@ var _scrollbar = _interopRequireDefault(require("../../../../scrollbar"));
 
 var _drawerManager = _interopRequireDefault(require("../../../../drawer-manager"));
 
+var _utils = require("./utils");
+
 var _openData = require("../../../../../utils/open-data");
 
 require("./index.css");
@@ -29,7 +31,8 @@ var TableRowOKR = function TableRowOKR(_ref) {
       _ref$isFirstLevel = _ref.isFirstLevel,
       isFirstLevel = _ref$isFirstLevel === void 0 ? true : _ref$isFirstLevel,
       _ref$order = _ref.order,
-      order = _ref$order === void 0 ? 1 : _ref$order;
+      order = _ref$order === void 0 ? 1 : _ref$order,
+      data = _ref.data;
 
   var handleClickTitle = function handleClickTitle() {
     if (isO) {
@@ -54,7 +57,15 @@ 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("p", null, /*#__PURE__*/_react["default"].createElement("span", null, (0, _openData.parseString)(text)), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__common-time")
+  }, (0, _utils.formatPeriod)({
+    annualNum: data.AnnualNum,
+    yqmNum: data.YqmNum,
+    cycleType: data.CycleType,
+    startDate: data.StartDate,
+    endDate: data.EndDate
+  })))), !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/components/table-row-okr/utils.js

@@ -0,0 +1,62 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.formatPeriod = void 0;
+
+var _getLocale = require("../../../../../utils/getLocale");
+
+var _constant = require("../../../../../utils/constant");
+
+var _moment = _interopRequireDefault(require("moment"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var formatPeriod = function formatPeriod(selected) {
+  if (!selected) return "";
+  var quarter = ["", "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_1stQuarter")), "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_2ndQuarter")), "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_3rdQuarter")), "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_4thQuarter"))];
+  var cycleDate = "";
+  var annualNum = Number("".concat(selected.annualNum)) === -1 ? "".concat((0, _getLocale.getLocale)("OKR_MyO_Butt_Allyears")) : Number("".concat(selected.cycleType)) === 0 ? null : "".concat(selected.annualNum).concat(_getLocale.isEn ? "" : "年");
+  var month = (0, _constant.getMonth)();
+
+  switch ("".concat(selected.cycleType)) {
+    case "-1":
+      cycleDate = "".concat((0, _getLocale.getLocale)("OKR_MyO_Butt_AllStatee"));
+      break;
+
+    case "1":
+      cycleDate = "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Year"));
+      break;
+
+    case "2":
+      // 季度
+      cycleDate = quarter[Number(selected.yqmNum)];
+      break;
+
+    case "3":
+      cycleDate = month[Number(selected.yqmNum) - 1];
+      break;
+
+    case "4":
+      cycleDate = "".concat(month[Number(selected.yqmNum) - 1], " - ").concat(month[((Number(selected.yqmNum) + 1) % 12 || 12) - 1]);
+      break;
+
+    case "5":
+      cycleDate = Number("".concat(selected.yqmNum)) === 1 ? "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Firsthalf")) : "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Secondhalf"));
+      break;
+
+    default:
+      var startDate = (0, _moment["default"])(selected.startDate).format('YYYY年MM月DD日');
+      var endDate = (0, _moment["default"])(selected.endDate).format('YYYY年MM月DD日');
+      cycleDate = "".concat(startDate, "~").concat(endDate);
+  }
+
+  if (annualNum) {
+    return "".concat(annualNum, "  ").concat(cycleDate);
+  } else {
+    return "".concat(cycleDate);
+  }
+};
+
+exports.formatPeriod = formatPeriod;

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,28 +20,71 @@ 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;
-  if (!data || !data.length) return null;
+  var data = props.data,
+      curAtUser = props.curAtUser;
+
+  var _ref = data || {},
+      _ref$Departments = _ref.Departments,
+      Departments = _ref$Departments === void 0 ? [] : _ref$Departments,
+      _ref$Groups = _ref.Groups,
+      Groups = _ref$Groups === void 0 ? [] : _ref$Groups,
+      _ref$Users = _ref.Users,
+      Users = _ref$Users === void 0 ? [] : _ref$Users;
+
+  if (!data || !Departments.length && !Groups.length && !Users.length) return null;
+  console.log("data", data);
   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) {
+  }, Users === null || Users === void 0 ? void 0 : Users.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__user")
+    }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
+      userId: item.User.UserId,
+      name: item.User.Name,
+      src: item.User.Avatar.Medium,
+      color: item.User.Avatar.Color
+    }), /*#__PURE__*/_react["default"].createElement("span", {
+      className: "".concat(preCls, "__user-name")
+    }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+      name: item.User.Name,
+      id: item.User.UserId
+    }), /*#__PURE__*/_react["default"].createElement("i", {
+      className: "".concat(preCls, "__user-name-icon ").concat((item.User.UserId === curAtUser || item.HasRead) && "hasRead")
+    })));
+  }), Departments === null || Departments === void 0 ? void 0 : Departments.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__user")
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: "".concat(preCls, "__user-departments")
+    }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
+      userId: item.Id,
+      name: item === null || item === void 0 ? void 0 : item.Name,
+      color: "#3296fa"
+    }), /*#__PURE__*/_react["default"].createElement("span", {
+      className: "".concat(preCls, "__user-name")
+    }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+      name: item === null || item === void 0 ? void 0 : item.Name,
+      id: item.Id
+    }))));
+  }), Groups === null || Groups === void 0 ? void 0 : Groups.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(preCls, "__user")
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: "".concat(preCls, "__user-groups")
     }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
-      userId: item.userId,
+      userId: item.id,
       name: item.name,
-      src: item.avatar.medium,
-      color: item.avatar.color
+      color: "rgb(90, 216, 166)"
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(preCls, "__user-name")
     }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
       name: item.name,
-      id: item.userId
-    })));
+      id: item.id
+    }))));
   })));
 };
 

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

@@ -98,6 +98,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)(),
@@ -105,15 +106,20 @@ var DynamicReply = function DynamicReply(_ref) {
       motionValue = _useState2[0],
       setMotionValue = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(false),
+  var _useState3 = (0, _react.useState)(null),
       _useState4 = _slicedToArray(_useState3, 2),
-      showDelete = _useState4[0],
-      setShowDelete = _useState4[1];
+      atValue = _useState4[0],
+      setAtValue = _useState4[1];
 
   var _useState5 = (0, _react.useState)(false),
       _useState6 = _slicedToArray(_useState5, 2),
-      showEdit = _useState6[0],
-      setShowEdit = _useState6[1];
+      showDelete = _useState6[0],
+      setShowDelete = _useState6[1];
+
+  var _useState7 = (0, _react.useState)(false),
+      _useState8 = _slicedToArray(_useState7, 2),
+      showEdit = _useState8[0],
+      setShowEdit = _useState8[1];
 
   var contentRichTextRef = (0, _react.useRef)();
   var workPlanRichTextRef = (0, _react.useRef)();
@@ -121,10 +127,10 @@ var DynamicReply = function DynamicReply(_ref) {
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
 
-  var _useState7 = (0, _react.useState)(evaluates || []),
-      _useState8 = _slicedToArray(_useState7, 2),
-      currentEvalutes = _useState8[0],
-      setCurrentEvalutes = _useState8[1];
+  var _useState9 = (0, _react.useState)(evaluates || []),
+      _useState10 = _slicedToArray(_useState9, 2),
+      currentEvalutes = _useState10[0],
+      setCurrentEvalutes = _useState10[1];
 
   var renderSuffix = /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(prefix, "__complete-type"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "__complete-type--normal"), submitState === 1), _defineProperty(_classNames, "".concat(prefix, "__complete-type--delay"), submitState === 2), _classNames))
@@ -169,6 +175,16 @@ var DynamicReply = function DynamicReply(_ref) {
       setMotionValue(motion);
     }
   }, [dailyContent]);
+  (0, _react.useEffect)(function () {
+    if (dailyContent) {
+      var atData = dailyContent.find(function (item) {
+        return item.contentType === 5;
+      });
+      if (!(atData !== null && atData !== void 0 && atData.content)) return;
+      var atMotion = JSON.parse(atData.content || "{}");
+      setAtValue(atMotion);
+    }
+  }, [dailyContent]);
   (0, _react.useEffect)(function () {
     if (loginUserId === publishUser.userId) {
       setShowDelete(true);
@@ -250,7 +266,8 @@ var DynamicReply = function DynamicReply(_ref) {
     editable: false,
     enableDelete: false
   })), /*#__PURE__*/_react["default"].createElement(_remindUserView["default"], {
-    data: atUsers
+    data: atValue,
+    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/remind/read/".concat(feedId));
+};
+
+exports.setSummaryAlreadyRead = setSummaryAlreadyRead;

package/lib/components/menus/export-modules/summary-menus/menus.js

@@ -107,6 +107,13 @@ var summaryMenus = /*#__PURE__*/function () {
       type: _index.GROUP_NAME_NODE,
       href: "",
       isShow: isShowManage
+    }, {
+      icon: 'yibiao',
+      label: _i18n.locale.menu_summary_dashboard,
+      key: PAGE_SUMMARY_DASHBOARD,
+      type: _index.MENU_ITEM_NOE,
+      href: '#/summary/dashboard',
+      isShow: props.isShowDashboard
     }, {
       icon: "my-setup",
       label: _i18n.locale.menu_summary_role,
@@ -115,13 +122,6 @@ var summaryMenus = /*#__PURE__*/function () {
       href: "#/enterprise/manage?reactRouterName=daily",
       isShow: isShowManage,
       openBlank: true
-    }, {
-      icon: 'yibiao',
-      label: _i18n.locale.menu_summary_dashboard,
-      key: PAGE_SUMMARY_DASHBOARD,
-      type: _index.MENU_ITEM_NOE,
-      href: '#/summary/dashboard',
-      isShow: props.isShowDashboard
     }];
   }
 

package/lib/components/picker/range-picker/index.js

@@ -33,7 +33,7 @@ var _picker = _interopRequireDefault(require("../picker"));
 
 var _pickerTrigger = _interopRequireDefault(require("./components/picker-trigger"));
 
-var _excluded = ["onChange", "format", "values", "picker", "children", "popupPlacement", "direction", "onPopupVisibleChange", "visible"];
+var _excluded = ["onChange", "format", "values", "picker", "children", "popupPlacement", "direction", "onPopupVisibleChange", "visible", "canEmpty"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -70,6 +70,8 @@ var RangePicker = function RangePicker(props) {
       onPopupVisibleChange = props.onPopupVisibleChange,
       _props$visible = props.visible,
       visible = _props$visible === void 0 ? false : _props$visible,
+      _props$canEmpty = props.canEmpty,
+      canEmpty = _props$canEmpty === void 0 ? true : _props$canEmpty,
       restProps = _objectWithoutProperties(props, _excluded);
 
   var initValues = (0, _react.useCallback)(function () {
@@ -196,9 +198,11 @@ var RangePicker = function RangePicker(props) {
     settingTypeRef.current = settingType;
   }, [settingType]);
   var popContent = (0, _react.useMemo)(function () {
-    var okBtnDisabled = viewDate.filter(function (v) {
+    var okBtnDisabled = canEmpty ? viewDate.filter(function (v) {
       return !v;
-    }).length === 1;
+    }).length === 1 : viewDate.filter(function (v) {
+      return !!v;
+    }).length !== 2;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: _utils.PickerRangesClass
     }, /*#__PURE__*/_react["default"].createElement(_placeholder["default"], {
@@ -235,7 +239,7 @@ var RangePicker = function RangePicker(props) {
       size: "small",
       type: "primary"
     }, (0, _getLocale.getLocale)('Mod_Determiness')))));
-  }, [viewDate]);
+  }, [viewDate, canEmpty]);
   return /*#__PURE__*/_react["default"].createElement(_context.RangePickerContext.Provider, {
     value: {
       values: values,

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

@@ -37,38 +37,91 @@ var prefix = "titaui-rich-editor-at";
 
 var RichEditorAt = function RichEditorAt(_ref) {
   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;
+      text = _ref$text === void 0 ? "" : _ref$text,
+      _ref$isOnlySelectUser = _ref.isOnlySelectUser,
+      isOnlySelectUser = _ref$isOnlySelectUser === void 0 ? true : _ref$isOnlySelectUser;
 
-  var _useState = (0, _react.useState)(users),
+  var _useState = (0, _react.useState)(),
       _useState2 = _slicedToArray(_useState, 2),
-      seleceUsers = _useState2[0],
+      selectUsers = _useState2[0],
       setSelectUsers = _useState2[1];
 
+  var _useState3 = (0, _react.useState)(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      selectDepartments = _useState4[0],
+      setSelectDepartments = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(),
+      _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);
+    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 === null || selectUsers === void 0 ? void 0 : 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 === null || selectDepartments === void 0 ? void 0 : 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 === null || selectGroups === void 0 ? void 0 : selectGroups.filter(function (item) {
+      return item.id !== info.id;
+    });
+    setSelectGroups(newData);
+
+    if (onChange) {
+      onChange(selectUsers, selectDepartments, newData);
     }
   };
 
   (0, _react.useEffect)(function () {
-    setSelectUsers(users);
+    if (!isOnlySelectUser) {
+      if (users && users.users && users.users[0]) {
+        setSelectUsers(users.users.map(function (item) {
+          return item.user;
+        }));
+      }
+    } else {
+      setSelectUsers(users);
+    }
+
+    setSelectDepartments(users.departments);
+    setSelectGroups(users.groups);
   }, [users]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
@@ -76,7 +129,7 @@ var RichEditorAt = function RichEditorAt(_ref) {
     className: "".concat(prefix, "__title")
   }, text), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
-  }, users.map(function (item) {
+  }, selectUsers && selectUsers[0] && selectUsers.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__content-user")
     }, /*#__PURE__*/_react["default"].createElement(_components["default"], {
@@ -90,16 +143,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/lib/components/version-change-modal/index.css

@@ -1,3 +1,5 @@
+@charset "UTF-8";
+
 .version-change-modal {
   display: flex;
   flex-direction: column;
@@ -185,3 +187,7 @@
 .titaui-version-change-modal__dialog > .rc-dialog-content {
   background-color: transparent !important;
 }
+
+.tita-font {
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
+}

package/lib/components/version-change-modal/index.js

@@ -222,7 +222,9 @@ var VersionChangeModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref
       return /*#__PURE__*/_react["default"].createElement("li", {
         className: "tu-icon-yiwancheng",
         key: item + index
-      }, item);
+      }, /*#__PURE__*/_react["default"].createElement("span", {
+        className: "tita-font"
+      }, item));
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "item-cover"
     }, /*#__PURE__*/_react["default"].createElement("a", {

package/package.json

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