@titaui/pc 1.11.52-beta.16 → 1.11.52-beta.19

package/lib/components/create-okr-modal/fields/o-new-name.js

@@ -172,10 +172,6 @@ function ONewName(_ref) {
     }
   }, []);
   var handleOnKeyDown = (0, _react.useCallback)(function (e) {
-    if (e.key.toLocaleLowerCase() == 'enter') {
-      e.preventDefault();
-    }
-
     setIsInputContent(true);
   }, [setIsInputContent]);
   var handleOnKeyUp = (0, _react.useCallback)(function (e) {
@@ -202,8 +198,6 @@ function ONewName(_ref) {
     position: "top"
   }, /*#__PURE__*/_react["default"].createElement(_richEditor.TitaInlineRichEditor, {
     initialState: richText,
-    manualWrap: true,
-    contentEditable: true,
     key: richEditorStatus,
     onDocChange: onChangeHandler,
     onFocus: handleInputFocus,

package/lib/components/create-okr-modal/kr-items/krItem.js

@@ -103,10 +103,6 @@ function KrItem(props) {
   // }, [onAddKr])
 
   var handleOnKeyDown = (0, _react.useCallback)(function (e) {
-    if (e.key.toLocaleLowerCase() == 'enter') {
-      e.preventDefault();
-    }
-
     setIsInputContent(true);
   }, [setIsInputContent]);
   var handleOnKeyUp = (0, _react.useCallback)(function (e) {
@@ -144,8 +140,6 @@ function KrItem(props) {
     position: "top"
   }, /*#__PURE__*/_react["default"].createElement(_richEditor.TitaInlineRichEditor, {
     initialState: mileStoneNameRichText,
-    manualWrap: true,
-    contentEditable: true,
     key: krData === null || krData === void 0 ? void 0 : krData.uuid,
     onDocChange: onKrNameInputChangeHandler,
     onFocus: handleInputFocus,

package/lib/components/dynamic/components/title/index.js

@@ -15,8 +15,6 @@ var _searchKeyHandle = _interopRequireDefault(require("../../../search-key-handl
 
 var _context = require("../../context");
 
-var _openData = require("../../../../utils/open-data");
-
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -25,7 +23,7 @@ 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; }
 
-var prefix = "titaui-dynamic-title";
+var prefix = 'titaui-dynamic-title';
 
 var DynamicTitle = function DynamicTitle(_ref) {
   var content = _ref.content,
@@ -64,7 +62,7 @@ var DynamicTitle = function DynamicTitle(_ref) {
     onClick: onTitleClick
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     text: /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: (0, _openData.parseString)(content),
+      str: content,
       keyWord: searchKeyWord
     }),
     isPercent: true

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

@@ -53,7 +53,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-align-item";
+var prefix = 'titaui-dynamic-align-item';
 
 var DynamicAlign = function DynamicAlign(_ref) {
   var _classNames;
@@ -77,27 +77,27 @@ var DynamicAlign = function DynamicAlign(_ref) {
 
   var handleClickTitle = function handleClickTitle(id, type) {
     if (type === _constant.EObjType.Kr) {
-      _drawerManager["default"].open("krDetail", {
+      _drawerManager["default"].open('krDetail', {
         krId: id
       });
     }
 
     if (type === _constant.EObjType.O) {
-      _drawerManager["default"].open("okrDetail", {
+      _drawerManager["default"].open('okrDetail', {
         okrId: id
       });
     }
   };
 
   var renderDesc = (0, _react.useMemo)(function () {
-    var text = "";
+    var text = '';
 
     if (parentObjType === _constant.EObjType.Kr) {
-      text = "".concat((0, _getLocale.getLocale)("Mod_Aligned")).concat((0, _getLocale.getLocale)("Mod_KeyResults"));
+      text = "".concat((0, _getLocale.getLocale)('Mod_Aligned')).concat((0, _getLocale.getLocale)('Mod_KeyResults'));
     }
 
     if (parentObjType === _constant.EObjType.O) {
-      text = "".concat((0, _getLocale.getLocale)("Mod_Aligned")).concat((0, _getLocale.getLocale)("Mod_Objective"));
+      text = "".concat((0, _getLocale.getLocale)('Mod_Aligned')).concat((0, _getLocale.getLocale)('Mod_Objective'));
     }
 
     return /*#__PURE__*/_react["default"].createElement("span", {
@@ -133,7 +133,7 @@ var DynamicAlign = function DynamicAlign(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     isPercent: true,
     text: /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: (0, _openData.parseString)((0, _tools.htmlDecodeByRegExp)(parentObjName)),
+      str: (0, _tools.htmlDecodeByRegExp)(parentObjName),
       keyWord: searchKeyWord
     })
   })), /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -98,13 +98,13 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
     },
     // 部门
     3: {
-      icon: "tu-icon-gong_si",
-      text: (0, _getLocale.getLocale)("OKR_MyO_Pop_Company")
+      icon: 'tu-icon-gong_si',
+      text: (0, _getLocale.getLocale)('OKR_MyO_Pop_Company')
     },
     // 公司
     4: {
-      icon: "tu-icon-liebiao-tuandui",
-      text: okrTypeName || (0, _getLocale.getLocale)("OKR_MyO_Text_Team")
+      icon: 'tu-icon-liebiao-tuandui',
+      text: okrTypeName || (0, _getLocale.getLocale)('OKR_MyO_Text_Team')
     } // 团队
 
   };
@@ -112,15 +112,15 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
 
   if (!okrTypeInfo) {
     okrTypeInfo = {
-      icon: "tu-icon-liebiao-geren",
-      text: (0, _getLocale.getLocale)("OKR_Menu_Title_Others")
+      icon: 'tu-icon-liebiao-geren',
+      text: (0, _getLocale.getLocale)('OKR_Menu_Title_Others')
     };
   }
 
   var renderDesc = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-desc")
-    }, (0, _getLocale.getLocale)("Mod_InChargeof"), (0, _getLocale.getLocale)("Mod_Objective"));
+    }, (0, _getLocale.getLocale)('Mod_InChargeof'), (0, _getLocale.getLocale)('Mod_Objective'));
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
@@ -136,9 +136,9 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_progress["default"].Circle, {
     linear: true,
     linearId: data.feedId,
-    linearStartColor: (0, _util.getProcessColor)(okrStatus, riskLevel, "linearStartColor"),
-    linearEndColor: (0, _util.getProcessColor)(okrStatus, riskLevel, "linearEndColor"),
-    backgroundColor: (0, _util.getProcessColor)(okrStatus, riskLevel, "backgroundColor"),
+    linearStartColor: (0, _util.getProcessColor)(okrStatus, riskLevel, 'linearStartColor'),
+    linearEndColor: (0, _util.getProcessColor)(okrStatus, riskLevel, 'linearEndColor'),
+    backgroundColor: (0, _util.getProcessColor)(okrStatus, riskLevel, 'backgroundColor'),
     percent: Number.parseInt(okrProgress || 0, 10),
     showTextContent: true,
     size: 48,
@@ -153,7 +153,7 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
     onClick: handleClickOTitle
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     text: /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: (0, _openData.parseString)((0, _tools.htmlDecodeByRegExp)(okrName)),
+      str: (0, _tools.htmlDecodeByRegExp)(okrName),
       keyWord: searchKeyWord
     }),
     isPercent: true
@@ -179,7 +179,7 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
         handleClickKrTitle(kr.krId);
       }
     }, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: (0, _openData.parseString)((0, _tools.htmlDecodeByRegExp)(kr.krName)),
+      str: (0, _tools.htmlDecodeByRegExp)(kr.krName),
       keyWord: searchKeyWord
     })));
   }))))));

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

