@titaui/pc 1.11.30 → 1.11.31-beta.1

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;
+}

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

@@ -9,8 +9,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _titaUi = require("tita-ui");
-
 var _userSelector = _interopRequireDefault(require("../../user-selector"));
 
 var _drawer = _interopRequireDefault(require("../../drawer"));
@@ -27,7 +25,9 @@ var _requestApis = require("../request-apis");
 
 var _okrShare = _interopRequireDefault(require("../../okr-share"));
 
-var _context7 = require("../context");
+var _context6 = require("../context");
+
+var _constant = require("./constant");
 
 var _deleteConfirm = _interopRequireDefault(require("./delete-confirm/delete-confirm"));
 
@@ -74,7 +74,7 @@ function OkrDetailHeader(_ref) {
       setShareVisible = _useState2[1];
 
   var userSelectRef = (0, _react.useRef)();
-  var popRef = (0, _react.useRef)();
+  var deletePopRef = (0, _react.useRef)();
 
   var _useState3 = (0, _react.useState)([]),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -83,8 +83,11 @@ function OkrDetailHeader(_ref) {
 
 
   var loginUserId = window.BSGlobal.loginUserInfo.Id;
-  var context = (0, _react.useContext)(_context7.GeneralDataContext);
-  var commonContext = (0, _react.useContext)(_context7.CommonContext);
+  var context = (0, _react.useContext)(_context6.GeneralDataContext);
+  var commonContext = (0, _react.useContext)(_context6.CommonContext);
+  var approvalSetting = commonContext.approvalSetting,
+      okrInfo = commonContext.okrInfo;
+  var approveStatusColor = (0, _constant.ApproveStatusColor)(okrInfo.applyState);
   var changVisiblity = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(workId, visibility) {
       var visibilityScope,
@@ -133,220 +136,238 @@ function OkrDetailHeader(_ref) {
   var closeShareModal = (0, _react.useCallback)(function () {
     setShareVisible(false);
   }, []);
+
+  var handleDeleteOkr = function handleDeleteOkr(selected) {
+    (0, _requestApis.workDelete)({
+      deleteType: selected,
+      workId: detailInfo.workId
+    }).then(function (resp) {
+      if (resp.Code === 1) {
+        _toast["default"].Success((0, _getLocale.getLocale)('Pro_detail_Deletsuccess'));
+
+        setTimeout(function () {
+          commonContext.refreshAll();
+        }, 500);
+      } else {
+        _toast["default"].Error(resp.Message);
+      }
+    });
+  };
+
   var actions = (0, _react.useMemo)(function () {
     if (!detailInfo) {
       return [];
-    } else {
-      return (0, _actions.getOkrHeadActions)({
-        roleType: context.generalRoleType,
-        principalUser: context.generalPrincipalUser,
-        visibility: context.generalVisibility.visibility,
-        detailInfo: detailInfo,
-        openShareModal: function () {
-          var _openShareModal = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-            var krss;
-            return regeneratorRuntime.wrap(function _callee2$(_context2) {
-              while (1) {
-                switch (_context2.prev = _context2.next) {
-                  case 0:
-                    _context2.next = 2;
-                    return (0, _requestApis.getKrs)({
-                      okrId: detailInfo.workId
-                    });
-
-                  case 2:
-                    krss = _context2.sent;
-                    setKrs(krss);
-                    setShareVisible(true);
-
-                  case 5:
-                  case "end":
-                    return _context2.stop();
-                }
-              }
-            }, _callee2);
-          }));
+    }
 
-          function openShareModal() {
-            return _openShareModal.apply(this, arguments);
-          }
+    return (0, _actions.getOkrHeadActions)({
+      roleType: context.generalRoleType,
+      principalUser: context.generalPrincipalUser,
+      visibility: context.generalVisibility.visibility,
+      detailInfo: detailInfo,
+      openShareModal: function () {
+        var _openShareModal = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+          var krss;
+          return regeneratorRuntime.wrap(function _callee2$(_context2) {
+            while (1) {
+              switch (_context2.prev = _context2.next) {
+                case 0:
+                  _context2.next = 2;
+                  return (0, _requestApis.getKrs)({
+                    okrId: detailInfo.workId
+                  });
 
-          return openShareModal;
-        }(),
-        changeVisiblilty: function changeVisiblilty(visibility) {
-          if (visibility === 4) {
-            if (userSelectRef.current) {
-              userSelectRef.current.open();
+                case 2:
+                  krss = _context2.sent;
+                  setKrs(krss);
+                  setShareVisible(true);
+
+                case 5:
+                case "end":
+                  return _context2.stop();
+              }
             }
+          }, _callee2);
+        }));
 
-            return;
+        function openShareModal() {
+          return _openShareModal.apply(this, arguments);
+        }
+
+        return openShareModal;
+      }(),
+      changeVisiblilty: function changeVisiblilty(visibility) {
+        if (visibility === 4) {
+          if (userSelectRef.current) {
+            userSelectRef.current.open();
           }
 
-          changVisiblity(detailInfo.workId, visibility);
-        },
-        onDeleteOkr: function onDeleteOkr(e) {
-          popRef.current.getRef().show(e.target);
-        },
-        onCopyOkr: function onCopyOkr() {
-          // @ts-ignore
-          window.openCopyOkrModal({
-            okrId: detailInfo.workId,
-            okrType: detailInfo.okrType
-          });
-        },
-        onChangeOkrFollow: function () {
-          var _onChangeOkrFollow = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(follow) {
-            var res;
-            return regeneratorRuntime.wrap(function _callee3$(_context3) {
-              while (1) {
-                switch (_context3.prev = _context3.next) {
-                  case 0:
-                    _context3.next = 2;
-                    return (0, _confirm["default"])(follow ? (0, _getLocale.getLocale)('OKR_MyO_Err_Focuson') : (0, _getLocale.getLocale)('OKR_MyO_Err_Unfollow'), follow ? (0, _getLocale.getLocale)('OKR_MyO_Err_Payatten') : (0, _getLocale.getLocale)('OKR_MyO_Err_Progress'));
-
-                  case 2:
-                    res = _context3.sent;
-
-                    if (!res) {
-                      _context3.next = 14;
-                      break;
-                    }
-
-                    if (!follow) {
-                      _context3.next = 9;
-                      break;
-                    }
-
-                    _context3.next = 7;
-                    return (0, _requestApis.addUser)(loginUserId, detailInfo.workId, 3);
-
-                  case 7:
-                    _context3.next = 11;
+          return;
+        }
+
+        changVisiblity(detailInfo.workId, visibility);
+      },
+      onDeleteOkr: function onDeleteOkr(e) {
+        deletePopRef.current.show();
+      },
+      onCopyOkr: function onCopyOkr() {
+        // @ts-ignore
+        window.openCopyOkrModal({
+          okrId: detailInfo.workId,
+          okrType: detailInfo.okrType
+        });
+      },
+      onChangeOkrFollow: function () {
+        var _onChangeOkrFollow = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(follow) {
+          var res;
+          return regeneratorRuntime.wrap(function _callee3$(_context3) {
+            while (1) {
+              switch (_context3.prev = _context3.next) {
+                case 0:
+                  _context3.next = 2;
+                  return (0, _confirm["default"])(follow ? (0, _getLocale.getLocale)('OKR_MyO_Err_Focuson') : (0, _getLocale.getLocale)('OKR_MyO_Err_Unfollow'), follow ? (0, _getLocale.getLocale)('OKR_MyO_Err_Payatten') : (0, _getLocale.getLocale)('OKR_MyO_Err_Progress'));
+
+                case 2:
+                  res = _context3.sent;
+
+                  if (!res) {
+                    _context3.next = 14;
                     break;
+                  }
 
-                  case 9:
-                    _context3.next = 11;
-                    return (0, _requestApis.deleteUser)(loginUserId, detailInfo.workId, 3);
+                  if (!follow) {
+                    _context3.next = 9;
+                    break;
+                  }
 
-                  case 11:
-                    context.setGeneralRoleType(follow ? 3 : 0); // 关注
+                  _context3.next = 7;
+                  return (0, _requestApis.addUser)(loginUserId, detailInfo.workId, 3);
 
-                    _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
+                case 7:
+                  _context3.next = 11;
+                  break;
 
-                    if (!follow) {
-                      commonContext.refreshAll();
-                    }
+                case 9:
+                  _context3.next = 11;
+                  return (0, _requestApis.deleteUser)(loginUserId, detailInfo.workId, 3);
 
-                  case 14:
-                  case "end":
-                    return _context3.stop();
-                }
+                case 11:
+                  context.setGeneralRoleType(follow ? 3 : 0); // 关注
+
+                  _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
+
+                  if (!follow) {
+                    commonContext.refreshAll();
+                  }
+
+                case 14:
+                case "end":
+                  return _context3.stop();
               }
-            }, _callee3);
-          }));
+            }
+          }, _callee3);
+        }));
 
-          function onChangeOkrFollow(_x3) {
-            return _onChangeOkrFollow.apply(this, arguments);
-          }
+        function onChangeOkrFollow(_x3) {
+          return _onChangeOkrFollow.apply(this, arguments);
+        }
+
+        return onChangeOkrFollow;
+      }(),
+      onFinishOrReOpen: function () {
+        var _onFinishOrReOpen = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(isFinish) {
+          var res;
+          return regeneratorRuntime.wrap(function _callee4$(_context4) {
+            while (1) {
+              switch (_context4.prev = _context4.next) {
+                case 0:
+                  _context4.next = 2;
+                  return (0, _confirm["default"])(isFinish ? (0, _getLocale.getLocale)('OKR_MyO_Areycloseobjective') : (0, _getLocale.getLocale)('OKR_MyO_Err_Restart'));
+
+                case 2:
+                  res = _context4.sent;
 
-          return onChangeOkrFollow;
-        }(),
-        onFinishOrReOpen: function () {
-          var _onFinishOrReOpen = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(isFinish) {
-            var res;
-            return regeneratorRuntime.wrap(function _callee4$(_context4) {
-              while (1) {
-                switch (_context4.prev = _context4.next) {
-                  case 0:
-                    _context4.next = 2;
-                    return (0, _confirm["default"])(isFinish ? (0, _getLocale.getLocale)('OKR_MyO_Areycloseobjective') : (0, _getLocale.getLocale)('OKR_MyO_Err_Restart'));
-
-                  case 2:
-                    res = _context4.sent;
-
-                    if (!res) {
-                      _context4.next = 13;
-                      break;
-                    }
-
-                    if (!isFinish) {
-                      _context4.next = 9;
-                      break;
-                    }
-
-                    _context4.next = 7;
-                    return (0, _requestApis.close)(detailInfo.workId);
-
-                  case 7:
-                    _context4.next = 11;
+                  if (!res) {
+                    _context4.next = 13;
                     break;
+                  }
 
-                  case 9:
-                    _context4.next = 11;
-                    return (0, _requestApis.start)(detailInfo.workId);
+                  if (!isFinish) {
+                    _context4.next = 9;
+                    break;
+                  }
+
+                  _context4.next = 7;
+                  return (0, _requestApis.close)(detailInfo.workId);
+
+                case 7:
+                  _context4.next = 11;
+                  break;
 
-                  case 11:
-                    commonContext.refreshAll(); // 刷新
+                case 9:
+                  _context4.next = 11;
+                  return (0, _requestApis.start)(detailInfo.workId);
 
-                    _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
+                case 11:
+                  commonContext.refreshAll(); // 刷新
 
-                  case 13:
-                  case "end":
-                    return _context4.stop();
-                }
+                  _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
+
+                case 13:
+                case "end":
+                  return _context4.stop();
               }
-            }, _callee4);
-          }));
+            }
+          }, _callee4);
+        }));
 
-          function onFinishOrReOpen(_x4) {
-            return _onFinishOrReOpen.apply(this, arguments);
-          }
+        function onFinishOrReOpen(_x4) {
+          return _onFinishOrReOpen.apply(this, arguments);
+        }
+
+        return onFinishOrReOpen;
+      }(),
+      onQuit: function () {
+        var _onQuit = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
+          var res;
+          return regeneratorRuntime.wrap(function _callee5$(_context5) {
+            while (1) {
+              switch (_context5.prev = _context5.next) {
+                case 0:
+                  _context5.next = 2;
+                  return (0, _confirm["default"])((0, _getLocale.getLocale)('OKR_MyO_Err_Quit'), (0, _getLocale.getLocale)('OKR_MyO_Err_Inchargec'));
+
+                case 2:
+                  res = _context5.sent;
+
+                  if (!res) {
+                    _context5.next = 8;
+                    break;
+                  }
 
-          return onFinishOrReOpen;
-        }(),
-        onQuit: function () {
-          var _onQuit = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
-            var res;
-            return regeneratorRuntime.wrap(function _callee5$(_context5) {
-              while (1) {
-                switch (_context5.prev = _context5.next) {
-                  case 0:
-                    _context5.next = 2;
-                    return (0, _confirm["default"])((0, _getLocale.getLocale)('OKR_MyO_Err_Quit'), (0, _getLocale.getLocale)('OKR_MyO_Err_Inchargec'));
-
-                  case 2:
-                    res = _context5.sent;
-
-                    if (!res) {
-                      _context5.next = 8;
-                      break;
-                    }
-
-                    _context5.next = 6;
-                    return (0, _requestApis.deleteUser)(loginUserId, detailInfo.workId, 2);
-
-                  case 6:
-                    // context.setGeneralRoleType(0)
-                    commonContext.refreshAll(); // 刷新
-
-                    _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
-
-                  case 8:
-                  case "end":
-                    return _context5.stop();
-                }
+                  _context5.next = 6;
+                  return (0, _requestApis.deleteUser)(loginUserId, detailInfo.workId, 2);
+
+                case 6:
+                  // context.setGeneralRoleType(0)
+                  commonContext.refreshAll(); // 刷新
+
+                  _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
+
+                case 8:
+                case "end":
+                  return _context5.stop();
               }
-            }, _callee5);
-          }));
+            }
+          }, _callee5);
+        }));
 
