@titaui/pc 1.11.5-beta.4 → 1.11.6

package/.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
-
-npm run lint-staged
+# 
+npm run lint-staged

package/lib/components/button/rect-btn/index.css

@@ -13,7 +13,7 @@
   align-items: center;
   justify-content: center;
   min-width: 64px;
-  font-size: 14px;
+  font-size: 13px;
   padding: 0 12px;
 }
 
@@ -60,35 +60,21 @@
   background: #5c8eff;
 }
 
-.titaui-rect-btn--secondary {
-  font-size: 14px;
-  font-weight: normal;
-  color: #2879ff;
-  line-height: 28px;
-  background: rgba(40, 121, 255, 0.2);
-  margin-right: 16px;
-}
-
-.titaui-rect-btn--secondary:hover {
-  color: #fff;
-  background-color: #2879ff;
-}
-
 .titaui-rect-btn--cancel {
-  color: #6f7886;
-  border: 1px solid #dfe3ea;
-  background: #ffffff;
+  color: #6F7886;
+  border: 1px solid #DFE3EA;
+  background: #FFFFFF;
 }
 
 .titaui-rect-btn--cancel:hover {
-  color: #2879ff;
-  border: 1px solid #2879ff;
+  color: #2879FF;
+  border: 1px solid #2879FF;
 }
 
 .titaui-rect-btn--delete {
-  background: #ffffff;
-  color: #f05e5e;
-  border: 1px solid #f05e5e;
+  background: #FFFFFF;
+  color: #F05E5E;
+  border: 1px solid #F05E5E;
 }
 
 .titaui-rect-btn--delete:hover {
@@ -107,10 +93,10 @@
 }
 
 .titaui-rect-btn--primary.titaui-rect-btn--disabled {
-  background: #93bcff;
+  background: #93BCFF;
   opacity: 1;
 }
 
 .titaui-rect-btn--primary.titaui-rect-btn--disabled:hover {
-  background: #93bcff;
+  background: #93BCFF;
 }

package/lib/components/button/rect-btn/index.js

@@ -34,8 +34,7 @@ function RectBtn(props) {
       className = _props$className === void 0 ? "" : _props$className,
       _props$disabled = props.disabled,
       disabled = _props$disabled === void 0 ? false : _props$disabled,
-      style = props.style,
-      children = props.children;
+      style = props.style;
 
   var renderIcon = function renderIcon() {
     if (typeof icon === "string") {
@@ -51,19 +50,16 @@ function RectBtn(props) {
     }, icon);
   };
 
-  var onClickHandler = function onClickHandler(e) {
+  var onClickHandler = function onClickHandler() {
     if (disabled) return;
-
-    if (onClick) {
-      onClick(e);
-    }
+    onClick && onClick();
   };
 
   return /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])(precls, "".concat(precls, "--").concat(type), "".concat(precls, "--").concat(size), _defineProperty({}, "".concat(precls, "--disabled"), disabled), className),
     style: style,
     onClick: onClickHandler
-  }, icon && renderIcon(), children || text);
+  }, icon && renderIcon(), props.children || text);
 }
 
 var _default = RectBtn;

package/lib/components/create-okr-modal/request-api.js

