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

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

@@ -13,6 +13,8 @@ var _getLocale = require("../../../../utils/getLocale");
 
 var _tools = require("../../../../utils/tools");
 
+var _openData = require("../../../../utils/open-data");
+
 var _helper = require("../../helper");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -28,7 +30,7 @@ function OName(props) {
       OkrAndKrApprovalTypes = props.OkrAndKrApprovalTypes;
 
   var handleEditClick = function handleEditClick() {
-    if ((0, _helper.getApprovalOkr)(approvalSetting, "changeOkrName", applyState, OkrAndKrApprovalTypes)) {
+    if ((0, _helper.getApprovalOkr)(approvalSetting, 'changeOkrName', applyState, OkrAndKrApprovalTypes)) {
       if (editable) {
         setIsEdit(true);
       }
@@ -36,15 +38,15 @@ function OName(props) {
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("okr-drawer-header__title", {
-      "okr-drawer-header__title--editable": editable
+    className: (0, _classnames["default"])('okr-drawer-header__title', {
+      'okr-drawer-header__title--editable': editable
     })
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "okr-drawer-header__name",
     onClick: handleEditClick
-  }, (0, _tools.htmlDecodeByRegExp)(okrName)), children, Number(okrStatus) === 2 && /*#__PURE__*/_react["default"].createElement("span", {
+  }, (0, _openData.parseString)((0, _tools.htmlDecodeByRegExp)(okrName))), children, Number(okrStatus) === 2 && /*#__PURE__*/_react["default"].createElement("span", {
     className: "okr-drawer-header__over-tag"
-  }, (0, _getLocale.getLocale)("OKR_MyO_Butt_Hasended")));
+  }, (0, _getLocale.getLocale)('OKR_MyO_Butt_Hasended')));
 }
 
 var _default = OName;

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

@@ -153,3 +153,7 @@
 .tita-okrdt-tree__kr-node-title .tita-rich-editor--disabled .ProseMirror p:hover {
   color: #2879ff;
 }
+
+.tita-okrdt-tree .rc-tree-treenode {
+  overflow: visible !important;
+}

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

@@ -29,6 +29,8 @@ var _toast = _interopRequireDefault(require("../../../../../toast"));
 
 var _dialogConfirm = _interopRequireWildcard(require("../../../../../dialog-confirm"));
 
+var _errorTip = _interopRequireDefault(require("../../../../../tooltip/error-tip"));
+
 var _requestApis = require("../../../../request-apis");
 
 var _auth = require("../../../../../../utils/auth");
@@ -51,6 +53,8 @@ var _helper = require("../../../../helper");
 
 var _getLocale = require("../../../../../../utils/getLocale");
 
