@titaui/pc 1.11.52-beta.2 → 1.11.52-beta.20

package/lib/components/create-okr-modal/fields/okr-parent.js

@@ -19,6 +19,8 @@ var _changeOkrModal = _interopRequireDefault(require("../../change-okr-modal"));
 
 var _getLocale = require("../../../utils/getLocale");
 
+var _openData = require("../../../utils/open-data");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -68,7 +70,7 @@ function _default(_ref) {
     e.stopPropagation();
     setParent({
       parentWorkId: 0,
-      parentWorkName: "",
+      parentWorkName: '',
       parentType: 0,
       parentKrId: 0
     });
@@ -107,7 +109,7 @@ function _default(_ref) {
 
   (0, _react.useEffect)(function () {
     // @ts-ignore
-    (0, _helper.taker)((0, _helper.getApiUrl)("org/Get"), "get").then(function (res) {
+    (0, _helper.taker)((0, _helper.getApiUrl)('org/Get'), 'get').then(function (res) {
       if (res.Code == 1) {
         var SuperiorUser = res.Data.SuperiorUser;
 
@@ -127,13 +129,13 @@ function _default(_ref) {
     className: "create-modal__sub-block"
   }, isCreateModal ? /*#__PURE__*/_react["default"].createElement("div", {
     className: "create-modal__sub-title"
-  }, (0, _getLocale.getLocale)("OKR_MyO_Pop_SetAlignment")) : /*#__PURE__*/_react["default"].createElement(_style.TitleLine, null, (0, _getLocale.getLocale)("OKR_MyO_Pop_SetAlignment")), /*#__PURE__*/_react["default"].createElement(_style.SelectBtn, {
+  }, (0, _getLocale.getLocale)('OKR_MyO_Pop_SetAlignment')) : /*#__PURE__*/_react["default"].createElement(_style.TitleLine, null, (0, _getLocale.getLocale)('OKR_MyO_Pop_SetAlignment')), /*#__PURE__*/_react["default"].createElement(_style.SelectBtn, {
     onClick: onSelectClickHandler
   }, /*#__PURE__*/_react["default"].createElement("span", {
     style: {
-      color: !parent.parentWorkName ? "#BFC7D5" : ""
+      color: !parent.parentWorkName ? '#BFC7D5' : ''
     }
-  }, !parent.parentWorkName ? (0, _getLocale.getLocale)("OKR_MyO_Pop_Aligneobjective") : parent.parentWorkName), !!parent.parentWorkName && /*#__PURE__*/_react["default"].createElement("a", {
+  }, !parent.parentWorkName ? (0, _getLocale.getLocale)('OKR_MyO_Pop_Aligneobjective') : (0, _openData.parseString)(parent.parentWorkName)), !!parent.parentWorkName && /*#__PURE__*/_react["default"].createElement("a", {
     className: "tu-icon-cross",
     onClick: iconCrossClickHandler
   }), /*#__PURE__*/_react["default"].createElement("i", {

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

@@ -9,10 +9,14 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _richEditor = require("@titaui/rich-editor");
+
 var _uuid = _interopRequireDefault(require("uuid"));
 
 var _titaUi = require("tita-ui");
 
+var _scrollbar = _interopRequireDefault(require("../scrollbar"));
+
 var _bsGlobal = require("../../utils/bs-global");
 
 var _roundWeight = require("../../utils/roundWeight");
@@ -106,6 +110,13 @@ var initOCheckResult = function initOCheckResult() {
   });
 };
 
+var DefaultOkrNameData = {
+  mentionUsers: [],
+  pureText: '',
+  pureTextExcludeAt: '',
+  richText: undefined
+};
+
 function CreateOkrModal(_ref, ref) {
   var initCycle = _ref.initCycle,
       userInfo = _ref.userInfo,
@@ -121,10 +132,15 @@ function CreateOkrModal(_ref, ref) {
       _ref$isFromAssess = _ref.isFromAssess,
       isFromAssess = _ref$isFromAssess === void 0 ? false : _ref$isFromAssess;
 
-  var _useState = (0, _react.useState)(visible),
+  var _useState = (0, _react.useState)('initialization'),
       _useState2 = _slicedToArray(_useState, 2),
-      isVisible = _useState2[0],
-      setVisible = _useState2[1]; // @ts-ignore
+      richEditorStatus = _useState2[0],
+      setRichEditorStatus = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(visible),
+      _useState4 = _slicedToArray(_useState3, 2),
+      isVisible = _useState4[0],
+      setVisible = _useState4[1]; // @ts-ignore
 
 
   var userId = BSGlobal.loginUserInfo.Id;
@@ -138,80 +154,80 @@ function CreateOkrModal(_ref, ref) {
       Id = _ref2.Id,
       UserAvatar = _ref2.UserAvatar;
 
-  var _useState3 = (0, _react.useState)(''),
-      _useState4 = _slicedToArray(_useState3, 2),
-      okrName = _useState4[0],
-      setOkrName = _useState4[1]; // 目标名称
+  var _useState5 = (0, _react.useState)(DefaultOkrNameData),
+      _useState6 = _slicedToArray(_useState5, 2),
+      okrNameData = _useState6[0],
+      setOkrNameData = _useState6[1]; // 目标名称
 
 
-  var _useState5 = (0, _react.useState)({
+  var _useState7 = (0, _react.useState)({
     name: Name,
     id: Id,
     avatar: UserAvatar
   }),
-      _useState6 = _slicedToArray(_useState5, 2),
-      user = _useState6[0],
-      setUser = _useState6[1]; // 负责人
+      _useState8 = _slicedToArray(_useState7, 2),
+      user = _useState8[0],
+      setUser = _useState8[1]; // 负责人
 
 
-  var _useState7 = (0, _react.useState)(false),
-      _useState8 = _slicedToArray(_useState7, 2),
-      isCustomWeight = _useState8[0],
-      setIsCustomWeight = _useState8[1]; // 是否自定义权重
+  var _useState9 = (0, _react.useState)(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      isCustomWeight = _useState10[0],
+      setIsCustomWeight = _useState10[1]; // 是否自定义权重
 
 
-  var _useState9 = (0, _react.useState)({
+  var _useState11 = (0, _react.useState)({
     departmentId: 0,
     departmentName: ''
   }),
-      _useState10 = _slicedToArray(_useState9, 2),
-      dept = _useState10[0],
-      setDept = _useState10[1]; // 部门信息 用于目标类型为部门时
+      _useState12 = _slicedToArray(_useState11, 2),
+      dept = _useState12[0],
+      setDept = _useState12[1]; // 部门信息 用于目标类型为部门时
 
 
-  var _useState11 = (0, _react.useState)({
+  var _useState13 = (0, _react.useState)({
     groupId: 0,
     groupName: ''
   }),
-      _useState12 = _slicedToArray(_useState11, 2),
-      team = _useState12[0],
-      setTeam = _useState12[1]; // 团队信息 用于目标类型为团队时
+      _useState14 = _slicedToArray(_useState13, 2),
+      team = _useState14[0],
+      setTeam = _useState14[1]; // 团队信息 用于目标类型为团队时
 
 
-  var _useState13 = (0, _react.useState)({
+  var _useState15 = (0, _react.useState)({
     typeName: (0, _getLocale.getLocale)('OKR_MyO_Pop_Individual'),
     typeId: 1
   }),
-      _useState14 = _slicedToArray(_useState13, 2),
-      type = _useState14[0],
-      setType = _useState14[1]; // 目标类型
-
-
-  var _useState15 = (0, _react.useState)(initCycle),
       _useState16 = _slicedToArray(_useState15, 2),
-      cycle = _useState16[0],
-      setCycle = _useState16[1]; // 目标周期信息
+      type = _useState16[0],
+      setType = _useState16[1]; // 目标类型
 
 
-  var _useState17 = (0, _react.useState)(),
+  var _useState17 = (0, _react.useState)(initCycle),
       _useState18 = _slicedToArray(_useState17, 2),
-      okrClassify = _useState18[0],
-      setOkrClassify = _useState18[1]; // 目标类别
+      cycle = _useState18[0],
+      setCycle = _useState18[1]; // 目标周期信息
 
 
-  var _useState19 = (0, _react.useState)(1),
+  var _useState19 = (0, _react.useState)(),
       _useState20 = _slicedToArray(_useState19, 2),
-      visibility = _useState20[0],
-      setVisibility = _useState20[1]; // 可见性
+      okrClassify = _useState20[0],
+      setOkrClassify = _useState20[1]; // 目标类别
 
 
-  var _useState21 = (0, _react.useState)({}),
+  var _useState21 = (0, _react.useState)(1),
       _useState22 = _slicedToArray(_useState21, 2),
-      visiableLimit = _useState22[0],
-      setVisiableLimit = _useState22[1]; // 可见性指定范围
+      visibility = _useState22[0],
+      setVisibility = _useState22[1]; // 可见性
+
+
+  var _useState23 = (0, _react.useState)({}),
+      _useState24 = _slicedToArray(_useState23, 2),
+      visiableLimit = _useState24[0],
+      setVisiableLimit = _useState24[1]; // 可见性指定范围
 
 
-  var _useState23 = (0, _react.useState)([{
+  var _useState25 = (0, _react.useState)([{
     // kr信息
     uuid: _uuid["default"].v1(),
     principalId: Id,
@@ -219,91 +235,94 @@ function CreateOkrModal(_ref, ref) {
     userAvatar: UserAvatar,
     krWeight: 100,
     mileStoneName: '',
+    mileStoneNamePureTextExcludeAt: '',
+    mileStoneNameRichText: undefined,
+    aiteUsers: [],
     confidenceIndex: 5
   }]),
-      _useState24 = _slicedToArray(_useState23, 2),
-      krDatas = _useState24[0],
-      setKrDatas = _useState24[1];
+      _useState26 = _slicedToArray(_useState25, 2),
+      krDatas = _useState26[0],
+      setKrDatas = _useState26[1];
 
-  var _useState25 = (0, _react.useState)({
+  var _useState27 = (0, _react.useState)({
     // 对其目标
     parentWorkId: 0,
     parentWorkName: '',
     parentType: 0,
     parentKrId: 0
   }),
-      _useState26 = _slicedToArray(_useState25, 2),
-      parent = _useState26[0],
-      setParent = _useState26[1];
-
-  var _useState27 = (0, _react.useState)(false),
       _useState28 = _slicedToArray(_useState27, 2),
-      oNameIsInput = _useState28[0],
-      setONameIsInput = _useState28[1];
+      parent = _useState28[0],
+      setParent = _useState28[1];
 
   var _useState29 = (0, _react.useState)(false),
       _useState30 = _slicedToArray(_useState29, 2),
-      krIsInput = _useState30[0],
-      setKrIsInput = _useState30[1];
+      oNameIsInput = _useState30[0],
+      setONameIsInput = _useState30[1];
 
-  var _useState31 = (0, _react.useState)(initOCheckResult()),
+  var _useState31 = (0, _react.useState)(false),
       _useState32 = _slicedToArray(_useState31, 2),
-      oNameCheckResult = _useState32[0],
-      setONameCheckResult = _useState32[1];
+      krIsInput = _useState32[0],
+      setKrIsInput = _useState32[1];
+
+  var _useState33 = (0, _react.useState)(initOCheckResult()),
+      _useState34 = _slicedToArray(_useState33, 2),
+      oNameCheckResult = _useState34[0],
+      setONameCheckResult = _useState34[1];
 
-  var _useState33 = (0, _react.useState)({
+  var _useState35 = (0, _react.useState)({
     finalResult: _okrCreateSuggest.EOkrCreateSuggestResultType.normal,
     friendlyResult: []
   }),
-      _useState34 = _slicedToArray(_useState33, 2),
-      krsCheckResult = _useState34[0],
-      setKrsCheckResult = _useState34[1];
-
-  var _useState35 = (0, _react.useState)(false),
       _useState36 = _slicedToArray(_useState35, 2),
-      customCloseOSuggest = _useState36[0],
-      setCustomCloseOSuggest = _useState36[1]; // 用户点击收起后不再自动弹出
-
+      krsCheckResult = _useState36[0],
+      setKrsCheckResult = _useState36[1];
 
   var _useState37 = (0, _react.useState)(false),
       _useState38 = _slicedToArray(_useState37, 2),
-      customCloseKrSuggest = _useState38[0],
-      setCustomCloseKrSuggest = _useState38[1];
+      customCloseOSuggest = _useState38[0],
+      setCustomCloseOSuggest = _useState38[1]; // 用户点击收起后不再自动弹出
+
 
-  var _useState39 = (0, _react.useState)(),
+  var _useState39 = (0, _react.useState)(false),
       _useState40 = _slicedToArray(_useState39, 2),
-      createdSuccessInfo = _useState40[0],
-      setCreatedSuccessInfo = _useState40[1];
+      customCloseKrSuggest = _useState40[0],
+      setCustomCloseKrSuggest = _useState40[1];
 
-  var _useState41 = (0, _react.useState)(false),
+  var _useState41 = (0, _react.useState)(),
       _useState42 = _slicedToArray(_useState41, 2),
-      showCreatedSuccessInfo = _useState42[0],
-      setShowCreatedSuccessInfo = _useState42[1];
+      createdSuccessInfo = _useState42[0],
+      setCreatedSuccessInfo = _useState42[1];
 
-  var _useState43 = (0, _react.useState)(Math.floor(Math.random() * 6)),
+  var _useState43 = (0, _react.useState)(false),
       _useState44 = _slicedToArray(_useState43, 2),
-      tipIndex = _useState44[0],
-      setTipIndex = _useState44[1];
+      showCreatedSuccessInfo = _useState44[0],
+      setShowCreatedSuccessInfo = _useState44[1];
 
-  var _useState45 = (0, _react.useState)(''),
+  var _useState45 = (0, _react.useState)(Math.floor(Math.random() * 6)),
       _useState46 = _slicedToArray(_useState45, 2),
-      userAvatarBase64Url = _useState46[0],
-      setUserAvatarBase64Url = _useState46[1];
+      tipIndex = _useState46[0],
+      setTipIndex = _useState46[1];
 
-  var _useState47 = (0, _react.useState)(false),
+  var _useState47 = (0, _react.useState)(''),
       _useState48 = _slicedToArray(_useState47, 2),
-      krIsValidate = _useState48[0],
-      setKrIsValidate = _useState48[1];
+      userAvatarBase64Url = _useState48[0],
+      setUserAvatarBase64Url = _useState48[1];
 
   var _useState49 = (0, _react.useState)(false),
       _useState50 = _slicedToArray(_useState49, 2),
-      isApplyTpl = _useState50[0],
-      setIsApplyTpl = _useState50[1];
+      krIsValidate = _useState50[0],
+      setKrIsValidate = _useState50[1];
 
   var _useState51 = (0, _react.useState)(false),
       _useState52 = _slicedToArray(_useState51, 2),
-      isInputContent = _useState52[0],
-      setIsInputContent = _useState52[1];
+      isApplyTpl = _useState52[0],
+      setIsApplyTpl = _useState52[1];
+
+  var _useState53 = (0, _react.useState)(false),
+      _useState54 = _slicedToArray(_useState53, 2),
+      isInputContent = _useState54[0],
+      setIsInputContent = _useState54[1];
 
   var wrapperRef = (0, _react.useRef)();
   var modalRef = (0, _react.useRef)();
@@ -336,7 +355,12 @@ function CreateOkrModal(_ref, ref) {
       setCase: function setCase(data) {
         var name = data.name,
             subelements = data.subelements;
-        setOkrName(name);
+        setOkrNameData({
+          mentionUsers: [],
+          pureText: name,
+          pureTextExcludeAt: name,
+          richText: (0, _richEditor.TitaRichEditorInitTextState)(name)
+        });
         setKrDatas(subelements.map(function (s) {
           return {
             uuid: _uuid["default"].v1(),
@@ -345,13 +369,21 @@ function CreateOkrModal(_ref, ref) {
             userAvatar: UserAvatar,
             krWeight: (0, _roundWeight.RoundWeight)(100 / subelements.length),
             mileStoneName: s.name,
+            mileStoneNamePureTextExcludeAt: '',
+            mileStoneNameRichText: (0, _richEditor.TitaRichEditorInitTextState)(s.name),
+            aiteUsers: [],
             confidenceIndex: 5
           };
         }));
         setIsCustomWeight(false);
       },
       setData: function setData(data) {
-        setOkrName(data.okrName);
+        setOkrNameData({
+          mentionUsers: [],
+          pureText: data.okrName,
+          pureTextExcludeAt: data.okrName,
+          richText: (0, _richEditor.TitaRichEditorInitTextState)(data.okrName)
+        });
         setUser(data.user);
       },
       show: showCreateOkrModal,
@@ -401,13 +433,15 @@ function CreateOkrModal(_ref, ref) {
 
   var onModalOkHandler = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      var orkNameLengthValidate, visibilityArea, data, krNum, krTotalLength, krAvarageLength, krMeasurableLength, oHasVtWords, callData, workId;
+      var mentionUsers, pureText, pureTextExcludeAt, richText, orkNameLengthValidate, visibilityArea, formData, data, krNum, krTotalLength, krAvarageLength, krMeasurableLength, oHasVtWords, callData, workId;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              if (okrName) {
-                _context.next = 3;
+              mentionUsers = okrNameData.mentionUsers, pureText = okrNameData.pureText, pureTextExcludeAt = okrNameData.pureTextExcludeAt, richText = okrNameData.richText;
+
+              if (pureText) {
+                _context.next = 4;
                 break;
               }
 
@@ -417,9 +451,9 @@ function CreateOkrModal(_ref, ref) {
 
               return _context.abrupt("return");
 
-            case 3:
-              if (!(okrName.length > 500)) {
-                _context.next = 6;
+            case 4:
+              if (!(pureTextExcludeAt.length > 500)) {
+                _context.next = 7;
                 break;
               }
 
@@ -429,9 +463,9 @@ function CreateOkrModal(_ref, ref) {
 
               return _context.abrupt("return");
 
-            case 6:
+            case 7:
               if (allKrHasName) {
-                _context.next = 10;
+                _context.next = 11;
                 break;
               }
 
@@ -442,13 +476,15 @@ function CreateOkrModal(_ref, ref) {
               setKrIsValidate(true);
               return _context.abrupt("return");
 
-            case 10:
+            case 11:
               orkNameLengthValidate = krDatas.filter(function (kr) {
-                return kr.mileStoneName.trim().length > 500;
+                var _trim;
+
+                return ((_trim = (kr.mileStoneNamePureTextExcludeAt || '').trim()) === null || _trim === void 0 ? void 0 : _trim.length) > 500;
               }).length == 0;
 
               if (orkNameLengthValidate) {
-                _context.next = 14;
+                _context.next = 15;
                 break;
               }
 
@@ -458,11 +494,11 @@ function CreateOkrModal(_ref, ref) {
 
               return _context.abrupt("return");
 
-            case 14:
+            case 15:
               setKrIsValidate(false);
 
               if (krWeightValid) {
-                _context.next = 18;
+                _context.next = 19;
                 break;
               }
 
@@ -472,27 +508,32 @@ function CreateOkrModal(_ref, ref) {
 
               return _context.abrupt("return");
 
-            case 18:
+            case 19:
               if (cycle) {
-                _context.next = 20;
+                _context.next = 21;
                 break;
               }
 
               return _context.abrupt("return");
 
-            case 20:
+            case 21:
               handleCreatedClose();
               visibilityArea = formatVisiableLimit();
-              _context.next = 24;
-              return (0, _requestApi.createWidthKr)(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+              formData = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
                 krInfos: krDatas.map(function (kr) {
+                  // @ts-ignore
+                  delete kr.mileStoneNamePureTextExcludeAt;
                   return _objectSpread(_objectSpread({}, kr), {}, {
                     startDate: cycle.startDate,
                     endDate: cycle.endDate
                   });
                 })
               }, cycle), {}, {
-                workName: okrName
+                workName: pureText,
+                workNameRichText: richText,
+                aiteUsers: mentionUsers === null || mentionUsers === void 0 ? void 0 : mentionUsers.map(function (user) {
+                  return user.mentionId;
+                })
               }, parent), {}, {
                 workType: 6,
                 visibility: visibility,
@@ -505,13 +546,15 @@ function CreateOkrModal(_ref, ref) {
                 }]
               }, visibilityArea), {}, {
                 CreateFromAssess: isFromAssess
-              }));
+              });
+              _context.next = 26;
+              return (0, _requestApi.createWidthKr)(formData);
 
-            case 24:
+            case 26:
               data = _context.sent;
 
               if (!(data.Code === 0)) {
-                _context.next = 28;
+                _context.next = 30;
                 break;
               }
 
@@ -521,7 +564,7 @@ function CreateOkrModal(_ref, ref) {
 
               return _context.abrupt("return");
 
-            case 28:
+            case 30:
               hideCreateOkrModal();
 
               if (onSuccess || !isHiddenCreatedCard) {
@@ -529,8 +572,10 @@ function CreateOkrModal(_ref, ref) {
                 krNum = krDatas.length;
                 krTotalLength = 0;
                 krDatas && krDatas.forEach(function (kr) {
+                  var _kr$mileStoneNamePure;
+
                   // 计算平均长度要去掉百分号和数字
-                  krTotalLength += kr.mileStoneName.replace(/(%|\d)/g, '').length;
+                  krTotalLength += (_kr$mileStoneNamePure = kr.mileStoneNamePureTextExcludeAt) === null || _kr$mileStoneNamePure === void 0 ? void 0 : _kr$mileStoneNamePure.replace(/(%|\d)/g, '').length;
                 });
                 krAvarageLength = krDatas.length > 0 ? krTotalLength / krDatas.length : 0;
                 krMeasurableLength = krsCheckResult.friendlyResult.filter(function (kr) {
@@ -538,7 +583,7 @@ function CreateOkrModal(_ref, ref) {
                 }).length;
                 oHasVtWords = oNameCheckResult[0].result === _okrCreateSuggest.EOkrCreateSuggestResultType.correct;
                 callData = data;
-                callData.countSurpassPercentage = (0, _getCreateOkrSurpassPercent["default"])(okrName.replace(/(%|\d)/g, '').length, oHasVtWords, krNum, krMeasurableLength, Number.parseInt(krAvarageLength.toString()));
+                callData.countSurpassPercentage = (0, _getCreateOkrSurpassPercent["default"])(okrNameData.pureTextExcludeAt.replace(/(%|\d)/g, '').length, oHasVtWords, krNum, krMeasurableLength, Number.parseInt(krAvarageLength.toString()));
                 newOkrDataRef.current = callData;
                 handleOnSuccess();
               } else {
@@ -551,7 +596,7 @@ function CreateOkrModal(_ref, ref) {
 
               setIsApplyTpl(false);
 
-            case 31:
+            case 33:
             case "end":
               return _context.stop();
           }
@@ -566,9 +611,15 @@ function CreateOkrModal(_ref, ref) {
 
 
   var OnOkRApplyTplHandler = function OnOkRApplyTplHandler(data) {
+    setRichEditorStatus('refresh');
     var name = data.name,
         subelements = data.subelements;
-    setOkrName(name);
+    setOkrNameData({
+      mentionUsers: [],
+      pureText: name,
+      pureTextExcludeAt: name,
+      richText: (0, _richEditor.TitaRichEditorInitTextState)(name)
+    });
     setKrDatas(subelements.map(function (s) {
       return {
         uuid: _uuid["default"].v1(),
@@ -577,11 +628,15 @@ function CreateOkrModal(_ref, ref) {
         userAvatar: UserAvatar,
         krWeight: (0, _roundWeight.RoundWeight)(100 / subelements.length),
         mileStoneName: s.name,
+        mileStoneNamePureTextExcludeAt: s.name,
+        mileStoneNameRichText: (0, _richEditor.TitaRichEditorInitTextState)(s.name),
+        aiteUsers: [],
         confidenceIndex: 5
       };
     }));
     setIsCustomWeight(false);
     setIsApplyTpl(true);
+    setRichEditorStatus('initialization');
   };
 
   (0, _react.useEffect)(function () {
@@ -593,9 +648,12 @@ function CreateOkrModal(_ref, ref) {
         userAvatar: UserAvatar,
         krWeight: 100,
         mileStoneName: '',
+        mileStoneNamePureTextExcludeAt: '',
+        mileStoneNameRichText: undefined,
+        aiteUsers: [],
         confidenceIndex: 5
       }]);
-      setOkrName('');
+      setOkrNameData(DefaultOkrNameData);
       setUser({
         name: Name,
         id: Id,
@@ -620,6 +678,10 @@ function CreateOkrModal(_ref, ref) {
         parentKrId: 0
       });
     }
+
+    return function () {
+      return setRichEditorStatus('initialization');
+    };
   }, [isVisible]);
   var handleONameSuggestClose = (0, _react.useCallback)(function () {
     setONameIsInput(false);
@@ -839,17 +901,20 @@ function CreateOkrModal(_ref, ref) {
     }
   }, /*#__PURE__*/_react["default"].createElement(_style.Wrapper, {
     ref: wrapperRef
+  }, /*#__PURE__*/_react["default"].createElement(_scrollbar["default"], null, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "create-modal__wrapper-inner"
   }, /*#__PURE__*/_react["default"].createElement(_oNewName["default"], {
     container: modalRef,
+    richEditorStatus: richEditorStatus,
+    key: richEditorStatus,
     user: user,
     setUser: setUser,
-    okrName: okrName,
-    setOkrName: setOkrName,
+    okrNameData: okrNameData,
+    setOkrNameData: setOkrNameData,
     onOInputFocusStateChange: handleOInputFocusStateChange,
     setONameCheckResult: setONameCheckResult,
     setIsInputContent: setIsInputContent
   }), /*#__PURE__*/_react["default"].createElement(_krDatas["default"], {
-    krs: krDatas,
     isCustomWeight: isCustomWeight,
     wrapperRef: wrapperRef,
     krDatas: krDatas,
@@ -899,29 +964,29 @@ function CreateOkrModal(_ref, ref) {
     okrClassify: okrClassify,
     setOkrClassify: setOkrClassify,
     isCreateModal: true
-  }))), !customCloseOSuggest && oNameIsInput ? /*#__PURE__*/_react["default"].createElement(_okrCreateSuggest["default"], {
+  }))))), /*#__PURE__*/_react["default"].createElement("img", {
+    className: "teach-suggest teach-suggest__o",
+    src: _hand["default"],
+    onClick: handleShowOSuggest
+  }), /*#__PURE__*/_react["default"].createElement("img", {
+    className: "teach-suggest teach-suggest__kr",
+    src: _hand["default"],
+    onClick: handleShowKrSuggest
+  }), !customCloseOSuggest && oNameIsInput ? /*#__PURE__*/_react["default"].createElement(_okrCreateSuggest["default"], {
     isInput: isInputContent,
     isOSuggest: true,
     descs: (0, _constant.getODesc)(),
     example: (0, _constant.getOExample)(),
     results: oNameCheckResult,
     handleClose: handleONameSuggestClose
-  }) : null, /*#__PURE__*/_react["default"].createElement("img", {
-    className: "teach-suggest teach-suggest__o",
-    src: _hand["default"],
-    onClick: handleShowOSuggest
-  }), !customCloseKrSuggest && krIsInput ? /*#__PURE__*/_react["default"].createElement(_okrCreateSuggest["default"], {
+  }) : null, !customCloseKrSuggest && krIsInput ? /*#__PURE__*/_react["default"].createElement(_okrCreateSuggest["default"], {
     isInput: isInputContent,
     isOSuggest: false,
     descs: (0, _constant.getKrDesc)(),
     example: (0, _constant.KrExample)(),
     results: krCheckFinalResult,
     handleClose: handleKrSuggestClose
-  }) : null, /*#__PURE__*/_react["default"].createElement("img", {
-    className: "teach-suggest teach-suggest__kr",
-    src: _hand["default"],
-    onClick: handleShowKrSuggest
-  })))), !isApplyTpl && !isHiddenCreatedCard && showCreatedSuccessInfo ? /*#__PURE__*/_react["default"].createElement(_createSuccessCmpWrapper["default"], null, /*#__PURE__*/_react["default"].createElement(_createSuccessCmp["default"], {
+  }) : null))), !isApplyTpl && !isHiddenCreatedCard && showCreatedSuccessInfo ? /*#__PURE__*/_react["default"].createElement(_createSuccessCmpWrapper["default"], null, /*#__PURE__*/_react["default"].createElement(_createSuccessCmp["default"], {
     tipIndex: tipIndex,
     createdSuccessInfo: createdSuccessInfo,
     isDownload: false,