@titaui/pc 1.11.52-beta.6 → 1.11.52-beta.7

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

@@ -39,6 +39,8 @@ var _utils = require("../../../../../progress/utils");
 
 var _getLocale = require("../../../../../../utils/getLocale");
 
+var _openData = require("../../../../../../utils/open-data");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -65,10 +67,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var getSeasonTectMap = function getSeasonTectMap() {
   return {
-    1: "一",
-    2: "二",
-    3: "三",
-    4: "四"
+    1: '一',
+    2: '二',
+    3: '三',
+    4: '四'
   };
 };
 
@@ -130,7 +132,7 @@ function _default(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              if (!(name == "modifyParent")) {
+              if (!(name == 'modifyParent')) {
                 _context.next = 4;
                 break;
               }
@@ -140,7 +142,7 @@ function _default(props) {
               break;
 
             case 4:
-              if (!(name == "cancelParent")) {
+              if (!(name == 'cancelParent')) {
                 _context.next = 9;
                 break;
               }
@@ -149,7 +151,7 @@ function _default(props) {
               return (0, _requestApis.cancelParentOkr)(okrInfo.workId);
 
             case 7:
-              _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+              _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
 
               removeParent();
 
@@ -179,11 +181,11 @@ function _default(props) {
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__o-parent-node-title")),
     onClick: function onClick() {
-      _drawerManager["default"].open("okrDetail", {
+      _drawerManager["default"].open('okrDetail', {
         okrId: data.workId
       });
     }
-  }, title), /*#__PURE__*/_react["default"].createElement(_oClassify["default"], {
+  }, (0, _openData.parseString)(title)), /*#__PURE__*/_react["default"].createElement(_oClassify["default"], {
     editable: false,
     okrClassify: data.okrClassify,
     okrId: data.workId
@@ -216,8 +218,8 @@ function _default(props) {
     percent: data.progress,
     backgroundColor: "#F7F8FA",
     width: 40,
-    textColor: data.status === 2 ? "#89919f" : _utils.OkrRiskMapping[data.manualRiskLevel].textColor,
-    color: data.status === 2 ? "linear-gradient(270deg, #BFC7D5, #E1E5EC)" : _utils.OkrRiskMapping[data.manualRiskLevel].line
+    textColor: data.status === 2 ? '#89919f' : _utils.OkrRiskMapping[data.manualRiskLevel].textColor,
+    color: data.status === 2 ? 'linear-gradient(270deg, #BFC7D5, #E1E5EC)' : _utils.OkrRiskMapping[data.manualRiskLevel].line
   })), canEditOkr && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__o-parent-node-actions"))
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
@@ -229,8 +231,8 @@ function _default(props) {
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
     icon: "tu-icon-bianji3",
     name: "modifyParent"
-  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("OKR_MyO_Butt_ModifyAlig"))), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
+  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_Butt_ModifyAlig'))), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
     icon: "tu-icon-liebiao-duiqinubiao",
     name: "cancelParent"
-  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("OKR_MyO_Butt_CancelAlig"))))))));
+  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_Butt_CancelAlig'))))))));
 }

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

