@titaui/pc 1.12.7 → 1.12.8

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

@@ -11,6 +11,10 @@ var _react = _interopRequireWildcard(require("react"));
 
 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"));
@@ -27,7 +31,7 @@ var _toast = _interopRequireDefault(require("../../../../../toast"));
 
 var _dialogConfirm = _interopRequireWildcard(require("../../../../../dialog-confirm"));
 
-var _editableInput = _interopRequireDefault(require("../../../../components/editable-input"));
+var _errorTip = _interopRequireDefault(require("../../../../../tooltip/error-tip"));
 
 var _requestApis = require("../../../../request-apis");
 
@@ -51,6 +55,10 @@ 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");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -86,9 +94,9 @@ function OkrRowColumn(_ref) {
       marginLeft = _ref$marginLeft === void 0 ? 0 : _ref$marginLeft;
   return /*#__PURE__*/_react["default"].createElement("span", {
     style: {
-      display: "inline-block",
+      display: 'inline-block',
       width: width,
-      textAlign: "left",
+      textAlign: 'left',
       marginLeft: marginLeft
     }
   }, children);
@@ -100,6 +108,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,
@@ -111,53 +121,68 @@ function _default(props) {
       confidence = _useState2[0],
       setConfidence = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(data.user || {}),
+  var _useState3 = (0, _react.useState)(''),
       _useState4 = _slicedToArray(_useState3, 2),
-      user = _useState4[0],
-      setUser = _useState4[1];
+      errorTip = _useState4[0],
+      setErrorTip = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(false),
+  var _useState5 = (0, _react.useState)(data.user || {}),
       _useState6 = _slicedToArray(_useState5, 2),
-      editWightVisible = _useState6[0],
-      setEditWightVisible = _useState6[1];
+      user = _useState6[0],
+      setUser = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(data.evaluateValue),
+  var _useState7 = (0, _react.useState)(false),
       _useState8 = _slicedToArray(_useState7, 2),
-      evaluateValue = _useState8[0],
-      setEvaluateValue = _useState8[1];
+      editWightVisible = _useState8[0],
+      setEditWightVisible = _useState8[1];
 
   var _useState9 = (0, _react.useState)(false),
       _useState10 = _slicedToArray(_useState9, 2),
-      krModalVsible = _useState10[0],
-      setKrModalVsible = _useState10[1];
+      editing = _useState10[0],
+      setEditing = _useState10[1];
 
-  var _useState11 = (0, _react.useState)(false),
+  var _useState11 = (0, _react.useState)(data.evaluateValue),
       _useState12 = _slicedToArray(_useState11, 2),
-      deleteModalVisible = _useState12[0],
-      setDeleteModalVisible = _useState12[1];
+      evaluateValue = _useState12[0],
+      setEvaluateValue = _useState12[1];
 
-  var _useState13 = (0, _react.useState)(title),
+  var _useState13 = (0, _react.useState)(false),
       _useState14 = _slicedToArray(_useState13, 2),
-      krName = _useState14[0],
-      setKrName = _useState14[1];
+      krModalVsible = _useState14[0],
+      setKrModalVsible = _useState14[1];
+
+  var _useState15 = (0, _react.useState)(false),
+      _useState16 = _slicedToArray(_useState15, 2),
+      deleteModalVisible = _useState16[0],
+      setDeleteModalVisible = _useState16[1];
+
+  var _useState17 = (0, _react.useState)({
+    pureText: mileStoneName,
+    pureTextExcludeAt: mileStoneName,
+    richText: mileStoneNameRichText ? JSON.parse(mileStoneNameRichText) : (0, _richEditor.TitaRichEditorInitTextState)(mileStoneName),
+    mentionUsers: []
+  }),
+      _useState18 = _slicedToArray(_useState17, 2),
+      krNameData = _useState18[0],
+      setKrNameData = _useState18[1];
 
-  var _useState15 = (0, _react.useState)((0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting").KRSetting.ShowKrConfidence),
-      _useState16 = _slicedToArray(_useState15, 1),
-      showHeart = _useState16[0]; // 高级功能： 关键成果信心指数
+  var _useState19 = (0, _react.useState)((0, _bsGlobal.getBSGlobal)('OkrAdvancedSetting').KRSetting.ShowKrConfidence),
+      _useState20 = _slicedToArray(_useState19, 1),
+      showHeart = _useState20[0]; // 高级功能： 关键成果信心指数
 
 
-  var _useState17 = (0, _react.useState)((0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting").KRSetting.KrWeight),
-      _useState18 = _slicedToArray(_useState17, 1),
-      showKrWeight = _useState18[0]; // 高级功能： 关见成果权重
+  var _useState21 = (0, _react.useState)((0, _bsGlobal.getBSGlobal)('OkrAdvancedSetting').KRSetting.KrWeight),
+      _useState22 = _slicedToArray(_useState21, 1),
+      showKrWeight = _useState22[0]; // 高级功能： 关见成果权重
 
 
-  var _useState19 = (0, _react.useState)(data.isEvaluate),
-      _useState20 = _slicedToArray(_useState19, 2),
-      isEvaluate = _useState20[0],
-      setIsEvaluate = _useState20[1]; // 权限 & 非结束目标
+  var _useState23 = (0, _react.useState)(data.isEvaluate),
+      _useState24 = _slicedToArray(_useState23, 2),
+      isEvaluate = _useState24[0],
+      setIsEvaluate = _useState24[1]; // 权限 & 非结束目标
 
 
-  var _useState21 = (0, _react.useState)(function () {
+  var _useState25 = (0, _react.useState)(function () {
     var hasAuth = new _auth.KRAuth({
       user: data.user,
       createUserId: data.createUserId
@@ -165,12 +190,18 @@ function _default(props) {
     var livetime = okrInfo.status != 2;
     return hasAuth && livetime;
   }),
-      _useState22 = _slicedToArray(_useState21, 1),
-      krCanEdit = _useState22[0];
+      _useState26 = _slicedToArray(_useState25, 1),
+      krCanEdit = _useState26[0];
 
+  var mentionInputRef = (0, _react.useRef)();
   (0, _react.useEffect)(function () {
-    setKrName(title);
-  }, [title]);
+    setKrNameData({
+      pureText: mileStoneName,
+      pureTextExcludeAt: mileStoneName,
+      richText: data.mileStoneNameRichText ? JSON.parse(data.mileStoneNameRichText) : (0, _richEditor.TitaRichEditorInitTextState)(mileStoneName),
+      mentionUsers: []
+    });
+  }, [mileStoneName]);
 
   var _useContext2 = (0, _react.useContext)(_context2.OkrListContext),
       updateKrs = _useContext2.updateKrs;
@@ -192,9 +223,7 @@ function _default(props) {
       kr: data,
       confidenceIndex: level
     }).then(function () {
-      _toast["default"].Success("修改成功", {
-        top: 60
-      });
+      _toast["default"].Success('修改成功');
     });
   };
 
@@ -216,7 +245,7 @@ function _default(props) {
         progressDescription = val.progressDescription,
         riskLevel = val.riskLevel,
         updateProgressWay = val.updateProgressWay;
-    progress = progress.replace(/%/, "");
+    progress = progress.replace(/%/, '');
     (0, _requestApis.updateKrProgressAndStatus)({
       krId: data.mileStoneId,
       progress: Number(progress),
@@ -225,7 +254,7 @@ function _default(props) {
       updateProgressWay: updateProgressWay
     }).then(function (res) {
       if (res.Code == 1) {
-        _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+        _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
 
         refreshAll();
         updateKrs();
@@ -253,7 +282,7 @@ function _default(props) {
               setDeleteModalVisible(false);
 
               if (!Message) {
-                _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+                _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
 
                 setTimeout(function () {
                   refreshAll();
@@ -276,13 +305,62 @@ function _default(props) {
     };
   }();
 
-  var onKrNameChangeHandler = function onKrNameChangeHandler(val) {
+  var onInputKeyDownHandler = function onInputKeyDownHandler(e) {
+    if (e.keyCode !== 13) return;
+    onKrNameChangeHandler();
+  };
+
+  var validateKrName = function validateKrName(data) {
+    var _pureTextExcludeAt$tr;
+
+    var pureTextExcludeAt = data.pureTextExcludeAt;
+    var krNameLen = pureTextExcludeAt === null || pureTextExcludeAt === void 0 ? void 0 : (_pureTextExcludeAt$tr = pureTextExcludeAt.trim()) === null || _pureTextExcludeAt$tr === void 0 ? void 0 : _pureTextExcludeAt$tr.length;
+
+    if (krNameLen === 0) {
+      setErrorTip('KR 名称不能为空');
+      return false;
+    }
+
+    if (krNameLen > 5000) {
+      setErrorTip((0, _i18nFrontTranslate.inputWordTrans)(krNameLen, 5000));
+      return false;
+    }
+
+    setErrorTip('');
+    return true;
+  };
+
+  var onEditorChange = function onEditorChange(data) {
+    setKrNameData(function () {
+      return data;
+    });
+    validateKrName(data);
+  };
+
+  var onKrNameChangeHandler = function onKrNameChangeHandler() {
+    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)({
-      mileStoneName: val,
+      mileStoneName: pureText,
+      mileStoneNameRichText: richText,
+      aiteUsers: mentionUsers === null || mentionUsers === void 0 ? void 0 : mentionUsers.map(function (user) {
+        return user.mentionId;
+      }),
       workId: data.workId,
       workMileStoneId: data.mileStoneId
-    }).then(function () {
-      _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+    }).then(function (res) {
+      setEditing(false);
+
+      _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
     });
   };
 
@@ -299,11 +377,26 @@ function _default(props) {
   };
 
   var onTitleTextClickHandler = function onTitleTextClickHandler() {
-    _drawerManager["default"].open("krDetail", {
+    if (editing) return;
+
+    _drawerManager["default"].open('krDetail', {
       krId: data.mileStoneId
     });
   };
 
+  var triggerEdit = function triggerEdit(e) {
+    e.stopPropagation();
+    e.nativeEvent.stopImmediatePropagation();
+    setEditing(true);
+    setTimeout(function () {
+      var _mentionInputRef$curr;
+
+      // @ts-ignore
+      (_mentionInputRef$curr = mentionInputRef.current) === null || _mentionInputRef$curr === void 0 ? void 0 : _mentionInputRef$curr.methods().focus();
+    }, 0);
+  };
+
+  var krNameEditable = krCanEdit && (0, _helper.getApprovalKr)(approvalSetting, 'changeOkrName', okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes, data === null || data === void 0 ? void 0 : data.KrApprovalTypes);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node"))
   }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -314,16 +407,33 @@ function _default(props) {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-h1"))
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-prefix"))
-  }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
-    className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-title"))
-  }, /*#__PURE__*/_react["default"].createElement(_editableInput["default"], {
-    editable: krCanEdit && (0, _helper.getApprovalKr)(approvalSetting, "changeOkrName", okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes, data === null || data === void 0 ? void 0 : data.KrApprovalTypes),
-    defaultValue: krName,
-    emptyMessage: "KR\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A",
-    onKeyDown: onKrNameChangeHandler,
+  }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement(_errorTip["default"], {
+    overlay: /*#__PURE__*/_react["default"].createElement("span", {
+      style: {
+        color: '#f05e5e'
+      }
+    }, 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"), _defineProperty({}, "".concat(_precls["default"], "__kr-node-title--editing"), editing)),
+    onClick: onTitleTextClickHandler
+  }, /*#__PURE__*/_react["default"].createElement(_richEditor.TitaInlineRichEditor, {
+    editable: editing,
+    initialState: krNameData.richText,
+    onDocChange: onEditorChange,
     onBlur: onKrNameChangeHandler,
-    onTextClick: onTitleTextClickHandler
-  }))), /*#__PURE__*/_react["default"].createElement("div", {
+    onKeyDown: onInputKeyDownHandler,
+    placeholder: "KR\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A",
+    ref: mentionInputRef
+  }), krNameEditable && !editing && /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__text-icon"))
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "tu-icon-bianji2",
+    onClick: triggerEdit
+  })))))), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-h2"))
   }, /*#__PURE__*/_react["default"].createElement(OkrRowColumn, {
     width: 68
@@ -350,7 +460,7 @@ function _default(props) {
     marginLeft: 16
   }, /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
     data: data,
-    editable: krCanEdit && (0, _helper.getApprovalKr)(approvalSetting, "changeOkrTime", okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes, data === null || data === void 0 ? void 0 : data.KrApprovalTypes)
+    editable: krCanEdit && (0, _helper.getApprovalKr)(approvalSetting, 'changeOkrTime', okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes, data === null || data === void 0 ? void 0 : data.KrApprovalTypes)
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-actions"))
   }, showHeart && /*#__PURE__*/_react["default"].createElement("div", {
@@ -368,9 +478,9 @@ function _default(props) {
     percent: data.progress,
     linear: true,
     linearId: data.mileStoneId,
-    linearStartColor: (0, _utils.getProcessColor)(data.riskLevel, "linearStartColor", okrInfo.status),
-    linearEndColor: (0, _utils.getProcessColor)(data.riskLevel, "linearEndColor", okrInfo.status),
-    backgroundColor: (0, _utils.getProcessColor)(data.riskLevel, "backgroundColor", okrInfo.status)
+    linearStartColor: (0, _utils.getProcessColor)(data.riskLevel, 'linearStartColor', okrInfo.status),
+    linearEndColor: (0, _utils.getProcessColor)(data.riskLevel, 'linearEndColor', okrInfo.status),
+    backgroundColor: (0, _utils.getProcessColor)(data.riskLevel, 'backgroundColor', okrInfo.status)
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-score"))
   }, /*#__PURE__*/_react["default"].createElement(_krScoreEditor["default"], {
@@ -396,7 +506,7 @@ function _default(props) {
     onOk: onEditWightOkHandler
   }), /*#__PURE__*/_react["default"].createElement(_okrProgressModal["default"], {
     okrInfo: data,
-    title: (0, _getLocale.getLocale)("OKR_MyO_Title_UpdateKR"),
+    title: (0, _getLocale.getLocale)('OKR_MyO_Title_UpdateKR'),
     visible: krModalVsible,
     onClose: function onClose() {
       return setKrModalVsible(false);
@@ -409,15 +519,15 @@ function _default(props) {
     type: "warning"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     type: "title"
-  }, (0, _getLocale.getLocale)("OKR_MyO_KRP_Deletekey")), /*#__PURE__*/_react["default"].createElement("span", {
+  }, (0, _getLocale.getLocale)('OKR_MyO_KRP_Deletekey')), /*#__PURE__*/_react["default"].createElement("span", {
     type: "content"
-  }, (0, _getLocale.getLocale)("OKR_MyO_KRP_Thekeyachieve")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.CancelButton, {
+  }, (0, _getLocale.getLocale)('OKR_MyO_KRP_Thekeyachieve')), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.CancelButton, {
     type: "button",
     onClick: function onClick() {
       return setDeleteModalVisible(false);
     }
-  }, (0, _getLocale.getLocale)("Mod_Cancel")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.WarningButton, {
+  }, (0, _getLocale.getLocale)('Mod_Cancel')), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.WarningButton, {
     type: "button",
     onClick: onDeleteKrHandler
-  }, (0, _getLocale.getLocale)("Mod_Delete"))));
+  }, (0, _getLocale.getLocale)('Mod_Delete'))));
 }

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

@@ -27,7 +27,7 @@ var _oClassify = _interopRequireDefault(require("../../../o-classify"));
 
 var _precls = _interopRequireDefault(require("../../precls"));
 
-var _getLocale = require("../../../../../../utils/getLocale");
+var _openData = require("../../../../../../utils/open-data");
 
 var _avatar = _interopRequireDefault(require("../../../../../avatar"));
 
@@ -61,10 +61,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var getSeasonTectMap = function getSeasonTectMap() {
   return {
-    1: "一",
-    2: "二",
-    3: "三",
-    4: "四"
+    1: '一',
+    2: '二',
+    3: '三',
+    4: '四'
   };
 };
 
@@ -91,7 +91,7 @@ function _default(props) {
       _useState4 = _slicedToArray(_useState3, 1),
       user = _useState4[0];
 
-  var _useState5 = (0, _react.useState)(((_getBSGlobal = (0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting")) === null || _getBSGlobal === void 0 ? void 0 : (_getBSGlobal$KRSettin = _getBSGlobal.KRSetting) === null || _getBSGlobal$KRSettin === void 0 ? void 0 : _getBSGlobal$KRSettin.OKrWeight) || false),
+  var _useState5 = (0, _react.useState)(((_getBSGlobal = (0, _bsGlobal.getBSGlobal)('OkrAdvancedSetting')) === null || _getBSGlobal === void 0 ? void 0 : (_getBSGlobal$KRSettin = _getBSGlobal.KRSetting) === null || _getBSGlobal$KRSettin === void 0 ? void 0 : _getBSGlobal$KRSettin.OKrWeight) || false),
       _useState6 = _slicedToArray(_useState5, 1),
       OKrWeightSetting = _useState6[0];
 
@@ -151,11 +151,11 @@ function _default(props) {
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__o-child-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
@@ -196,7 +196,7 @@ function _default(props) {
     percent: data.progress,
     width: 40,
     backgroundColor: "#F7F8FA"
-  }, _defineProperty(_React$createElement, "width", 40), _defineProperty(_React$createElement, "textColor", data.status === 2 ? "#89919f" : _utils.OkrRiskMapping[data.manualRiskLevel].textColor), _defineProperty(_React$createElement, "color", data.status === 2 ? "linear-gradient(270deg, #BFC7D5, #E1E5EC)" : _utils.OkrRiskMapping[data.manualRiskLevel].line), _React$createElement))))), /*#__PURE__*/_react["default"].createElement(_editChildOkrWeight["default"], {
+  }, _defineProperty(_React$createElement, "width", 40), _defineProperty(_React$createElement, "textColor", data.status === 2 ? '#89919f' : _utils.OkrRiskMapping[data.manualRiskLevel].textColor), _defineProperty(_React$createElement, "color", data.status === 2 ? 'linear-gradient(270deg, #BFC7D5, #E1E5EC)' : _utils.OkrRiskMapping[data.manualRiskLevel].line), _React$createElement))))), /*#__PURE__*/_react["default"].createElement(_editChildOkrWeight["default"], {
     okrId: okrInfo.workId,
     visible: editVisible,
     onCancel: function onCancel() {

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 }; }
@@ -67,10 +69,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var getSeasonTectMap = function getSeasonTectMap() {
   return {
-    1: "一",
-    2: "二",
-    3: "三",
-    4: "四"
+    1: '一',
+    2: '二',
+    3: '三',
+    4: '四'
   };
 };
 
@@ -132,7 +134,7 @@ function _default(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              if (!(name == "modifyParent")) {
+              if (!(name == 'modifyParent')) {
                 _context.next = 4;
                 break;
               }
@@ -142,7 +144,7 @@ function _default(props) {
               break;
 
             case 4:
-              if (!(name == "cancelParent")) {
+              if (!(name == 'cancelParent')) {
                 _context.next = 9;
                 break;
               }
@@ -151,7 +153,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();
 
@@ -181,11 +183,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
@@ -218,8 +220,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"], {
@@ -231,8 +233,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/components/tab-panel-content/index.css

@@ -1,5 +1,6 @@
 .okr-detail__tabpanel-content {
   height: 100%;
+  padding-bottom: 52px;
   overflow-y: auto;
 }
 

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

@@ -35,6 +35,8 @@ var _drawerManager = _interopRequireDefault(require("../../drawer-manager"));
 
 var _getLocale = require("../../../utils/getLocale");
 
+var _openData = require("../../../utils/open-data");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -67,6 +69,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,10 +400,10 @@ 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", {
+    content: parent && /*#__PURE__*/_react["default"].createElement("span", {
       className: "okr-detail-head-parent"
     }, /*#__PURE__*/_react["default"].createElement("i", {
       className: "tu-icon-liebiao-duiqinubiao"
@@ -411,14 +415,16 @@ function OkrDetailHeader(_ref) {
           krId: parent.id
         });
       }
-    }, /*#__PURE__*/_react["default"].createElement("span", null, parent.type === 'okr' ? 'O ' : 'KR '), parent.name)) : null,
-    onlyShowContent: approveStatusColor ? /*#__PURE__*/_react["default"].createElement("div", {
+    }, /*#__PURE__*/_react["default"].createElement("span", null, parent.type === 'okr' ? 'O ' : 'KR '), (0, _openData.parseString)(parent.name))),
+    onlyShowContent: /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, approveStatusColor ? /*#__PURE__*/_react["default"].createElement("div", {
       className: "okr-detail-header-status",
       style: {
         color: approveStatusColor.color,
         backgroundColor: approveStatusColor.bgColor
       }
-    }, (0, _constant.getApproveStatusTextMap)(okrInfo.applyState)) : null
+    }, (0, _constant.getApproveStatusTextMap)(okrInfo.applyState)) : null, Number(detailInfo.status) === 2 && /*#__PURE__*/_react["default"].createElement("span", {
+      className: "okr-drawer-header__over-tag"
+    }, (0, _getLocale.getLocale)('OKR_MyO_Butt_Hasended')))
   }), /*#__PURE__*/_react["default"].createElement(_okrShare["default"], {
     visible: shareVisible,
     onClose: closeShareModal,

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

@@ -63,3 +63,20 @@
   color: #2879ff;
   margin-left: 10px;
 }
+
+.okr-list-create-kr__input .tita-rich-editor {
+  height: 36px;
+  border: 1px solid #2879ff;
+  border-radius: 8px;
+  box-shadow: 0px 0px 6px 0px rgba(40, 121, 255, 0.3) inset;
+  transition: all 0.3s ease;
+  box-sizing: border-box;
+}
+
+.okr-list-create-kr__input .tita-rich-editor .ProseMirror {
+  width: calc(100% - 76px);
+}
+
+.okr-list-create-kr__input .tita-rich-editor .ProseMirror p {
+  font-size: 14px;
+}