@titaui/pc 1.11.4-13 → 1.11.4-17

package/lib/components/dynamic/constant.js

@@ -119,5 +119,5 @@ var EStatusStatus2ClassType = {
   5: 'tu-icon-jiantou-right'
 };
 exports.EStatusStatus2ClassType = EStatusStatus2ClassType;
-var PlanReportType = ['titaPlanReport'];
+var PlanReportType = ['titaPlanReport', 'titaPlanManagerReport'];
 exports.PlanReportType = PlanReportType;

package/lib/components/eReport/eReportShare/index.js

@@ -64,7 +64,7 @@ var EReportShare = /*#__PURE__*/function (_PureComponent) {
       var _this$props = _this.props,
           onSubmit = _this$props.onSubmit,
           workId = _this$props.workId;
-      sentData.ObjType = 4;
+      sentData.ObjType = 62;
       sentData.ObjId = workId;
 
       if (submitType === 'submit') {

package/lib/components/grid-layout/sub-employee-okr/person-okr.js

@@ -19,6 +19,8 @@ var _dateTestChange = require("../../../utils/date-test-change");
 
 var _openData = require("../../../utils/open-data");
 
+var _getLocale = require("../../../utils/getLocale");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -54,7 +56,11 @@ function PersonalOkr(props) {
 
   var toolTipRef = (0, _react.useRef)();
   (0, _react.useEffect)(function () {
-    setSubUpdateTime((0, _dateTestChange.judgeTimeSpaceFromNow)(updateTime));
+    if (updateTime) {
+      setSubUpdateTime((0, _dateTestChange.judgeTimeSpaceFromNow)(updateTime) + (0, _getLocale.getLocale)('OKR_MyO_Butt_Update'));
+    } else {
+      setSubUpdateTime((0, _getLocale.getLocale)('OKR_MyO_KRP_Notupdated'));
+    }
   }, [updateTime]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "subOKRComponents-PersonalOkr"
@@ -85,15 +91,15 @@ function PersonalOkr(props) {
     id: userId
   }))), /*#__PURE__*/_react["default"].createElement("span", {
     className: "subOKRComponents-PersonalOkr__left__updatetime"
-  }, subUpdateTime, "\u66F4\u65B0"))), /*#__PURE__*/_react["default"].createElement("span", {
+  }, subUpdateTime))), /*#__PURE__*/_react["default"].createElement("span", {
     className: "subOKRComponents-PersonalOkr__right"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "subOKRComponents-PersonalOkr__right__percentNum"
   }, num, "%"), /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      position: "absolute",
