@titaui/pc 1.16.39-beta.2 → 1.16.39-beta.4

package/lib/components/communication/index.js

@@ -228,18 +228,62 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
       isShowAllCommunicationRecord ? _this.getFeedInfo(feedId, communicationTrackTotal) : _this.getFeedInfo(feedId, commentCount);
     };
 
-    _this.handlerReply = function (submitType, sentData) {
+    _this.customSubmitCallback = function (res) {
+      var _this$state3 = _this.state,
+          communicationTrackList = _this$state3.communicationTrackList,
+          isShowAllCommunicationRecord = _this$state3.isShowAllCommunicationRecord,
+          communicationTrackTotal = _this$state3.communicationTrackTotal;
       var _this$props4 = _this.props,
           feedId = _this$props4.feedId,
-          commentCount = _this$props4.commentCount,
-          commentType = _this$props4.commentType,
-          okrFeedParams = _this$props4.okrFeedParams,
-          onReplyChange = _this$props4.onReplyChange;
-      var _this$state3 = _this.state,
-          isShowReplyToUser = _this$state3.isShowReplyToUser,
-          replyUserCommentId = _this$state3.replyUserCommentId,
-          communicationTrackTotal = _this$state3.communicationTrackTotal,
-          isShowAllCommunicationRecord = _this$state3.isShowAllCommunicationRecord;
+          commentCount = _this$props4.commentCount;
+
+      if (res.Code === 1) {
+        _this.setState({
+          submitStatus: 1,
+          isShowReplyToUser: false,
+          isShowDefaultInput: true
+        });
+
+        if (!feedId) {
+          _this.setState({
+            communicationTrackList: [].concat(_toConsumableArray(communicationTrackList), [res.Data])
+          });
+
+          return;
+        }
+
+        if (isShowAllCommunicationRecord) _this.getFeedInfo(feedId, communicationTrackTotal + 1);else _this.getFeedInfo(feedId, commentCount);
+      } else {
+        _this.setState({
+          submitStatus: 0
+        });
+      }
+    };
+
+    _this.handlerReply = function (submitType, sentData) {
+      var _this$state4 = _this.state,
+          isShowReplyToUser = _this$state4.isShowReplyToUser,
+          replyUserCommentId = _this$state4.replyUserCommentId,
+          communicationTrackTotal = _this$state4.communicationTrackTotal,
+          isShowAllCommunicationRecord = _this$state4.isShowAllCommunicationRecord;
+      var _this$props5 = _this.props,
+          feedId = _this$props5.feedId,
+          commentCount = _this$props5.commentCount,
+          commentType = _this$props5.commentType,
+          okrFeedParams = _this$props5.okrFeedParams,
+          onReplyChange = _this$props5.onReplyChange,
+          customSubmitHandlerSync = _this$props5.customSubmitHandlerSync,
+          customSubmitHandler = _this$props5.customSubmitHandler;
+
+      if (submitType === 'submit' && customSubmitHandlerSync) {
+        customSubmitHandlerSync(sentData).then(_this.customSubmitCallback);
+        return;
+      }
+
+      if (submitType === 'submit' && customSubmitHandler) {
+        customSubmitHandler(sentData, _this.customSubmitCallback);
+        return;
+      }
 
       if (submitType === 'submit') {
         // 发送
@@ -333,11 +377,11 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
   _createClass(Communication, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _this$props5 = this.props,
-          feedId = _this$props5.feedId,
-          commentCount = _this$props5.commentCount,
-          commentType = _this$props5.commentType,
-          usePropsComment = _this$props5.usePropsComment;
+      var _this$props6 = this.props,
+          feedId = _this$props6.feedId,
+          commentCount = _this$props6.commentCount,
+          commentType = _this$props6.commentType,
+          usePropsComment = _this$props6.usePropsComment;
 
       if ((feedId || commentType === 2) && !usePropsComment) {
         this.getFeedInfo(feedId, commentCount);
@@ -347,9 +391,9 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps, prevState) {
       if (prevProps.feedId !== this.props.feedId || prevProps.okrFeedParams !== this.props.okrFeedParams || prevProps.usePropsComment !== this.props.usePropsComment) {
-        var _this$props6 = this.props,
-            feedId = _this$props6.feedId,
-            commentCount = _this$props6.commentCount;
+        var _this$props7 = this.props,
+            feedId = _this$props7.feedId,
+            commentCount = _this$props7.commentCount;
         this.getFeedInfo(feedId, commentCount);
       }
     }
@@ -365,42 +409,42 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
     value: function render() {
       var _this2 = this;
 
-      var _this$state4 = this.state,
-          communicationTrackList = _this$state4.communicationTrackList,
-          communicationTrackTotal = _this$state4.communicationTrackTotal,
-          isShowAllCommunicationRecord = _this$state4.isShowAllCommunicationRecord,
-          replyUser = _this$state4.replyUser,
-          replyUserId = _this$state4.replyUserId,
-          isShowReplyToUser = _this$state4.isShowReplyToUser,
-          submitStatus = _this$state4.submitStatus,
-          isShowPraiseRecordPop = _this$state4.isShowPraiseRecordPop,
-          praiseObjId = _this$state4.praiseObjId,
-          isShowDefaultInput = _this$state4.isShowDefaultInput,
-          needAutoFocus = _this$state4.needAutoFocus;
-      var _this$props7 = this.props,
-          feedId = _this$props7.feedId,
-          className = _this$props7.className,
-          isShowSendSms = _this$props7.isShowSendSms,
-          confirmPopAlign = _this$props7.confirmPopAlign,
-          setTextareaRef = _this$props7.setTextareaRef,
-          userSelectorPopAlign = _this$props7.userSelectorPopAlign,
-          emotionsSelectorPopAlign = _this$props7.emotionsSelectorPopAlign,
-          showAtAll = _this$props7.showAtAll,
-          atAllTipText = _this$props7.atAllTipText,
-          atAllValue = _this$props7.atAllValue,
-          atAllText = _this$props7.atAllText,
-          commentCount = _this$props7.commentCount,
-          useCustomMblog = _this$props7.useCustomMblog,
-          _this$props7$submitTe = _this$props7.submitText,
-          submitText = _this$props7$submitTe === void 0 ? (0, _getLocale.getLocale)('Mod_Reply') : _this$props7$submitTe,
-          _this$props7$highLigh = _this$props7.highLightKeyWord,
-          highLightKeyWord = _this$props7$highLigh === void 0 ? '' : _this$props7$highLigh,
-          _this$props7$autoFocu = _this$props7.autoFocus,
-          autoFocus = _this$props7$autoFocu === void 0 ? false : _this$props7$autoFocu,
-          _this$props7$showUser = _this$props7.showUser,
-          showUser = _this$props7$showUser === void 0 ? false : _this$props7$showUser,
-          _this$props7$attachem = _this$props7.attachemntCanSubmit,
-          attachemntCanSubmit = _this$props7$attachem === void 0 ? true : _this$props7$attachem;
+      var _this$state5 = this.state,
+          communicationTrackList = _this$state5.communicationTrackList,
+          communicationTrackTotal = _this$state5.communicationTrackTotal,
+          isShowAllCommunicationRecord = _this$state5.isShowAllCommunicationRecord,
+          replyUser = _this$state5.replyUser,
+          replyUserId = _this$state5.replyUserId,
+          isShowReplyToUser = _this$state5.isShowReplyToUser,
+          submitStatus = _this$state5.submitStatus,
+          isShowPraiseRecordPop = _this$state5.isShowPraiseRecordPop,
+          praiseObjId = _this$state5.praiseObjId,
+          isShowDefaultInput = _this$state5.isShowDefaultInput,
+          needAutoFocus = _this$state5.needAutoFocus;
+      var _this$props8 = this.props,
+          feedId = _this$props8.feedId,
+          className = _this$props8.className,
+          isShowSendSms = _this$props8.isShowSendSms,
+          confirmPopAlign = _this$props8.confirmPopAlign,
+          setTextareaRef = _this$props8.setTextareaRef,
+          userSelectorPopAlign = _this$props8.userSelectorPopAlign,
+          emotionsSelectorPopAlign = _this$props8.emotionsSelectorPopAlign,
+          showAtAll = _this$props8.showAtAll,
+          atAllTipText = _this$props8.atAllTipText,
+          atAllValue = _this$props8.atAllValue,
+          atAllText = _this$props8.atAllText,
+          commentCount = _this$props8.commentCount,
+          useCustomMblog = _this$props8.useCustomMblog,
+          _this$props8$submitTe = _this$props8.submitText,
+          submitText = _this$props8$submitTe === void 0 ? (0, _getLocale.getLocale)('Mod_Reply') : _this$props8$submitTe,
+          _this$props8$highLigh = _this$props8.highLightKeyWord,
+          highLightKeyWord = _this$props8$highLigh === void 0 ? '' : _this$props8$highLigh,
+          _this$props8$autoFocu = _this$props8.autoFocus,
+          autoFocus = _this$props8$autoFocu === void 0 ? false : _this$props8$autoFocu,
+          _this$props8$showUser = _this$props8.showUser,
+          showUser = _this$props8$showUser === void 0 ? false : _this$props8$showUser,
+          _this$props8$attachem = _this$props8.attachemntCanSubmit,
+          attachemntCanSubmit = _this$props8$attachem === void 0 ? true : _this$props8$attachem;
       var user = (0, _bsGlobal.getUserInfo)();
       return /*#__PURE__*/_react["default"].createElement(_style.CommunicationWrapper, {
         className: "communcation-wrapper ".concat(className)

package/lib/components/mblog/components/MblogContent.js

@@ -217,6 +217,8 @@ var MblogContent = /*#__PURE__*/function (_PureComponent) {
         editable: true,
         showToolbar: false,
         withMentions: true,
+        onKeyUp: this._handlerKeyUp,
+        onKeyDown: this._handlerKeyDown,
         initialState: {},
         onDocChange: this.onChangeEditor,
         placeholder: placeholderText

package/lib/components/menus/export-modules/survey-menu/menus.js

@@ -50,7 +50,7 @@ var surveyMenus = /*#__PURE__*/function () {
       label: (0, _getLocale.getLocale)('Per_Menu_Title_Label_BasicSettings'),
       key: "other",
       type: _index.GROUP_NAME_NODE,
-      href: "#/",
+      href: "",
       isShow: props.isShowSurveyManage
     }, {
       icon: 'setting',

package/lib/components/menus/export-modules/survey-menu/survey-front-menus.js

@@ -95,7 +95,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var firstMenuHref = menus[0].data.href;
     if (firstMenuHref.split('#')[1] === pathname) return; //当前路由与二级菜单第一项相同时直接return
 
-    var menusHrefArr = ['/survey/manage', '/survey/my-involved', '/survey/assess-settings'];
+    var menusHrefArr = ['/survey/manage', '/survey/my-involved'];
     var isIncludeMenu = menusHrefArr.find(function (item) {
       //表示当前路由是否是左侧二级菜单的选项
       return item.includes(pathname);
@@ -109,7 +109,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
     if (!isShowMenuItem) {
       //如果当前路由没有权限展示的话，则跳转到有权限二级路由的第一项
-      window.location.href = '#/survey/my-involved';
+      window.location.href = firstMenuHref;
     }
   }, [history.location.pathname, history.location.search]);
 

package/lib/utils/editor.js

@@ -22,19 +22,21 @@ exports.UserTypeNumberEnum = UserTypeNumberEnum;
   UserTypeNumberEnum[UserTypeNumberEnum["User"] = 1] = "User";
   UserTypeNumberEnum[UserTypeNumberEnum["AllMembers"] = 2] = "AllMembers";
   UserTypeNumberEnum[UserTypeNumberEnum["ProjectOrTarget"] = 4] = "ProjectOrTarget";
+  UserTypeNumberEnum[UserTypeNumberEnum["Department"] = 15] = "Department";
 })(UserTypeNumberEnum || (exports.UserTypeNumberEnum = UserTypeNumberEnum = {}));
 
 var appendUsers = function appendUsers(users) {
   return (0, _flatten["default"])(users.map(function (_ref) {
     var Name = _ref.Name,
         Id = _ref.Id,
-        _ref$type = _ref.type,
-        type = _ref$type === void 0 ? 'user' : _ref$type;
+        DepartmentName = _ref.DepartmentName;
+    var type = 'user';
+    if (DepartmentName) type = 'department';
     return [{
       type: 'mention',
       attrs: {
         mentionId: Id,
-        mentionName: Name,
+        mentionName: Name || DepartmentName,
         mentionType: type
       }
     }, {
@@ -67,7 +69,8 @@ var usersTypeToNumber = function usersTypeToNumber(mentionUsers) {
     return _objectSpread(_objectSpread({}, user), {}, {
       mentionType: {
         user: UserTypeNumberEnum.User,
-        all_members: UserTypeNumberEnum.AllMembers
+        all_members: UserTypeNumberEnum.AllMembers,
+        department: UserTypeNumberEnum.Department
       }[user.mentionType]
     });
   });

package/package.json

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