@titaui/pc 1.12.7 → 1.12.8

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

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _richEditor = require("@titaui/rich-editor");
+
 var _toast = _interopRequireDefault(require("../../../toast"));
 
 var _requestApis = require("../../request-apis");
@@ -31,6 +33,12 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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."); }
@@ -43,25 +51,38 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+var prefixCls = 'okr-drawer-header__edit';
+
 function EditNameCmp(props) {
-  var okrName = props.okrName,
+  var _classNames;
+
+  var editable = props.editable,
+      okrName = props.okrName,
       okrId = props.okrId,
-      setIsEdit = props.setIsEdit,
       setOkrName = props.setOkrName;
 
-  var _useState = (0, _react.useState)(""),
+  var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
-      errorTip = _useState2[0],
-      setErrorTip = _useState2[1];
+      editing = _useState2[0],
+      setEditing = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(''),
+      _useState4 = _slicedToArray(_useState3, 2),
+      errorTip = _useState4[0],
+      setErrorTip = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(_objectSpread(_objectSpread({}, okrName), {}, {
+    editorState: 'normal'
+  })),
+      _useState6 = _slicedToArray(_useState5, 2),
+      okrNameData = _useState6[0],
+      setOkrNameData = _useState6[1];
 
-  var inputRef = (0, _react.useRef)();
-  (0, _react.useEffect)(function () {
-    inputRef.current.setSelectionRange(9999999, 9999999);
-  }, []);
+  var mentionInputRef = (0, _react.useRef)();
 
   var checkError = function checkError(val) {
     if (val.length == 0) {
-      setErrorTip((0, _getLocale.getLocale)("OKR_MyO_Pop_Targetname"));
+      setErrorTip((0, _getLocale.getLocale)('OKR_MyO_Pop_Targetname'));
       return;
     }
 
@@ -70,21 +91,33 @@ function EditNameCmp(props) {
       return;
     }
 
-    setErrorTip("");
+    setErrorTip('');
+  };
+
+  var onChangeHandler = function onChangeHandler(data) {
+    setOkrNameData(function (prevData) {
+      return _objectSpread(_objectSpread({}, prevData), data);
+    });
+    checkError(data.pureTextExcludeAt);
   };
 
-  var onTitleChangeHandler = function onTitleChangeHandler(e) {
-    checkError(e.currentTarget.value);
+  var onFocusHandler = function onFocusHandler() {
+    return setEditing(true);
   };
 
   var cancelEditHandler = function cancelEditHandler() {
-    setIsEdit(false);
-    setErrorTip("");
+    setEditing(false);
+    setErrorTip('');
+    setOkrNameData(function (prevData) {
+      return _objectSpread(_objectSpread({}, okrName), {}, {
+        editorState: prevData.editorState === 'normal' ? 'reset' : 'normal'
+      });
+    });
   };
 
   var confiremEditHandle = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var editVal, data;
+      var mentionUsers, pureText, richText, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -97,31 +130,35 @@ function EditNameCmp(props) {
               return _context.abrupt("return");
 
             case 2:
-              editVal = inputRef.current.value;
+              mentionUsers = okrNameData.mentionUsers, pureText = okrNameData.pureText, richText = okrNameData.richText;
 
-              if (!(okrName == editVal)) {
+              if (!(okrName.pureText == pureText)) {
                 _context.next = 6;
                 break;
               }
 
-              setIsEdit(false);
+              setEditing(false);
               return _context.abrupt("return");
 
             case 6:
               _context.next = 8;
               return (0, _requestApis.updateOkrName)({
                 workId: okrId,
-                workName: editVal
+                workName: pureText,
+                workNameRichText: richText,
+                aiteUsers: mentionUsers.map(function (user) {
+                  return user.mentionId;
+                })
               });
 
             case 8:
               data = _context.sent;
 
               if (data.Code == 1) {
-                setIsEdit(false);
-                setOkrName(editVal);
+                setEditing(false);
+                setOkrName(okrNameData.richText);
 
-                _toast["default"].Success("修改成功");
+                _toast["default"].Success('修改成功');
               } else {
                 _toast["default"].Error(data.Message);
               }
@@ -140,27 +177,27 @@ function EditNameCmp(props) {
   }();
 
   return /*#__PURE__*/_react["default"].createElement("section", {
-    className: "okr-drawer-header__edit"
+    className: prefixCls
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("okr-drawer-header__edit-input", {
-      "okr-drawer-header__edit-input--error": errorTip.length > 0
-    })
-  }, /*#__PURE__*/_react["default"].createElement("textarea", {
-    autoFocus: true,
-    onChange: onTitleChangeHandler,
-    ref: inputRef,
-    defaultValue: okrName
-  })), errorTip.length > 0 && /*#__PURE__*/_react["default"].createElement("span", {
-    className: "okr-drawer-header__edit-error-tip"
+    className: (0, _classnames["default"])("".concat(prefixCls, "-input"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefixCls, "-input--editable"), editable), _defineProperty(_classNames, "".concat(prefixCls, "-input--editing"), editing), _defineProperty(_classNames, "".concat(prefixCls, "-input--error"), errorTip.length > 0), _classNames))
+  }, /*#__PURE__*/_react["default"].createElement(_richEditor.TitaInlineRichEditor, {
+    key: okrNameData.editorState,
+    editable: editable,
+    initialState: okrNameData.richText,
+    onDocChange: onChangeHandler,
+    onFocus: onFocusHandler,
+    ref: mentionInputRef
+  })), /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(prefixCls, "-error-tip"), _defineProperty({}, "".concat(prefixCls, "-error-tip--visible"), errorTip.length > 0))
   }, errorTip), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "okr-drawer-header__edit-btns"