-      right: "-8px",
-      bottom: "0"
+      position: 'absolute',
+      right: '-8px',
+      bottom: '0'
     }
   }, /*#__PURE__*/_react["default"].createElement(_index["default"], {
     percent: num,

package/lib/components/nav-top/components/menu/index.css

@@ -117,6 +117,97 @@
   position: relative;
 }
 
+.titaui-nav-top-menu__tips {
+  position: relative;
+}
+
+.titaui-nav-top-menu__tips-new {
+  width: 36px;
+  height: 26px;
+  position: absolute;
+  top: 6px;
+  right: -8px;
+}
+
+.titaui-nav-top-menu__tips-box {
+  width: 308px;
+  height: 142px;
+  box-sizing: border-box;
+  padding: 16px;
+  background: #5c8eff;
+  box-shadow: 0px -8px 24px 0px rgba(127, 145, 180, 0.3);
+  border: 1px solid #eff0f1;
+  border-radius: 12px;
+  z-index: 99;
+}
+
+.titaui-nav-top-menu__tips-box-head {
+  padding-left: 24px;
+  background-image: url("./img/wecome-temp.png");
+  background-position: 0 0;
+  background-repeat: no-repeat;
+  background-size: 20px 20px;
+}
+
+.titaui-nav-top-menu__tips-box-title {
+  display: block;
+  font-size: 14px;
+  color: #ffffff;
+  line-height: 22px;
+  font-weight: 600;
+}
+
+.titaui-nav-top-menu__tips-box-content {
+  font-size: 12px;
+  color: #ffffff;
+  line-height: 18px;
+  margin-top: 10px;
+}
+
+.titaui-nav-top-menu__tips-box-ok {
+  height: 28px;
+  margin-top: 8px;
+  margin-left: 210px;
+  background: #ffffff;
+  box-shadow: 0px -4px 12px 0px rgba(127, 145, 180, 0.2);
+  border-radius: 14px;
+  box-sizing: border-box;
+  padding: 3px 17px;
+  font-size: 14px;
+  color: #2879ff;
+  line-height: 22px;
+  cursor: pointer;
+}
+
+.titaui-nav-top-menu__tips-triangle {
+  position: absolute;
+  top: -4px;
+  left: 50%;
+  margin-left: -4px;
+  width: 0;
+  height: 0;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 5px solid #fff;
+}
+
+.titaui-nav-top-menu__tips-triangle::after {
+  content: '';
+  width: 0;
+  height: 0;
+  position: absolute;
+  left: -4px;
+  top: 2px;
+  border-left: solid 4px transparent;
+  border-right: solid 4px transparent;
+  border-bottom: solid 4px #5c8eff;
+  z-index: 99;
+}
+
+.titaui-nav-top-menu__tips-hide {
+  display: none;
+}
+
 .titaui-nav-top-menu .rc-overflow-item {
   position: relative;
 }

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

@@ -21,6 +21,8 @@ var _conditionRender = _interopRequireDefault(require("../../../../components/co
 
 var _useGlobalValue3 = _interopRequireDefault(require("../../useGlobalValue"));
 
+var _new = _interopRequireDefault(require("./img/new.png"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -52,6 +54,15 @@ var popupAlign = {
   },
   targetOffset: [0, 0]
 };
+var NewFeatureGuidePopupAlign = {
+  offset: [104, -5],
+  overflow: {
+    adjustX: true,
+    adjustY: true
+  },
+  targetOffset: [0, 0]
+};
+var NEWMENUS = '#/interview';
 
 var Menu = function Menu(_ref) {
   var menus = _ref.menus,
@@ -59,8 +70,13 @@ var Menu = function Menu(_ref) {
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
-      popupVisible = _useState2[0],
-      setPopupVisible = _useState2[1];
+      isKnow = _useState2[0],
+      setIsKonw = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      popupVisible = _useState4[0],
+      setPopupVisible = _useState4[1];
 
   var _useGlobalValue = (0, _useGlobalValue3["default"])(),
       _useGlobalValue2 = _slicedToArray(_useGlobalValue, 1),
@@ -84,33 +100,66 @@ var Menu = function Menu(_ref) {
     }
   };
 
-  var handleClickToLearning = function handleClickToLearning() {
-    window.open("".concat(apiPath, "/").concat(userId, "/eLearningHome#/"), '_self');
+  var handleClick = function handleClick() {
+    setIsKonw(true);
+    localStorage.setItem("isNewMenuItem__".concat(userId), "".concat(userId));
   };
 
+  (0, _react.useEffect)(function () {
+    var isKnow = localStorage.getItem("isNewMenuItem__".concat(userId));
+
+    if (isKnow) {
+      setIsKonw(true);
+    }
+  }, []);
+
+  var popup = /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__tips")
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(prefix, "__tips-box"), _defineProperty({}, "".concat(prefix, "__tips-hide"), isKnow))
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__tips-box-head")
+  }, /*#__PURE__*/_react["default"].createElement("h2", {
+    className: "".concat(prefix, "__tips-box-title")
+  }, "1 : 1 \u9762\u8C08\uFF08\u4E00\u5BF9\u4E00\u9762\u8C08\uFF09\u4E0A\u7EBF\u5566\uFF01"), /*#__PURE__*/_react["default"].createElement("p", {
+    className: "".concat(prefix, "__tips-box-content")
+  }, "\u52A9\u529B\u7ECF\u7406\u548C\u4E0B\u7EA7\u8FDB\u884C\u6301\u7EED\u6C9F\u901A\uFF0C\u4E3A\u4E0D\u540C\u573A\u666F\u63D0\u4F9B\u4E30\u5BCC\u7684\u6C9F\u901A\u6A21\u677F\uFF0C\u5373\u523B\u4E86\u89E3\uFF0CGo~")), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__tips-box-ok"),
+    onClick: handleClick
+  }, "\u597D\u54D2")), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(prefix, "__tips-triangle"), _defineProperty({}, "".concat(prefix, "__tips-hide"), isKnow))
+  }));
+
   var renderRawItem = function renderRawItem(menu) {
+    var href = menu.href;
+
+    if (menu.title === 'Learning') {
+      href = "".concat(apiPath, "/").concat(userId, "/eLearningHome#/");
+    }
+
     return /*#__PURE__*/_react["default"].createElement(_rcOverflow["default"].Item, {
       component: "span"
     }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
-      condition: menu.title !== 'Learning'
+      condition: menu.id
+    }, /*#__PURE__*/_react["default"].createElement(_popup["default"], {
+      popupVisible: !isKnow,
+      popup: menu.href === NEWMENUS ? popup : null,
+      mask: false,
+      action: ['focus'],
+      popupAlign: NewFeatureGuidePopupAlign
     }, /*#__PURE__*/_react["default"].createElement("a", {
       className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), _defineProperty({}, "".concat(prefix, "__menu-show--active"), activeMenuId === menu.id)),
-      href: "".concat(menu.href),
+      href: href,
       target: "_self",
       onClick: function onClick() {
         return handleTracker(menu);
       }
     }, menu.title, menu.href === '#dynamic' && feedNum > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])("".concat(prefix, "__menu--hasNum"), _defineProperty({}, "".concat(prefix, "__menu--hasNum-active"), activeMenuId === menu.id && menu.href === '#dynamic'))