@@ -27,8 +27,6 @@ var _constant = require("../../constant");
 
 var _getLocale = require("../../../../utils/getLocale");
 
-var _openData = require("../../../../utils/open-data");
-
 var _utils = require("./utils");
 
 var _conditionRender = _interopRequireDefault(require("../../../condition-render"));
@@ -111,7 +109,7 @@ var DynamicProgress = function DynamicProgress(_ref) {
         onClick: handleClickOTitle
       }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
         text: /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-          str: (0, _openData.parseString)((0, _tools.htmlDecodeByRegExp)(relationParentName)),
+          str: (0, _tools.htmlDecodeByRegExp)(relationParentName),
           keyWord: searchKeyWord
         }),
         isPercent: true

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

@@ -69,7 +69,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-relative-item";
+var prefix = 'titaui-dynamic-relative-item';
 
 var DynamicRelative = function DynamicRelative(_ref) {
   var _classNames, _classNames2;
@@ -99,13 +99,13 @@ var DynamicRelative = function DynamicRelative(_ref) {
 
   var handleClickTitle = function handleClickTitle(id, type) {
     if (type === _constant.EObjType.Kr) {
-      _drawerManager["default"].open("krDetail", {
+      _drawerManager["default"].open('krDetail', {
         krId: id
       });
     }
 
     if (type === _constant.EObjType.O) {
-      _drawerManager["default"].open("okrDetail", {
+      _drawerManager["default"].open('okrDetail', {
         okrId: id
       });
     }
@@ -115,7 +115,7 @@ var DynamicRelative = function DynamicRelative(_ref) {
     }
 
     if (type === _constant.EObjType.Task) {
-      window.Talent.app.vent.trigger("global-pull-screen", id, "task");
+      window.Talent.app.vent.trigger('global-pull-screen', id, 'task');
     }
   };
 
@@ -123,15 +123,15 @@ var DynamicRelative = function DynamicRelative(_ref) {
     var text;
 
     if (relateObjType === _constant.EObjType.Kr) {
-      text = "".concat((0, _getLocale.getLocale)("Mod_Connected")).concat((0, _getLocale.getLocale)("Mod_KeyResults"));
+      text = "".concat((0, _getLocale.getLocale)('Mod_Connected')).concat((0, _getLocale.getLocale)('Mod_KeyResults'));
     }
 
     if (relateObjType === _constant.EObjType.O) {
-      text = "".concat((0, _getLocale.getLocale)("Mod_Connected")).concat((0, _getLocale.getLocale)("Mod_Objective"));
+      text = "".concat((0, _getLocale.getLocale)('Mod_Connected')).concat((0, _getLocale.getLocale)('Mod_Objective'));
     }
 
     if (relateObjType === _constant.EObjType.Project) {
-      text = "".concat((0, _getLocale.getLocale)("Mod_Connected")).concat((0, _getLocale.getLocale)("Feed_Set_Project"));
+      text = "".concat((0, _getLocale.getLocale)('Mod_Connected')).concat((0, _getLocale.getLocale)('Feed_Set_Project'));
     }
 
     return /*#__PURE__*/_react["default"].createElement("span", {
@@ -165,7 +165,7 @@ var DynamicRelative = function DynamicRelative(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("img", {
     alt: "",
     className: "".concat(prefix, "__obj-base-info-left-img"),
-    src: relatedImgUrl || ""
+    src: relatedImgUrl || ''
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__obj-base-info-right")
   }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -176,7 +176,7 @@ var DynamicRelative = function DynamicRelative(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     isPercent: true,
     text: /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: (0, _openData.parseString)((0, _tools.htmlDecodeByRegExp)(relateObjName)),
+      str: (0, _tools.htmlDecodeByRegExp)(relateObjName),
       keyWord: searchKeyWord
     })
   })), /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/eReport/eReportLists/reportList.js

@@ -64,7 +64,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
     }
 
     return _possibleConstructorReturn(_this, (_this = _super.call.apply(_super, [this].concat(args)), _this.state = {
-      selectedPeriodValue: "",
+      selectedPeriodValue: '',
       showDatePick: false,
       eReportWeekList: [],
       timePickRef: /*#__PURE__*/_react["default"].createRef(),
@@ -73,25 +73,25 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
       timePickResultsEmpty: false,
       isShowEReportSharePop: false,
       eReportId: 0,
-      eReportDate: "",
+      eReportDate: '',
       isShowToast: false,
-      submitStatus: ""
+      submitStatus: ''
     }, _this.setIsTimeSelected = function (v) {
       _this.setState({
         selectedPeriodValue: v
       });
     }, _this.handleClickReportListsDiv = function (e) {
       _this.setState({
-        showDatePick: e.target.getAttribute("data-name") === "time-pick"
+        showDatePick: e.target.getAttribute('data-name') === 'time-pick'
       });
     }, _this.handleTimePickConfirm = function (_ref) {
       var startDate = _ref.startDate,
           endDate = _ref.endDate;
       // 将2019-12-3改为2019年12月3日
-      var start = startDate.substring(0, startDate.indexOf("T"));
-      var end = endDate.substring(0, endDate.indexOf("T"));
-      start = start.replace(/-/i, "年").replace(/-/i, "月") + (0, _getLocale.getLocale)("Mod_Sun");
-      end = end.replace(/-/i, "年").replace(/-/i, "月") + (0, _getLocale.getLocale)("Mod_Sun");
+      var start = startDate.substring(0, startDate.indexOf('T'));
+      var end = endDate.substring(0, endDate.indexOf('T'));
+      start = start.replace(/-/i, '年').replace(/-/i, '月') + (0, _getLocale.getLocale)('Mod_Sun');
+      end = end.replace(/-/i, '年').replace(/-/i, '月') + (0, _getLocale.getLocale)('Mod_Sun');
 
       _this.setState({
         selectedPeriodValue: "".concat(start, " - ").concat(end),
@@ -102,7 +102,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
 
       var okrId = _this.props.okrId;
       var url = (0, _requestV.getApiUrl)("okr/weekStatistics/list?okrId=".concat(okrId, "&startDate=").concat(start, "&endDate=").concat(end));
-      (0, _requestV.taker)(url, "get", null, {}).then(function (res) {
+      (0, _requestV.taker)(url, 'get', null, {}).then(function (res) {
         _this.setState({
           eReportWeekList: res.Data
         });
@@ -113,15 +113,15 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
       });
 
       var url = (0, _requestV.getApiUrl)("okr/weekStatistics/info?id=".concat(id));
-      (0, _requestV.taker)(url, "get", null).then(function (res) {
+      (0, _requestV.taker)(url, 'get', null).then(function (res) {
         window.open();
       });
     }, _this.handlerEReportShareSubmit = function (submitStatus, eReportId, startDate, endDate) {
-      if (submitStatus === "success") {
+      if (submitStatus === 'success') {
         _this.setState({
           isShowEReportSharePop: false,
           isShowToast: true,
-          submitStatus: "success"
+          submitStatus: 'success'
         });
 
         setTimeout(function () {
@@ -129,11 +129,11 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
             isShowToast: false
           });
         }, 2000);
-      } else if (submitStatus === "failed") {
+      } else if (submitStatus === 'failed') {
         _this.setState({
           isShowEReportSharePop: false,
           isShowToast: true,
-          submitStatus: "error"
+          submitStatus: 'error'
         });
 
         setTimeout(function () {
@@ -141,11 +141,11 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
             isShowToast: false
           });
         }, 2000);
-      } else if (submitStatus === "cancel") {
+      } else if (submitStatus === 'cancel') {
         _this.setState({
           isShowEReportSharePop: false
         });
-      } else if (submitStatus === "showEReportShare") {
+      } else if (submitStatus === 'showEReportShare') {
         _this.setState({
           isShowEReportSharePop: true,
           eReportId: eReportId || 0,
@@ -157,6 +157,8 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
           isVisible = _this$props.isVisible,
           okrName = _this$props.okrName,
           okrId = _this$props.okrId;
+      var StrRreg = /@\$(userName|departmentName)\=(.+?)\$/g;
+      var workName = okrName === null || okrName === void 0 ? void 0 : okrName.replace(StrRreg, '');
       return /*#__PURE__*/_react["default"].createElement(_Portals["default"], null, /*#__PURE__*/_react["default"].createElement(_transition["default"], {
         visible: showShare,
         animate: true,
@@ -168,7 +170,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/_react["default"].createElement(_eReportShare["default"], {
         className: "ereport__share__wrapper",
         isVisible: isVisible,
-        workName: okrName,
+        workName: workName,
         workId: okrId,
         eReportId: id,
         eReportDate: date,
@@ -186,7 +188,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
 
       var okrId = this.props.okrId;
       var url = (0, _requestV.getApiUrl)("okr/weekStatistics/list?okrId=".concat(okrId));
-      (0, _requestV.taker)(url, "get", null, {}).then(function (res) {
+      (0, _requestV.taker)(url, 'get', null, {}).then(function (res) {
         _this2.setState({
           eReportWeekList: res.Data || [],
           timePick: _this2.state.timePickRef.current
@@ -204,22 +206,19 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
           key: v.id
         }, /*#__PURE__*/_react["default"].createElement(_style.ItemTimeDivStyle, null, /*#__PURE__*/_react["default"].createElement(_style.ItemTimeBackgroundStyle, {
           className: "tu-icon-OKRs-E"
-        }), /*#__PURE__*/_react["default"].createElement(_style.ItemTimeTextStyle, null, "(", "".concat(v.startDate, "-").concat(v.endDate), ")")), /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsActionsDivStyle, null, /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsChildsDivStyle, null, /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsShareBackgroundStyle, {
+        }), /*#__PURE__*/_react["default"].createElement(_style.ItemTimeTextStyle, null, "(", "".concat(v.startDate, "-").concat(v.endDate), ")")), /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsActionsDivStyle, null, /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsChildsDivStyle, {
           onClick: function onClick() {
-            return _this3.handlerEReportShareSubmit("showEReportShare", v.id, v.startDate, v.endDate);
-          },
-          className: "tu-icon-share1"
-        }), /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsShareTextStyle, {
-          onClick: function onClick() {
-            return _this3.handlerEReportShareSubmit("showEReportShare", v.id, v.startDate, v.endDate);
+            return _this3.handlerEReportShareSubmit('showEReportShare', v.id, v.startDate, v.endDate);
           }
-        }, (0, _getLocale.getLocale)("OKR_MyO_Share"))), /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsChildsDivStyle, null, /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsMoreInfoTextStyle, {
+        }, /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsShareBackgroundStyle, {
+          className: "tu-icon-share1 hahahahaha"
+        }), /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsShareTextStyle, null, (0, _getLocale.getLocale)('OKR_MyO_Share'))), /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsChildsDivStyle, null, /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsMoreInfoTextStyle, {
           target: "_new",
           onClick: function onClick() {
             return window.open("".concat(location.pathname, "#okr/eReport?okrId=").concat(v.id, "&work_id=").concat(okrId));
           },
           href: void 0
-        }, (0, _getLocale.getLocale)("Mod_Checkdetails")), /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsMoreInfoBackgroundStyle, {
+        }, (0, _getLocale.getLocale)('Mod_Checkdetails')), /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsMoreInfoBackgroundStyle, {
           onClick: function onClick() {
             window.open("".concat(location.pathname, "#okr/eReport?okrId=").concat(v.id, "&work_id=").concat(okrId));
           },
@@ -239,7 +238,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
     value: function getTimePick() {
       return /*#__PURE__*/_react["default"].createElement(_style.ListTopDivStyle, {
         ref: this.state.timePickRef
-      }, /*#__PURE__*/_react["default"].createElement(_style.ListTopLabelStyle, null, (0, _getLocale.getLocale)("OKR_MyO_Ew_List")), /*#__PURE__*/_react["default"].createElement(_style.ListTopTimePickDivStyle, null, /*#__PURE__*/_react["default"].createElement(_style.TimePickStyle, {
+      }, /*#__PURE__*/_react["default"].createElement(_style.ListTopLabelStyle, null, (0, _getLocale.getLocale)('OKR_MyO_Ew_List')), /*#__PURE__*/_react["default"].createElement(_style.ListTopTimePickDivStyle, null, /*#__PURE__*/_react["default"].createElement(_style.TimePickStyle, {
         "data-name": "time-pick",
         className: "tu-icon-schedule"
       }), /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
@@ -250,7 +249,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
         onConfirm: this.handleTimePickConfirm
       }, /*#__PURE__*/_react["default"].createElement(_style.TimePickTextStyle, {
         "data-name": "time-pick"
-      }, this.state.selectedPeriodValue || (0, _getLocale.getLocale)("OKR_MyO_Ew_Butt_Filterbytime")))));
+      }, this.state.selectedPeriodValue || (0, _getLocale.getLocale)('OKR_MyO_Ew_Butt_Filterbytime')))));
     }
   }, {
     key: "render",
@@ -267,7 +266,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
       return timePickResultsEmpty ? /*#__PURE__*/_react["default"].createElement(_style.ListStyle, {
         onClick: this.handleClickReportListsDiv
       }, this.getTimePick(), eReportWeekList.length === 0 ? /*#__PURE__*/_react["default"].createElement(_eReportListEmpty["default"], {
-        text: (0, _getLocale.getLocale)("Mod_ lookingfor")
+        text: (0, _getLocale.getLocale)('Mod_ lookingfor')
       }) : this.getListItem(eReportWeekList), this.getShare(isShowEReportSharePop, eReportId, eReportDate), this.getToast(isShowToast, submitStatus)) : eReportWeekList.length === 0 ? /*#__PURE__*/_react["default"].createElement(_eReportListEmpty["default"], {
         text: "\u8FD8\u672A\u5230E-\u5468\u62A5\u751F\u6210\u65F6\u95F4\u54E6~"
       }) : /*#__PURE__*/_react["default"].createElement(_style.ListStyle, {

package/lib/components/eReport/eReportShare/style.js

@@ -17,7 +17,7 @@ var ModalWrapper = _styledComponents["default"].div(_templateObject || (_templat
 
 exports.ModalWrapper = ModalWrapper;
 
-var ModalContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  width: ", ";\n  height: 223px;\n  padding: 20px 30px 10px;\n  box-shadow: 0 0 4px 0 rgba(0,0,0,0.20);\n  border-radius: 4px;\n  background: #FFFFFF;\n"])), function (p) {
+var ModalContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  width: ", ";\n  height: 223px;\n  padding: 20px 30px 10px;\n  box-shadow: 0 0 4px 0 rgba(0,0,0,0.20);\n  border-radius: 12px;\n  background: #FFFFFF;\n"])), function (p) {
   return p.width;
 });
 

package/lib/components/nav-top/components/user-message/components/inform/inform-item.js

@@ -260,7 +260,7 @@ function Inform(props) {
     className: (0, _classnames["default"])("".concat(preCls, "__item-right-content"))
   }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
     overlayClassName: "".concat(preCls, "__item-right-content-tooltip"),
-    text: (0, _utils.htmlToText)((0, _openData.parseString)((0, _utils.deleteText)(item.content))),
+    text: (0, _openData.parseString)((0, _utils.deleteText)(item.content)),
     isPercent: true,
     mouseEnterDelay: 0.8
   })), /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/nav-top/components/user-message/components/todos/todo-item.js

@@ -23,7 +23,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 
 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 preCls = "titaui-user-message-msg-todos";
+var preCls = 'titaui-user-message-msg-todos';
 
 var TodoItem = function TodoItem(props) {
   var item = props.item,
@@ -34,7 +34,7 @@ var TodoItem = function TodoItem(props) {
     onItemClick && onItemClick(false);
 
     if (item.objType === 7) {
-      window.Talent.app.vent.trigger("global-pull-screen", item.objId, "task");
+      window.Talent.app.vent.trigger('global-pull-screen', item.objId, 'task');
     } else {
       (0, _tools.openPage)(item.objUrl);
     }
@@ -78,7 +78,7 @@ var TodoItem = function TodoItem(props) {
     className: (0, _classnames["default"])("".concat(preCls, "__item-right-content"))
   }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
     overlayClassName: "".concat(preCls, "__item-right-content-tooltip"),
-    text: (0, _openData.parseString)((0, _utils.deleteText)((0, _utils.htmlToText)(item.content))),
+    text: (0, _openData.parseString)((0, _utils.deleteText)(item.content)),
     isPercent: true,
     mouseEnterDelay: 0.8
   })), /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/okr-detail/components/header/edit-name.js

@@ -182,7 +182,6 @@ function EditNameCmp(props) {
     key: okrNameData.editorState,
     editable: editable,
     initialState: okrNameData.richText,
-    manualWrap: true,
     onDocChange: onChangeHandler,
     onFocus: onFocusHandler,
     ref: mentionInputRef

package/lib/components/okr-detail/components/header/index.css

@@ -7,6 +7,7 @@
 .okr-drawer-header__content {
   flex: 1;
   position: relative;
+  overflow: visible;
 }
 
 .okr-drawer-header__avatar {
@@ -102,7 +103,7 @@
 }
 
 .okr-drawer-header__edit-input {
-  height: calc(100% - 32px);
+  min-height: calc(100% - 32px);
   margin-bottom: 8px;
   border-bottom: 1px solid transparent;
   transition: border 0.3s ease;
@@ -145,6 +146,7 @@
   padding: 0 0 4px 0;
   font-size: 20px;
   font-weight: 600;
+  white-space: normal !important;
 }
 
 .okr-drawer-header__edit-btns {

package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/index.css

@@ -71,6 +71,10 @@
   color: #f05e5e;
 }
 
+.tita-okrdt-tree__kr-node-h1 {
+  display: flex;
+}
+
 .tita-okrdt-tree__kr-node-h2 {
   height: 20px;
   padding-left: 28px;
@@ -88,7 +92,7 @@
 }
 
 .tita-okrdt-tree__kr-node-title {
-  width: calc(100% - 32px);
+  max-width: calc(100% - 32px);
   margin-left: 8px;
   font-size: 14px;
   font-weight: 600;
@@ -100,6 +104,10 @@
   white-space: break-spaces;
 }
 
+.tita-okrdt-tree__kr-node-title--editing {
+  width: calc(100% - 32px);
+}
+
 .tita-okrdt-tree__kr-node-title .tu-icon-bianji2 {
   margin-left: 5px;
   font-size: 13px;

package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/index.js

@@ -13,6 +13,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _richEditor = require("@titaui/rich-editor");
 
+var _titaUi = require("tita-ui");
+
 var _bsGlobal = require("../../../../../../utils/bs-global");
 
 var _avatar = _interopRequireDefault(require("../../../../../avatar"));
@@ -53,6 +55,8 @@ var _helper = require("../../../../helper");
 
 var _getLocale = require("../../../../../../utils/getLocale");
 
+var _openData = require("../../../../../../utils/open-data");
+
 var _i18nFrontTranslate = require("../../../../../../utils/i18n-front-translate");
 
 require("./index.css");
@@ -102,6 +106,8 @@ function _default(props) {
       title = props.title,
       key = props.key,
       canEditOkr = props.canEditOkr;
+  var mileStoneName = data.mileStoneName,
+      mileStoneNameRichText = data.mileStoneNameRichText;
 
   var _useContext = (0, _react.useContext)(_context2.CommonContext),
       refreshAll = _useContext.refreshAll,
@@ -149,9 +155,9 @@ function _default(props) {
       setDeleteModalVisible = _useState16[1];
 
   var _useState17 = (0, _react.useState)({
-    pureText: title,
-    pureTextExcludeAt: title,
-    richText: data.mileStoneNameRichText ? JSON.parse(data.mileStoneNameRichText) : (0, _richEditor.TitaRichEditorInitTextState)(title),
+    pureText: mileStoneName,
+    pureTextExcludeAt: mileStoneName,
+    richText: mileStoneNameRichText ? JSON.parse(mileStoneNameRichText) : (0, _richEditor.TitaRichEditorInitTextState)(mileStoneName),
     mentionUsers: []
   }),
       _useState18 = _slicedToArray(_useState17, 2),
@@ -188,12 +194,12 @@ function _default(props) {
   var mentionInputRef = (0, _react.useRef)();
   (0, _react.useEffect)(function () {
     setKrNameData({
-      pureText: title,
-      pureTextExcludeAt: title,
-      richText: data.mileStoneNameRichText ? JSON.parse(data.mileStoneNameRichText) : (0, _richEditor.TitaRichEditorInitTextState)(title),
+      pureText: mileStoneName,
+      pureTextExcludeAt: mileStoneName,
+      richText: data.mileStoneNameRichText ? JSON.parse(data.mileStoneNameRichText) : (0, _richEditor.TitaRichEditorInitTextState)(mileStoneName),
       mentionUsers: []
     });
-  }, [title]);
+  }, [mileStoneName]);
 
   var _useContext2 = (0, _react.useContext)(_context2.OkrListContext),
       updateKrs = _useContext2.updateKrs;
@@ -299,11 +305,6 @@ function _default(props) {
 
   var onInputKeyDownHandler = function onInputKeyDownHandler(e) {
     if (e.keyCode !== 13) return;
-
-    if (e.key.toLocaleLowerCase() == 'enter') {
-      e.preventDefault();
-    }
-
     onKrNameChangeHandler();
   };
 
@@ -338,6 +339,12 @@ function _default(props) {
     var mentionUsers = krNameData.mentionUsers,
         pureText = krNameData.pureText,
         richText = krNameData.richText;
+
+    if (data.mileStoneName == pureText) {
+      setEditing(false);
+      return;
+    }
+
     var hasError = !validateKrName(krNameData);
     if (hasError) return;
     (0, _requestApis.updateKrName)({
@@ -406,14 +413,14 @@ function _default(props) {
     }, errorTip),
     visible: editing && errorTip.length > 0,
     placement: "top"
+  }, /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
+    content: editing ? '' : (0, _openData.parseString)(krNameData.pureText)
   }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-title")),
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-title"), _defineProperty({}, "".concat(_precls["default"], "__kr-node-title--editing"), editing)),
     onClick: onTitleTextClickHandler
   }, /*#__PURE__*/_react["default"].createElement(_richEditor.TitaInlineRichEditor, {
     editable: editing,
     initialState: krNameData.richText,
-    manualWrap: true,
-    contentEditable: true,
     onDocChange: onEditorChange,
     onBlur: onKrNameChangeHandler,
     onKeyDown: onInputKeyDownHandler,
@@ -424,7 +431,7 @@ function _default(props) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "tu-icon-bianji2",
     onClick: triggerEdit
-  }))))), /*#__PURE__*/_react["default"].createElement("div", {
+  })))))), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-h2"))
   }, /*#__PURE__*/_react["default"].createElement(OkrRowColumn, {
     width: 68

package/lib/components/okr-detail/okr-list/create-kr-item/index.js

@@ -172,7 +172,6 @@ function CreateKr(_ref) {
 
   var onInputKeyDown = function onInputKeyDown(e) {
     if (e.key.toLocaleLowerCase() == 'enter' && !pendingRef.current) {
-      e.preventDefault();
       pendingRef.current = true;
       var mentionUsers = krNameData.mentionUsers,
           pureText = krNameData.pureText,
@@ -243,8 +242,6 @@ function CreateKr(_ref) {
     className: (0, _classnames["default"])("".concat(preCls, "__input"))
   }, /*#__PURE__*/_react["default"].createElement(_richEditor.TitaInlineRichEditor, {
     initialState: undefined,
-    manualWrap: true,
-    contentEditable: true,
     onDocChange: setKrNameData,
     onBlur: createKr,
     onFocus: onFocus,

package/lib/components/okr-detail/okr-list/index.js

@@ -94,16 +94,16 @@ var _getUserInfo = (0, _bsGlobal.getUserInfo)(),
     Id = _getUserInfo.Id,
     UserAvatar = _getUserInfo.UserAvatar;
 
-var preCls = "okr-detail-okrs-list";
+var preCls = 'okr-detail-okrs-list';
 
 var treeDataFormate = function treeDataFormate(nodes) {
-  var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "kr";
+  var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'kr';
   var canEditOkr = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var formateNodes = [];
   nodes.forEach(function (it, index) {
-    var title = "";
-    if (type == "kr" || type == "kr-parent") title = it.mileStoneName;
-    if (type == "o-child" || type == "o-parent") title = it.workName;
+    var title = ''; // if (type == "kr" || type == "kr-parent") title = it.mileStoneName;
+
+    if (type == 'o-child' || type == 'o-parent') title = it.workName;
     formateNodes.push({
       key: it.mileStoneId,
       index: index,
@@ -206,7 +206,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
               });
 
               if (authChildWorks.length > 0) {
-                setChildOkrs(treeDataFormate(authChildWorks, "o-child"));
+                setChildOkrs(treeDataFormate(authChildWorks, 'o-child'));
               } else {
                 setChildOkrs(null);
               }
@@ -277,7 +277,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     updateKrs();
   }, []);
   (0, _react.useEffect)(function () {
-    var strucKrs = treeDataFormate(pureKrs, "kr", canEditOkr);
+    var strucKrs = treeDataFormate(pureKrs, 'kr', canEditOkr);
     setKrs(strucKrs);
   }, [pureKrs, canEditOkr]);
 
@@ -285,7 +285,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     refreshAll();
     updateKrs();
 
-    _toast["default"].Success((0, _getLocale.getLocale)("OKR_Db_Success"), {
+    _toast["default"].Success((0, _getLocale.getLocale)('OKR_Db_Success'), {
       canClose: false
     });
   };
@@ -324,7 +324,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
     (0, _requestApis.updateParentId)(params).then(function (data) {
       if (data.Code == 1) {
-        _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+        _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
 
         setGeneralParent({
           parentId: params.parentId,
@@ -376,7 +376,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     if (!canEditOkr) return;
     var dropNode = info.node;
     var dragNode = info.dragNode;
-    var dropPos = info.node.pos.split("-");
+    var dropPos = info.node.pos.split('-');
     var dropPosition = info.dropPosition - Number(dropPos[dropPos.length - 1]); // 移动类型，after 1 before 2
 
     var isDown = dropPosition != -1;
@@ -410,17 +410,17 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       parentOkr: parentOkr
     });
 
-    okrParent = treeDataFormate([newParentKr], "kr-parent");
+    okrParent = treeDataFormate([newParentKr], 'kr-parent');
   } else if (parentOkr) {
-    okrParent = treeDataFormate([parentOkr], "o-parent");
+    okrParent = treeDataFormate([parentOkr], 'o-parent');
   }
 
   var isShowAlignOkr = (0, _react.useMemo)(function () {
-    return childOkrs && childOkrs.length > 0 // 有子目标
-    || parentOkr // 有父目标
-    || !parentOkr && canEditOkr // 无父目标但有权限编辑
-    ;
-  }, [parentOkr, childOkrs, canEditOkr]);
+    return childOkrs && childOkrs.length > 0 || // 有子目标
+    parentOkr || // 有父目标
+    !parentOkr && canEditOkr;
+  }, // 无父目标但有权限编辑
+  [parentOkr, childOkrs, canEditOkr]);
 
   var renderKrs = function renderKrs() {
     var _classNames;
@@ -432,9 +432,9 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         },
         canEditOkr: canEditOkr || isInnerUser,
         style: isShowAlignOkr ? {
-          padding: "40px 0 24px 0"
+          padding: '40px 0 24px 0'
         } : {
-          padding: "100px 0"
+          padding: '100px 0'
         }
       });
     }
@@ -449,7 +449,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       okrInfo: okrInfo,
       draggable: canEditOkr && (okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState) === _helper.EApproveStatus.UnderApproval,
       onDrop: onOkrItemDropHandler
-    }))), (canEditOkr || isInnerUser) && (0, _helper.getApprovalOkr)(approvalSetting, "createOkr", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes) && /*#__PURE__*/_react["default"].createElement("div", {
+    }))), (canEditOkr || isInnerUser) && (0, _helper.getApprovalOkr)(approvalSetting, 'createOkr', okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes) && /*#__PURE__*/_react["default"].createElement("div", {
       ref: wrapperRef,
       className: (0, _classnames["default"])("".concat(preCls, "__addkr"))
     }, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], null, createKrShow ? /*#__PURE__*/_react["default"].createElement(_createKrItem["default"], {
@@ -468,10 +468,10 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         return setCreateKrShow(true);
       }
     }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(preCls, "__addkr-prefix"), "tu-icon-add1")
+      className: (0, _classnames["default"])("".concat(preCls, "__addkr-prefix"), 'tu-icon-add1')
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])("".concat(preCls, "__addkr-text"))
-    }, (0, _getLocale.getLocale)("OKR_MyO_Pop_Butt_AddKR"))))));
+    }, (0, _getLocale.getLocale)('OKR_MyO_Pop_Butt_AddKR'))))));
   };
 
   return /*#__PURE__*/_react["default"].createElement(_context2.OkrListContext.Provider, {
@@ -487,13 +487,13 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     className: (0, _classnames["default"])(preCls)
   }, !loading ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, renderKrs(), isShowAlignOkr && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_blockLine["default"], {
     style: {
-      padding: "0 32px"
+      padding: '0 32px'
     }
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__align-to"))
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__align-to-title"))
-  }, (0, _getLocale.getLocale)("OKR_MyO_Pop_SetAlignment")), !parentOkr && canEditOkr ? /*#__PURE__*/_react["default"].createElement(_addParentOkr["default"], {
+  }, (0, _getLocale.getLocale)('OKR_MyO_Pop_SetAlignment')), !parentOkr && canEditOkr ? /*#__PURE__*/_react["default"].createElement(_addParentOkr["default"], {
     onClick: onAddParentOkrHandler
   }) : /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__align-to-tree"))