+    className: (0, _classnames["default"])("".concat(prefixCls, "-btns"), _defineProperty({}, "".concat(prefixCls, "-btns--visible"), editing))
   }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: (0, _classnames["default"])("titaui-pc-button", "okr-drawer-header__edit-btns-cancel"),
+    className: (0, _classnames["default"])('titaui-pc-button', "".concat(prefixCls, "-btns-cancel")),
     onClick: cancelEditHandler
-  }, (0, _getLocale.getLocale)("Mod_Cancel")), /*#__PURE__*/_react["default"].createElement("span", {
-    className: (0, _classnames["default"])("titaui-pc-button", "okr-drawer-header__edit-btns-confirm"),
+  }, (0, _getLocale.getLocale)('Mod_Cancel')), /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])('titaui-pc-button', "".concat(prefixCls, "-btns-confirm"), _defineProperty({}, "".concat(prefixCls, "-btns-confirm--disabled"), errorTip.length > 0)),
     onClick: confiremEditHandle
-  }, (0, _getLocale.getLocale)("OKR_MyO_Butt_Determine"))));
+  }, (0, _getLocale.getLocale)('OKR_MyO_Butt_Determine'))));
 }
 
 var _default = EditNameCmp;

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

@@ -7,6 +7,7 @@
 .okr-drawer-header__content {
   flex: 1;
   position: relative;
+  overflow: visible;
 }
 
 .okr-drawer-header__avatar {
@@ -35,37 +36,46 @@
 }
 
 .okr-drawer-header__classify {
+  padding: 3px 4px;
+  font-size: 12px;
+  line-height: 18px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  transition: all 0.3s ease;
+  color: #89919f;
   display: inline-block;
-  width: 18px;
-  height: 20px;
-  margin: 0 9px;
   vertical-align: middle;
+  white-space: nowrap;
 }
 