-    }, feedNum > 100 ? '99+' : feedNum))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
-      condition: menu.title === 'Learning'
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), _defineProperty({}, "".concat(prefix, "__menu-show--active"), activeMenuId === menu.id)),
-      onClick: function onClick() {
-        handleTracker(menu);
-        handleClickToLearning();
-      }
-    }, menu.title)));
+    }, feedNum > 100 ? '99+' : feedNum), menu.href === NEWMENUS && /*#__PURE__*/_react["default"].createElement("img", {
+      src: _new["default"],
+      className: "".concat(prefix, "__tips-new")
+    })))));
   };
 
   var renderRest = function renderRest(items) {
@@ -122,18 +171,17 @@ var Menu = function Menu(_ref) {
     var popContent = /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__hide-menus")
     }, items.map(function (menu) {
+      var href = menu.href;
+
+      if (menu.title === 'Learning') {
+        href = "".concat(apiPath, "/").concat(userId, "/eLearningHome#/");
+      }
+
       return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
-        condition: menu.title !== 'Learning'
-      }, /*#__PURE__*/_react["default"].createElement("a", {
-        className: (0, _classnames["default"])("".concat(prefix, "__menu-hide"), _defineProperty({}, "".concat(prefix, "__menu-hide--active"), activeMenuId === menu.id)),
-        href: "".concat(menu.href),
-        key: menu.id,
-        target: "_self"
-      }, menu.title)), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
-        condition: menu.title === 'Learning'
+        condition: menu.id
       }, /*#__PURE__*/_react["default"].createElement("a", {
         className: (0, _classnames["default"])("".concat(prefix, "__menu-hide"), _defineProperty({}, "".concat(prefix, "__menu-hide--active"), activeMenuId === menu.id)),
-        href: "".concat(apiPath, "/").concat(userId, "/eLearningHome#/"),
+        href: href,
         key: menu.id,
         target: "_self"
       }, menu.title)));

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

@@ -94,7 +94,8 @@ function _default(props) {
   var data = props.data,
       index = props.index,
       title = props.title,
-      key = props.key;
+      key = props.key,
+      canEditOkr = props.canEditOkr;
 
   var _useContext = (0, _react.useContext)(_context2.CommonContext),
       refreshAll = _useContext.refreshAll,
@@ -155,7 +156,7 @@ function _default(props) {
     var hasAuth = new _auth.KRAuth({
       user: data.user,
       createUserId: data.createUserId
-    }).hasAuth();
+    }).hasAuth() || canEditOkr;
     var livetime = okrInfo.status != 2;
     return hasAuth && livetime;
   }),

package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/range-picker-pop.js

@@ -15,6 +15,10 @@ var _requestApis = require("../../../../request-apis");
 
 var _rangePickerPop = _interopRequireDefault(require("../../../../../range-picker-pop"));
 