@@ -46,7 +46,7 @@ var createWidthKr = /*#__PURE__*/function () {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            url = "".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/okr/createWithKr");
+            url = "".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/work/createWithKr");
             _context.next = 3;
             return _axios["default"].post(url, _objectSpread({
               workType: 6

package/lib/components/drawer/index.js

@@ -25,9 +25,7 @@ require("./index.css");
 
 var _context = _interopRequireDefault(require("../drawer-manager/context"));
 
-var _dom = require("./utils/dom");
-
-var _excluded = ["visible", "placement", "children", "mask", "width", "className", "contentWrapperStyle", "onClose", "style", "afterVisibleChange", "destroyOnClose", "bodyStyle", "zIndex", "autoClosable"];
+var _excluded = ["visible", "placement", "children", "mask", "width", "className", "contentWrapperStyle", "onClose", "style", "afterVisibleChange", "destroyOnClose", "bodyStyle", "zIndex"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -56,7 +54,7 @@ var Drawer = function Drawer(props) {
 
   var visible = props.visible,
       _props$placement = props.placement,
-      placement = _props$placement === void 0 ? 'right' : _props$placement,
+      placement = _props$placement === void 0 ? "right" : _props$placement,
       children = props.children,
       _props$mask = props.mask,
       mask = _props$mask === void 0 ? false : _props$mask,
@@ -72,8 +70,6 @@ var Drawer = function Drawer(props) {
       bodyStyle = props.bodyStyle,
       _props$zIndex = props.zIndex,
       zIndex = _props$zIndex === void 0 ? 1200 : _props$zIndex,
-      _props$autoClosable = props.autoClosable,
-      autoClosable = _props$autoClosable === void 0 ? false : _props$autoClosable,
       rest = _objectWithoutProperties(props, _excluded);
 
   var handleAfterVisibleChange = (0, _react.useCallback)(function (opened) {
@@ -93,20 +89,6 @@ var Drawer = function Drawer(props) {
     return children;
   }
 
-  var autoClose = function autoClose(e) {
-    if ((0, _dom.hasAncestorElement)(e.target, 'document-mouse-event-ignore,rc-tooltip,titaui-popup,rc-dialog-root,common-modal,in-modal,task-hot-add')) return;
-    onClose();
-  };
-
-  (0, _react.useEffect)(function () {
-    if (autoClosable) {
-      document.addEventListener('mousedown', autoClose);
-    }
-
-    return function () {
-      document.removeEventListener('mousedown', autoClose);
-    };
-  }, []);
   return /*#__PURE__*/_react["default"].createElement(DrawerContext.Provider, {
     value: {
       close: function close() {
@@ -114,7 +96,7 @@ var Drawer = function Drawer(props) {
       }
     }
   }, /*#__PURE__*/_react["default"].createElement(_rcDrawer["default"], _extends({
-    className: (0, _classnames["default"])('titaui-drawer', 'document-mouse-event-ignore', className),
+    className: (0, _classnames["default"])("titaui-drawer", "document-mouse-event-ignore", className),
     style: _objectSpread(_objectSpread({}, style), {}, {
       zIndex: zIndex
     })
@@ -140,7 +122,8 @@ function DrawerHeader(_ref) {
       actionMaxCount = _ref$actionMaxCount === void 0 ? 4 : _ref$actionMaxCount,
       content = _ref.content,
       style = _ref.style,
-      onClose = _ref.onClose;
+      onClose = _ref.onClose,
+      actionComponent = _ref.actionComponent;
   var drawer = (0, _react.useContext)(DrawerContext);
   var manager = (0, _react.useContext)(_context["default"]);
   var showClose = closable && (!!onClose || !!drawer);
@@ -163,16 +146,16 @@ function DrawerHeader(_ref) {
     onClick: manager && manager.goBack
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "tu-icon-fanhui"
-  }), (0, _getLocale.getLocale)('Mod_Back')), showBackBtn && hasContent && /*#__PURE__*/_react["default"].createElement("div", {
+  }), (0, _getLocale.getLocale)("Mod_Back")), showBackBtn && hasContent && /*#__PURE__*/_react["default"].createElement("div", {
     className: "titaui-drawer-header-divider"
   }), hasContent && content, /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       flex: 1
     }
-  }), displayActions.map(function (action) {
+  }), /*#__PURE__*/_react["default"].createElement("div", null, actionComponent), displayActions.map(function (action) {
     return /*#__PURE__*/_react["default"].createElement(_headerAction["default"], action);
   }), !!collapsedActions.length && /*#__PURE__*/_react["default"].createElement(_headerAction["default"], {
-    title: (0, _getLocale.getLocale)('Mod_MoreOperate'),
+    title: (0, _getLocale.getLocale)("Mod_MoreOperate"),
     icon: "tu-icon-10",
     children: collapsedActions
   }), showClose && /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -15,8 +15,6 @@ var _bsGlobal = require("../../utils/bs-global");
 
 var _userOwnMenu = _interopRequireDefault(require("./components/user-own-menu"));
 
-var _useGlobalValue = _interopRequireDefault(require("./useGlobalValue"));
-
 var _menu = _interopRequireDefault(require("./components/menu"));
 
 var _userMessage = _interopRequireDefault(require("./components/user-message"));
@@ -172,7 +170,5 @@ var NavTop = function NavTop() {
   }, /*#__PURE__*/_react["default"].createElement(_userOwnMenu["default"], null)));
 };
 
-var _default = NavTop; // @ts-ignore
-
-exports["default"] = _default;
-NavTop.useGlobalValue = _useGlobalValue["default"];
+var _default = NavTop;
+exports["default"] = _default;

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getOkrHeadActions = getOkrHeadActions;
 
-var _dayjs = _interopRequireDefault(require("dayjs"));
-
 var _bsGlobal = require("../../../utils/bs-global");
 
 var _auth = require("../../../utils/auth");
@@ -15,36 +13,12 @@ var _enums = require("./enums");
 
 var _getLocale = require("../../../utils/getLocale");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 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 getOkrHeadActions(data) {
-  var actions = [];
-  var auth = new _auth.OAuth({
-    principalUser: data.principalUser,
-    createUserId: data.detailInfo.createUserId
-  });
-
-  var dataWithAuth = _objectSpread(_objectSpread({}, data), {}, {
-    auth: auth
-  });
-
-  addShareButton(dataWithAuth, actions);
-  addVisibilityButton(dataWithAuth, actions);
-  addFollowButton(dataWithAuth, actions);
-  addExitButton(dataWithAuth, actions);
-  addFinishOrReopenButton(dataWithAuth, actions);
-  addCopyButton(dataWithAuth, actions);
-  addDeleteButton(dataWithAuth, actions); // addDetailButton(dataWithAuth,actions)
-
-  return actions;
-}
-
 var addShareButton = function addShareButton(_ref, actions) {
   var openShareModal = _ref.openShareModal;
   actions.push({
@@ -81,10 +55,10 @@ var addVisibilityButton = function addVisibilityButton(_ref2, actions) {
     }
   }];
 
-  var editable = auth.hasAuth() && detailInfo.status == _enums.OkrStatus.inProgress;
+  var editable = auth.hasAuth() && detailInfo.status === _enums.OkrStatus.inProgress;
 
   actions.push({
-    icon: visibility != 1 ? "tu-icon-simi-icon" : "tu-icon-gongkai",
+    icon: visibility !== 1 ? "tu-icon-simi-icon" : "tu-icon-gongkai",
     title: children[visibility - 1].title + (0, _getLocale.getLocale)("OKR_MyO_Text_Visible"),
     children: editable ? children : null
   });
@@ -92,7 +66,6 @@ var addVisibilityButton = function addVisibilityButton(_ref2, actions) {
 
 var addFollowButton = function addFollowButton(_ref3, actions) {
   var roleType = _ref3.roleType,
-      detailInfo = _ref3.detailInfo,
       onChangeOkrFollow = _ref3.onChangeOkrFollow;
 
   // 未开启关注目标功能
@@ -101,12 +74,12 @@ var addFollowButton = function addFollowButton(_ref3, actions) {
   } // 是负责人或是内部成员不能关注目标
 
 
-  if (roleType == _enums.OkrRole.principal || roleType == _enums.OkrRole.member) {
+  if (roleType === _enums.OkrRole.principal || roleType === _enums.OkrRole.member) {
     return;
   } // 已关注目标
 
 
-  if (roleType == _enums.OkrRole.follower) {
+  if (roleType === _enums.OkrRole.follower) {
     actions.push({
       icon: "okr-drawer-header-followed",
       title: (0, _getLocale.getLocale)("OKR_MyO_Butt_Unfollow"),
@@ -131,7 +104,7 @@ var addExitButton = function addExitButton(_ref4, actions) {
   var roleType = _ref4.roleType,
       onQuit = _ref4.onQuit;
 
-  if (roleType == _enums.OkrRole.member) {
+  if (roleType === _enums.OkrRole.member) {
     actions.push({
       icon: "tu-icon-tuichu",
       title: (0, _getLocale.getLocale)("Pro_Admin_pop_Withdraw"),
@@ -146,7 +119,7 @@ var addFinishOrReopenButton = function addFinishOrReopenButton(_ref5, actions) {
       onFinishOrReOpen = _ref5.onFinishOrReOpen;
   if (!auth.hasAuth()) return;
 
-  if (detailInfo.status == _enums.OkrStatus.inProgress) {
+  if (detailInfo.status === _enums.OkrStatus.inProgress) {
     actions.push({
       icon: "tu-icon-liebiao-jieshu",
       title: (0, _getLocale.getLocale)("OKR_MyO_EndObjective"),
@@ -185,16 +158,39 @@ var addDeleteButton = function addDeleteButton(_ref7, actions) {
     title: (0, _getLocale.getLocale)("OKR_MyO_Butt_DeleteO"),
     onClick: onDeleteOkr
   });
-};
+}; // const addDetailButton: ActionDealFunction = ({ detailInfo }, actions) => {
+//   const registerDate = window.BSGlobal.tenantAuthentication.StartDate;
+//   dayjs(registerDate).year() < 2021
+//     && actions.push({
+//       icon: "tu-icon-xiangqing1",
+//       title: "目标详情",
+//       onClick: () => {
+//         window.open(
+//           `${location.pathname}#okr/manage?work_id=${detailInfo.workId}`,
+//         );
+//       },
+//     });
+// };
 
-var addDetailButton = function addDetailButton(_ref8, actions) {
-  var detailInfo = _ref8.detailInfo;
-  var registerDate = window.BSGlobal.tenantAuthentication.StartDate;
-  (0, _dayjs["default"])(registerDate).year() < 2021 && actions.push({
-    icon: "tu-icon-xiangqing1",
-    title: "目标详情",
-    onClick: function onClick() {
-      window.open("".concat(location.pathname, "#okr/manage?work_id=").concat(detailInfo.workId));
-    }
+
+function getOkrHeadActions(data) {
+  var actions = [];
+  var auth = new _auth.OAuth({
+    principalUser: data.principalUser,
+    createUserId: data.detailInfo.createUserId
   });
-};
+
+  var dataWithAuth = _objectSpread(_objectSpread({}, data), {}, {
+    auth: auth
+  });
+
+  addShareButton(dataWithAuth, actions);
+  addVisibilityButton(dataWithAuth, actions);
+  addFollowButton(dataWithAuth, actions);
+  addExitButton(dataWithAuth, actions);
+  addFinishOrReopenButton(dataWithAuth, actions);
+  addCopyButton(dataWithAuth, actions);
+  addDeleteButton(dataWithAuth, actions); // addDetailButton(dataWithAuth,actions)
+
+  return actions;
+}

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

@@ -5,7 +5,7 @@
 .okr-detail-head-parent {
   display: flex;
   align-items: center;
-  color: #89919F;
+  color: #89919f;
 }
 
 .okr-detail-head-parent .tu-icon-liebiao-duiqinubiao {
@@ -23,5 +23,5 @@
 }
 
 .okr-detail-head-parent > span:hover {
-  color: #2879FF;
+  color: #2879ff;
 }