@titaui/pc 1.12.7-beta.4 → 1.12.9-beta.1

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,

package/lib/components/okr-detail/okr-list/index.css

@@ -120,3 +120,12 @@
   color: #a4acb9;
   line-height: 22px;
 }
+
+.okr-detail-okrs-list .tita-okrdt-tree {
+  overflow: visible;
+}
+
+.okr-detail-okrs-list .tita-okrdt-tree .titaui-tree,
+    .okr-detail-okrs-list .tita-okrdt-tree .rc-tree-list-holder {
+  overflow: visible;
+}

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

@@ -96,16 +96,16 @@ var _getUserInfo = (0, _bsGlobal.getUserInfo)(),
     Id = _getUserInfo.Id,
     UserAvatar = _getUserInfo.UserAvatar;
 
-var preCls = "okr-detail-okrs-list";
+var preCls = 'okr-detail-okrs-list';
 
 var treeDataFormate = function treeDataFormate(nodes) {
-  var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "kr";
+  var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'kr';
   var canEditOkr = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var formateNodes = [];
   nodes.forEach(function (it, index) {
-    var title = "";
-    if (type == "kr" || type == "kr-parent") title = it.mileStoneName;
-    if (type == "o-child" || type == "o-parent") title = it.workName;
+    var title = ''; // if (type == "kr" || type == "kr-parent") title = it.mileStoneName;
+
+    if (type == 'o-child' || type == 'o-parent') title = it.workName;
     formateNodes.push({
       key: it.mileStoneId,
       index: index,
@@ -208,7 +208,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
               });
 
               if (authChildWorks.length > 0) {
-                setChildOkrs(treeDataFormate(authChildWorks, "o-child"));
+                setChildOkrs(treeDataFormate(authChildWorks, 'o-child'));
               } else {
                 setChildOkrs(null);
               }
@@ -279,7 +279,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     updateKrs();
   }, []);
   (0, _react.useEffect)(function () {
-    var strucKrs = treeDataFormate(pureKrs, "kr", canEditOkr);
+    var strucKrs = treeDataFormate(pureKrs, 'kr', canEditOkr);
     setKrs(strucKrs);
   }, [pureKrs, canEditOkr]);
 
@@ -287,7 +287,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     refreshAll();
     updateKrs();
 
-    _toast["default"].Success((0, _getLocale.getLocale)("OKR_Db_Success"), {
+    _toast["default"].Success((0, _getLocale.getLocale)('OKR_Db_Success'), {
       canClose: false
     });
   };
@@ -326,7 +326,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
     (0, _requestApis.updateParentId)(params).then(function (data) {
       if (data.Code == 1) {
-        _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+        _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
 
         setGeneralParent({
           parentId: params.parentId,
@@ -378,7 +378,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     if (!canEditOkr) return;
     var dropNode = info.node;
     var dragNode = info.dragNode;
-    var dropPos = info.node.pos.split("-");
+    var dropPos = info.node.pos.split('-');
     var dropPosition = info.dropPosition - Number(dropPos[dropPos.length - 1]); // 移动类型，after 1 before 2
 
     var isDown = dropPosition != -1;
@@ -412,17 +412,17 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       parentOkr: parentOkr
     });
 
-    okrParent = treeDataFormate([newParentKr], "kr-parent");
+    okrParent = treeDataFormate([newParentKr], 'kr-parent');
   } else if (parentOkr) {
-    okrParent = treeDataFormate([parentOkr], "o-parent");
+    okrParent = treeDataFormate([parentOkr], 'o-parent');
   }
 
   var isShowAlignOkr = (0, _react.useMemo)(function () {
-    return childOkrs && childOkrs.length > 0 // 有子目标
-    || parentOkr // 有父目标
-    || !parentOkr && canEditOkr // 无父目标但有权限编辑
-    ;
-  }, [parentOkr, childOkrs, canEditOkr]);
+    return childOkrs && childOkrs.length > 0 || // 有子目标
+    parentOkr || // 有父目标
+    !parentOkr && canEditOkr;
+  }, // 无父目标但有权限编辑
+  [parentOkr, childOkrs, canEditOkr]);
 
   var renderKrs = function renderKrs() {
     var _classNames;
@@ -434,9 +434,9 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         },
         canEditOkr: canEditOkr || isInnerUser,
         style: isShowAlignOkr ? {
-          padding: "40px 0 24px 0"
+          padding: '40px 0 24px 0'
         } : {
-          padding: "100px 0"
+          padding: '100px 0'
         }
       });
     }
@@ -451,7 +451,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       okrInfo: okrInfo,
       draggable: canEditOkr && (okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState) === _helper.EApproveStatus.UnderApproval,
       onDrop: onOkrItemDropHandler
-    }))), (canEditOkr || isInnerUser) && (0, _helper.getApprovalOkr)(approvalSetting, "createOkr", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes) && /*#__PURE__*/_react["default"].createElement("div", {
+    }))), (canEditOkr || isInnerUser) && (0, _helper.getApprovalOkr)(approvalSetting, 'createOkr', okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes) && /*#__PURE__*/_react["default"].createElement("div", {
       ref: wrapperRef,
       className: (0, _classnames["default"])("".concat(preCls, "__addkr"))
     }, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], null, createKrShow ? /*#__PURE__*/_react["default"].createElement(_createKrItem["default"], {
@@ -470,10 +470,10 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         return setCreateKrShow(true);
       }
     }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(preCls, "__addkr-prefix"), "tu-icon-add1")
+      className: (0, _classnames["default"])("".concat(preCls, "__addkr-prefix"), 'tu-icon-add1')
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])("".concat(preCls, "__addkr-text"))
-    }, (0, _getLocale.getLocale)("OKR_MyO_Pop_Butt_AddKR"))))));
+    }, (0, _getLocale.getLocale)('OKR_MyO_Pop_Butt_AddKR'))))));
   };
 
   return /*#__PURE__*/_react["default"].createElement(_context2.OkrListContext.Provider, {
@@ -489,13 +489,13 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     className: (0, _classnames["default"])(preCls)
   }, !loading ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, renderKrs(), isShowAlignOkr && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_blockLine["default"], {
     style: {
-      padding: "0 32px"
+      padding: '0 32px'
     }
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__align-to"))
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__align-to-title"))
-  }, (0, _getLocale.getLocale)("OKR_MyO_Pop_SetAlignment")), !parentOkr && canEditOkr ? /*#__PURE__*/_react["default"].createElement(_addParentOkr["default"], {
+  }, (0, _getLocale.getLocale)('OKR_MyO_Pop_SetAlignment')), !parentOkr && canEditOkr ? /*#__PURE__*/_react["default"].createElement(_addParentOkr["default"], {
     onClick: onAddParentOkrHandler
   }) : /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__align-to-tree"))
@@ -508,7 +508,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     onClick: function onClick() {
       return setIsOpened(!isOpened);
     }
-  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("OKR_MyO_KRP_OKRs_Alignedmeobje"), "\uFF08", childOkrs.length, "\uFF09")), /*#__PURE__*/_react["default"].createElement(_reactCollapse.Collapse, {
+  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_KRP_OKRs_Alignedmeobje'), "\uFF08", childOkrs.length, "\uFF09")), /*#__PURE__*/_react["default"].createElement(_reactCollapse.Collapse, {
     isOpened: isOpened
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__align-on-tree"))