@titaui/pc 1.11.33 → 1.11.35-beta.2

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

@@ -47,6 +47,8 @@ var _EditKrWightModal = _interopRequireDefault(require("../../../../../edit-kr-w
 
 var _okrProgressModal = _interopRequireDefault(require("../../../../../okr-progress-modal"));
 
+var _helper = require("../../../../helper");
+
 var _getLocale = require("../../../../../../utils/getLocale");
 
 require("./index.css");
@@ -99,7 +101,8 @@ function _default(props) {
 
   var _useContext = (0, _react.useContext)(_context2.CommonContext),
       refreshAll = _useContext.refreshAll,
-      okrInfo = _useContext.okrInfo;
+      okrInfo = _useContext.okrInfo,
+      approvalSetting = _useContext.approvalSetting;
 
   var _useState = (0, _react.useState)(data.confidenceIndex),
       _useState2 = _slicedToArray(_useState, 2),
@@ -220,17 +223,13 @@ function _default(props) {
       updateProgressWay: updateProgressWay
     }).then(function (res) {
       if (res.Code == 1) {
-        _toast["default"].Success("修改成功", {
-          top: 60
-        });
+        _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
 
         refreshAll();
         updateKrs();
         setKrModalVsible(false);
       } else {
-        _toast["default"].Error(res.Message, {
-          top: 60
-        });
+        _toast["default"].Error(res.Message);
       }
     });
   };
@@ -252,7 +251,7 @@ function _default(props) {
               setDeleteModalVisible(false);
 
               if (!Message) {
-                _toast["default"].Success((0, _getLocale.getLocale)("Pro_detail_Deletsuccess"));
+                _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
 
                 setTimeout(function () {
                   refreshAll();
@@ -281,7 +280,7 @@ function _default(props) {
       workId: data.workId,
       workMileStoneId: data.mileStoneId
     }).then(function () {
-      _toast["default"].Success("修改成功");
+      _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
     });
   };
 
@@ -316,7 +315,7 @@ function _default(props) {
   }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-title"))
   }, /*#__PURE__*/_react["default"].createElement(_editableInput["default"], {
-    editable: krCanEdit,
+    editable: krCanEdit && (0, _helper.getApprovalKr)(approvalSetting, "changeOkrName", okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes, data === null || data === void 0 ? void 0 : data.KrApprovalTypes),
     defaultValue: krName,
     emptyMessage: "KR\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A",
     onKeyDown: onKrNameChangeHandler,
@@ -330,10 +329,10 @@ function _default(props) {
     name: user.name,
     id: user.userId,
     width: 68,
-    editable: krCanEdit,
+    editable: krCanEdit && okrInfo.applyState !== _helper.EApproveStatus.UnderApproval,
     onEditUser: onEditUserHandler,
     nameTips: function nameTips(name) {
-      return /*#__PURE__*/_react["default"].createElement("span", null, "\u8D1F\u8D23\u4EBA\uFF1A", name);
+      return /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_Text_Owner'), name);
     }
   })), showKrWeight && /*#__PURE__*/_react["default"].createElement(OkrRowColumn, {
     width: 60,
@@ -349,7 +348,7 @@ function _default(props) {
     marginLeft: 16
   }, /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
     data: data,
-    editable: krCanEdit
+    editable: krCanEdit && (0, _helper.getApprovalKr)(approvalSetting, "changeOkrTime", okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes, data === null || data === void 0 ? void 0 : data.KrApprovalTypes)
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-actions"))
   }, showHeart && /*#__PURE__*/_react["default"].createElement("div", {
@@ -378,7 +377,7 @@ function _default(props) {
     evaluateValue: evaluateValue,
     setEvaluateValue: onEvaluateChangeHanler,
     isEvaluate: isEvaluate
-  })), krCanEdit && /*#__PURE__*/_react["default"].createElement("div", {
+  })), krCanEdit && okrInfo.applyState !== _helper.EApproveStatus.UnderApproval && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-delete")),
     onClick: function onClick() {
       return setDeleteModalVisible(true);

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

@@ -0,0 +1,53 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getApproveStatusTextMap = exports.ApproveStatusColor = exports.ApproveStatus = void 0;
+
+var _getLocale = require("../../../utils/getLocale");
+
+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; }
+
+var ApproveStatus;
+exports.ApproveStatus = ApproveStatus;
+
+(function (ApproveStatus) {
+  ApproveStatus[ApproveStatus["None"] = 0] = "None";
+  ApproveStatus[ApproveStatus["WaitCommit"] = 6] = "WaitCommit";
+  ApproveStatus[ApproveStatus["Rejected"] = 3] = "Rejected";
+  ApproveStatus[ApproveStatus["UnderApproval"] = 1] = "UnderApproval";
+  ApproveStatus[ApproveStatus["ApproveAgree"] = 2] = "ApproveAgree";
+  ApproveStatus[ApproveStatus["WithDraw"] = 4] = "WithDraw";
+  ApproveStatus[ApproveStatus["Done"] = 5] = "Done";
+})(ApproveStatus || (exports.ApproveStatus = ApproveStatus = {}));
+
+var getApproveStatusTextMap = function getApproveStatusTextMap(status) {
+  var _ApproveStatusTextMap;
+
+  var ApproveStatusTextMap = (_ApproveStatusTextMap = {}, _defineProperty(_ApproveStatusTextMap, ApproveStatus.WaitCommit, (0, _getLocale.getLocale)('OKR_MyO_Tobesubmitted')), _defineProperty(_ApproveStatusTextMap, ApproveStatus.Rejected, (0, _getLocale.getLocale)('OKR_MyO_Tobesubmitted')), _defineProperty(_ApproveStatusTextMap, ApproveStatus.UnderApproval, (0, _getLocale.getLocale)('Pro_detail_Approval')), _defineProperty(_ApproveStatusTextMap, ApproveStatus.ApproveAgree, ''), _defineProperty(_ApproveStatusTextMap, ApproveStatus.WithDraw, ''), _defineProperty(_ApproveStatusTextMap, ApproveStatus.None, ''), _defineProperty(_ApproveStatusTextMap, ApproveStatus.Done, ''), _ApproveStatusTextMap);
+  return ApproveStatusTextMap[status];
+};
+
+exports.getApproveStatusTextMap = getApproveStatusTextMap;
+
+var ApproveStatusColor = function ApproveStatusColor(status) {
+  var _ApprovalStatusColorM;
+
+  var ApprovalStatusColorMap = (_ApprovalStatusColorM = {}, _defineProperty(_ApprovalStatusColorM, ApproveStatus.WaitCommit, {
+    color: '#F0A326',
+    bgColor: 'rgba(240, 163, 38, 0.1)'
+  }), _defineProperty(_ApprovalStatusColorM, ApproveStatus.Rejected, {
+    color: '#F0A326',
+    bgColor: 'rgba(240, 163, 38, 0.1)'
+  }), _defineProperty(_ApprovalStatusColorM, ApproveStatus.UnderApproval, {
+    color: '#2879FF',
+    bgColor: 'rgba(40, 121, 255, 0.1)'
+  }), _defineProperty(_ApprovalStatusColorM, ApproveStatus.ApproveAgree, {
+    color: '#ffffff',
+    bgColor: '#ffffff'
+  }), _ApprovalStatusColorM);
+  return ApprovalStatusColorMap[status];
+};
+
+exports.ApproveStatusColor = ApproveStatusColor;

package/lib/components/okr-detail/detail-header/delete-confirm/delete-confirm.js

@@ -9,14 +9,16 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _titaUi = require("tita-ui");
-
-var _style = require("./style");
+var _classnames = _interopRequireDefault(require("classnames"));
 
 var _tooltip = _interopRequireDefault(require("../../../tooltip"));
 
 var _getLocale = require("../../../../utils/getLocale");
 
+var _dialogConfirm = _interopRequireDefault(require("../../../dialog-confirm"));
+
+require("./index.css");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -35,61 +37,114 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+var prefix = 'okr-detail-delete-confirm';
+
 var getDeleteOptions = function getDeleteOptions() {
   return [{
     id: 0,
-    text: "不删除目标下的任务",
-    tips: ""
+    text: (0, _getLocale.getLocale)('OKR_MyO_Text_OdeletionNTask'),
+    tips: ''
   }, {
     id: 1,
-    text: "同时删除目标下所有任务",
-    tips: (0, _getLocale.getLocale)("Pro_detail_Tasksapproval")
+    text: (0, _getLocale.getLocale)('OKR_MyO_Text_OdeletionTask'),
+    tips: (0, _getLocale.getLocale)('Pro_detail_Tasksapproval')
   }, {
     id: 2,
-    text: (0, _getLocale.getLocale)("Pro_detail_Attheametime"),
-    tips: (0, _getLocale.getLocale)("Pro_detail_Tasksapproval")
+    text: (0, _getLocale.getLocale)('Pro_detail_Attheametime'),
+    tips: (0, _getLocale.getLocale)('Pro_detail_Tasksapproval')
   }];
 };
 
-function OkrDeleteConfirm(_ref) {
-  var onConfirm = _ref.onConfirm,
-      onCancel = _ref.onCancel;
+var OkrDeletePop = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+  var onCancel = _ref.onCancel,
+      onConfirm = _ref.onConfirm,
+      approvalSetting = _ref.approvalSetting,
+      okrInfo = _ref.okrInfo;
 
-  var _useState = (0, _react.useState)(0),
+  var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
-      selected = _useState2[0],
-      setSelected = _useState2[1];
+      showConfirmPop = _useState2[0],
+      setShowConfirmPop = _useState2[1];
 
-  return /*#__PURE__*/_react["default"].createElement(_style.DeleteWrapper, {
-    onClick: function onClick(e) {
-      return e.stopPropagation();
-    }
-  }, /*#__PURE__*/_react["default"].createElement(_style.DeleteTitle, null, "\u76EE\u6807\u5220\u9664\u64CD\u4F5C\u4E0D\u53EF\u6062\u590D\uFF01\u8BF7\u8C28\u614E\u64CD\u4F5C"), /*#__PURE__*/_react["default"].createElement("div", null, getDeleteOptions().map(function (option) {
-    return /*#__PURE__*/_react["default"].createElement(_style.Options, {
-      key: option.id,
-      onClick: function onClick() {
-        return setSelected(option.id);
-      }
-    }, /*#__PURE__*/_react["default"].createElement(_style.Icon, {
-      className: selected == option.id ? "tu-icon-singlebox-avtive" : "tu-icon-singlebox-have"
-    }), /*#__PURE__*/_react["default"].createElement("p", null, option.text), option.tips && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-      overlay: option.tips,
-      placement: "top",
-      zIndex: 15000
-    }, /*#__PURE__*/_react["default"].createElement(_style.Icon, {
-      className: "tu-icon-warning"
-    })));
-  })), /*#__PURE__*/_react["default"].createElement(_style.ButtonGroup, null, /*#__PURE__*/_react["default"].createElement(_titaUi.Button, {
-    onClick: function onClick() {
+  var _useState3 = (0, _react.useState)(0),
+      _useState4 = _slicedToArray(_useState3, 2),
+      selected = _useState4[0],
+      setSelected = _useState4[1];
+
+  var handleCancelClick = function handleCancelClick() {
+    if (onCancel) {
       onCancel();
     }
-  }, (0, _getLocale.getLocale)("Mod_Cancel")), /*#__PURE__*/_react["default"].createElement(_titaUi.Button, {
-    type: "primary",
-    onClick: function onClick() {
-      return onConfirm(selected);
+
+    setShowConfirmPop(false);
+  };
+
+  var handleConfirmClick = function handleConfirmClick() {
+    if (onConfirm) {
+      onConfirm(selected);
     }
-  }, (0, _getLocale.getLocale)("Pro_detail_Submission"))));
-}
 
-var _default = OkrDeleteConfirm;
+    setShowConfirmPop(false);
+  };
+
+  var show = function show() {
+    setShowConfirmPop(true);
+  };
+
+  var hide = function hide() {
+    setShowConfirmPop(false);
+  };
+
+  var showApprovalCmp = (0, _react.useMemo)(function () {
+    var _okrInfo$OkrAndKrAppr;
+
+    return approvalSetting.isOpen && !(okrInfo !== null && okrInfo !== void 0 && (_okrInfo$OkrAndKrAppr = okrInfo.OkrAndKrApprovalTypes) !== null && _okrInfo$OkrAndKrAppr !== void 0 && _okrInfo$OkrAndKrAppr.includes(53));
+  }, [approvalSetting, okrInfo]);
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      show: show,
+      hide: hide
+    };
+  });
+  var renderDialogConfirm = (0, _react.useMemo)(function () {
+    return /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
+      zIndex: 1200,
+      visible: showConfirmPop,
+      type: "warning"
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      type: "title"
+    }, showApprovalCmp ? (0, _getLocale.getLocale)('OKR_MyO_Deleteoapproval') : (0, _getLocale.getLocale)('OKR_MyO_Determinedeletiono')), /*#__PURE__*/_react["default"].createElement("span", {
+      type: "content"
+    }, !showApprovalCmp && (0, _getLocale.getLocale)('OKR_MyO_Text_Odeletion'), /*#__PURE__*/_react["default"].createElement("div", null, getDeleteOptions().map(function (option) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        className: "".concat(prefix, "__option"),
+        key: option.id,
+        onClick: function onClick() {
+          return setSelected(option.id);
+        }
+      }, /*#__PURE__*/_react["default"].createElement("span", {
+        className: (0, _classnames["default"])("".concat(prefix, "__icon"), {
+          'tu-icon-singlebox-avtive': selected == option.id,
+          'tu-icon-singlebox-have': selected != option.id
+        })
+      }), /*#__PURE__*/_react["default"].createElement("span", {
+        className: "".concat(prefix, "__option-text")
+      }, option.text, option.tips && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+        overlay: option.tips,
+        placement: "top",
+        zIndex: 15000
+      }, /*#__PURE__*/_react["default"].createElement("span", {
+        className: "".concat(prefix, "__icon tu-icon-warning")
+      }))));
+    }))), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"].CancelButton, {
+      type: "button",
+      onClick: handleCancelClick
+    }, (0, _getLocale.getLocale)('Mod_Cancel')), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"].SureButton, {
+      type: "button",
+      onClick: handleConfirmClick
+    }, showApprovalCmp ? (0, _getLocale.getLocale)('OKR_MyO_Submittedapproval') : (0, _getLocale.getLocale)('Pro_detail_Submission')));
+  }, [showConfirmPop, selected]);
+  return renderDialogConfirm;
+});
+var _default = OkrDeletePop;
 exports["default"] = _default;

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