@@ -506,7 +506,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     onClick: function onClick() {
       return setIsOpened(!isOpened);
     }
-  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("OKR_MyO_KRP_OKRs_Alignedmeobje"), "\uFF08", childOkrs.length, "\uFF09")), /*#__PURE__*/_react["default"].createElement(_reactCollapse.Collapse, {
+  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_KRP_OKRs_Alignedmeobje'), "\uFF08", childOkrs.length, "\uFF09")), /*#__PURE__*/_react["default"].createElement(_reactCollapse.Collapse, {
     isOpened: isOpened
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__align-on-tree"))

package/lib/components/search-key-handle/index.js

@@ -18,7 +18,7 @@ var SearchKeyHandle = function SearchKeyHandle(_ref) {
       keyWord = _ref$keyWord === void 0 ? '' : _ref$keyWord,
       _ref$color = _ref.color,
       color = _ref$color === void 0 ? '#F05E5E' : _ref$color;
-  if (!str || !keyWord) return /*#__PURE__*/_react["default"].createElement("span", null, str);
+  if (!str || !keyWord) return /*#__PURE__*/_react["default"].createElement("span", null, (0, _openData.parseString)(str));
   var result = str.split(keyWord);
   return /*#__PURE__*/_react["default"].createElement("span", null, result.map(function (item, index) {
     if (index !== result.length - 1) {
@@ -26,10 +26,10 @@ var SearchKeyHandle = function SearchKeyHandle(_ref) {
         style: {
           color: color
         }
-      }, keyWord));
+      }, (0, _openData.parseString)(keyWord)));
     }
 
-    return item;
+    return (0, _openData.parseString)(item);
   }));
 };
 