+var _i18nFrontTranslate = require("../../../../../../utils/i18n-front-translate");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -109,63 +113,68 @@ function _default(props) {
       confidence = _useState2[0],
       setConfidence = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(data.user || {}),
+  var _useState3 = (0, _react.useState)(''),
       _useState4 = _slicedToArray(_useState3, 2),
-      user = _useState4[0],
-      setUser = _useState4[1];
+      errorTip = _useState4[0],
+      setErrorTip = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(false),
+  var _useState5 = (0, _react.useState)(data.user || {}),
       _useState6 = _slicedToArray(_useState5, 2),
-      editWightVisible = _useState6[0],
-      setEditWightVisible = _useState6[1];
+      user = _useState6[0],
+      setUser = _useState6[1];
 
   var _useState7 = (0, _react.useState)(false),
       _useState8 = _slicedToArray(_useState7, 2),
-      editing = _useState8[0],
-      setEditing = _useState8[1];
+      editWightVisible = _useState8[0],
+      setEditWightVisible = _useState8[1];
 
-  var _useState9 = (0, _react.useState)(data.evaluateValue),
+  var _useState9 = (0, _react.useState)(false),
       _useState10 = _slicedToArray(_useState9, 2),
-      evaluateValue = _useState10[0],
-      setEvaluateValue = _useState10[1];
+      editing = _useState10[0],
+      setEditing = _useState10[1];
 
-  var _useState11 = (0, _react.useState)(false),
+  var _useState11 = (0, _react.useState)(data.evaluateValue),
       _useState12 = _slicedToArray(_useState11, 2),
-      krModalVsible = _useState12[0],
-      setKrModalVsible = _useState12[1];
+      evaluateValue = _useState12[0],
+      setEvaluateValue = _useState12[1];
 
   var _useState13 = (0, _react.useState)(false),
       _useState14 = _slicedToArray(_useState13, 2),
-      deleteModalVisible = _useState14[0],
-      setDeleteModalVisible = _useState14[1];
+      krModalVsible = _useState14[0],
+      setKrModalVsible = _useState14[1];
+
+  var _useState15 = (0, _react.useState)(false),
+      _useState16 = _slicedToArray(_useState15, 2),
+      deleteModalVisible = _useState16[0],
+      setDeleteModalVisible = _useState16[1];
 
-  var _useState15 = (0, _react.useState)({
+  var _useState17 = (0, _react.useState)({
     pureText: title,
     pureTextExcludeAt: title,
     richText: data.mileStoneNameRichText ? JSON.parse(data.mileStoneNameRichText) : (0, _richEditor.TitaRichEditorInitTextState)(title),
     mentionUsers: []
   }),
-      _useState16 = _slicedToArray(_useState15, 2),
-      krNameData = _useState16[0],
-      setKrNameData = _useState16[1];
+      _useState18 = _slicedToArray(_useState17, 2),
+      krNameData = _useState18[0],
+      setKrNameData = _useState18[1];
 
-  var _useState17 = (0, _react.useState)((0, _bsGlobal.getBSGlobal)('OkrAdvancedSetting').KRSetting.ShowKrConfidence),
-      _useState18 = _slicedToArray(_useState17, 1),
-      showHeart = _useState18[0]; // 高级功能： 关键成果信心指数
+  var _useState19 = (0, _react.useState)((0, _bsGlobal.getBSGlobal)('OkrAdvancedSetting').KRSetting.ShowKrConfidence),
+      _useState20 = _slicedToArray(_useState19, 1),
+      showHeart = _useState20[0]; // 高级功能： 关键成果信心指数
 
 
-  var _useState19 = (0, _react.useState)((0, _bsGlobal.getBSGlobal)('OkrAdvancedSetting').KRSetting.KrWeight),
-      _useState20 = _slicedToArray(_useState19, 1),
-      showKrWeight = _useState20[0]; // 高级功能： 关见成果权重
+  var _useState21 = (0, _react.useState)((0, _bsGlobal.getBSGlobal)('OkrAdvancedSetting').KRSetting.KrWeight),
+      _useState22 = _slicedToArray(_useState21, 1),
+      showKrWeight = _useState22[0]; // 高级功能： 关见成果权重
 
 
-  var _useState21 = (0, _react.useState)(data.isEvaluate),
-      _useState22 = _slicedToArray(_useState21, 2),
-      isEvaluate = _useState22[0],
-      setIsEvaluate = _useState22[1]; // 权限 & 非结束目标
+  var _useState23 = (0, _react.useState)(data.isEvaluate),
+      _useState24 = _slicedToArray(_useState23, 2),
+      isEvaluate = _useState24[0],
+      setIsEvaluate = _useState24[1]; // 权限 & 非结束目标
 
 
-  var _useState23 = (0, _react.useState)(function () {
+  var _useState25 = (0, _react.useState)(function () {
     var hasAuth = new _auth.KRAuth({
       user: data.user,
       createUserId: data.createUserId
@@ -173,8 +182,8 @@ function _default(props) {
     var livetime = okrInfo.status != 2;
     return hasAuth && livetime;
   }),
-      _useState24 = _slicedToArray(_useState23, 1),
-      krCanEdit = _useState24[0];
+      _useState26 = _slicedToArray(_useState25, 1),
+      krCanEdit = _useState26[0];
 
   var mentionInputRef = (0, _react.useRef)();
   (0, _react.useEffect)(function () {
@@ -293,10 +302,39 @@ function _default(props) {
     onKrNameChangeHandler();
   };
 
+  var validateKrName = function validateKrName(data) {
+    var _pureTextExcludeAt$tr;
+
+    var pureTextExcludeAt = data.pureTextExcludeAt;
+    var krNameLen = pureTextExcludeAt === null || pureTextExcludeAt === void 0 ? void 0 : (_pureTextExcludeAt$tr = pureTextExcludeAt.trim()) === null || _pureTextExcludeAt$tr === void 0 ? void 0 : _pureTextExcludeAt$tr.length;
+
+    if (krNameLen === 0) {
+      setErrorTip('KR 名称不能为空');
+      return false;
+    }
+
+    if (krNameLen > 5000) {
+      setErrorTip((0, _i18nFrontTranslate.inputWordTrans)(krNameLen, 5000));
+      return false;
+    }
+
+    setErrorTip('');
+    return true;
+  };
+
+  var onEditorChange = function onEditorChange(data) {
+    setKrNameData(function () {
+      return data;
+    });
+    validateKrName(data);
+  };
+
   var onKrNameChangeHandler = function onKrNameChangeHandler() {
     var mentionUsers = krNameData.mentionUsers,
         pureText = krNameData.pureText,
         richText = krNameData.richText;
+    var hasError = !validateKrName(krNameData);
+    if (hasError) return;
     (0, _requestApis.updateKrName)({
       mileStoneName: pureText,
       mileStoneNameRichText: richText,
@@ -305,7 +343,7 @@ function _default(props) {
       }),
       workId: data.workId,
       workMileStoneId: data.mileStoneId
-    }).then(function () {
+    }).then(function (res) {
       setEditing(false);
 
       _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
@@ -325,6 +363,8 @@ function _default(props) {
   };
 
   var onTitleTextClickHandler = function onTitleTextClickHandler() {
+    if (editing) return;
+
     _drawerManager["default"].open('krDetail', {
       krId: data.mileStoneId
     });
@@ -353,14 +393,22 @@ function _default(props) {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-h1"))
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-prefix"))
-  }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
+  }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement(_errorTip["default"], {
+    overlay: /*#__PURE__*/_react["default"].createElement("span", {
+      style: {
+        color: '#f05e5e'
+      }
+    }, errorTip),
+    visible: editing && errorTip.length > 0,
+    placement: "top"
+  }, /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-title")),
     onClick: onTitleTextClickHandler
   }, /*#__PURE__*/_react["default"].createElement(_richEditor.TitaInlineRichEditor, {
     editable: editing,
     initialState: krNameData.richText,
-    onChange: setKrNameData // onBlur={onKrNameChangeHandler}
-    ,
+    onDocChange: onEditorChange,
+    onBlur: onKrNameChangeHandler,
     onKeyDown: onInputKeyDownHandler,
     placeholder: "KR\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A",
     ref: mentionInputRef
@@ -369,7 +417,7 @@ function _default(props) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "tu-icon-bianji2",
     onClick: triggerEdit
-  })))), /*#__PURE__*/_react["default"].createElement("div", {
+  }))))), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-h2"))
   }, /*#__PURE__*/_react["default"].createElement(OkrRowColumn, {
     width: 68

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 }; }
@@ -409,7 +411,7 @@ function OkrDetailHeader(_ref) {
           krId: parent.id
         });
       }
-    }, /*#__PURE__*/_react["default"].createElement("span", null, parent.type === 'okr' ? 'O ' : 'KR '), parent.name)),
+    }, /*#__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: {

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

@@ -21,8 +21,6 @@ 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");
@@ -109,6 +107,7 @@ function CreateKr(_ref) {
 
 
   var mentionInputRef = (0, _react.useRef)();
+  var pendingRef = (0, _react.useRef)(false);
   dataRef.current = _objectSpread(_objectSpread({}, dataRef.current), {}, {
     krNameData: krNameData,
     user: user,
@@ -119,14 +118,15 @@ 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 (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,
@@ -145,6 +145,7 @@ function CreateKr(_ref) {
         workId: dataRef.current.workId,
         confidenceIndex: confidenceIndex
       }).then(function (res) {
+        setShowTip(false);
         dataRef.current.addKr(res);
         dataRef.current.onHide();
       });
@@ -170,7 +171,8 @@ function CreateKr(_ref) {
   }, []);
 
   var onInputKeyDown = function onInputKeyDown(e) {
-    if (e.key.toLocaleLowerCase() == 'enter') {
+    if (e.key.toLocaleLowerCase() == 'enter' && !pendingRef.current) {
+      pendingRef.current = true;
       var mentionUsers = krNameData.mentionUsers,
           pureText = krNameData.pureText,
           richText = krNameData.richText;
@@ -190,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);
   };
@@ -244,8 +242,8 @@ function CreateKr(_ref) {
     className: (0, _classnames["default"])("".concat(preCls, "__input"))
   }, /*#__PURE__*/_react["default"].createElement(_richEditor.TitaInlineRichEditor, {
     initialState: undefined,
-    onChange: setKrNameData // onBlur={onBlur}
-    ,
+    onDocChange: setKrNameData,
+    onBlur: createKr,
     onFocus: onFocus,
     onKeyDown: onInputKeyDown,
     placeholder: (0, _getLocale.getLocale)('OKR_MyO_Text_Createkeyr'),

package/lib/components/okr-detail/schedule/components/kr-progress/index.js

@@ -17,6 +17,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 }; }
@@ -33,7 +35,7 @@ var renderTitle = function renderTitle(index, title, id) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "kr-progress__order"
   }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
-    text: title,
+    text: (0, _openData.parseString)(title),
     maxWidth: 600,
     exClass: "kr-progress__title-text"
   }));