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

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

@@ -171,7 +171,7 @@ function ONewName(_ref) {
       onOInputFocusStateChange(false);
     }
   }, []);
-  var handleOnKeyDown = (0, _react.useCallback)(function () {
+  var handleOnKeyDown = (0, _react.useCallback)(function (e) {
     setIsInputContent(true);
   }, [setIsInputContent]);
   var handleOnKeyUp = (0, _react.useCallback)(function (e) {

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

@@ -102,7 +102,7 @@ function KrItem(props) {
   //   }
   // }, [onAddKr])
 
-  var handleOnKeyDown = (0, _react.useCallback)(function () {
+  var handleOnKeyDown = (0, _react.useCallback)(function (e) {
     setIsInputContent(true);
   }, [setIsInputContent]);
   var handleOnKeyUp = (0, _react.useCallback)(function (e) {

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/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, _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/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/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

@@ -251,7 +251,7 @@ var parseString = function parseString(str) {
   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.15",
+  "version": "1.11.52-beta.18",
   "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",