@@ -107,6 +107,7 @@ function CreateKr(_ref) {
 
 
   var mentionInputRef = (0, _react.useRef)();
+  var pendingRef = (0, _react.useRef)(false);
   dataRef.current = _objectSpread(_objectSpread({}, dataRef.current), {}, {
     krNameData: krNameData,
     user: user,
@@ -170,7 +171,8 @@ function CreateKr(_ref) {
   }, []);
 
   var onInputKeyDown = function onInputKeyDown(e) {
-    if (e.key.toLocaleLowerCase() == 'enter') {
+    if (e.key.toLocaleLowerCase() == 'enter' && !pendingRef.current) {
+      pendingRef.current = true;
       var mentionUsers = krNameData.mentionUsers,
           pureText = krNameData.pureText,
           richText = krNameData.richText;
@@ -190,9 +192,11 @@ function CreateKr(_ref) {
         }).then(function (res) {
           addKr(res);
           onHide();
+          pendingRef.current = false;
         });
       } else {
         onHide();
+        pendingRef.current = false;
       }
     }
   };
@@ -238,7 +242,7 @@ function CreateKr(_ref) {
     className: (0, _classnames["default"])("".concat(preCls, "__input"))
   }, /*#__PURE__*/_react["default"].createElement(_richEditor.TitaInlineRichEditor, {
     initialState: undefined,
-    onChange: setKrNameData,
+    onDocChange: setKrNameData,
     onBlur: createKr,
     onFocus: onFocus,
     onKeyDown: onInputKeyDown,

package/lib/components/okr-detail/schedule/components/o-progress/index.js

@@ -105,12 +105,12 @@ var OProgress = function OProgress(_ref) {
       editOProgressVisiable = _useState12[0],
       setEditOProgressVisiable = _useState12[1];
 
-  var _useState13 = (0, _react.useState)(""),
+  var _useState13 = (0, _react.useState)(''),
       _useState14 = _slicedToArray(_useState13, 2),
       editOProgressContent = _useState14[0],
       setEditOProgressContent = _useState14[1];
 
-  var _useState15 = (0, _react.useState)(""),
+  var _useState15 = (0, _react.useState)(''),
       _useState16 = _slicedToArray(_useState15, 2),
       editOProgressId = _useState16[0],
       setEditOProgressId = _useState16[1];
@@ -145,9 +145,9 @@ var OProgress = function OProgress(_ref) {
   };
 
   var handleModalOkClick = function handleModalOkClick() {
-    (0, _requestApis.updateProgressDesc)(editOProgressId, okrInfo.workId, editOProgressContent || "").then(function (resp) {
+    (0, _requestApis.updateProgressDesc)(editOProgressId, okrInfo.workId, editOProgressContent || '').then(function (resp) {
       if (resp.Code === 1) {
-        _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
+        _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'), {
           canClose: false
         });
 
@@ -160,7 +160,7 @@ var OProgress = function OProgress(_ref) {
         });
       }
     })["catch"](function (e) {
-      _toast["default"].Error("网络异常", {
+      _toast["default"].Error('网络异常', {
         canClose: false
       });
     });
@@ -179,7 +179,7 @@ var OProgress = function OProgress(_ref) {
       onClick: onOpenModal
     }, /*#__PURE__*/_react["default"].createElement("i", {
       className: "tu-icon-gengxin o-progress__func-btn-icon"
-    }), (0, _getLocale.getLocale)("OKR_MyO_Prog_Butt_Update"));
+    }), (0, _getLocale.getLocale)('OKR_MyO_Prog_Butt_Update'));
   };
 
   var handleRemind = (0, _react.useCallback)(function () {
@@ -190,7 +190,7 @@ var OProgress = function OProgress(_ref) {
       type: 2
     }).then(function (resp) {
       if (resp.Code === 1) {
-        _toast["default"].Success((0, _getLocale.getLocale)("OKR_MyO_Prog_Remindersu"), {
+        _toast["default"].Success((0, _getLocale.getLocale)('OKR_MyO_Prog_Remindersu'), {
           canClose: false
         });
       } else {
@@ -199,7 +199,7 @@ var OProgress = function OProgress(_ref) {
         });
       }
     })["catch"](function (e) {
-      _toast["default"].Error("网络异常", {
+      _toast["default"].Error('网络异常', {
         canClose: false
       });
     })["finally"](function () {
@@ -214,7 +214,7 @@ var OProgress = function OProgress(_ref) {
         work_id: okrInfo.workId
       }).then(function (resp) {
         if (resp.Code === 1) {
-          _toast["default"].Success((0, _getLocale.getLocale)("OKR_MyO_Prog_Remindersu"), {
+          _toast["default"].Success((0, _getLocale.getLocale)('OKR_MyO_Prog_Remindersu'), {
             canClose: false
           });
         } else {
@@ -223,7 +223,7 @@ var OProgress = function OProgress(_ref) {
           });
         }
       })["catch"](function (e) {
-        _toast["default"].Error("网络异常", {
+        _toast["default"].Error('网络异常', {
           canClose: false
         });
       });
@@ -247,7 +247,7 @@ var OProgress = function OProgress(_ref) {
   }, [generalPrincipalUser]);
   (0, _react.useEffect)(function () {
     // @ts-ignore
-    var dom = document.querySelector(".o-progress__contnet-wrapper").querySelector(".okr-progress-item-wrapper"); // @ts-ignore
+    var dom = document.querySelector('.o-progress__contnet-wrapper').querySelector('.okr-progress-item-wrapper'); // @ts-ignore
 
     var height = dom ? dom.offsetHeight : 0; // 为了解决展开内容编辑过后收起时计算的高度是根据展开的算 16是第一个目标进展在展开和收起所以列表的时候的padding-bottom差
 
@@ -267,53 +267,53 @@ var OProgress = function OProgress(_ref) {
       type: "warning"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       type: "title"
-    }, (0, _getLocale.getLocale)("OKR_DR_Pop_Areyousure")), /*#__PURE__*/_react["default"].createElement("span", {
+    }, (0, _getLocale.getLocale)('OKR_DR_Pop_Areyousure')), /*#__PURE__*/_react["default"].createElement("span", {
       type: "content"
-    }, (0, _getLocale.getLocale)("OKR_DR_Pop_ThesystemOKR")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.CancelButton, {
+    }, (0, _getLocale.getLocale)('OKR_DR_Pop_ThesystemOKR')), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.CancelButton, {
       type: "button",
       onClick: handleCancelRemind
-    }, (0, _getLocale.getLocale)("Mod_Cancel")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.SureButton, {
+    }, (0, _getLocale.getLocale)('Mod_Cancel')), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.SureButton, {
       type: "button",
       onClick: handleEnsureRemind
-    }, (0, _getLocale.getLocale)("OKR_MyO_Butt_Determine")));
+    }, (0, _getLocale.getLocale)('OKR_MyO_Butt_Determine')));
   }, [showRemindDialogConfirm, handleCancelRemind, handleEnsureRemind]);
   var renderEmptyCmp = (0, _react.useMemo)(function () {
     var renderUpdateBtn = function renderUpdateBtn(_ref3) {
       var onOpenModal = _ref3.onOpenModal;
       return /*#__PURE__*/_react["default"].createElement("button", {
-        className: "o-progress__empty-button ".concat(isPrincipalUser ? "" : "o-progress__empty-button--not-principaluser"),
+        className: "o-progress__empty-button ".concat(isPrincipalUser ? '' : 'o-progress__empty-button--not-principaluser'),
         onClick: onOpenModal
-      }, (0, _getLocale.getLocale)("OKR_MyO_Prog_Butt_Update"));
+      }, (0, _getLocale.getLocale)('OKR_MyO_Prog_Butt_Update'));
     };
 
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])({
-        "o-progress__empty-wrapper": true,
-        "o-progress__empty-wrapper--not-principaluser": hasOtherProgress
+        'o-progress__empty-wrapper': true,
+        'o-progress__empty-wrapper--not-principaluser': hasOtherProgress
       })
     }, /*#__PURE__*/_react["default"].createElement("img", {
       width: 128,
       src: _scheduleEmpty["default"]
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "o-progress__empty-text"
-    }, isPrincipalUser ? (0, _getLocale.getLocale)("OKR_MyO_KRP_tochecko") : (0, _getLocale.getLocale)("OKR_MyO_Pr_Text_Nooprogress")), isPrincipalUser && /*#__PURE__*/_react["default"].createElement(_oProgressUpdate["default"], {
+    }, isPrincipalUser ? (0, _getLocale.getLocale)('OKR_MyO_KRP_tochecko') : (0, _getLocale.getLocale)('OKR_MyO_Pr_Text_Nooprogress')), isPrincipalUser && /*#__PURE__*/_react["default"].createElement(_oProgressUpdate["default"], {
       okrInfo: okrInfo,
       renderContent: renderUpdateBtn,
       setUpdateData: setUpdateProgress
     }), !isCanEditProgress && /*#__PURE__*/_react["default"].createElement("button", {
       className: "o-progress__empty-button",
       onClick: handleRemindClick
-    }, (0, _getLocale.getLocale)("OKR_MyO_Pr_Butt_Reminder")), isCanEditProgress && !isPrincipalUser && /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("button", {
+    }, (0, _getLocale.getLocale)('OKR_MyO_Pr_Butt_Reminder')), isCanEditProgress && !isPrincipalUser && /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("button", {
       className: "o-progress__empty-button",
       onClick: handleRemindClick
-    }, (0, _getLocale.getLocale)("OKR_MyO_Pr_Butt_Reminder")), /*#__PURE__*/_react["default"].createElement(_oProgressUpdate["default"], {
+    }, (0, _getLocale.getLocale)('OKR_MyO_Pr_Butt_Reminder')), /*#__PURE__*/_react["default"].createElement(_oProgressUpdate["default"], {
       okrInfo: okrInfo,
       renderContent: renderUpdateBtn,
       setUpdateData: setUpdateProgress
     })));
   }, [hasOtherProgress]);
   var renderDefaultRemindCmp = (0, _react.useMemo)(function () {
-    var text = isPrincipalUser ? (0, _auth.hasSuperior)() ? (0, _getLocale.getLocale)("OKR_MyO_Prog_Butt_Remind") : null : (0, _getLocale.getLocale)("OKR_MyO_Pr_Butt_Reminder");
+    var text = isPrincipalUser ? (0, _auth.hasSuperior)() ? (0, _getLocale.getLocale)('OKR_MyO_Prog_Butt_Remind') : null : (0, _getLocale.getLocale)('OKR_MyO_Pr_Butt_Reminder');
     return /*#__PURE__*/_react["default"].createElement("span", {
       className: "o-progress__func-btn",
       onClick: handleRemindClick
@@ -326,7 +326,7 @@ var OProgress = function OProgress(_ref) {
   }, oProgressData.length === 0 ? renderEmptyCmp : /*#__PURE__*/_react["default"].createElement("div", {
     className: "o-progress__header"
   }, /*#__PURE__*/_react["default"].createElement(_title["default"], {
-    title: (0, _getLocale.getLocale)("OKR_MyO_Prog_Objectiveprogress")
+    title: (0, _getLocale.getLocale)('OKR_MyO_Prog_Objectiveprogress')
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "o-progress__func-btns"
   }, okrInfo.status === 2 ? null : renderDefaultRemindCmp, isCanEditProgress ? /*#__PURE__*/_react["default"].createElement(_oProgressUpdate["default"], {
@@ -334,12 +334,12 @@ var OProgress = function OProgress(_ref) {
     renderContent: renderContent,
     setUpdateData: setUpdateProgress
   }) : null)), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "o-progress__contnet-wrapper ".concat(isMoreThanOneProgress && isShowAll ? "" : "o-progress__content-wrapper--fold"),
+    className: "o-progress__contnet-wrapper ".concat(isMoreThanOneProgress && isShowAll ? '' : 'o-progress__content-wrapper--fold'),
     style: {
-      height: isShowAll ? "auto" : "".concat(initHeight, "px")
+      height: isShowAll ? 'auto' : "".concat(initHeight, "px")
     }
   }, oProgressData && oProgressData.map(function (item, index) {
-    var rightTip = "";
+    var rightTip = '';
 
     if (okrInfo.status !== 2 && okrInfo.progress !== 100 && index === 0 && isCanEditProgress) {
       rightTip = (0, _util.getToNowTime)(item.time);
@@ -348,7 +348,7 @@ var OProgress = function OProgress(_ref) {
     return /*#__PURE__*/_react["default"].createElement(_okrProgressDetail["default"], {
       key: item.id,
       riskLevel: item.riskLevel,
-      title: (0, _openData.parseString)(item.title),
+      title: (0, _openData.parseString)(item.title || ''),
       percent: item.percent,
       oldPercent: item.oldPercent,
       content: item.content,
@@ -363,8 +363,8 @@ var OProgress = function OProgress(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "o-progress__shrink-text",
     onClick: handleChangeShowAll
-  }, isShowAll ? (0, _getLocale.getLocale)("OKR_MyO_Prog_Butt_Fold") : (0, _getLocale.getLocale)("OKR_MyO_Pr_Butt_Viewall"), /*#__PURE__*/_react["default"].createElement("i", {
-    className: isShowAll ? "tu-icon-arrow-up" : "tu-icon-arrow-down"
+  }, isShowAll ? (0, _getLocale.getLocale)('OKR_MyO_Prog_Butt_Fold') : (0, _getLocale.getLocale)('OKR_MyO_Pr_Butt_Viewall'), /*#__PURE__*/_react["default"].createElement("i", {
+    className: isShowAll ? 'tu-icon-arrow-up' : 'tu-icon-arrow-down'
   }))) : null, /*#__PURE__*/_react["default"].createElement(_titaUi.Modal, {
     className: "common-modal o-progress__modal",
     maskClosable: false,
@@ -375,9 +375,9 @@ var OProgress = function OProgress(_ref) {
     visible: editOProgressVisiable,
     width: 600
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "o-progress__textarea-wrapper ".concat(hasError ? "o-progress__textarea-wrapper--error" : "")
+    className: "o-progress__textarea-wrapper ".concat(hasError ? 'o-progress__textarea-wrapper--error' : '')
   }, /*#__PURE__*/_react["default"].createElement("textarea", {
-    placeholder: (0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Pleprogress"),
+    placeholder: (0, _getLocale.getLocale)('OKR_MyO_Pop_Upd_Pleprogress'),
     className: "o-progress__textarea",
     value: editOProgressContent,
     onChange: handleTextareaChange

package/lib/components/wechat-btn/index.css

@@ -1,4 +1,5 @@
 .titaui-wechat-btn {
+  margin: 0 8px;
   font-size: 18px;
   color: #a4acb9;
   cursor: pointer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.11.52-beta.6",
+  "version": "1.11.52-beta.7",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -34,7 +34,7 @@
     "@storybook/addon-knobs": "6.0.10",
     "@storybook/addon-links": "6.0.10",
     "@storybook/react": "6.0.10",
-    "@titaui/rich-editor": "^0.1.29",
+    "@titaui/rich-editor": "^0.1.32",
     "@types/prosemirror-state": "1.2.8",
     "@types/styled-components": "5.1.2",
     "@typescript-eslint/eslint-plugin": "5.10.0",