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

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

@@ -9,6 +9,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _cloneDeep = _interopRequireDefault(require("clone-deep"));
+
 var _uuid = _interopRequireDefault(require("uuid"));
 
 var _bsGlobal = require("../../../utils/bs-global");
@@ -60,8 +62,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function KrDatas(props) {
-  var krs = props.krs,
-      isCustomWeight = props.isCustomWeight,
+  var isCustomWeight = props.isCustomWeight,
       wrapperRef = props.wrapperRef,
       setKrDatas = props.setKrDatas,
       krDatas = props.krDatas,
@@ -88,6 +89,7 @@ function KrDatas(props) {
 
   var timerRef = (0, _react.useRef)();
   var krNameIsEmpty = (0, _react.useRef)(!inputKrInfo || !inputKrInfo.mileStoneName);
+  var krDatasRef = (0, _react.useRef)(krDatas);
   var setting = (0, _bsGlobal.getBSGlobal)('OkrAdvancedSetting').KRSetting;
 
   var _getUserInfo = (0, _bsGlobal.getUserInfo)(),
@@ -99,49 +101,13 @@ function KrDatas(props) {
   var total = 0;
 
   if (isCustomWeight) {
-    krs.forEach(function (kr) {
+    krDatas.forEach(function (kr) {
       return total += Number(kr.krWeight);
     }); // total = RoundWeight(total); // 不知道为啥，这样如果自定义了总的超过100了还是会展示total100
 
     total = total.toFixed(1);
   } else {
     total = 100;
-  } // 添加KR
-
-
-  function addKr() {
-    setKrIsValidate(false);
-    setTimeout(function () {
-      if (!wrapperRef.current || krDatas.length < 6) return;
-      wrapperRef.current.scrollTop = wrapperRef.current.scrollHeight;
-    }, 0);
-
-    if (!isCustomWeight) {
-      setKrDatas([].concat(_toConsumableArray(krDatas.map(function (kr) {
-        return _objectSpread(_objectSpread({}, kr), {}, {
-          krWeight: (0, _roundWeight.RoundWeight)(100 / (krDatas.length + 1))
-        });
-      })), [{
-        uuid: _uuid["default"].v1(),
-        principalId: Id,
-        principalName: Name,
-        userAvatar: UserAvatar,
-        krWeight: (0, _roundWeight.RoundWeight)(100 / (krDatas.length + 1)),
-        mileStoneName: '',
-        confidenceIndex: 5
-      }]));
-      return;
-    }
-
-    setKrDatas([].concat(_toConsumableArray(krDatas), [{
-      uuid: _uuid["default"].v1(),
-      principalId: Id,
-      principalName: Name,
-      userAvatar: UserAvatar,
-      krWeight: 0,
-      mileStoneName: '',
-      confidenceIndex: 5
-    }]));
   }
 
   var getKrAnalysisInfo = function getKrAnalysisInfo() {
@@ -190,50 +156,78 @@ function KrDatas(props) {
     })["finally"](function () {
       setIsInputContent(false);
     });
-  }; // 修改KR
+  }; // 添加KR
 
 
-  var changeKr = function changeKr(kr) {
-    var index = krDatas.findIndex(function (k) {
-      return k.uuid === kr.uuid;
-    });
+  function addKr() {
+    var krDatasClone = (0, _cloneDeep["default"])(krDatasRef.current);
+    var krsCount = krDatasClone.length;
+    setKrIsValidate(false);
+    setTimeout(function () {
+      if (!wrapperRef.current || krsCount < 6) return;
+      wrapperRef.current.scrollTop = wrapperRef.current.scrollHeight;
+    }, 0);
+
+    if (!isCustomWeight) {
+      var krWeight = (0, _roundWeight.RoundWeight)(100 / (krsCount + 1));
 
-    if (krDatas[index].krWeight !== kr.krWeight) {
+      var _newKrs = [].concat(_toConsumableArray(krDatasClone.map(function (kr) {
+        return _objectSpread(_objectSpread({}, kr), {}, {
+          krWeight: krWeight
+        });
+      })), [{
+        uuid: _uuid["default"].v1(),
+        principalId: Id,
+        principalName: Name,
+        userAvatar: UserAvatar,
+        krWeight: krWeight,
+        mileStoneName: '',
+        mileStoneNamePureTextExcludeAt: '',
+        mileStoneNameRichText: undefined,
+        aiteUsers: [],
+        confidenceIndex: 5
+      }]);
+
+      setKrDatas(_newKrs);
+      krDatasRef.current = _newKrs;
+      return;
+    }
+
+    var newKrs = [].concat(_toConsumableArray(krDatasClone), [{
+      uuid: _uuid["default"].v1(),
+      principalId: Id,
+      principalName: Name,
+      userAvatar: UserAvatar,
+      krWeight: 0,
+      mileStoneName: '',
+      mileStoneNamePureTextExcludeAt: '',
+      mileStoneNameRichText: undefined,
+      aiteUsers: [],
+      confidenceIndex: 5
+    }]);
+    setKrDatas(newKrs);
+    krDatasRef.current = newKrs;
+  } // 修改KR
+
+
+  var _changeKr = (0, _react.useCallback)(function (kr, index) {
+    if (krDatasRef.current[index].krWeight !== kr.krWeight) {
       setIsCustomWeight(true);
     }
 
-    var newKrs = _toConsumableArray(krDatas);
+    var newKrs = _toConsumableArray(krDatasRef.current);
 
     newKrs[index] = kr;
     setKrDatas(newKrs);
+    krDatasRef.current = newKrs;
     setInputKrInfo(kr);
-  };
-
-  (0, _react.useEffect)(function () {
-    // 防抖
-    krNameIsEmpty.current = !inputKrInfo || !inputKrInfo.mileStoneName;
-
-    if (!inputKrInfo || !inputKrInfo.mileStoneName) {
-      setIsInputContent(false);
-      setKrsCheckResult({
-        finalResult: _okrCreateSuggest.EOkrCreateSuggestResultType.normal,
-        friendlyResult: []
-      });
-    } else if (timerRef.current) {
-      clearTimeout(timerRef.current);
-      timerRef.current = setTimeout(getKrAnalysisInfo, 1000);
-    } else {
-      timerRef.current = setTimeout(getKrAnalysisInfo, 1000);
-    }
+  }, [krDatasRef.current]); // 删除KR
 
-    return function () {
-      clearTimeout(timerRef.current);
-    };
-  }, [inputKrInfo, setIsInputContent]); // 删除KR
 
   var deleteKr = function deleteKr(id) {
+    var krDatasClone = (0, _cloneDeep["default"])(krDatasRef.current);
     setKrIsValidate(false);
-    var newKrDatas = krDatas.filter(function (k) {
+    var newKrDatas = krDatasClone.filter(function (k) {
       return k.uuid !== id;
     });
 
@@ -246,6 +240,7 @@ function KrDatas(props) {
     }
 
     setKrDatas(newKrDatas);
+    krDatasRef.current = newKrDatas;
 
     var tempKrCheckResult = _toConsumableArray(krsCheckFriendlyResult);
 
@@ -266,16 +261,39 @@ function KrDatas(props) {
 
   var onKrInputStateChange = (0, _react.useCallback)(function (isFocus, krInfo) {
     setInputKrInfo(krInfo);
+    handleKrInputStateChange === null || handleKrInputStateChange === void 0 ? void 0 : handleKrInputStateChange(isFocus);
+  }, []);
+  (0, _react.useEffect)(function () {
+    // 防抖
+    krNameIsEmpty.current = !inputKrInfo || !inputKrInfo.mileStoneName;
 
-    if (handleKrInputStateChange) {
-      handleKrInputStateChange(isFocus);
+    if (!inputKrInfo || !inputKrInfo.mileStoneName) {
+      setIsInputContent(false);
+      setKrsCheckResult({
+        finalResult: _okrCreateSuggest.EOkrCreateSuggestResultType.normal,
+        friendlyResult: []
+      });
+    } else if (timerRef.current) {
+      clearTimeout(timerRef.current);
+      timerRef.current = setTimeout(getKrAnalysisInfo, 1000);
+    } else {
+      timerRef.current = setTimeout(getKrAnalysisInfo, 1000);
     }
+
+    return function () {
+      clearTimeout(timerRef.current);
+    };
+  }, [inputKrInfo, setIsInputContent]);
+  (0, _react.useEffect)(function () {
+    krDatasRef.current = krDatas;
   }, []);
-  return /*#__PURE__*/_react["default"].createElement("div", null, krs.map(function (kr, index) {
+  return /*#__PURE__*/_react["default"].createElement("div", null, krDatasRef.current.map(function (kr, index) {
     return /*#__PURE__*/_react["default"].createElement(_krItem["default"], {
       key: kr === null || kr === void 0 ? void 0 : kr.uuid,
       krData: kr,
-      changeKr: changeKr,
+      changeKr: function changeKr(newKr) {
+        return _changeKr(newKr, index);
+      },
       deleteKr: deleteKr,
       container: container,
       index: index + 1,
@@ -292,7 +310,7 @@ function KrDatas(props) {
     className: "add-kr-btn__icon",
     src: _krAdd["default"],
     alt: ""
-  }), (0, _getLocale.getLocale)('OKR_MyO_Pop_Butt_AddKR')), krs.length > 0 && openKrWeight && /*#__PURE__*/_react["default"].createElement("span", {
+  }), (0, _getLocale.getLocale)('OKR_MyO_Pop_Butt_AddKR')), krDatasRef.current.length > 0 && openKrWeight && /*#__PURE__*/_react["default"].createElement("span", {
     className: "krs-info__total-weight"
   }, (0, _getLocale.getLocale)('OKR_MyO_Pop_Text_Total'), total, "%")));
 }

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

@@ -9,6 +9,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _richEditor = require("@titaui/rich-editor");
 
 var _bsGlobal = require("../../../utils/bs-global");
@@ -35,54 +37,37 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-function KrItem(_ref) {
-  var krData = _ref.krData,
-      changeKr = _ref.changeKr,
-      deleteKr = _ref.deleteKr,
-      container = _ref.container,
-      index = _ref.index,
-      onKrInputStateChange = _ref.onKrInputStateChange,
-      onAddKr = _ref.onAddKr,
-      setIsInputContent = _ref.setIsInputContent,
-      domRef = _ref.domRef,
-      krIsValidate = _ref.krIsValidate;
+function KrItem(props) {
+  var krData = props.krData,
+      changeKr = props.changeKr,
+      deleteKr = props.deleteKr,
+      container = props.container,
+      index = props.index,
+      onKrInputStateChange = props.onKrInputStateChange,
+      onAddKr = props.onAddKr,
+      setIsInputContent = props.setIsInputContent,
+      domRef = props.domRef,
+      krIsValidate = props.krIsValidate;
   var setting = (0, _bsGlobal.getBSGlobal)('OkrAdvancedSetting').KRSetting;
   var openKrWeight = setting.KrWeight;
-
-  var _useState = (0, _react.useState)(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      showDelIcon = _useState2[0],
-      setShowDelIcon = _useState2[1];
-
   var mentionInputRef = (0, _react.useRef)();
   var oldKrNameRef = (0, _react.useRef)('');
+  var krDataRef = (0, _react.useRef)(krData);
 
   var onUserSelectorSubmitHandler = function onUserSelectorSubmitHandler(users) {
-    changeKr(_objectSpread(_objectSpread({}, krData), {}, {
+    changeKr(_objectSpread(_objectSpread({}, krDataRef.current), {}, {
       principalId: users[0].Id,
       principalName: users[0].Name,
       userAvatar: users[0].UserAvatar
     }));
   };
 
-  var onKrNameInputChangeHandler = function onKrNameInputChangeHandler(_ref2) {
-    var mentionUsers = _ref2.mentionUsers,
-        pureText = _ref2.pureText,
-        pureTextExcludeAt = _ref2.pureTextExcludeAt,
-        richText = _ref2.richText;
-    changeKr(_objectSpread(_objectSpread({}, krData), {}, {
+  var onKrNameInputChangeHandler = (0, _react.useCallback)(function (data) {
+    var mentionUsers = data.mentionUsers,
+        pureText = data.pureText,
+        pureTextExcludeAt = data.pureTextExcludeAt,
+        richText = data.richText;
+    changeKr(_objectSpread(_objectSpread({}, krDataRef.current), {}, {
       mileStoneName: pureText,
       mileStoneNameRichText: richText,
       mileStoneNamePureTextExcludeAt: pureTextExcludeAt,
@@ -90,10 +75,10 @@ function KrItem(_ref) {
         return user.mentionId;
       })
     }));
-  };
+  }, []);
 
   var onDeleteKrClickHandler = function onDeleteKrClickHandler() {
-    deleteKr(krData.uuid);
+    return deleteKr(krData.uuid);
   };
 
   var formatUser = (0, _react.useMemo)(function () {
@@ -104,12 +89,6 @@ function KrItem(_ref) {
       Id: krData.principalId
     };
   }, [krData.userAvatar.Medium, krData.principalName, krData.principalName, krData.principalId]);
-  var handleMouseEnter = (0, _react.useCallback)(function () {
-    setShowDelIcon(true);
-  }, []);
-  var handleMouseLeave = (0, _react.useCallback)(function () {
-    setShowDelIcon(false);
-  }, []);
   var handleInputFocus = (0, _react.useCallback)(function () {
     onKrInputStateChange && onKrInputStateChange(true, krData);
   }, [krData]);
@@ -135,26 +114,34 @@ function KrItem(_ref) {
       oldKrNameRef.current = e.target.value;
     }
   }, []);
+  (0, _react.useEffect)(function () {
+    krDataRef.current = krData;
+  }, [krData]);
+  var _krDataRef$current = krDataRef.current,
+      mileStoneNamePureTextExcludeAt = _krDataRef$current.mileStoneNamePureTextExcludeAt,
+      mileStoneNameRichText = _krDataRef$current.mileStoneNameRichText;
+  var krNameLen = (mileStoneNamePureTextExcludeAt === null || mileStoneNamePureTextExcludeAt === void 0 ? void 0 : mileStoneNamePureTextExcludeAt.length) || 0;
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: "create-kr-item-wrapper",
-    onMouseEnter: handleMouseEnter,
-    onMouseLeave: handleMouseLeave
+    className: "create-kr-item-wrapper"
   }, /*#__PURE__*/_react["default"].createElement("a", {
-    className: "kr-item__delete-icon tu-icon-del ".concat(showDelIcon ? 'kr-item__delete-icon--show' : ''),
+    className: "kr-item__delete-icon tu-icon-del",
     onClick: onDeleteKrClickHandler
   }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "kr-item__right-block ".concat(krIsValidate ? krData.mileStoneName && krData.mileStoneName.length <= 500 ? '' : 'kr-item__right-block--error' : '')
+    className: (0, _classnames["default"])('kr-item__right-block', {
+      'kr-item__right-block--error': krNameLen > 500
+    })
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "kr-item__order"
   }, "KR", index), /*#__PURE__*/_react["default"].createElement("div", {
     className: "kr-item__input-wrapper"
   }, /*#__PURE__*/_react["default"].createElement(_inputWithErrPopup["default"], {
-    strLength: krData.mileStoneName ? krData.mileStoneName.length : 0,
+    strLength: krNameLen,
     maxLength: 500,
     position: "top"
   }, /*#__PURE__*/_react["default"].createElement(_richEditor.TitaInlineRichEditor, {
-    initialState: krData.mileStoneName,
-    onChange: onKrNameInputChangeHandler,
+    initialState: mileStoneNameRichText,
+    key: krData === null || krData === void 0 ? void 0 : krData.uuid,
+    onDocChange: onKrNameInputChangeHandler,
     onFocus: handleInputFocus,
     onBlur: handleInputBlur,
     onKeyDown: handleOnKeyDown,

package/lib/components/create-okr-modal/style.js

@@ -13,7 +13,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
-var Wrapper = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  height: 449px;\n  padding: 0 32px;\n  overflow: auto;\n"])));
+var Wrapper = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  height: 449px;\n  overflow: auto;\n  \n  .create-modal__wrapper-inner {\n    padding: 0 32px;\n  }\n"])));
 
 exports.Wrapper = Wrapper;
 
@@ -48,17 +48,17 @@ var KrItemWrapper = _styledComponents["default"].div(_templateObject9 || (_templ
 exports.KrItemWrapper = KrItemWrapper;
 
 var KrEditWrapper = _styledComponents["default"].div(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n  height: 36px;\n  background: #ffffff;\n  border: 1px solid ", ";\n  border-radius: 4px;\n  ", "\n  display: flex;\n  align-items: center;\n  flex: 1;\n  padding: 0 10px;\n  transition: border 0.2s ease 0.2s, box-shadow 0.2s ease 0.2s;\n  > span {\n    font-size: 13px;\n    font-weight: 400;\n    text-align: left;\n    color: #6f7886;\n    margin-left: 18px;\n  }\n  :hover {\n    border: 1px solid #2879ff;\n  }\n"])), function (p) {
-  return p.active ? "#2879ff" : "#f0f2f5";
+  return p.active ? '#2879ff' : '#f0f2f5';
 }, function (p) {
-  return p.active ? "box-shadow: 0px 0px 6px 0px rgba(40, 121, 255, 0.3) inset;" : "";
+  return p.active ? 'box-shadow: 0px 0px 6px 0px rgba(40, 121, 255, 0.3) inset;' : '';
 });
 
 exports.KrEditWrapper = KrEditWrapper;
 
 var InputWrapper = _styledComponents["default"].div(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n  height: 36px;\n  background: #ffffff;\n  border: 1px solid ", ";\n  border-radius: 4px;\n  ", "\n  display: flex;\n  align-items: center;\n  flex: 1;\n  padding: 0 10px;\n  transition: border 0.2s ease 0.2s, box-shadow 0.2s ease 0.2s;\n  :hover {\n    border: 1px solid #2879ff;\n  }\n  > input {\n    flex: 1;\n    border: none;\n    padding: 0;\n    margin: 0;\n  }\n"])), function (p) {
-  return p.active ? "#2879ff" : "#f0f2f5";
+  return p.active ? '#2879ff' : '#f0f2f5';
 }, function (p) {
-  return p.active ? "box-shadow: 0px 0px 6px 0px rgba(40, 121, 255, 0.3) inset;" : "";
+  return p.active ? 'box-shadow: 0px 0px 6px 0px rgba(40, 121, 255, 0.3) inset;' : '';
 });
 
 exports.InputWrapper = InputWrapper;

package/lib/components/dynamic/dynamic-item/components/feed-operate/index.js

@@ -23,7 +23,7 @@ require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var prefix = "titaui-dynamic-operation";
+var prefix = 'titaui-dynamic-operation';
 
 var DynamicOperation = function DynamicOperation(_ref) {
   var feedOperations = _ref.feedOperations,
@@ -41,20 +41,20 @@ var DynamicOperation = function DynamicOperation(_ref) {
 
   var handleClickShowAll = function handleClickShowAll() {
     if (feedType === _constant.EFeedType.Kr) {
-      _drawerManager["default"].open("krDetail", {
+      _drawerManager["default"].open('krDetail', {
         krId: krId
       });
     } else if (feedType === _constant.EFeedType.O) {
-      _drawerManager["default"].open("okrDetail", {
+      _drawerManager["default"].open('okrDetail', {
         okrId: okrId,
-        activeTabKey: "cooperation"
+        activeTabKey: 'cooperation'
       });
     } else if (feedType === _constant.EFeedType.Task) {
-      window.Talent.app.vent.trigger("global-pull-screen", taskId, "task");
+      window.Talent.app.vent.trigger('global-pull-screen', taskId, 'task');
     } else if (feedType === _constant.EFeedType.Project) {
       window.open(window.location.href.replace(window.location.hash, "#work?iTalentNavCode=tita-work&work_id=".concat(workId)));
     } else if (feedType === _constant.EFeedType.MileStone) {
-      window.Talent.app.vent.trigger("global-pull-screen", mileStoneId, "milestone", new window.Talent.Model(data), {
+      window.Talent.app.vent.trigger('global-pull-screen', mileStoneId, 'milestone', new window.Talent.Model(data), {
         option: true,
         width: 465,
         React: _react["default"],
@@ -91,7 +91,7 @@ var DynamicOperation = function DynamicOperation(_ref) {
       })
     })), /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-content")
-    }, (0, _openData.parseHtmlAndTextTag)(content)))), index === 2 && feedOperations.total > 3 && /*#__PURE__*/_react["default"].createElement("div", {
+    }, (0, _openData.parseString)((0, _openData.parseHtmlAndTextTag)(content))))), index === 2 && feedOperations.total > 3 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__operate-item")
     }, /*#__PURE__*/_react["default"].createElement("img", {
       className: "".concat(prefix, "__operate-icon"),
@@ -103,7 +103,7 @@ var DynamicOperation = function DynamicOperation(_ref) {
     }, "\u5168\u90E8\u64CD\u4F5C", /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-item-total-num")
     }, feedOperations.total), /*#__PURE__*/_react["default"].createElement("i", {
-      className: (0, _classnames["default"])("tu-icon-APP-xi")
+      className: (0, _classnames["default"])('tu-icon-APP-xi')
     }))));
   }));
 };

package/lib/components/dynamic/dynamic-item/dynamic-create-o/index.js

@@ -47,7 +47,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-create-o-item";
+var prefix = 'titaui-dynamic-create-o-item';
 
 var DynamicCreateO = function DynamicCreateO(_ref) {
   var data = _ref.data,
@@ -72,39 +72,39 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
       searchKeyWord = _useContext.searchKeyWord;
 
   var handleClickOTitle = function handleClickOTitle() {
-    _drawerManager["default"].open("okrDetail", {
+    _drawerManager["default"].open('okrDetail', {
       okrId: okrId
     });
   };
 
   var handleClickKrTitle = function handleClickKrTitle(id) {
-    _drawerManager["default"].open("krDetail", {
+    _drawerManager["default"].open('krDetail', {
       krId: id
     });
   };
 
   var okrTypeMap = {
     1: {
-      icon: "tu-icon-liebiao-geren",
-      text: (0, _getLocale.getLocale)("OKR_MyO_Pop_Individual")
+      icon: 'tu-icon-liebiao-geren',
+      text: (0, _getLocale.getLocale)('OKR_MyO_Pop_Individual')
     },
     // 个人
     2: {
-      icon: "tu-icon-liebiao-xiashu",
-      text: okrTypeId === -1 ? "默认部门" : /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
+      icon: 'tu-icon-liebiao-xiashu',
+      text: okrTypeId === -1 ? '默认部门' : /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
         id: okrTypeId,
         name: okrTypeName
       })
     },
     // 部门
     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,
@@ -179,7 +179,7 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
         handleClickKrTitle(kr.krId);
       }
     }, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: (0, _tools.htmlDecodeByRegExp)(kr.krName),
+      str: (0, _openData.parseString)((0, _tools.htmlDecodeByRegExp)(kr.krName)),
       keyWord: searchKeyWord
     })));
   }))))));

package/lib/components/nav-top/components/menu/index.js

@@ -106,9 +106,9 @@ var Menu = function Menu(_ref) {
   };
 
   (0, _react.useEffect)(function () {
-    var isKnow = localStorage.getItem("isNewMenuItem__".concat(userId));
+    var cacheIsKnow = localStorage.getItem("isNewMenuItem__".concat(userId));
 
-    if (isKnow) {
+    if (cacheIsKnow) {
       setIsKonw(true);
     }
   }, []);
@@ -146,7 +146,8 @@ var Menu = function Menu(_ref) {
       popup: menu.href === NEWMENUS ? popup : null,
       mask: false,
       action: ['focus'],
-      popupAlign: NewFeatureGuidePopupAlign
+      popupAlign: NewFeatureGuidePopupAlign,
+      zIndex: 1000
     }, /*#__PURE__*/_react["default"].createElement("a", {
       className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), _defineProperty({}, "".concat(prefix, "__menu-show--active"), activeMenuId === menu.id)),
       href: href,

package/lib/components/okr-detail/components/header/edit-name.js

@@ -191,7 +191,7 @@ function EditNameCmp(props) {
     editable: editable,
     initialState: okrNameData.richText,
     manualWrap: true,
-    onChange: onChangeHandler,
+    onDocChange: onChangeHandler,
     onFocus: onFocusHandler,
     ref: mentionInputRef
   })), /*#__PURE__*/_react["default"].createElement("span", {

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

@@ -44,6 +44,7 @@
   color: #89919f;
   display: inline-block;
   vertical-align: middle;
+  white-space: nowrap;
 }
 
 .okr-drawer-header__classify--editable:hover {
@@ -73,7 +74,7 @@
   vertical-align: middle;
 }
 
-.okr-drawer-header__action-item {
+.okr-drawer-header__action-item:not(:empty) {
   margin-right: 12px;
 }
 

package/lib/components/okr-detail/components/header/o-classify.js

@@ -110,7 +110,7 @@ var OClassify = function OClassify(props) {
     }, okrClassify == 1 ? (0, _getLocale.getLocale)('OKR_MyO_Es_Commitment') : (0, _getLocale.getLocale)('OKR_MyO_Es_Visiontype'));
   }, [okrClassify, editable]);
 
-  if (editable) {
+  if (editable && okrClassify !== 0) {
     var popContent = /*#__PURE__*/_react["default"].createElement("div", {
       className: "okr-drawer-header__classify-popup"
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -144,6 +144,7 @@ var OClassify = function OClassify(props) {
     }, renderTrigger);
   }
 
+  if (okrClassify === 0) return null;
   return renderTrigger;
 };