-.okr-drawer-header__classify--promise {
-  background: url(./images/promise.svg) no-repeat;
+.okr-drawer-header__classify--editable:hover {
+  cursor: pointer;
+  border-color: #e9ecf0;
 }
 
-.okr-drawer-header__classify--vision {
-  background: url(./images/vision.svg) no-repeat;
+.okr-drawer-header__classify::before {
+  margin-right: 7px;
+  position: relative;
+  top: 1px;
 }
 
 .okr-drawer-header__over-tag {
-  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
-  font-size: 12px;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  color: #a4acb9;
   width: 52px;
   height: 18px;
+  margin: 0 8px;
   line-height: 24px;
   border-radius: 9px;
+  font-size: 12px;
+  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   background-color: #f7f8fa;
+  color: #a4acb9;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
   vertical-align: middle;
 }
 
-.okr-drawer-header__action-item {
+.okr-drawer-header__action-item:not(:empty) {
   margin-right: 12px;
 }
 
@@ -88,18 +98,15 @@
 }
 
 .okr-drawer-header__edit {
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
+  position: relative;
   background-color: #fff;
 }
 
 .okr-drawer-header__edit-input {
+  min-height: calc(100% - 32px);
   margin-bottom: 8px;
-  border-bottom: 1px solid #2879FF;
-  height: calc(100% - 32px);
+  border-bottom: 1px solid transparent;
+  transition: border 0.3s ease;
 }
 
 .okr-drawer-header__edit-input textarea {
@@ -114,65 +121,139 @@
   font-size: 20px;
   line-height: 24px;
   font-weight: 600;
-  caret-color: #2879FF;
+  caret-color: #2879ff;
+}
+
+.okr-drawer-header__edit-input--editable:hover {
+  border-bottom-color: #e9ecf0;
+}
+
+.okr-drawer-header__edit-input--editing, .okr-drawer-header__edit-input--editing:hover {
+  border-bottom-color: #2879ff;
 }
 
 .okr-drawer-header__edit-input--error {
-  border-bottom: 1px solid #F05E5E;
+  border-bottom: 1px solid #f05e5e;
+}
+
+.okr-drawer-header__edit-input .tita-rich-editor {
+  height: 100%;
+  padding: 0;
+  overflow: auto;
+}
+
+.okr-drawer-header__edit-input .tita-rich-editor .ProseMirror p {
+  padding: 0 0 4px 0;
+  font-size: 20px;
+  font-weight: 600;
+  white-space: normal !important;
 }
 
 .okr-drawer-header__edit-btns {
-  float: right;
+  background-color: #ffffff;
+  opacity: 0;
+  transition: all 0.3s ease;
+  text-align: right;
+  visibility: hidden;
+  position: absolute;
+  right: 0;
+  left: 0;
 }
 
 .okr-drawer-header__edit-btns .titaui-pc-button {
-  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
-  display: inline-block;
+  padding: 5px 19px;
   font-size: 13px;
   line-height: 18px;
-  padding: 5px 19px;
-  border-radius: 4px;
+  border-radius: 15px;
+  transform: translateY(-100%);
+  transition: all 0.3s ease;
+  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
+  display: inline-block;
   cursor: pointer;
 }
 
+.okr-drawer-header__edit-btns--visible {
+  opacity: 1;
+  z-index: 2;
+  visibility: visible;
+}
+
+.okr-drawer-header__edit-btns--visible .titaui-pc-button {
+  transform: translateY(0);
+}
+
 .okr-drawer-header__edit-btns-confirm {
+  border: 1px solid #2879ff;
+  background: #2879ff;
   color: #fff;
-  background: #2879FF;
+}
+
+.okr-drawer-header__edit-btns-confirm:hover {
+  background-color: #5c8eff;
+}
+
+.okr-drawer-header__edit-btns-confirm--disabled, .okr-drawer-header__edit-btns-confirm--disabled:hover {
+  background-color: rgba(40, 121, 255, 0.4);
+  cursor: not-allowed;
 }
 
 .okr-drawer-header__edit-btns-cancel {
-  color: #6F7886;
-  background: #fff;
-  border: 1px solid #DFE3EA;
   margin-right: 10px;
+  border: 1px solid #dfe3ea;
+  background: #fff;
+  color: #6f7886;
+}
+
+.okr-drawer-header__edit-btns-cancel:hover {
+  border-color: #2879ff;
+  color: #2879ff;
 }
 
 .okr-drawer-header__edit-error-tip {
-  float: left;
+  margin-top: -6px;
   font-size: 12px;
   line-height: 18px;
+  opacity: 0;
+  transform: translateY(-100%);
+  transition: all 0.3s ease;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
-  color: #F05E5E;
-  margin-top: -6px;
+  color: #f05e5e;
+  visibility: hidden;
+  position: absolute;
+  z-index: 3;
+}
+
+.okr-drawer-header__edit-error-tip--visible {
+  opacity: 1;
+  transform: translateY(0);
+  visibility: visible;
 }
 
 .okr-drawer-header__classify-popup {
-  background: #fff;
-  padding: 16px 0;
+  padding: 16px 6px;
+  border: 1px solid #f0f2f5;
+  border-radius: 8px;
   box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
-  border: 1px solid #F0F2F5;
+  background: #ffffff;
 }
 
 .okr-drawer-header__classify-popup-item {
-  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
-  color: #3F4755;
+  padding: 5px 30px;
   font-size: 14px;
   line-height: 22px;
-  padding: 5px 30px;
+  border-radius: 8px;
+  transition: all 0.3s ease;
+  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
+  color: #3f4755;
   cursor: pointer;
 }
 
 .okr-drawer-header__classify-popup-item:hover {
+  background: #f7f8fa;
+  color: #2879ff;
+}
+
+.okr-drawer-header__classify-popup-item.active {
   color: #2879ff;
 }
 

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

@@ -11,9 +11,9 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _oName = _interopRequireDefault(require("./o-name"));
+var _richEditor = require("@titaui/rich-editor");
 
-var _oClassify = _interopRequireDefault(require("../o-classify"));
+var _oClassify = _interopRequireDefault(require("./o-classify"));
 
 var _oProgressUpdate = _interopRequireDefault(require("../o-progress-update"));
 
@@ -61,23 +61,26 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var precls = "okr-drawer-header";
+var precls = 'okr-drawer-header';
 
 function Header(props) {
   var _window, _window$BSGlobal, _window$BSGlobal$OkrA, _window$BSGlobal$OkrA2;
 
   // 外部取到的 headInfo
   var okrInfo = props.okrInfo;
-
-  var _useState = (0, _react.useState)(false),
+  var workName = okrInfo.workName,
+      workNameRichText = okrInfo.workNameRichText;
+  var richText = workNameRichText ? JSON.parse(workNameRichText) : (0, _richEditor.TitaRichEditorInitTextState)(workName);
+
+  var _useState = (0, _react.useState)({
+    mentionsUsers: [],
+    pureText: workName,
+    pureTextExcludeAt: workName,
+    richText: richText
+  }),
       _useState2 = _slicedToArray(_useState, 2),
-      isEdit = _useState2[0],
-      setIsEdit = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(okrInfo.workName),
-      _useState4 = _slicedToArray(_useState3, 2),
-      okrName = _useState4[0],
-      setOkrName = _useState4[1];
+      okrNameData = _useState2[0],
+      setOkrNameData = _useState2[1];
 
   var _useContext = (0, _react.useContext)(_context.GeneralDataContext),
       generalPrincipalUser = _useContext.generalPrincipalUser,
@@ -94,10 +97,10 @@ function Header(props) {
       progressGrow = _okrInfo$progressGrow === void 0 ? 0 : _okrInfo$progressGrow,
       progress = okrInfo.progress;
 
-  var _useState5 = (0, _react.useState)(false),
-      _useState6 = _slicedToArray(_useState5, 2),
-      auth = _useState6[0],
-      setAuth = _useState6[1];
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      auth = _useState4[0],
+      setAuth = _useState4[1];
 
   (0, _react.useEffect)(function () {
     setAuth(new _auth.OAuth({
@@ -113,45 +116,45 @@ function Header(props) {
     var progressCmp = /*#__PURE__*/_react["default"].createElement(_progress["default"], {
       percent: progress,
       backgroundColor: "#F7F8FA",
-      textColor: okrInfo.status === 2 ? "#89919f" : _utils.OkrRiskMapping[okrInfo.manualRiskLevel].textColor,
-      color: okrInfo.status === 2 ? "linear-gradient(270deg, #BFC7D5, #E1E5EC)" : _utils.OkrRiskMapping[okrInfo.manualRiskLevel].line
+      textColor: okrInfo.status === 2 ? '#89919f' : _utils.OkrRiskMapping[okrInfo.manualRiskLevel].textColor,
+      color: okrInfo.status === 2 ? 'linear-gradient(270deg, #BFC7D5, #E1E5EC)' : _utils.OkrRiskMapping[okrInfo.manualRiskLevel].line
     });
 
     if (!editable) {
       return /*#__PURE__*/_react["default"].createElement("span", {
         className: "okr-drawer-header__action-progress"
       }, progressCmp, progressGrow !== 0 && /*#__PURE__*/_react["default"].createElement("span", {
-        className: (0, _classnames["default"])("okr-drawer-header__action-progress-diff", {
-          "okr-drawer-header__action-progress-diff--up": progressGrow > 0,
-          "okr-drawer-header__action-progress-diff--down": progressGrow < 0
+        className: (0, _classnames["default"])('okr-drawer-header__action-progress-diff', {
+          'okr-drawer-header__action-progress-diff--up': progressGrow > 0,
+          'okr-drawer-header__action-progress-diff--down': progressGrow < 0
         })
       }, progressGrow > 0 ? /*#__PURE__*/_react["default"].createElement("span", {
         className: "tu-icon-simple-sort-up"
       }) : /*#__PURE__*/_react["default"].createElement("span", {
         className: "tu-icon-simple-sort-down"
-      }), progressGrow.toString().replace("-", ""), "%"));
+      }), progressGrow.toString().replace('-', ''), "%"));
     }
 
     return /*#__PURE__*/_react["default"].createElement("span", {
       className: "okr-drawer-header__action-progress"
     }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-      overlay: (0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Upd"),
+      overlay: (0, _getLocale.getLocale)('OKR_MyO_Pop_Upd_Upd'),
       placement: "top"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       onClick: onOpenModal,
       style: {
-        cursor: "pointer"
+        cursor: 'pointer'
       }
     }, progressCmp)), progressGrow !== 0 && /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("okr-drawer-header__action-progress-diff", {
-        "okr-drawer-header__action-progress-diff--up": progressGrow > 0,
-        "okr-drawer-header__action-progress-diff--down": progressGrow < 0
+      className: (0, _classnames["default"])('okr-drawer-header__action-progress-diff', {
+        'okr-drawer-header__action-progress-diff--up': progressGrow > 0,
+        'okr-drawer-header__action-progress-diff--down': progressGrow < 0
       })
     }, progressGrow > 0 ? /*#__PURE__*/_react["default"].createElement("span", {
       className: "tu-icon-simple-sort-up"
     }) : /*#__PURE__*/_react["default"].createElement("span", {
       className: "tu-icon-simple-sort-down"
-    }), progressGrow.toString().replace("-", ""), "%"));
+    }), progressGrow.toString().replace('-', ''), "%"));
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -164,24 +167,16 @@ function Header(props) {
     okrId: okrInfo.workId
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(precls, "__content")
-  }, /*#__PURE__*/_react["default"].createElement(_oName["default"], {
-    editable: editable,
-    okrName: okrName,
-    setIsEdit: setIsEdit,
-    okrStatus: okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.status,
-    OkrAndKrApprovalTypes: okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes,
-    applyState: okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState,
-    approvalSetting: approvalSetting
-  }, /*#__PURE__*/_react["default"].createElement(_oClassify["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_editName["default"], {
     editable: editable,
+    okrName: okrNameData,
     okrId: okrInfo.workId,
-    okrClassify: generalOkrClassify,
-    onOkrClassifyChange: setGeneralOkrClassify
-  })), /*#__PURE__*/_react["default"].createElement("section", {
+    setOkrName: setOkrNameData
+  }), /*#__PURE__*/_react["default"].createElement("section", {
     className: "".concat(precls, "__action")
   }, /*#__PURE__*/_react["default"].createElement("span", {
     style: {
-      position: "relative",
+      position: 'relative',
       left: -4
     }
   }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -193,8 +188,15 @@ function Header(props) {
     onTypeChange: setGeneralOkrType
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__action-item")
+  }, /*#__PURE__*/_react["default"].createElement(_oClassify["default"], {
+    editable: editable,
+    okrId: okrInfo.workId,
+    okrClassify: generalOkrClassify,
+    onOkrClassifyChange: setGeneralOkrClassify
+  })), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(precls, "__action-item")
   }, /*#__PURE__*/_react["default"].createElement(_oCycle["default"], {
-    editable: editable && (0, _helper.getApprovalOkr)(approvalSetting, "changeOkrTime", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes),
+    editable: editable && (0, _helper.getApprovalOkr)(approvalSetting, 'changeOkrTime', okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes),
     okrId: okrInfo.workId
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__action-item")
@@ -206,12 +208,7 @@ function Header(props) {
   }))), /*#__PURE__*/_react["default"].createElement(_oProgressUpdate["default"], {
     okrInfo: okrInfo,
     renderContent: renderContent
-  })), isEdit && /*#__PURE__*/_react["default"].createElement(_editName["default"], {
-    okrName: okrName,
-    okrId: okrInfo.workId,
-    setOkrName: setOkrName,
-    setIsEdit: setIsEdit
-  })));
+  }))));
 }
 
 var _default = Header;