package/lib/utils/open-data.js

@@ -245,13 +245,13 @@ var parseString = function parseString(str) {
     matchStr = reg.exec(str);
   }
 
-  var commonStrs = str.split(strReg);
+  var commonStrs = str === null || str === void 0 ? void 0 : str.split(strReg);
   var renderData = [];
 
   for (var i = 0; i < commonStrs.length; i++) {
     var _v2Paresed = parseStringV2(commonStrs[i]);
 
-    openDatas.push( /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _v2Paresed)); // renderData.push(
+    renderData.push( /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _v2Paresed)); // renderData.push(
     //   <span dangerouslySetInnerHTML={{ __html: commonStrs[i] }} />,
     // )
 
@@ -276,8 +276,8 @@ var parseStringV2 = function parseStringV2(str) {
       __html: str
     }
   });
-  var reg = /\$(userName|departmentName)\=(.+?)\$(\s|$)/g;
-  var strReg = /\$(?:userName|departmentName)\=.+?\$(?:\s|$)/;
+  var reg = /\$(userName|departmentName)\=(.+?)\$/g;
+  var strReg = /\$(?:userName|departmentName)\=.+?\$/;
   var openDatas = [];
   var matchStr = reg.exec(str);
 
@@ -339,8 +339,8 @@ var parseOpenDataStringToImg = /*#__PURE__*/function () {
               fontWeight: '500',
               color: '#3f4755'
             }), font || {});
-            reg = /\$(userName|departmentName)\=(.+?)\$(\s|$)/g;
-            strReg = /\$(?:userName|departmentName)\=.+?\$(?:\s|$)/;
+            reg = /\$(userName|departmentName)\=(.+?)\$/g;
+            strReg = /\$(?:userName|departmentName)\=.+?\$/;
             openDatas = [];
             matchStr = reg.exec(str);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.11.52-beta.16",
+  "version": "1.11.52-beta.19",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -78,7 +78,7 @@
     "@titaui/rc-trigger": "5.2.5",
     "@titaui/react-flow-renderer": "9.5.4",
     "@titaui/request": "^1.0.1",
-    "@titaui/rich-editor": "^0.1.35",
+    "@titaui/rich-editor": "^0.1.39",
     "@titaui/toast": "1.0.0",
     "@types/color": "3.0.3",
     "@types/prosemirror-commands": "1.0.4",