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

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/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/okr-tree/tree-node/kr-node/index.js

@@ -299,11 +299,6 @@ function _default(props) {
 
   var onInputKeyDownHandler = function onInputKeyDownHandler(e) {
     if (e.keyCode !== 13) return;
-
-    if (e.key.toLocaleLowerCase() == 'enter') {
-      e.preventDefault();
-    }
-
     onKrNameChangeHandler();
   };
 
@@ -412,8 +407,6 @@ 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/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/utils/open-data.js

@@ -223,7 +223,8 @@ var parseString = function parseString(str) {
     dangerouslySetInnerHTML: {
       __html: str
     }
-  });
+  }); // debugger
+
   var reg = /\[(\w+?)\:(\w+?)\]/g;
   var strReg = /\[\w+?\:\w+?\]/;
   var openDatas = [];
@@ -276,8 +277,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 +340,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.17",
   "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",