+var _toast = _interopRequireDefault(require("../../../../../toast"));
+
+var _getLocale = require("../../../../../../utils/getLocale");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -68,6 +72,12 @@ function _default(props) {
       kr: data,
       startDate: startDate,
       endDate: endDate
+    }).then(function (resp) {
+      if (resp.Code === 1) {
+        _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
+      } else {
+        _toast["default"].Error(resp.Message);
+      }
     });
     rangePicker.current.setRange({
       startDate: startDate,

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

@@ -96,6 +96,7 @@ var preCls = "okr-detail-okrs-list";
 
 var treeDataFormate = function treeDataFormate(nodes) {
   var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "kr";
+  var canEditOkr = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var formateNodes = [];
   nodes.forEach(function (it, index) {
     var title = "";
@@ -107,7 +108,8 @@ var treeDataFormate = function treeDataFormate(nodes) {
       title: title,
       isLeaf: true,
       nodeType: type,
-      data: it
+      data: it,
+      canEditOkr: canEditOkr
     });
   });
   return formateNodes;
@@ -272,9 +274,9 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     updateKrs();
   }, []);
   (0, _react.useEffect)(function () {
-    var strucKrs = treeDataFormate(pureKrs, "kr");
+    var strucKrs = treeDataFormate(pureKrs, "kr", canEditOkr);
     setKrs(strucKrs);
-  }, [pureKrs]);
+  }, [pureKrs, canEditOkr]);
 
   var onAddKrHandler = function onAddKrHandler(kr) {
     refreshAll();

package/lib/components/okr-flow/child-node/index.css

@@ -49,7 +49,7 @@
   width: 340px;
   height: 102px;
   background: url(../images/private-light.png) no-repeat;
-  background-size: contain;
+  background-size: 340px 102px;
 }
 
 .titaui-okr-flow--node__search {

package/lib/components/okr-flow/export-modal/index.js

@@ -37,6 +37,8 @@ var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 
 require("rc-color-picker/assets/index.css");
 
+var Sentry = _interopRequireWildcard(require("@sentry/browser"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -155,6 +157,8 @@ var ExportMapModal = function ExportMapModal(props) {
               };
               _context.next = 12;
               return (0, _html2canvas["default"])(okrMapRef, opts).then(function (result) {
+                var _window, _window$BSGlobal, _window$BSGlobal$logi, _window2, _window2$BSGlobal, _window2$BSGlobal$ten;
+
                 if ((0, _bsGlobal.isWx)() && window.WWOpenData) {
                   if (window.WWOpenData.enableCanvasSharing) {
                     window.WWOpenData.enableCanvasSharing();
@@ -165,11 +169,69 @@ var ExportMapModal = function ExportMapModal(props) {
                   }
                 }
 
+                var userId = (_window = window) === null || _window === void 0 ? void 0 : (_window$BSGlobal = _window.BSGlobal) === null || _window$BSGlobal === void 0 ? void 0 : (_window$BSGlobal$logi = _window$BSGlobal.loginUserInfo) === null || _window$BSGlobal$logi === void 0 ? void 0 : _window$BSGlobal$logi.Id;
+                var telentId = (_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$BSGlobal = _window2.BSGlobal) === null || _window2$BSGlobal === void 0 ? void 0 : (_window2$BSGlobal$ten = _window2$BSGlobal.tenantInfo) === null || _window2$BSGlobal$ten === void 0 ? void 0 : _window2$BSGlobal$ten.Id;
                 var imgUrl = result.toDataURL('image/png'); // 得到图片的base64编码数据
 
                 // 得到图片的base64编码数据
+                _toast["default"].Warning('导出中，请勿关闭弹窗', {
+                  canClose: true
+                });
+
+                var equalIndex = imgUrl.indexOf('='); // 获取=号下标
+
+                // 获取=号下标
+                var size = 0;
+
+                if (equalIndex > 0) {
+                  var str = imgUrl.substring(0, equalIndex); // 去除=号
+
+                  // 去除=号
+                  var strLength = str.length;
+                  var fileLength = strLength - strLength / 8 * 2; // 真实的图片byte大小
+
+                  // 真实的图片byte大小
+                  size = Math.floor(fileLength); // 向下取整
+                } else {
+                  var _strLength = imgUrl.length;
+
+                  var _fileLength = _strLength - _strLength / 8 * 2;
+
+                  size = Math.floor(_fileLength); // 向下取整
+                }
+
+                size = size / 1024 / 1024; // @ts-ignore
+
+                // @ts-ignore
+                window.titaTracker && window.titaTracker("action").record({
+                  actionName: userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl.slice(1, 200),
+                  actionGroup: 'okr地图图片',
+                  productName: 'okr地图导出'
+                });
+                Sentry.withScope(function (scope) {
+                  scope.setTag("error-level", "P0");
+                  scope.setTag("error-type", "地图导出-图片生成");
+                  scope.setExtra("userMessage", userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
+                });
                 (0, _requestApis.getBase64DownloadUrl)(imgUrl.split(',')[1]).then(function (url) {
-                  var image = new Image();
+                  var image = new Image(); // @ts-ignore
+
+                  // @ts-ignore
+                  window.titaTracker && window.titaTracker("action").record({
+                    actionName: userId + '租户：' + telentId + '我获得了地址' + url.Data.obj,
+                    actionGroup: 'okr地图接口',
+                    productName: 'okr地图导出'
+                  });
+                  Sentry.withScope(function (scope) {
+                    scope.setTag("error-level", "P0");
+                    scope.setTag("error-type", "地图导出-图片地址");
+                    scope.setExtra("userMessage", userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
+                  });
+
+                  _toast["default"].Warning('图片上传成功，准备本地下载', {
+                    canClose: true
+                  });
+
                   image.setAttribute('crossOrigin', 'anonymous');
 
                   image.onload = function () {
@@ -188,9 +250,9 @@ var ExportMapModal = function ExportMapModal(props) {
                     a.download = 'okr地图'; // 设置图片名称
 
                     // 设置图片名称
-                    a.href = url.Data.obj; // 将生成的URL设置为a.href属性
+                    a.href = url.Data.obj; // 将生成的URL设置为a
 
-                    // 将生成的URL设置为a.href属性
+                    // 将生成的URL设置为a
                     a.dispatchEvent(event); // 触发a的单击事件
 
                     // 触发a的单击事件
@@ -269,6 +331,7 @@ var ExportMapModal = function ExportMapModal(props) {
     onOk: confirmHandler,
     onCancel: onCloseHandler,
     ref: modalRef,
+    confirmLoading: isExport,
     className: "export-map-modal titaui-dialog",
     forceRender: true
   }, /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/survey-model/index.js

@@ -29,6 +29,8 @@ var _tools = require("../../utils/tools");
 
 require("./index.css");
 
+var _helpers = require("../../utils/helpers");
+
 var _window$BSGlobal, _window$BSGlobal$tena, _window$BSGlobal2, _window$BSGlobal2$ten;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -104,6 +106,7 @@ var SurveyModel = function SurveyModel(_ref) {
 
   (0, _react.useEffect)(function () {
     if (Version === 1) return;
+    if ((0, _helpers.isDingDing)()) return;
     if (!!window.location.hostname.match(/.work/)) return;
     var newDate = (0, _dayjs["default"])();
     var oldDate = localStorage.getItem("survey_model_date__".concat(loginUserInfo.Id));

package/lib/components/time-picker/time-picker.js

@@ -21,7 +21,7 @@ var _utils = require("./utils");
 
 require("./index.css");
 
-var _excluded = ["disabled", "timeFormat", "hourStep", "minuteStep", "onChange", "value"];
+var _excluded = ["disabled", "enableKeyBoard", "timeFormat", "hourStep", "minuteStep", "onChange", "value"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -51,6 +51,8 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 var TimePicker = function TimePicker(props) {
   var disabled = props.disabled,
+      _props$enableKeyBoard = props.enableKeyBoard,
+      enableKeyBoard = _props$enableKeyBoard === void 0 ? true : _props$enableKeyBoard,
       _props$timeFormat = props.timeFormat,
       timeFormat = _props$timeFormat === void 0 ? 'hh:mm' : _props$timeFormat,
       _props$hourStep = props.hourStep,
@@ -77,53 +79,47 @@ var TimePicker = function TimePicker(props) {
   var mInputRef = (0, _react.useRef)();
   var minuteRef = (0, _react.useRef)((0, _moment["default"])(value || '00:00', timeFormat).format('mm'));
   var triggerRef = (0, _react.useRef)();
-  var timerRef = (0, _react.useRef)();
   var hours = (0, _utils.getHours)(hourStep);
   var minutes = (0, _utils.getMinutes)(minuteStep);
 
   var onTimeChange = function onTimeChange() {
-    onChange === null || onChange === void 0 ? void 0 : onChange("".concat(hourRef.current, ":").concat(minuteRef.current));
+    return onChange === null || onChange === void 0 ? void 0 : onChange("".concat(hourRef.current, ":").concat(minuteRef.current));
   };
 
-  var onInputClick = function onInputClick(type) {
-    clearTimeout(timerRef.current);
-    timerRef.current = setTimeout(function () {
-      if (type === 'hour') {
-        var _hInputRef$current;
-
-        (_hInputRef$current = hInputRef.current) === null || _hInputRef$current === void 0 ? void 0 : _hInputRef$current.focus();
-      } else {
-        var _mInputRef$current;
-
-        (_mInputRef$current = mInputRef.current) === null || _mInputRef$current === void 0 ? void 0 : _mInputRef$current.focus();
-      }
-
-      setTimeSettingType(function () {
-        return type;
-      });
-    }, 0);
+  var onBlurHandler = function onBlurHandler() {
+    return setTimeSettingType('');
   };
 
   var onFocusHandler = function onFocusHandler(type) {
-    setTimeSettingType(function () {
+    return setTimeSettingType(function () {
       return type;
     });
   };
 
-  var onHourInputBlur = function onHourInputBlur() {
-    // setHour((prevHour) => {
-    // const prevHour = hourRef.current;
-    // let nextHour = (Array(2).join("0") + prevHour).slice(-2);
-    // if (Number(prevHour) > Number(hours[hours.length - 1])) {
-    //   nextHour = `0${prevHour.slice(0, 1)}`;
-    // }
-    // hourRef.current = nextHour;
-    // });
-    // if (timeSetType === "hour" && hInputRef.current) {
-    //   hInputRef.current.focus();
-    // }
-    // onTimeChange();
-    setTimeSettingType('');
+  var onKeyDownHandler = function onKeyDownHandler(e) {
+    if (!e) return;
+    var keyCode = e.keyCode;
+
+    if ([_utils.KEYCODE.directionLeft, _utils.KEYCODE.directionRight].includes(keyCode)) {
+      setTimeSettingType(_utils.TargetMapByKeyCode[keyCode]);
+    }
+
+    if ([_utils.KEYCODE.directionUp, _utils.KEYCODE.directionDown].includes(keyCode)) {
+      switch (timeSetingtType) {
+        case 'hour':
+          hourRef.current = setTimeOnKeyboardDirectionChange(keyCode, 'hour', hourRef.current);
+          break;
+
+        case 'minute':
+          minuteRef.current = setTimeOnKeyboardDirectionChange(keyCode, 'minute', minuteRef.current);
+          break;
+
+        default:
+          break;
+      }
+
+      onTimeChange();
+    }
   };
 
   var onHourInputChange = function onHourInputChange(e) {
@@ -141,32 +137,6 @@ var TimePicker = function TimePicker(props) {
     }
   };
 
-  var onMinuteInputBlur = function onMinuteInputBlur() {
-    // setMinute((prevMinute) => {
-    // let nextMinute = minuteRef.current;
-    // minutes.forEach((m, i) => {
-    //   const mNum = Number(m);
-    //   const nextMinuteNum = Number(nextMinute);
-    //   if (mNum === nextMinuteNum) {
-    //     nextMinute = m;
-    //   } else if (
-    //     mNum < nextMinuteNum
-    //     && Number(minutes[i + 1]) > nextMinuteNum
-    //   ) {
-    //     nextMinute = m;
-    //   } else if (nextMinuteNum > Number(minutes[minutes.length - 1])) {
-    //     nextMinute = "00";
-    //   }
-    // });
-    // minuteRef.current = nextMinute;
-    // });
-    // if (timeSetType === "minute" && mInputRef.current) {
-    //   mInputRef.current.focus();
-    // }
-    // onTimeChange();
-    setTimeSettingType('');
-  };
-
   var onMinuteInputChange = function onMinuteInputChange(e) {
     var v = e.target.value;
 
@@ -227,78 +197,52 @@ var TimePicker = function TimePicker(props) {
     return currTime;
   };
 
-  var handleKeyDown = function handleKeyDown(e) {
-    var keyCode = e.keyCode;
-
-    if ([_utils.KEYCODE.directionLeft, _utils.KEYCODE.directionRight].includes(keyCode)) {
-      setTimeSettingType(_utils.TargetMapByKeyCode[keyCode]);
-    }
-
-    if ([_utils.KEYCODE.directionUp, _utils.KEYCODE.directionDown].indexOf(keyCode) === -1) return;
-
-    switch (timeSetingtType) {
-      case 'hour':
-        hourRef.current = setTimeOnKeyboardDirectionChange(keyCode, 'hour', hourRef.current);
-        break;
-
-      case 'minute':
-        minuteRef.current = setTimeOnKeyboardDirectionChange(keyCode, 'minute', minuteRef.current);
-        break;
-
-      default:
-        break;
-    }
-
-    onTimeChange();
+  var showSelectorPop = function showSelectorPop() {
+    return setVisible(true);
   };
 
-  (0, _react.useEffect)(function () {
-    timerRef.current = setTimeout(function () {
-      document.removeEventListener('keydown', handleKeyDown);
-      timeSetingtType && document.addEventListener('keydown', handleKeyDown);
-    }, 0);
-    return function () {
-      clearTimeout(timerRef.current);
-      document.removeEventListener('keydown', handleKeyDown);
-    };
-  }, [timeSetingtType]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _utils.TimePickerClass
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_utils.TimePickerClass, "-trigger"), _defineProperty({}, "".concat(_utils.TimePickerClass, "-trigger--disabled"), disabled)),
     ref: triggerRef
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(_utils.TimePickerClass, "-inputs"), _defineProperty({}, "".concat(_utils.TimePickerClass, "-inputs--placeholder"), !value))
-  }, /*#__PURE__*/_react["default"].createElement(_timerPickerInput["default"], {
+    className: (0, _classnames["default"])("".concat(_utils.TimePickerClass, "-inputs"), _defineProperty({}, "".concat(_utils.TimePickerClass, "-inputs--placeholder"), !value)),
+    onClick: function onClick() {
+      return !enableKeyBoard && showSelectorPop();
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_timerPickerInput["default"], _extends({
     className: (0, _classnames["default"])("".concat(_utils.TimePickerClass, "-input"), {
-      active: timeSetingtType === 'hour'
+      active: enableKeyBoard && timeSetingtType === 'hour'
     }),
     disabled: disabled,
     maxLength: 2,
-    onBlur: onHourInputBlur,
+    onBlur: onBlurHandler,
     onChange: onHourInputChange,
     onClick: function onClick() {
-      return onInputClick('hour');
+      return !enableKeyBoard && showSelectorPop();
     },
     onFocus: function onFocus() {
       return onFocusHandler('hour');
     },
+    onKeyDown: onKeyDownHandler,
     ref: hInputRef,
     value: hourRef.current
-  }), /*#__PURE__*/_react["default"].createElement("span", null, ":"), /*#__PURE__*/_react["default"].createElement(_timerPickerInput["default"], {
+  }, restProps)), /*#__PURE__*/_react["default"].createElement("span", null, ":"), /*#__PURE__*/_react["default"].createElement(_timerPickerInput["default"], {
     className: (0, _classnames["default"])("".concat(_utils.TimePickerClass, "-input"), {
-      active: timeSetingtType === 'minute'
+      active: enableKeyBoard && timeSetingtType === 'minute'
     }),
     disabled: disabled,
     maxLength: 2,
-    onBlur: onMinuteInputBlur,
+    onBlur: onBlurHandler,
     onChange: onMinuteInputChange,
     onClick: function onClick() {
-      return onInputClick('minute');
+      return !enableKeyBoard && showSelectorPop();
     },
     onFocus: function onFocus() {
       return onFocusHandler('minute');
     },
+    onKeyDown: onKeyDownHandler,
     ref: mInputRef,
     value: minuteRef.current
   })), !disabled && /*#__PURE__*/_react["default"].createElement(_timePickerSelector["default"], _extends({
@@ -329,9 +273,7 @@ var TimePicker = function TimePicker(props) {
     }
   }, restProps), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(_utils.TimePickerClass, "-icon tu-icon-caret-down"),
-    onClick: function onClick() {
-      setVisible(true);
-    }
+    onClick: showSelectorPop
   }))));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.11.4-13",
+  "version": "1.11.4-17",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",