@@ -0,0 +1,55 @@
+.okr-detail-delete-confirm__option {
+  cursor: pointer;
+  display: flex;
+  margin-top: 10px;
+}
+
+.okr-detail-delete-confirm__option-text {
+  font-size: 14px;
+  color: #3F4755;
+  line-height: 22px;
+  margin-left: 6px;
+}
+
+.okr-detail-delete-confirm__option-text:hover {
+  color: #2879ff;
+}
+
+.okr-detail-delete-confirm__icon {
+  font-size: 12px;
+  color: #89919f;
+  vertical-align: middle;
+}
+
+.okr-detail-delete-confirm__icon.tu-icon-singlebox-have, .okr-detail-delete-confirm__icon.tu-icon-singlebox-avtive {
+  margin-top: 4px;
+  font-size: 16px;
+  color: #2879ff;
+}
+
+.okr-detail-delete-confirm__icon.tu-icon-warning {
+  font-size: 14px;
+  color: #acb7bf;
+  margin-left: 4px;
+  vertical-align: text-top;
+}
+
+.isApprovalDisabled {
+  margin-bottom: 0;
+  padding: 5px 24px;
+  font-size: 14px;
+  line-height: 22px;
+  transition: all .3s ease-in;
+  color: #BFC7D5;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  white-space: nowrap;
+}
+
+.isApprovalDisabled .options-icon {
+  margin-right: 12px;
+  font-size: 14px;
+  transition: all .3s ease-in;
+  color: #89919f;
+}

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

@@ -25,3 +25,14 @@
 .okr-detail-head-parent > span:hover {
   color: #2879ff;
 }
+
+.okr-detail-header-status {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 16px;
+  width: 68px;
+  height: 28px;
+  margin-right: 18px;
+  font-size: 12px;
+}