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

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

@@ -171,7 +171,11 @@ function ONewName(_ref) {
       onOInputFocusStateChange(false);
     }
   }, []);
-  var handleOnKeyDown = (0, _react.useCallback)(function () {
+  var handleOnKeyDown = (0, _react.useCallback)(function (e) {
+    if (e.key.toLocaleLowerCase() == 'enter') {
+      e.preventDefault();
+    }
+
     setIsInputContent(true);
   }, [setIsInputContent]);
   var handleOnKeyUp = (0, _react.useCallback)(function (e) {
@@ -198,6 +202,8 @@ 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

@@ -102,7 +102,11 @@ function KrItem(props) {
   //   }
   // }, [onAddKr])
 
-  var handleOnKeyDown = (0, _react.useCallback)(function () {
+  var handleOnKeyDown = (0, _react.useCallback)(function (e) {
+    if (e.key.toLocaleLowerCase() == 'enter') {
+      e.preventDefault();
+    }
+
     setIsInputContent(true);
   }, [setIsInputContent]);
   var handleOnKeyUp = (0, _react.useCallback)(function (e) {
@@ -140,6 +144,8 @@ 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/dynamic-item/dynamic-task/index.js

@@ -29,6 +29,8 @@ var _getLocale = require("../../../../utils/getLocale");
 
 var _mblog = require("../../../../utils/mblog");
 
+var _openData = require("../../../../utils/open-data");
+
 require("./index.css");
 
 var _excluded = ["data"];
@@ -118,7 +120,7 @@ var DynamicTask = function DynamicTask(_ref) {
         className: "".concat(prefix, "__object-name"),
         onClick: handleClickTitle
       }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
-        text: (0, _mblog.htmlDecodeByRegExp)(obj.objName),
+        text: (0, _openData.parseString)((0, _mblog.htmlDecodeByRegExp)(obj.objName)),
         isPercent: true
       })), (0, _getLocale.getLocale)('Mod_stask'));
     }

package/lib/components/edit-kr-wight/EditKrWightModal.js

@@ -27,6 +27,8 @@ var _utils = require("./utils");
 
 var _getLocale = require("../../utils/getLocale");
 
+var _openData = require("../../utils/open-data");
+
 require("./style/style.css");
 
 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); }
@@ -110,7 +112,7 @@ var EditKrWightModal = /*#__PURE__*/function (_Component) {
 
     _this.handleOk = function () {
       if (!_this.state.isValid) {
-        _toast["default"].Warning("关键成果总权重须等于100%");
+        _toast["default"].Warning('关键成果总权重须等于100%');
 
         return;
       }
@@ -126,10 +128,10 @@ var EditKrWightModal = /*#__PURE__*/function (_Component) {
         };
       });
 
-      (0, _requestV.taker)((0, _requestV.getApiUrl)(url), "post", data).then(function (res) {
+      (0, _requestV.taker)((0, _requestV.getApiUrl)(url), 'post', data).then(function (res) {
         _this.props.onOk && _this.props.onOk(); // @ts-ignore
 
-        window.Talent.app.vent.trigger("updateProgress:Project-Progress-View", {});
+        window.Talent.app.vent.trigger('updateProgress:Project-Progress-View', {});
       });
     };
 
@@ -295,7 +297,7 @@ var EditKrWightModal = /*#__PURE__*/function (_Component) {
           isValid = _this$state.isValid,
           isDone = _this$state.isDone;
       return /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
-        title: (0, _getLocale.getLocale)("OKR_MyO_Text_krweightsetting"),
+        title: (0, _getLocale.getLocale)('OKR_MyO_Text_krweightsetting'),
         noFooterLine: true,
         visible: !isDone && isShowModal,
         width: "570px",
@@ -324,19 +326,19 @@ var EditKrWightModal = /*#__PURE__*/function (_Component) {
           }, /*#__PURE__*/_react["default"].createElement(_style.KrCounter, null, /*#__PURE__*/_react["default"].createElement("div", {
             className: "kr-counter"
           }, "KR".concat(index + 1))), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-            title: mileStoneName,
+            title: (0, _openData.parseString)(mileStoneName),
             overlayStyle: mileStoneName.length > 18 ? {
               zIndex: 99999
             } : {}
-          }, /*#__PURE__*/_react["default"].createElement(_style.KrTitle, null, mileStoneName)), /*#__PURE__*/_react["default"].createElement(_style.FormItemWrapper, {
+          }, /*#__PURE__*/_react["default"].createElement(_style.KrTitle, null, (0, _openData.parseString)(mileStoneName))), /*#__PURE__*/_react["default"].createElement(_style.FormItemWrapper, {
             style: {
               width: 140
             }
-          }, /*#__PURE__*/_react["default"].createElement(_style.FormItemLabel, null, (0, _getLocale.getLocale)("OKR_MyO_Text_Weights")), /*#__PURE__*/_react["default"].createElement(_FormItemV["default"], {
+          }, /*#__PURE__*/_react["default"].createElement(_style.FormItemLabel, null, (0, _getLocale.getLocale)('OKR_MyO_Text_Weights')), /*#__PURE__*/_react["default"].createElement(_FormItemV["default"], {
             isDirty: data.isDirty,
-            errorText: (0, _getLocale.getLocale)("OKR_MyO_KRP_Please0and100")
+            errorText: (0, _getLocale.getLocale)('OKR_MyO_KRP_Please0and100')
           }, /*#__PURE__*/_react["default"].createElement(_Input["default"], {
-            suffixIcon: (0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Percentage"),
+            suffixIcon: (0, _getLocale.getLocale)('OKR_MyO_Pop_Upd_Percentage'),
             value: krWeight,
             onChange: function onChange(value) {
               return _this4.handleWeightChange(value, feedId);

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, _openData.parseString)((0, _utils.deleteText)((0, _utils.htmlToText)(item.content))),
+    text: (0, _utils.htmlToText)((0, _openData.parseString)((0, _utils.deleteText)(item.content))),
     isPercent: true,
     mouseEnterDelay: 0.8
   })), /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -299,6 +299,11 @@ function _default(props) {
 
   var onInputKeyDownHandler = function onInputKeyDownHandler(e) {
     if (e.keyCode !== 13) return;
+
+    if (e.key.toLocaleLowerCase() == 'enter') {
+      e.preventDefault();
+    }
+
     onKrNameChangeHandler();
   };
 
@@ -407,6 +412,8 @@ function _default(props) {
   }, /*#__PURE__*/_react["default"].createElement(_richEditor.TitaInlineRichEditor, {
     editable: editing,
     initialState: krNameData.richText,
+    manualWrap: true,
+    contentEditable: true,
     onDocChange: onEditorChange,
     onBlur: onKrNameChangeHandler,
     onKeyDown: onInputKeyDownHandler,

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

@@ -67,6 +67,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+var StrRreg = /@\$(userName|departmentName)\=(.+?)\$(\s|$)/g;
+
 function OkrDetailHeader(_ref) {
   var detailInfo = _ref.detailInfo;
 
@@ -396,7 +398,7 @@ function OkrDetailHeader(_ref) {
     actionComponent: /*#__PURE__*/_react["default"].createElement(_wechatBtn["default"], {
       id: detailInfo.workId,
       objType: 62,
-      name: detailInfo.workName,
+      name: detailInfo.workName.replace(StrRreg, ''),
       principalUser: detailInfo.principalUser
     }),
     content: parent && /*#__PURE__*/_react["default"].createElement("span", {

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

@@ -172,6 +172,7 @@ 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,
@@ -242,6 +243,8 @@ 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/package.json

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