@titaui/pc 1.11.51 → 1.11.52-beta.11

package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/kr-score-editor/edit-pop.js

@@ -81,7 +81,7 @@ var EditPop = /*#__PURE__*/function (_PureComponent) {
   var _super = _createSuper(EditPop);
 
   function EditPop() {
-    var _this;
+    var _temp, _this;
 
     _classCallCheck(this, EditPop);
 
@@ -89,7 +89,7 @@ var EditPop = /*#__PURE__*/function (_PureComponent) {
       args[_key] = arguments[_key];
     }
 
-    return _possibleConstructorReturn(_this, (_this = _super.call.apply(_super, [this].concat(args)), _this.state = {
+    return _possibleConstructorReturn(_this, (_temp = _this = _super.call.apply(_super, [this].concat(args)), _this.state = {
       value: _this.props.value,
       showError: false,
       errMsg: "",
@@ -152,7 +152,7 @@ var EditPop = /*#__PURE__*/function (_PureComponent) {
         errMsg: (0, _i18nFrontTranslate.inputWordTrans)(value.length, maxLength),
         disable: !!(maxLength && value.length > maxLength && disable)
       });
-    }, _assertThisInitialized(_this)));
+    }, _temp));
   }
 
   _createClass(EditPop, [{

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 }; }
@@ -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/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 }; }
@@ -397,7 +399,7 @@ function OkrDetailHeader(_ref) {
       name: detailInfo.workName,
       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"
@@ -409,14 +411,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/e-list/index.js

@@ -84,12 +84,12 @@ function Elist(props, ref) {
       krList = _useState2[0],
       setKrList = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(hasCondition ? JSON.parse(localStorage.getItem("okrDrawerECheckedStatus".concat(loginUser))) : []),
+  var _useState3 = (0, _react.useState)(hasCondition ? JSON.parse(localStorage.getItem("okrDrawerECheckedStatus".concat(loginUser)) || '[]') : []),
       _useState4 = _slicedToArray(_useState3, 2),
       checkedStatus = _useState4[0],
       setCheckedStatus = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(hasCondition ? JSON.parse(localStorage.getItem("okrDrawerESelectUsers".concat(loginUser))) : []),
+  var _useState5 = (0, _react.useState)(hasCondition ? JSON.parse(localStorage.getItem("okrDrawerESelectUsers".concat(loginUser)) || '[]') : []),
       _useState6 = _slicedToArray(_useState5, 2),
       selectUsers = _useState6[0],
       setSelectUsers = _useState6[1];

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;
+}

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

@@ -9,18 +9,18 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _titaUi = require("tita-ui");
-
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _richEditor = require("@titaui/rich-editor");
+
+var _titaUi = require("tita-ui");
+
 var _userSelector = _interopRequireDefault(require("../../../user-selector"));
 
 var _confidence = _interopRequireDefault(require("../../../confidence"));
 
 var _bsGlobal = require("../../../../utils/bs-global");
 
-var _dom = require("./dom");
-
 var _requestApis = require("../../request-apis");
 
 var _getLocale = require("../../../../utils/getLocale");
@@ -51,7 +51,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var preCls = "okr-list-create-kr";
+var preCls = 'okr-list-create-kr';
 
 function CreateKr(_ref) {
   var startDate = _ref.startDate,
@@ -62,17 +62,22 @@ function CreateKr(_ref) {
       onHide = _ref.onHide;
   var dataRef = (0, _react.useRef)();
 
-  var _useState = (0, _react.useState)(""),
+  var _useState = (0, _react.useState)({
+    pureText: '',
+    pureTextExcludeAt: '',
+    mentionUsers: [],
+    richText: undefined
+  }),
       _useState2 = _slicedToArray(_useState, 2),
-      krName = _useState2[0],
-      setKrName = _useState2[1];
+      krNameData = _useState2[0],
+      setKrNameData = _useState2[1];
 
   var _useState3 = (0, _react.useState)(false),
       _useState4 = _slicedToArray(_useState3, 2),
       showTip = _useState4[0],
       setShowTip = _useState4[1];
 
-  var tipsEnable = localStorage.getItem("list_create_kr_tips_".concat((0, _bsGlobal.getUserInfo)().Id)) != "false";
+  var tipsEnable = localStorage.getItem("list_create_kr_tips_".concat((0, _bsGlobal.getUserInfo)().Id)) != 'false';
 
   var _useState5 = (0, _react.useState)(5),
       _useState6 = _slicedToArray(_useState5, 2),
@@ -97,11 +102,14 @@ function CreateKr(_ref) {
   }),
       _useState8 = _slicedToArray(_useState7, 2),
       user = _useState8[0],
-      setUser = _useState8[1];
+      setUser = _useState8[1]; // const inputRef =
+  //   useRef<HTMLInputElement>() as React.RefObject<HTMLInputElement>
+
 
-  var inputRef = (0, _react.useRef)();
+  var mentionInputRef = (0, _react.useRef)();
+  var pendingRef = (0, _react.useRef)(false);
   dataRef.current = _objectSpread(_objectSpread({}, dataRef.current), {}, {
-    krName: krName,
+    krNameData: krNameData,
     user: user,
     startDate: startDate,
     endDate: endDate,
@@ -110,23 +118,34 @@ function CreateKr(_ref) {
     getWrapperRef: getWrapperRef,
     onHide: onHide
   });
-  var create = (0, _react.useCallback)(function (e) {
+  var createKr = (0, _react.useCallback)(function () {
     // 选中了选人组件中的item
-    if ((0, _dom.hasAncestorElement)(e.target, "titaui-popup")) return;
-
-    if (dataRef.current.getWrapperRef().current && dataRef.current.getWrapperRef().current.contains(e.target)) {
-      return;
-    }
-
-    if (dataRef.current.krName.trim()) {
+    // if (hasAncestorElement(e.target, 'titaui-popup')) return
+    // if (
+    //   dataRef.current.getWrapperRef().current &&
+    //   dataRef.current.getWrapperRef().current.contains(e.target as Node)
+    // ) {
+    //   return
+    // }
+    var _dataRef$current$krNa = dataRef.current.krNameData,
+        mentionUsers = _dataRef$current$krNa.mentionUsers,
+        pureText = _dataRef$current$krNa.pureText,
+        richText = _dataRef$current$krNa.richText;
+
+    if (pureText.trim()) {
       (0, _requestApis.createNewKr)({
         PrincipalId: dataRef.current.user.id,
-        mileStoneName: dataRef.current.krName,
+        mileStoneName: pureText,
+        mileStoneNameRichText: richText,
+        aiteUsers: mentionUsers === null || mentionUsers === void 0 ? void 0 : mentionUsers.map(function (user) {
+          return user.mentionId;
+        }),
         startDate: dataRef.current.startDate,
         endDate: dataRef.current.endDate,
         workId: dataRef.current.workId,
         confidenceIndex: confidenceIndex
       }).then(function (res) {
+        setShowTip(false);
         dataRef.current.addKr(res);
         dataRef.current.onHide();
       });
@@ -137,26 +156,35 @@ function CreateKr(_ref) {
 
   var focus = function focus() {
     setTimeout(function () {
-      inputRef.current && inputRef.current.focus();
+      var _mentionInputRef$curr, _mentionInputRef$curr2;
+
+      (_mentionInputRef$curr = mentionInputRef.current) === null || _mentionInputRef$curr === void 0 ? void 0 : (_mentionInputRef$curr2 = _mentionInputRef$curr.methods()) === null || _mentionInputRef$curr2 === void 0 ? void 0 : _mentionInputRef$curr2.focus();
     }, 0);
-  };
+  }; // useEffect(() => {
+  //   document.addEventListener('click', create, false)
+  //   return () => document.removeEventListener('click', create)
+  // }, [])
+
 
-  (0, _react.useEffect)(function () {
-    document.addEventListener("click", create, false);
-    return function () {
-      return document.removeEventListener("click", create);
-    };
-  }, []);
   (0, _react.useEffect)(function () {
     focus();
   }, []);
 
   var onInputKeyDown = function onInputKeyDown(e) {
-    if (e.key.toLocaleLowerCase() == "enter") {
-      if (krName.trim()) {
+    if (e.key.toLocaleLowerCase() == 'enter' && !pendingRef.current) {
+      pendingRef.current = true;
+      var mentionUsers = krNameData.mentionUsers,
+          pureText = krNameData.pureText,
+          richText = krNameData.richText;
+
+      if (pureText.trim()) {
         (0, _requestApis.createNewKr)({
           PrincipalId: user.id,
-          mileStoneName: krName,
+          mileStoneName: pureText,
+          mileStoneNameRichText: richText,
+          aiteUsers: mentionUsers === null || mentionUsers === void 0 ? void 0 : mentionUsers.map(function (user) {
+            return user.mentionId;
+          }),
           startDate: startDate,
           endDate: endDate,
           workId: workId,
@@ -164,19 +192,15 @@ function CreateKr(_ref) {
         }).then(function (res) {
           addKr(res);
           onHide();
+          pendingRef.current = false;
         });
       } else {
         onHide();
+        pendingRef.current = false;
       }
     }
   };
 
-  var onBlur = function onBlur() {
-    setTimeout(function () {
-      setShowTip(false);
-    }, 200);
-  };
-
   var onFocus = function onFocus() {
     tipsEnable && !dataRef.current.hideTips && setShowTip(true);
   };
@@ -193,7 +217,7 @@ function CreateKr(_ref) {
 
   var onNoMoreShow = function onNoMoreShow() {
     setShowTip(false);
-    localStorage.setItem("list_create_kr_tips_".concat((0, _bsGlobal.getUserInfo)().Id), "false");
+    localStorage.setItem("list_create_kr_tips_".concat((0, _bsGlobal.getUserInfo)().Id), 'false');
   };
 
   var onUserSubmit = function onUserSubmit(_ref2) {
@@ -216,33 +240,31 @@ function CreateKr(_ref) {
     className: preCls
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__input"))
-  }, /*#__PURE__*/_react["default"].createElement(_titaUi.Input, {
-    placeholder: (0, _getLocale.getLocale)("OKR_MyO_Text_Createkeyr"),
-    inputRef: inputRef,
-    value: krName,
-    onChange: function onChange(e) {
-      return setKrName(e.target.value);
-    },
+  }, /*#__PURE__*/_react["default"].createElement(_richEditor.TitaInlineRichEditor, {
+    initialState: undefined,
+    onDocChange: setKrNameData,
+    onBlur: createKr,
     onFocus: onFocus,
-    onBlur: onBlur,
-    onKeyDown: onInputKeyDown
+    onKeyDown: onInputKeyDown,
+    placeholder: (0, _getLocale.getLocale)('OKR_MyO_Text_Createkeyr'),
+    ref: mentionInputRef
   }), /*#__PURE__*/_react["default"].createElement("p", {
     style: {
-      display: showTip ? "block" : "none",
+      display: showTip ? 'block' : 'none',
       zIndex: 1
     },
     onClick: stopPropagation
-  }, (0, _getLocale.getLocale)("OKR_MyO_Text_Recommendation"), /*#__PURE__*/_react["default"].createElement("br", null), /*#__PURE__*/_react["default"].createElement("p", null, (0, _getLocale.getLocale)("OKR_MyO_Text_ExampleC")), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("a", {
+  }, (0, _getLocale.getLocale)('OKR_MyO_Text_Recommendation'), /*#__PURE__*/_react["default"].createElement("br", null), /*#__PURE__*/_react["default"].createElement("p", null, (0, _getLocale.getLocale)('OKR_MyO_Text_ExampleC')), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("a", {
     onClick: onNextTalk
-  }, (0, _getLocale.getLocale)("OKR_MyO_Butt_Nexttime")), /*#__PURE__*/_react["default"].createElement("a", {
+  }, (0, _getLocale.getLocale)('OKR_MyO_Butt_Nexttime')), /*#__PURE__*/_react["default"].createElement("a", {
     onClick: onNoMoreShow
-  }, (0, _getLocale.getLocale)("OKR_MyO_Butt_Nomor")))), /*#__PURE__*/_react["default"].createElement("span", {
+  }, (0, _getLocale.getLocale)('OKR_MyO_Butt_Nomor')))), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(preCls, "__heart"))
   }, /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
     content: "\u4FEE\u65391"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     style: {
-      display: "inline-flex"
+      display: 'inline-flex'
     }
   }, /*#__PURE__*/_react["default"].createElement(_confidence["default"], {
     editable: true,