-          function onQuit() {
-            return _onQuit.apply(this, arguments);
-          }
+        function onQuit() {
+          return _onQuit.apply(this, arguments);
+        }
 
-          return onQuit;
-        }()
-      });
-    }
+        return onQuit;
+      }()
+    });
   }, [detailInfo, context.generalRoleType, context.generalPrincipalUser, context.generalVisibility.visibility]);
   var parent = null;
 
@@ -368,6 +389,8 @@ function OkrDetailHeader(_ref) {
 
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_drawer["default"].Header, {
     actions: actions,
+    approvalSetting: approvalSetting,
+    detailInfo: detailInfo,
     actionComponent: /*#__PURE__*/_react["default"].createElement(_wechatBtn["default"], {
       id: detailInfo.workId,
       objType: 62,
@@ -386,7 +409,14 @@ function OkrDetailHeader(_ref) {
           krId: parent.id
         });
       }
-    }, /*#__PURE__*/_react["default"].createElement("span", null, parent.type === 'okr' ? 'O ' : 'KR '), parent.name)) : null
+    }, /*#__PURE__*/_react["default"].createElement("span", null, parent.type === 'okr' ? 'O ' : 'KR '), parent.name)) : null,
+    onlyShowContent: approveStatusColor ? /*#__PURE__*/_react["default"].createElement("div", {
+      className: "okr-detail-header-status",
+      style: {
+        color: approveStatusColor.color,
+        backgroundColor: approveStatusColor.bgColor
+      }
+    }, (0, _constant.getApproveStatusTextMap)(okrInfo.applyState)) : null
   }), /*#__PURE__*/_react["default"].createElement(_okrShare["default"], {
     visible: shareVisible,
     onClose: closeShareModal,
@@ -404,48 +434,12 @@ function OkrDetailHeader(_ref) {
       })
     },
     zIndex: 2400
