@titaui/pc 1.16.31 → 1.16.33

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

@@ -579,8 +579,7 @@ var _initialiseProps = function _initialiseProps() {
                   data: isRefresh ? resData : [].concat(_toConsumableArray(data), _toConsumableArray(resData)),
                   isEnd: res.Data.nextPage === 0
                 }, function () {
-                  console.log(_this4.state.data);
-
+                  // console.log(this.state.data)
                   if (isRefresh) {
                     _this4.scollListToTop();
                   }

package/lib/components/communication/CommunicationRecord.js

@@ -21,6 +21,8 @@ var _ConvertUserName = _interopRequireDefault(require("./ConvertUserName"));
 
 var _openData = require("../../utils/open-data");
 
+var _richEditor = _interopRequireDefault(require("@titaui/rich-editor"));
+
 var _fileList = _interopRequireDefault(require("../file-list"));
 
 var _tools = require("../../utils/tools");
@@ -108,7 +110,13 @@ var CommunicationRecord = function CommunicationRecord(_ref) {
   })))), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__communication-content"),
     ref: contentRef
-  }, (0, _openData.parseTag)(communicationTrack.content.trim())), communicationTrack.attachments && /*#__PURE__*/_react["default"].createElement("div", {
+  }, [undefined, 0].includes(communicationTrack.version) && (0, _openData.parseTag)(communicationTrack.content.trim()), communicationTrack.version === 1 && /*#__PURE__*/_react["default"].createElement(_richEditor["default"], {
+    className: "".concat(prefix, "__editor-preview"),
+    placeholder: "",
+    editable: false,
+    showToolbar: false,
+    initialState: communicationTrack.content
+  })), communicationTrack.attachments && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__communication-attachments")
   }, /*#__PURE__*/_react["default"].createElement(_fileList["default"], {
     data: communicationTrack.attachments

package/lib/components/communication/index.css

@@ -1,3 +1,7 @@
+.titaui-communication__editor-preview {
+  background-color: transparent !important;
+}
+
 .titaui-communication__communication-item {
   display: flex;
   align-items: center;

package/lib/components/communication/index.js

@@ -398,7 +398,9 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           _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;
+          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 user = (0, _bsGlobal.getUserInfo)();
       return /*#__PURE__*/_react["default"].createElement(_style.CommunicationWrapper, {
         className: "communcation-wrapper ".concat(className)
@@ -474,6 +476,7 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
         isShowSendSms: isShowSendSms,
         submitText: submitText,
         showAtAll: showAtAll,
+        attachemntCanSubmit: attachemntCanSubmit,
         atAllText: atAllText,
         atAllTipText: atAllTipText,
         atAllValue: atAllValue,

package/lib/components/create-okr-modal/index.js

@@ -221,7 +221,13 @@ function CreateOkrModal(_ref, ref) {
       setOkrClassify = _useState20[1]; // 目标类别
 
 
-  var _useState21 = (0, _react.useState)(2),
+  var _useState21 = (0, _react.useState)(function () {
+    if (window.BSGlobal.tenantInfo.isOpenInfo) {
+      return 1;
+    } else {
+      return 2;
+    }
+  }),
       _useState22 = _slicedToArray(_useState21, 2),
       visibility = _useState22[0],
       setVisibility = _useState22[1]; // 可见性
@@ -680,7 +686,13 @@ function CreateOkrModal(_ref, ref) {
       });
       setCycle(cycle);
       setOkrClassify(undefined);
-      setVisibility(2);
+
+      if (window.BSGlobal.tenantInfo.isOpenInfo) {
+        setVisibility(1);
+      } else {
+        setVisibility(2);
+      }
+
       setParent({
         parentWorkId: 0,
         parentWorkName: '',
@@ -857,7 +869,7 @@ function CreateOkrModal(_ref, ref) {
     if (!isVisible) return; // @ts-ignore
 
     (0, _requestApi.getImageBase64ByUrl)(user.id).then(function (data) {
-      console.log(data);
+      // console.log(data)
       setUserAvatarBase64Url(data.Data.obj);
     })["catch"](function (err) {
       _toast["default"].Error(err);

package/lib/components/dynamic/dynamic-item/dynamic-announcement/index.css

@@ -2,6 +2,10 @@
   font-family: OPPOSans, Arial, Verdana, Helvetica Neue, Helvetica, PingFang SC, Microsoft YaHei, sans-serif;
 }
 
+.titaui-dynamic-announcement-item__editor-preview {
+  background-color: transparent !important;
+}
+
 .titaui-dynamic-announcement-item__content {
   font-size: 14px;
   color: #3f4755;

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

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _fileList = _interopRequireDefault(require("../../../file-list"));
 
+var _richEditor = _interopRequireDefault(require("@titaui/rich-editor"));
+
 var _context = require("../../context");
 
 var _tools = require("../../../../utils/tools");
@@ -72,7 +74,13 @@ var DynamicAnnouncement = function DynamicAnnouncement(_ref) {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     ref: contentRef
-  }, (0, _openData.parseTag)(data.content))), data.attachments && /*#__PURE__*/_react["default"].createElement("div", {
+  }, [undefined, 0].includes(data.version) && (0, _openData.parseTag)(data.content.trim()), data.version === 1 && /*#__PURE__*/_react["default"].createElement(_richEditor["default"], {
+    className: "".concat(prefix, "__editor-preview"),
+    placeholder: "",
+    editable: false,
+    showToolbar: false,
+    initialState: data.content
+  }))), data.attachments && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__files")
   }, /*#__PURE__*/_react["default"].createElement(_fileList["default"], {
     data: data.attachments

package/lib/components/dynamic/dynamic-item/dynamic-interview-share/index.css

@@ -7,6 +7,10 @@
   margin-bottom: 12px;
 }
 
+.titaui-dynamic-interview-share__editor-preview {
+  background-color: transparent !important;
+}
+
 .titaui-dynamic-interview-share__operate-desc {
   font-size: 14px;
   font-weight: 400;

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

@@ -9,6 +9,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _richEditor = _interopRequireDefault(require("@titaui/rich-editor"));
+
 var _getLocale = require("../../../../utils/getLocale");
 
 var _header = _interopRequireDefault(require("../components/header"));
@@ -36,8 +38,9 @@ function DynamicInterviewShare(_ref) {
       hasDynamicOpereateAuth = _ref$hasDynamicOperea === void 0 ? false : _ref$hasDynamicOperea;
   var publishUser = data.publishUser,
       content = data.content,
-      shareFeedSource = data.shareFeedSource;
-  var isPublisher = data.publishUser.userId === ((_window$BSGlobal$logi = window.BSGlobal.loginUserInfo) === null || _window$BSGlobal$logi === void 0 ? void 0 : _window$BSGlobal$logi.Id);
+      shareFeedSource = data.shareFeedSource,
+      version = data.version;
+  var isPublisher = publishUser.userId === ((_window$BSGlobal$logi = window.BSGlobal.loginUserInfo) === null || _window$BSGlobal$logi === void 0 ? void 0 : _window$BSGlobal$logi.Id);
   var renderDesc = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(preCls, "__operate-desc")
@@ -54,7 +57,13 @@ function DynamicInterviewShare(_ref) {
     showTopping: hasDynamicOpereateAuth
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__text")
-  }, (0, _openData.parseTag)(content)), /*#__PURE__*/_react["default"].createElement(_interviewContent["default"], {
+  }, [undefined, 0].includes(version) && (0, _openData.parseTag)(content.trim()), version === 1 && /*#__PURE__*/_react["default"].createElement(_richEditor["default"], {
+    className: "".concat(preCls, "__editor-preview"),
+    placeholder: "",
+    editable: false,
+    showToolbar: false,
+    initialState: content
+  })), /*#__PURE__*/_react["default"].createElement(_interviewContent["default"], {
     data: shareFeedSource
   }));
 }

package/lib/components/dynamic/dynamic-item/dynamic-share/index.css

@@ -2,6 +2,10 @@
   font-family: OPPOSans, Arial, Verdana, Helvetica Neue, Helvetica, PingFang SC, Microsoft YaHei, sans-serif;
 }
 
+.titaui-dynamic-share-item__editor-preview {
+  background-color: transparent !important;
+}
+
 .titaui-dynamic-share-item__content {
   font-size: 14px;
   color: #3f4755;

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

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _fileList = _interopRequireDefault(require("../../../file-list"));
 
+var _richEditor = _interopRequireDefault(require("@titaui/rich-editor"));
+
 var _context = require("../../context");
 
 var _header = _interopRequireDefault(require("../components/header"));
@@ -130,7 +132,13 @@ var DynamicShare = function DynamicShare(_ref) {
     onClickTitle: handleClickTitle
   }, (0, _utils.getDynamicTitleProps)(obj)))), /*#__PURE__*/_react["default"].createElement("div", {
     ref: contentRef
-  }, (0, _openData.parseTag)(data.content))), data.attachments && /*#__PURE__*/_react["default"].createElement("div", {
+  }, [undefined, 0].includes(data.version) && (0, _openData.parseTag)(data.content.trim()), data.version === 1 && /*#__PURE__*/_react["default"].createElement(_richEditor["default"], {
+    className: "".concat(prefix, "__editor-preview"),
+    placeholder: "",
+    editable: false,
+    showToolbar: false,
+    initialState: data.content
+  }))), data.attachments && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__files")
   }, /*#__PURE__*/_react["default"].createElement(_fileList["default"], {
     data: data.attachments

package/lib/components/emotions-selector/selector-content.js

@@ -19,6 +19,12 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -141,7 +147,9 @@ var EmotionsSelector = /*#__PURE__*/function (_PureComponent) {
           key: item.address,
           className: currentEmotions.size == "small" ? "emotion__body__item-small" : "emotion__body__item-big",
           onMouseDown: function onMouseDown() {
-            return onSubmit(item.name);
+            return onSubmit(item.name, _objectSpread(_objectSpread({}, item), {}, {
+              host: currentEmotions.host
+            }));
           }
         }, /*#__PURE__*/_react["default"].createElement("img", {
           "data-name": "emotion-img",

package/lib/components/emotions-selector/selector-pop.js

@@ -89,8 +89,8 @@ var EmotionsSelectorPop = /*#__PURE__*/function (_PureComponent) {
         container: container,
         className: "tita-common-pop-no-shadow ".concat(popExtraClassName) || ""
       }, /*#__PURE__*/_react["default"].createElement(_selectorContent["default"], {
-        onSubmit: function onSubmit(emotionName) {
-          _onSubmit(emotionName);
+        onSubmit: function onSubmit(emotionName, emotion) {
+          _onSubmit(emotionName, emotion);
 
           _this2.handleHide();
         },

package/lib/components/mblog/components/MblogAction.js

@@ -163,6 +163,8 @@ var MblogAction = /*#__PURE__*/function (_PureComponent) {
           emotionsSelectorPopAlign = _this$props.emotionsSelectorPopAlign,
           visibility = _this$props.visibility,
           onActionsSelectedUserChange = _this$props.onActionsSelectedUserChange,
+          onActionsAllMembersChange = _this$props.onActionsAllMembersChange,
+          onActionsEmotionChange = _this$props.onActionsEmotionChange,
           dragFilesList = _this$props.dragFilesList,
           _this$props$disableRa = _this$props.disableRangeSelect,
           disableRangeSelect = _this$props$disableRa === void 0 ? true : _this$props$disableRa;
@@ -214,9 +216,7 @@ var MblogAction = /*#__PURE__*/function (_PureComponent) {
       }, /*#__PURE__*/_react["default"].createElement(_style.LeftBtn, {
         key: this.props.atAllText,
         tips: this.props.atAllTipText,
-        onMouseDown: function onMouseDown() {
-          return onActionsTextChange(atAllValue || '');
-        }
+        onMouseDown: onActionsAllMembersChange
       }, /*#__PURE__*/_react["default"].createElement("span", {
         className: "btn-txt"
       }, this.props.atAllText))), this.props.isShowEmotion && /*#__PURE__*/_react["default"].createElement(_style.LeftBtn, {
@@ -225,8 +225,8 @@ var MblogAction = /*#__PURE__*/function (_PureComponent) {
         align: emotionsSelectorPopAlign,
         popExtraClassName: "pull-screen-ignore",
         container: this.context.popContainer,
-        onSubmit: function onSubmit(emotionName) {
-          return onActionsTextChange(emotionName);
+        onSubmit: function onSubmit(emotionName, emotion) {
+          return onActionsEmotionChange(emotion);
         }
       }, /*#__PURE__*/_react["default"].createElement(_style.IconSpan, {
         className: "tu-icon-emoji"

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

@@ -9,8 +9,12 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _richEditor = _interopRequireDefault(require("@titaui/rich-editor"));
+
 var _style = require("../style");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -47,10 +51,8 @@ var MblogContent = /*#__PURE__*/function (_PureComponent) {
 
     _this = _super.call(this, props);
 
-    _this._handlerTipsLabelClick = function () {
-      // @ts-ignore
-      _this.refs.textareaInput.focus(); // 点击 输入框获得焦点
-
+    _this._handlerTipsLabelClick = function () {// @ts-ignore
+      // this.refs.textareaInput.focus(); // 点击 输入框获得焦点
     };
 
     _this._handlerFocus = function (event) {
@@ -146,20 +148,22 @@ var MblogContent = /*#__PURE__*/function (_PureComponent) {
       _this.props.onContentChange(event.target.value);
 
       _this.setTextareaHeight(); // @ts-ignore
+      // this.refs.textareaInput.focus();
 
+    };
 
-      _this.refs.textareaInput.focus();
+    _this.onChangeEditor = function (value) {
+      _this.props.onContentChange(value);
     };
 
     _this.setTextareaHeight = function () {
       var _this$props = _this.props,
           initialTextHeight = _this$props.initialTextHeight,
           autoResizing = _this$props.autoResizing;
-      if (!autoResizing) return;
-      var textareaSetHeight = _this.refs.textareaSetHeight;
-      var textareaInput = _this.refs.textareaInput; // @ts-ignore
-
-      textareaInput.style.height = autoResizing && textareaSetHeight.scrollHeight > initialTextHeight ? "".concat(textareaSetHeight.scrollHeight, "px") : "".concat(initialTextHeight, "px");
+      if (!autoResizing) return; // const { textareaSetHeight } = this.refs;
+      // const { textareaInput } = this.refs;
+      // @ts-ignore
+      // // textareaInput.style.height = autoResizing && textareaSetHeight.scrollHeight > initialTextHeight ? `${textareaSetHeight.scrollHeight}px` : `${initialTextHeight}px`;
     };
 
     _this.state = {
@@ -172,12 +176,10 @@ var MblogContent = /*#__PURE__*/function (_PureComponent) {
   _createClass(MblogContent, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      if (this.props.autoFocus) {
-        // @ts-ignore
-        this.refs.textareaInput.focus();
-      }
+      if (this.props.autoFocus) {// @ts-ignore
+        // this.refs.textareaInput.focus();
+      } // this.props.setTextareaRef && this.props.setTextareaRef(this.refs.textareaInput);
 
-      this.props.setTextareaRef && this.props.setTextareaRef(this.refs.textareaInput);
     }
   }, {
     key: "componentDidUpdate",
@@ -210,21 +212,14 @@ var MblogContent = /*#__PURE__*/function (_PureComponent) {
         }
       }, placeholderText)), /*#__PURE__*/_react["default"].createElement(_style.TextareaWrapper, {
         className: "textarea-wrap"
-      }, /*#__PURE__*/_react["default"].createElement(_style.Textarea, {
-        ref: "textareaSetHeight",
-        value: textareaValue,
-        onChange: function onChange() {},
-        className: "textarea-setheight"
-      }), /*#__PURE__*/_react["default"].createElement(_style.Textarea, {
-        ref: "textareaInput",
-        className: "textarea-details ".concat(visibility === 1 ? "" : "private__bg"),
-        value: textareaValue,
-        onFocus: this._handlerFocus,
-        onBlur: this._handlerBlur,
-        onKeyUp: this._handlerKeyUp,
-        onKeyDown: this._handlerKeyDown,
-        onPaste: this._handlerPaste,
-        onChange: this._handleInputChange
+      }, /*#__PURE__*/_react["default"].createElement(_richEditor["default"], {
+        ref: "editorRef",
+        editable: true,
+        showToolbar: false,
+        withMentions: true,
+        initialState: {},
+        onDocChange: this.onChangeEditor,
+        placeholder: placeholderText
       })), /*#__PURE__*/_react["default"].createElement(_style.Tips, {
         className: "textarea-tips",
         onMouseDown: this._handlerTipsLabelClick,

package/lib/components/mblog/index.css

@@ -5,3 +5,14 @@
 .titaui-mblog__avatar {
   margin-right: 12px;
 }
+
+.titaui-mblog .textarea-wrap .tita-rich-editor {
+  height: 80px;
+  overflow-y: auto;
+}
+
+.titaui-mblog .textarea-wrap .tita-rich-editor p {
+  font-size: 14px;
+  line-height: 22px;
+  padding: 0;
+}

package/lib/components/mblog/index.js

@@ -27,6 +27,8 @@ var _platform = require("../../utils/platform");
 
 var _getLocale = require("../../utils/getLocale");
 
+var _editor = _interopRequireWildcard(require("../../utils/editor"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -94,17 +96,23 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
       });
     };
 
-    _this.onContentChange = function (contentValue) {
-      // @ts-ignore
-      var textareaInput = _this.refs.textEditor.refs.textareaInput;
-      var start = textareaInput.selectionStart;
-      var atAll = !!contentValue.match(/@\[所有同事:all_members\]/g);
+    _this.onEditorContentChange = function (_ref) {
+      var mentionUsers = _ref.mentionUsers,
+          pureText = _ref.pureText,
+          richText = _ref.richText,
+          state = _ref.state;
+      var contentValue = pureText;
+      var atAll = !!mentionUsers.find(function (_ref2) {
+        var mentionType = _ref2.mentionType;
+        return mentionType === 2;
+      });
 
       _this.setState({
-        isInputAt: contentValue.charAt(start - 1) == '@',
-        // isInputEnterSubmit: contentValue === 'isInputEnterSubmit',
+        mentionUsers: mentionUsers,
+        richText: richText,
+        pureText: pureText,
         textareaValue: contentValue,
-        isAllowSubmit: _this.allowSubmit(contentValue),
+        isAllowSubmit: state.doc.content.size > 2,
         isAtAll: atAll,
         visibility: atAll ? 1 : _this.state.visibility
       });
@@ -112,6 +120,26 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
       localStorage.setItem(_this.state.localStroageKey, contentValue);
     };
 
+    _this.onActionsAllMembersChange = function () {
+      var editorRef = _this.refs.textEditor.refs.editorRef;
+      editorRef.append((0, _editor["default"])([{
+        type: 'all_members',
+        Name: (0, _getLocale.getLocale)('Per_Ma_form_newdetail_All'),
+        Id: 0
+      }]), {
+        insertPos: true
+      });
+      editorRef.focus();
+    };
+
+    _this.onActionsEmotionChange = function (emotion) {
+      var editorRef = _this.refs.textEditor.refs.editorRef;
+      editorRef.append((0, _editor.appendImgs)(emotion.host + emotion.address, emotion.name), {
+        insertPos: true
+      });
+      editorRef.focus();
+    };
+
     _this.onActionsTextChange = function (actionValue) {
       if (actionValue === 'allowSendSMS') {
         return _this.setState({
@@ -135,63 +163,39 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
         return _this.setState({
           visibility: 3
         });
-      } // @ts-ignore
-
-
-      var textareaInput = _this.refs.textEditor.refs.textareaInput;
-      var textareaValue = _this.state.textareaValue;
-      textareaValue = (0, _index.insertTextAtPointer)(textareaInput, actionValue);
-      localStorage.setItem(_this.state.localStroageKey, textareaValue); // 输入内容进行本地缓存
-
-      var atAll = !!textareaValue.match(/@\[所有同事:all_members\]/g);
-
-      _this.setState({
-        textareaValue: textareaValue,
-        isAllowSubmit: _this.allowSubmit(textareaValue),
-        isAtAll: atAll,
-        visibility: atAll ? 1 : _this.state.visibility
-      }, function () {
-        _this.focus();
-      });
+      }
     };
 
     _this.onActionsSelectedUserChange = function (users) {
-      // @ts-ignore
-      var textareaInput = _this.refs.textEditor.refs.textareaInput;
-      var mark = (0, _index.generateSelectedMark)(users, textareaInput);
-      var nextContent = (0, _index.insertTextAtPointer)(textareaInput, mark);
+      var editorRef = _this.refs.textEditor.refs.editorRef;
+      editorRef.append((0, _editor["default"])(users), {
+        insertPos: true
+      });
+      editorRef.focus(); // @ts-ignore
+      // const { textareaInput } = this.refs.textEditor.refs
+      // const mark = generateSelectedMark(users, textareaInput)
+      // const nextContent = insertTextAtPointer(textareaInput, mark)
 
       _this.setState({
-        isInputAt: false,
-        textareaValue: nextContent,
-        isAllowSubmit: _this.allowSubmit(nextContent)
+        isInputAt: false
       }, function () {
         _this.focus();
       });
     };
 
     _this.handlerDealAttachemntData = function (uploadSuccessFilesPath) {
-      var _this$refs$textEditor2;
-
+      var attachemntCanSubmit = _this.props.attachemntCanSubmit;
       var successFilesPath = uploadSuccessFilesPath.filter(function (item) {
         return item !== '';
       });
-      var successFilesPathLen = successFilesPath.length; // @ts-ignore
-
-      var _this$refs$textEditor = (_this$refs$textEditor2 = _this.refs.textEditor) === null || _this$refs$textEditor2 === void 0 ? void 0 : _this$refs$textEditor2.refs,
-          textareaInput = _this$refs$textEditor.textareaInput;
-
-      var textareaValue = _this.state.textareaValue; // textareaValue = dealWithLoadedFileTips(textareaValue, successFilesPathLen); // 更新输入框内容
 
-      localStorage.setItem(_this.state.localStroageKey, textareaValue); // 将输入框内容进行本地缓存
-
-      if (textareaInput) {
-        textareaInput.focus();
+      if (successFilesPath.length > 0 && attachemntCanSubmit) {
+        _this.setState({
+          isAllowSubmit: true
+        });
       }
 
       _this.setState({
-        textareaValue: textareaValue,
-        isAllowSubmit: textareaValue.trim().length > 0 && textareaValue.trim().length <= (_this.props.maxLength || 2000) || successFilesPath.length > 0,
         uploadSuccessFilesPath: successFilesPath,
         dragFilesList: []
       });
@@ -217,7 +221,10 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
           textareaValue = _this$state.textareaValue,
           uploadSuccessFilesPath = _this$state.uploadSuccessFilesPath,
           isSendSMS = _this$state.isSendSMS,
-          visibility = _this$state.visibility;
+          visibility = _this$state.visibility,
+          mentionUsers = _this$state.mentionUsers,
+          richText = _this$state.richText,
+          pureText = _this$state.pureText;
       var _this$props2 = _this.props,
           isShowAttachment = _this$props2.isShowAttachment,
           isShowSendSms = _this$props2.isShowSendSms,
@@ -243,7 +250,15 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
       } // @ts-ignore
 
 
-      sentData.Content = (0, _index.htmlEncodeByRegExp)(textareaValue); // @ts-ignore
+      sentData.Content = richText; // @ts-ignore
+
+      if (pureText) {
+        sentData.contentTxt = pureText.replace(/@\$userName=0\$/g, '@所有人');
+      } // @ts-ignore
+
+
+      if (mentionUsers) sentData.mentionUsers = (0, _editor.usersTypeToNumber)(mentionUsers);
+      sentData.version = 1; // @ts-ignore
 
       if (submitType === 'submit' && submitStatus !== 2) {
         // 发送
@@ -253,6 +268,9 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
         _this.props.onMblogSubmit(submitType);
       }
 
+      var editorRef = _this.refs.textEditor.refs.editorRef;
+      editorRef.clear();
+
       _this.setState({
         textareaValue: '',
         uploadSuccessFilesPath: []
@@ -323,6 +341,9 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
     };
 
     _this.state = {
+      mentionUsers: [],
+      richText: '',
+      pureText: '',
       uploadSuccessFilesPath: [],
       isAllowSubmit: false,
       localStroageKey: '',
@@ -473,7 +494,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
           _this2.handlerPasteChange(file);
         },
         onContentChange: function onContentChange(contentValue) {
-          _this2.onContentChange(contentValue);
+          _this2.onEditorContentChange(contentValue);
         },
         onActionSubmit: function onActionSubmit(submitType) {
           _this2.onActionSubmit(submitType);
@@ -515,6 +536,8 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
         onActionsTextChange: function onActionsTextChange(actionValue) {
           _this2.onActionsTextChange(actionValue);
         },
+        onActionsAllMembersChange: this.onActionsAllMembersChange,
+        onActionsEmotionChange: this.onActionsEmotionChange,
         onActionsSelectedUserChange: function onActionsSelectedUserChange(users) {
           return _this2.onActionsSelectedUserChange(users);
         },
@@ -570,5 +593,6 @@ MBlog.defaultProps = {
   isShowRangeDropDown: true,
   isShowBtnCancel: true,
   submitStatus: 0,
-  showUser: false
+  showUser: false,
+  attachemntCanSubmit: true
 };

package/lib/components/okr-detail/e-list/search-form/fields/e-status.js

@@ -89,7 +89,7 @@ function _default(props) {
     name: "doing"
   }, (0, _getLocale.getLocale)("Per_MyRe_text_Inprogress")), /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "finish"
-  }, (0, _getLocale.getLocale)("OKR_MyO_Butt_Hasended")), /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
+  }, (0, _getLocale.getLocale)("OKR_MyO_E_From_Completed")), /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "delay"
   }, (0, _getLocale.getLocale)("OKR_MyO_E_From_Delayed")), /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "cancel"

package/lib/components/okr-review/ReviewPop/components/ReviewBody/index.js

@@ -271,9 +271,8 @@ var ReviewBody = /*#__PURE__*/function (_PureComponent) {
     };
 
     _this._handlerStandardModeProblemChange = function (value) {
-      var data = _objectSpread({}, _this.state.data);
+      var data = _objectSpread({}, _this.state.data); // console.log(htmlEncodeByRegExp(value))
 
-      console.log((0, _mblog.htmlEncodeByRegExp)(value));
 
       _this._updateReviewData(data, "Drawback", value);
     };
@@ -605,8 +604,8 @@ var ReviewBody = /*#__PURE__*/function (_PureComponent) {
       var screenHeight = window.screen.height;
       var _this$props2 = this.props,
           ObjData = _this$props2.ObjData,
-          EditType = _this$props2.EditType;
-      console.log(ObjData);
+          EditType = _this$props2.EditType; // console.log(ObjData);
+
       var _this$state = this.state,
           data = _this$state.data,
           popContainer = _this$state.popContainer;

package/lib/components/okr-review/components/ReviewItem/index.js

@@ -61,7 +61,7 @@ var ReviewItem = /*#__PURE__*/function (_PureComponent) {
           editReview = _this$props.editReview,
           reviewItemData = _this$props.reviewItemData,
           editAble = _this$props.editAble;
-      var href = "".concat(location.pathname, "#okr/reviewDetail?okrId=8077&back=").concat(location.hash, "&replayId=").concat(reviewItemData.replayId, "&feedId=").concat(feedId, "&krIndex=").concat(krIndex, "&editAble=").concat(editAble);
+      var href = "".concat(location.pathname, "#okr/reviewDetail?okrId=8077&back=''&replayId=").concat(reviewItemData.replayId, "&feedId=").concat(feedId, "&krIndex=").concat(krIndex, "&editAble=").concat(editAble);
       return /*#__PURE__*/_react["default"].createElement(_style.ReviewItemContainer, {
         className: className,
         mode: isCompactMode ? 0 : 1

package/lib/components/okr-review/index.js

@@ -210,7 +210,7 @@ var Review = /*#__PURE__*/function (_PureComponent) {
         mode: isCompactMode ? 0 : 1
       }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("OKR_MyO_KRP_Pop_Understandt"))))) : /*#__PURE__*/_react["default"].createElement(_style.ReviewList, null, reviewList.map(function (item, index) {
         return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, {
-          key: index
+          key: feedId
         }, /*#__PURE__*/_react["default"].createElement(_ReviewItem["default"], {
           isCompactMode: isCompactMode,
           feedId: feedId,

package/lib/components-v1/textarea/index.js

@@ -11,8 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _i18nFrontTranslate = require("../../utils/i18n-front-translate");
 
-var _mblog = require("../../utils/mblog");
-
 var _style = require("./style");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -149,7 +147,6 @@ var TextareaView = /*#__PURE__*/function (_PureComponent) {
           isFocus = _this$state.isFocus,
           isHasPlaceholder = _this$state.isHasPlaceholder;
       var valueLen = value.length;
-      console.log(123, (0, _mblog.htmlDecodeByRegExp)(value));
       return /*#__PURE__*/_react["default"].createElement(_style.TextareaWrapper, {
         className: className,
         style: style

package/lib/utils/bs-global.js

@@ -54,7 +54,10 @@ var getSource = function getSource() {
 exports.getSource = getSource;
 
 var getUploadMaxSize = function getUploadMaxSize() {
+  var _info$tenantSetting;
+
   var info = getBSGlobal('tenantInfo');
+  if ((_info$tenantSetting = info.tenantSetting) !== null && _info$tenantSetting !== void 0 && _info$tenantSetting.allowUploadAttachmentSize) return info.tenantSetting.allowUploadAttachmentSize;
   if (info.Id === 352728) return 150;
   var isDingDing = info.Source === 861;
   var isDingZhi = window.dingZhiSize && window.dingZhiSize.indexOf(info.Id) !== -1;

package/lib/utils/editor.js

@@ -0,0 +1,78 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.usersTypeToNumber = exports["default"] = exports.appendUsers = exports.appendImgs = exports.UserTypeNumberEnum = void 0;
+
+var _flatten = _interopRequireDefault(require("lodash/flatten"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+var UserTypeNumberEnum;
+exports.UserTypeNumberEnum = UserTypeNumberEnum;
+
+(function (UserTypeNumberEnum) {
+  UserTypeNumberEnum[UserTypeNumberEnum["User"] = 1] = "User";
+  UserTypeNumberEnum[UserTypeNumberEnum["AllMembers"] = 2] = "AllMembers";
+  UserTypeNumberEnum[UserTypeNumberEnum["ProjectOrTarget"] = 4] = "ProjectOrTarget";
+})(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;
+    return [{
+      type: 'mention',
+      attrs: {
+        mentionId: Id,
+        mentionName: Name,
+        mentionType: type
+      }
+    }, {
+      type: 'text',
+      text: ' '
+    }];
+  }));
+};
+
+exports.appendUsers = appendUsers;
+
+var appendImgs = function appendImgs(src, name) {
+  return [{
+    type: 'image',
+    attrs: {
+      src: src,
+      alt: name
+    },
+    content: [{
+      type: 'text',
+      text: name
+    }]
+  }];
+};
+
+exports.appendImgs = appendImgs;
+
+var usersTypeToNumber = function usersTypeToNumber(mentionUsers) {
+  return mentionUsers.map(function (user) {
+    return _objectSpread(_objectSpread({}, user), {}, {
+      mentionType: {
+        user: UserTypeNumberEnum.User,
+        all_members: UserTypeNumberEnum.AllMembers
+      }[user.mentionType]
+    });
+  });
+};
+
+exports.usersTypeToNumber = usersTypeToNumber;
+var _default = appendUsers;
+exports["default"] = _default;

package/package.json

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