-  }), /*#__PURE__*/_react["default"].createElement(_titaUi.PopConfirm, {
-    ref: popRef,
-    showArrow: false,
-    align: "top",
-    className: "document-mouse-event-ignore",
-    content: /*#__PURE__*/_react["default"].createElement(_deleteConfirm["default"], {
-      onConfirm: /*#__PURE__*/function () {
-        var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(selected) {
-          return regeneratorRuntime.wrap(function _callee6$(_context6) {
-            while (1) {
-              switch (_context6.prev = _context6.next) {
-                case 0:
-                  _context6.next = 2;
-                  return (0, _requestApis.workDelete)({
-                    deleteType: selected,
-                    workId: detailInfo.workId
-                  });
-
-                case 2:
-                  _toast["default"].Success((0, _getLocale.getLocale)('Pro_detail_Deletsuccess'));
-
-                  setTimeout(function () {
-                    commonContext.refreshAll();
-                  }, 500);
-
-                case 4:
-                case "end":
-                  return _context6.stop();
-              }
-            }
-          }, _callee6);
-        }));
-
-        return function (_x5) {
-          return _ref3.apply(this, arguments);
-        };
-      }(),
-      onCancel: function onCancel() {
-        return popRef.current && popRef.current.getRef().hide();
-      }
-    })
-  }, /*#__PURE__*/_react["default"].createElement("span", null)), /*#__PURE__*/_react["default"].createElement("div", {
+  }), /*#__PURE__*/_react["default"].createElement(_deleteConfirm["default"], {
+    ref: deletePopRef,
+    okrInfo: okrInfo,
+    approvalSetting: approvalSetting,
+    onConfirm: handleDeleteOkr
+  }), /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       textAlign: 'right',
       height: 0