@titaui/pc 1.6.29 → 1.6.33

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

@@ -86,10 +86,6 @@
   user-select: none;
 }
 
-.titaui-rect-btn--disabled:hover {
-  background: unset;
-}
-
 .titaui-rect-btn--primary.titaui-rect-btn--small {
   line-height: 28px;
 }
@@ -101,3 +97,12 @@
 .titaui-rect-btn--primary.titaui-rect-btn--big {
   line-height: 34px;
 }
+
+.titaui-rect-btn--primary.titaui-rect-btn--disabled {
+  background: #93BCFF;
+  opacity: 1;
+}
+
+.titaui-rect-btn--primary.titaui-rect-btn--disabled:hover {
+  background: #93BCFF;
+}

package/lib/components/checkbox/index.css

@@ -4,7 +4,7 @@
   height: 16px;
   background: #FFFFFF;
   border-radius: 4px;
-  border: 1px solid #E9ECF0;
+  border: 1px solid #DFE3EA;
   cursor: pointer;
   box-sizing: border-box;
 }

package/lib/components/drawer/index.css

@@ -25,6 +25,7 @@
   padding: 0 32px;
   color: #141C28;
   font-weight: 500;
+  font-size: 16px;
 }
 
 .titaui-drawer-header-back {
@@ -73,7 +74,7 @@
 
 .titaui-drawer-header-close {
   color: #141c28;
-  font-size: 18px;
+  font-size: 20px;
   cursor: pointer;
   margin-left: 18px;
   font-weight: bold;
@@ -163,6 +164,9 @@
   background-repeat: no-repeat;
 }
 
-.drawer-left .drawer-content-wrapper, .drawer-right .drawer-content-wrapper, .drawer-left .drawer-content, .drawer-right .drawer-content {
+.drawer-left .drawer-content-wrapper,
+.drawer-right .drawer-content-wrapper,
+.drawer-left .drawer-content,
+.drawer-right .drawer-content {
   border-radius: 24px 0 0 24px;
 }

package/lib/components/dynamic/dynamic.js

@@ -145,6 +145,9 @@ var Dynamic = function Dynamic() {
   var contentRef = (0, _react.useRef)();
   var currentPage = (0, _react.useRef)(1);
   var loginUser = window.BSGlobal.loginUserInfo;
+  (0, _react.useEffect)(function () {
+    document.title = "动态";
+  }, []);
 
   var changeTabActive = function changeTabActive(key) {
     setActiveFirstLevelTabKey(key); // @ts-ignore

package/lib/components/menus/components/drag-resize/index.css

@@ -4,15 +4,19 @@
   width: 10px;
   height: calc(100% - 52px);
   top: 40px;
-  right: -5px;
+  right: -3px;
 }
 
 .titaui-drag-resize__bar-darg {
   position: absolute;
-  width: 3px;
+  width: 2px;
   height: 100%;
   top: 0;
   right: 0;
   cursor: ew-resize;
   border-radius: 15px;
 }
+
+.titaui-drag-resize__bar-darg:hover {
+  background: rgba(40, 121, 255, 0.16);
+}

package/lib/components/menus/components/flip-menu-card/flip-back-header.js

@@ -21,7 +21,7 @@ var _default = function _default(props) {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__inner-back-action")),
     onClick: onClick
   }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: (0, _classnames["default"])("".concat(_precls["default"], "__inner-back-action-icon"))
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__inner-back-action-icon"), "tu-icon-fanhui")
   }), /*#__PURE__*/_react["default"].createElement("span", null, "\u8FD4\u56DE"));
 };
 

package/lib/components/menus/components/flip-menu-card/index.css

@@ -124,9 +124,6 @@
 }
 
 .titaui-flip-card__inner-back-action-icon {
-  display: inline-block;
-  height: 14px;
-  width: 14px;
+  color: #89919f;
   margin-right: 2px;
-  background: url(./back-icon.svg) transparent no-repeat 50% 50%;
 }

package/lib/components/menus/components/flip-menu-card/index.js

@@ -78,6 +78,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var flipBackRef = (0, _react.useRef)();
 
   var goBackHandler = function goBackHandler() {
+    if (!isBack) return;
     setMenuHideIcon(true);
     flipBackRef.current.style.position = 'absolute';
     flipFrontRef.current.style.display = 'block';
@@ -90,6 +91,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   };
 
   var nextHandler = function nextHandler() {
+    if (isBack) return;
     setMenuHideIcon(true);
     flipFrontRef.current.style.position = 'absolute';
     flipBackRef.current.style.display = 'block';

package/lib/components/menus/components/menu-tree/tree-node/depart-node/index.css

@@ -15,7 +15,7 @@
   color: #a3acb9;
 }
 
-.titaui-menus-tree__depart-node:hover {
+.titaui-menus-tree__depart-node:hover .titaui-menus-tree__depart-node-title {
   color: #2879ff;
 }
 

package/lib/components/menus/components/search-colleague/index.js

@@ -99,6 +99,9 @@ var _default = function _default(props) {
     panes: {
       'depart': false,
       'group': false
+    },
+    popupAlign: {
+      'offset': [62, 2]
     }
   }));
 };

package/lib/components/menus/export-modules/appraisal-menus/datas.js

@@ -74,7 +74,7 @@ var AppraisalMenus = /*#__PURE__*/function () {
       'isShow': performanceManageAuthority
     }, {
       'icon': 'uniEA10',
-      'label': '考核表',
+      'label': '考核模版',
       'key': 'template-appraisal',
       'href': '#/performance?reactRouterName=template',
       'isShow': performanceManageAuthority

package/lib/components/menus/export-modules/okr-menus/datas.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.defaultRefObject = exports["default"] = void 0;
 
+var _auth = require("../../../../utils/auth");
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -46,6 +48,13 @@ var okrMenus = /*#__PURE__*/function () {
     this.MYOKR = 'myokr';
     this.SUBORDINATES = 'subordinates';
     this.COMPANYALL = 'company-all';
+    var hasDashboardAuth = false;
+    var baseAuth = new _auth.BaseAuth();
+
+    if (baseAuth.isBoss() || baseAuth.isManager() || baseAuth.isDepartmentLeader()) {
+      hasDashboardAuth = true;
+    }
+
     this.menus = [{
       'icon': 'okr',
       'label': '我的 OKR',
@@ -103,7 +112,8 @@ var okrMenus = /*#__PURE__*/function () {
       'icon': 'yibiao',
       'label': 'OKR 仪表盘',
       'key': 'panzi',
-      'href': '#/okr/chart?iTalentFrameType=iframe&iTalentFrame=%2F%2Fwww.tita.gift%2Fmenuroute%3FmenuId%3D44269%26roleId%3D'
+      'href': '#/okr/chart?iTalentFrameType=iframe&iTalentFrame=%2F%2Fwww.tita.gift%2Fmenuroute%3FmenuId%3D44269%26roleId%3D',
+      'isShow': hasDashboardAuth
     }, {
       'icon': 'panel',
       'label': 'OKR 工作法',
@@ -125,7 +135,7 @@ var okrMenus = /*#__PURE__*/function () {
       for (var i = 0; i < concerns.length; i++) {
         var it = concerns[i];
 
-        if (it.key == "".concat(user.userId)) {
+        if (it.key == "concern-".concat(user.userId)) {
           return true;
         }
       }
@@ -157,7 +167,7 @@ var okrMenus = /*#__PURE__*/function () {
         this.menus[1].children.push({
           'icon': '',
           'label': 'loading',
-          'key': "loading-concern",
+          'key': "loading-subordinates",
           'type': 'loading',
           'href': '',
           'data': {}
@@ -181,7 +191,7 @@ var okrMenus = /*#__PURE__*/function () {
         treeNodeUsers.push({
           'icon': '',
           'label': user.name,
-          'key': "".concat(user.userId),
+          'key': "concern-".concat(user.userId),
           'type': 'follower',
           'href': '',
           'data': user
@@ -216,7 +226,7 @@ var okrMenus = /*#__PURE__*/function () {
       this.menus[2].children.push({
         'icon': '',
         'label': user.name,
-        'key': "".concat(user.userId),
+        'key': "concern-".concat(user.userId),
         'type': 'follower',
         'href': '',
         'data': user
@@ -226,7 +236,7 @@ var okrMenus = /*#__PURE__*/function () {
     key: "removeConcerner",
     value: function removeConcerner(user) {
       var newChildren = _toConsumableArray(this.menus[2].children).filter(function (it) {
-        return it.key != user.userId;
+        return it.key != "concern-".concat(user.userId);
       });
 
       if (!newChildren.length) {
@@ -257,8 +267,9 @@ var okrMenus = /*#__PURE__*/function () {
   }, {
     key: "getMenus",
     value: function getMenus() {
-      var menus = this.formateToTreeNodeData(this.menus);
-      1;
+      var menus = this.formateToTreeNodeData(this.menus.filter(function (it) {
+        return it.isShow === undefined || it.isShow == true;
+      }));
       return menus;
     }
   }, {

package/lib/components/menus/export-modules/okr-menus/depart-menus/index.css

@@ -0,0 +1,4 @@
+.titaui-menus__depart-menus .rc-tree-treenode-selected .titaui-menus-tree__depart-node-title {
+  color: #2879ff;
+  font-weight: 500;
+}

package/lib/components/menus/export-modules/okr-menus/depart-menus/index.js

@@ -9,6 +9,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _menuTree = _interopRequireDefault(require("../../../components/menu-tree"));
 
 var _requestApis = require("../../../request-apis");
@@ -58,9 +60,14 @@ var _default = function _default() {
       rawTreeData = _useState4[0],
       setRawTreeData = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(window.BSGlobal.OkrAdvancedSetting.KRSetting.OkrDepsShowUser),
-      _useState6 = _slicedToArray(_useState5, 1),
-      isGetUser = _useState6[0];
+  var _useState5 = (0, _react.useState)([]),
+      _useState6 = _slicedToArray(_useState5, 2),
+      selectedMenuKeys = _useState6[0],
+      setSelectedMenuKeys = _useState6[1];
+
+  var _useState7 = (0, _react.useState)(window.BSGlobal.OkrAdvancedSetting.KRSetting.OkrDepsShowUser),
+      _useState8 = _slicedToArray(_useState7, 1),
+      isGetUser = _useState8[0];
 
   (0, _react.useEffect)(function () {
     (0, _requestApis.getDepsAndUsers)(-1, isGetUser).then(function (rawTreeData) {
@@ -101,8 +108,10 @@ var _default = function _default() {
     });
   };
 
-  var onSelectHandler = function onSelectHandler(_id, _ref) {
+  var onSelectHandler = function onSelectHandler(selectedKyes, _ref) {
     var node = _ref.node;
+    // 处理菜单选中
+    if (!selectedKyes.length) return;
     var nodeType = node.nodeType,
         data = node.data;
 
@@ -111,14 +120,19 @@ var _default = function _default() {
     } else if (nodeType == "depart-node") {
       location.href = "#/okr/manage?departmentName=".concat(data.name, "&departmentId=").concat(data.id);
     }
+
+    setSelectedMenuKeys(selectedKyes);
   };
 
-  return /*#__PURE__*/_react["default"].createElement(_menuTree["default"], {
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("titaui-menus__depart-menus")
+  }, /*#__PURE__*/_react["default"].createElement(_menuTree["default"], {
     data: treeData,
     onSelect: onSelectHandler,
     defaultExpandedKeys: ["0"],
+    selectedKeys: selectedMenuKeys,
     loadData: onLoadTreeNodeDataHandler
-  });
+  }));
 };
 
 exports["default"] = _default;

package/lib/components/menus/export-modules/okr-menus/index.js

@@ -96,6 +96,7 @@ var OkrMenus = function OkrMenus(props) {
 
     if (pathname.match(/okr\/manage/) && search.match(/relation[\s]*?=[\s]*?1/)) {
       setSelectedMenuKeys(['myownerokr']);
+      flipRef.current.goback();
     }
   }, [history.location.pathname, history.location.search]);
 

package/lib/components/nav-top/components/user-message/components/inform/inform-item.js

@@ -62,6 +62,11 @@ var Inform = function Inform(props) {
     if (objType === _constant.EObjType.Task) {
       window.Talent.app.vent.trigger('global-pull-screen', objId, 'task');
       return;
+    }
+
+    if (objType === _constant.EObjType.Remind) {
+      window.Talent.app.vent.trigger('global-daily-detail-pull-screen', objId);
+      return;
     } // 日报
     // if () {
     // 	// @ts-ignore
@@ -75,16 +80,16 @@ var Inform = function Inform(props) {
     if (!isMessageMerging) {
       if (messageType === _constant.informType.details) {
         window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/taskinfo?Id=").concat(item.objId), '_blank');
-      } else if (item.objId) {
+      } else if (item.objId && objType !== 8) {
         window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#work?work_id=").concat(item.objId));
       } else if (messageType === _constant.informType.todayJob) {
         window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#plan?tag_id=0&tag_type=0&filter=1"));
       } else if (messageType === _constant.informType.daily) {
         var str = item.content.slice(0, 18);
         var Year = str.slice(4, 8);
-        var Month = "";
-        var Day = "";
-        var Week = "";
+        var Month = '';
+        var Day = '';
+        var Week = '';
 
         if (isNaN(parseInt(str.charAt(10)))) {
           Month = str.slice(9, 10);
@@ -113,10 +118,8 @@ var Inform = function Inform(props) {
         } else {
           window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#/daily?to_user_id=").concat(_constant.userId, "&group_id=9&tag_type=1&date=").concat(Year, "/").concat(Month, "/").concat(parseInt(Week) * 7, "&tag_id=").concat(parseInt(Month) + 1, "&dailyType=2"));
         }
-      } else {
-        if (item.objUrl) {
-          window.open(item.objUrl);
-        }
+      } else if (item.objUrl) {
+        window.open(item.objUrl);
       }
 
       return;

package/lib/components/nav-top/components/user-message/constant.js

@@ -42,4 +42,5 @@ exports.EObjType = EObjType;
   EObjType[EObjType["Assess"] = 23] = "Assess";
   EObjType[EObjType["MileStone"] = 27] = "MileStone";
   EObjType[EObjType["KanBan"] = 66] = "KanBan";
+  EObjType[EObjType["Remind"] = 8] = "Remind";
 })(EObjType || (exports.EObjType = EObjType = {}));

package/lib/components/nav-top/components/user-message/index.css

@@ -27,7 +27,7 @@
 .titaui-user-message__msg-total {
   position: absolute;
   background: #F05E5E;
-  box-shadow: 0px 2px 4px 0px rgba(240, 94, 94, 0.4), 0px 0px 2px 1px rgba(255, 255, 255, 0.5);
+  box-shadow: 0px 2px 4px 0px rgba(240, 94, 94, 0.6), inset 0px 0px 2px 1px rgba(255, 255, 255, 0.4);
   border-radius: 8px;
   font-size: 12px;
   font-family: ArialMT;

package/lib/components/nav-top/components/user-message/utils.js

@@ -27,6 +27,8 @@ var deleteText = function deleteText(text) {
     text = text.trim().slice(0, -4);
   } else if (last === '进入月报') {
     text = text.trim().slice(0, -4);
+  } else if (last === '进入项目') {
+    text = text.trim().slice(0, -4);
   } else {
     text = text;
   }

package/lib/components/period-selector/index.js

@@ -160,7 +160,7 @@ function PeriodSelector(_ref) {
   });
 
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])('titaui-period-selector'),
+    className: (0, _classnames["default"])("titaui-period-selector"),
     style: style
   }, /*#__PURE__*/_react["default"].createElement(_popup["default"], {
     popupVisible: visible,
@@ -176,14 +176,14 @@ function PeriodSelector(_ref) {
     type: "default",
     style: noBorder ? {
       padding: "0",
-      border: 'none'
+      border: "none"
     } : {
       padding: "6px 12px"
     }
   }, /*#__PURE__*/_react["default"].createElement("span", {
     style: {
-      'lineHeight': '18px',
-      'whiteSpace': 'nowrap'
+      lineHeight: "18px",
+      whiteSpace: "nowrap"
     }
   }, (0, _common.formatPeriod)(selectedPeriod)), /*#__PURE__*/_react["default"].createElement("span", {
     className: "titaui-period-selector__down-arrow"

package/lib/components/photo-card/index.js

@@ -142,7 +142,7 @@ var PhotoCard = function PhotoCard(props) {
   }))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: isAttention === true && userId !== userownInfo.Id
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-    overlay: "\u5173\u6CE8 / \u53D6\u6D88\u5173\u6CE8",
+    overlay: "\u53D6\u6D88\u5173\u6CE8",
     placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: _attention["default"],
@@ -153,7 +153,7 @@ var PhotoCard = function PhotoCard(props) {
   }))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: isAttention === false && userId !== userownInfo.Id
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-    overlay: "\u5173\u6CE8 / \u53D6\u6D88\u5173\u6CE8",
+    overlay: "\u5173\u6CE8",
     placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])("".concat(prefixCls, "__img"), "tu-icon-guanzhu-x"),

package/lib/components/tree/index.css

@@ -1,7 +1,6 @@
 .titaui-tree {
   position: relative;
   overflow: hidden;
-  height: 100%;
 }
 
 .titaui-tree .rc-tree-list-holder {

package/lib/components/user-selector/select-tree/choose-tree/index.css

@@ -2,6 +2,10 @@
   height: 100%;
 }
 
+.perspm-tree .titaui-tree {
+  height: 100%;
+}
+
 .perspm-tree__close {
   display: inline-block;
   position: absolute;
@@ -11,7 +15,7 @@
   border-radius: 50%;
   background: url(../../images/close.svg) transparent no-repeat 50% 50%;
   vertical-align: middle;
-  transition: all .2s;
+  transition: all 0.2s;
   cursor: pointer;
 }
 
@@ -30,7 +34,7 @@
   margin-left: 8px;
   background: #000000;
   background: url(../../images/checked.svg) transparent no-repeat 50% 50%;
-  transition: all .2s;
+  transition: all 0.2s;
   cursor: pointer;
 }
 
@@ -48,7 +52,7 @@
 }
 
 .perspm-tree .rc-tree-treenode:hover {
-  background: #F7F8FA;
+  background: #f7f8fa;
 }
 
 .perspm-tree .rc-tree-child-tree {

package/lib/components-v1/radio/style/index.css

@@ -30,7 +30,7 @@
   bottom: 0;
   border-radius: 100px;
   background-color: #fff;
-  border: 1px solid #92979c;
+  border: 1px solid #DFE3EA;
   transition: all 300ms;
 }
 

package/lib/pages/aha2021/index.js

@@ -29,10 +29,31 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 var preCls = "titaui-aha-2021";
 
 var ContentTemplate = function ContentTemplate(props) {
-  var children = props.children;
+  var children = props.children,
+      title = props.title;
+
+  var _useState = (0, _react.useState)(window.BSGlobal.tenantAuthentication.Version == 1),
+      _useState2 = _slicedToArray(_useState, 1),
+      isTrial = _useState2[0];
+
+  (0, _react.useEffect)(function () {
+    if (title) document.title = title;
+  }, []);
   if (_react.Children.count(children) == 0) return /*#__PURE__*/_react["default"].createElement("div", null);
 
   if (_react.Children.count(children) == 1) {

package/lib/pages/new-okr-list/header/filter.js

@@ -9,8 +9,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _moment = _interopRequireDefault(require("moment"));
-
 var _tooltip = _interopRequireDefault(require("../../../components/tooltip"));
 
 var _pc = require("@titaui/pc");
@@ -68,11 +66,7 @@ var Filter = function Filter(props) {
       filterNum = _useState4[0],
       setFilterNum = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(useLocalStorage.getItem("okr-filter-cycle") || {
-    annualNum: new Date().getFullYear() + "",
-    cycleType: "2",
-    yqmNum: "".concat((0, _moment["default"])().quarter())
-  }),
+  var _useState5 = (0, _react.useState)(useLocalStorage.getItem("okr-filter-cycle") || ""),
       _useState6 = _slicedToArray(_useState5, 2),
       cycle = _useState6[0],
       setCycle = _useState6[1];

package/lib/pages/new-okr-list/header/index.css

@@ -49,10 +49,6 @@
   justify-content: space-between;
 }
 
-.tita-okr-list-v2__header-filter .titaui-period-selector button {
-  color: #374755;
-}
-
 .tita-okr-list-v2__header-filter-text {
   display: flex;
   align-items: center;
@@ -81,7 +77,7 @@
   width: 16px;
   height: 16px;
   background: #f7b500;
-  box-shadow: 0px 2px 4px 0px rgba(246, 189, 22, 0.4), 0px 0px 2px 1px rgba(255, 255, 255, 0.5);
+  box-shadow: 0px 2px 4px 0px rgba(246, 189, 22, 0.4), inset 0px 0px 2px 1px rgba(255, 255, 255, 0.5);
   border-radius: 8px;
   font-size: 12px;
   font-family: ArialMT;
@@ -157,6 +153,10 @@
   font-size: 14px;
 }
 
-.tita-okr-list-v2__header__period-selector {
+.tita-okr-list-v2__period-selector {
   border-radius: 12px;
 }
+
+.tita-okr-list-v2__period-selector .titaui-period-selector button {
+  color: #374755;
+}

package/lib/pages/new-okr-list/index.js

@@ -88,6 +88,11 @@ var NewOkrList = function NewOkrList(props) {
     targetCategory: "",
     targetSort: ""
   };
+  var filterCycle = useLocalStorage.getItem("okr-filter-cycle") || {
+    annualNum: new Date().getFullYear() + "",
+    cycleType: "2",
+    yqmNum: "".concat((0, _moment["default"])().quarter())
+  };
   var showWorkExecution = (0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting").KRSetting.ShowWorkExecution;
 
   var _useState = (0, _react.useState)(true),
@@ -119,9 +124,9 @@ var NewOkrList = function NewOkrList(props) {
     okrType: formFieldValues.okrType,
     okrClassify: formFieldValues.okrClassify,
     orderType: formFieldValues.orderType,
-    annualNum: new Date().getFullYear() + "",
-    cycleType: "2",
-    yqmNum: "".concat((0, _moment["default"])().quarter()),
+    annualNum: filterCycle.annualNum,
+    cycleType: filterCycle.cycleType,
+    yqmNum: filterCycle.yqmNum,
     onlyThisDept: false,
     keyWords: ""
   }),

package/lib/pages/new-okr-list/keyword-search/index.css

@@ -11,7 +11,7 @@
 
 .titaui-keyword-search--active {
   box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1), 0px 0px 4px 0px rgba(40, 121, 255, 0.3);
-  border: 1px solid #2879FF;
+  border: 1px solid #2879ff;
 }
 
 .titaui-keyword-search__del-icon {
@@ -25,13 +25,13 @@
   color: #f05e5e;
 }
 
-.titaui-keyword-search__search-icon {
+.titaui-keyword-search__search-icon.tu-icon-search {
   font-size: 20px !important;
   cursor: pointer;
 }
 
-.titaui-keyword-search__search-icon:hover {
-  color: #2879FF;
+.titaui-keyword-search__search-icon.tu-icon-search:hover {
+  color: #2879ff;
 }
 
 .titaui-keyword-search__input {

package/lib/pages/new-okr-list/request-api.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.visitOkrCyclePag = exports.okrSearch = exports.okrList = exports.okrCrowd = exports.getUserInfoById = exports.getOkrInfoWithListData = exports.getCycleSetting = void 0;
+exports.visitOkrCyclePag = exports.okrSearch = exports.okrList = exports.okrCrowd = exports.getUserInfoById = exports.getOkrSetting = exports.getOkrInfoWithListData = exports.getCycleSetting = void 0;
 
 var _request = require("../../utils/request");
 
@@ -25,7 +25,7 @@ var okrSearch = /*#__PURE__*/function () {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return (0, _request.rpost)('v1')('okr/search', _objectSpread({
+            return (0, _request.rpost)("v1")("okr/search", _objectSpread({
               orderType: 2,
               // 默认创建时间正序
               relation: 0,
@@ -65,7 +65,7 @@ var okrCrowd = /*#__PURE__*/function () {
         switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return (0, _request.rpost)('v1')("okr/crowd", _objectSpread({
+            return (0, _request.rpost)("v1")("okr/crowd", _objectSpread({
               orderType: 2
             }, param));
 
@@ -100,7 +100,7 @@ var getOkrInfoWithListData = /*#__PURE__*/function () {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            return _context3.abrupt("return", (0, _request.rget)('v1')("okr/list/specificOkr?okrId=".concat(okrId)));
+            return _context3.abrupt("return", (0, _request.rget)("v1")("okr/list/specificOkr?okrId=".concat(okrId)));
 
           case 1:
           case "end":
@@ -117,15 +117,40 @@ var getOkrInfoWithListData = /*#__PURE__*/function () {
 
 exports.getOkrInfoWithListData = getOkrInfoWithListData;
 
-var okrList = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(param) {
-    var res;
+var getOkrSetting = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
     return regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
-            _context4.next = 2;
-            return (0, _request.rpost)('v1')("okr/list?toUserId=".concat(param.toUserId), _objectSpread({
+            return _context4.abrupt("return", (0, _request.rget)("v1")("okr/cycleSetting").then(function (res) {
+              return res.Data;
+            }));
+
+          case 1:
+          case "end":
+            return _context4.stop();
+        }
+      }
+    }, _callee4);
+  }));
+
+  return function getOkrSetting() {
+    return _ref4.apply(this, arguments);
+  };
+}();
+
+exports.getOkrSetting = getOkrSetting;
+
+var okrList = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(param) {
+    var res;
+    return regeneratorRuntime.wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.next = 2;
+            return (0, _request.rpost)("v1")("okr/list?toUserId=".concat(param.toUserId), _objectSpread({
               orderType: 2,
               // 默认创建时间正序
               relation: 0,
@@ -133,94 +158,94 @@ var okrList = /*#__PURE__*/function () {
             }, param));
 
           case 2:
-            res = _context4.sent;
+            res = _context5.sent;
 
             if (!(res.Code == 1)) {
-              _context4.next = 5;
+              _context5.next = 5;
               break;
             }
 
-            return _context4.abrupt("return", res.Data);
+            return _context5.abrupt("return", res.Data);
 
           case 5:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
       }
-    }, _callee4);
+    }, _callee5);
   }));
 
   return function okrList(_x4) {
-    return _ref4.apply(this, arguments);
+    return _ref5.apply(this, arguments);
   };
 }();
 
 exports.okrList = okrList;
 
 var getUserInfoById = /*#__PURE__*/function () {
-  var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(toUserId) {
-    return regeneratorRuntime.wrap(function _callee5$(_context5) {
+  var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(toUserId) {
+    return regeneratorRuntime.wrap(function _callee6$(_context6) {
       while (1) {
-        switch (_context5.prev = _context5.next) {
+        switch (_context6.prev = _context6.next) {
           case 0:
-            return _context5.abrupt("return", (0, _request.rget)('v2')("user/GetById?toUserid=".concat(toUserId)));
+            return _context6.abrupt("return", (0, _request.rget)("v2")("user/GetById?toUserid=".concat(toUserId)));
 
           case 1:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
       }
-    }, _callee5);
+    }, _callee6);
   }));
 
   return function getUserInfoById(_x5) {
-    return _ref5.apply(this, arguments);
+    return _ref6.apply(this, arguments);
   };
 }();
 
 exports.getUserInfoById = getUserInfoById;
 
 var visitOkrCyclePag = /*#__PURE__*/function () {
-  var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(toUserId) {
-    return regeneratorRuntime.wrap(function _callee6$(_context6) {
+  var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(toUserId) {
+    return regeneratorRuntime.wrap(function _callee7$(_context7) {
       while (1) {
-        switch (_context6.prev = _context6.next) {
+        switch (_context7.prev = _context7.next) {
           case 0:
-            return _context6.abrupt("return", (0, _request.rpost)('v1')("okr/visitOkrCyclePag?toUserId=".concat(toUserId)));
+            return _context7.abrupt("return", (0, _request.rpost)("v1")("okr/visitOkrCyclePag?toUserId=".concat(toUserId)));
 
           case 1:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
       }
-    }, _callee6);
+    }, _callee7);
   }));
 
   return function visitOkrCyclePag(_x6) {
-    return _ref6.apply(this, arguments);
+    return _ref7.apply(this, arguments);
   };
 }();
 
 exports.visitOkrCyclePag = visitOkrCyclePag;
 
 var getCycleSetting = /*#__PURE__*/function () {
-  var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
-    return regeneratorRuntime.wrap(function _callee7$(_context7) {
+  var _ref8 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
+    return regeneratorRuntime.wrap(function _callee8$(_context8) {
       while (1) {
-        switch (_context7.prev = _context7.next) {
+        switch (_context8.prev = _context8.next) {
           case 0:
-            return _context7.abrupt("return", (0, _request.rget)('v1')('okr/cycleSetting'));
+            return _context8.abrupt("return", (0, _request.rget)("v1")("okr/cycleSetting"));
 
           case 1:
           case "end":
-            return _context7.stop();
+            return _context8.stop();
         }
       }
-    }, _callee7);
+    }, _callee8);
   }));
 
   return function getCycleSetting() {
-    return _ref7.apply(this, arguments);
+    return _ref8.apply(this, arguments);
   };
 }();
 

package/lib/pages/personal-info/components/base-info/index.js

@@ -55,11 +55,16 @@ var BaseInfo = function BaseInfo() {
       userInfo = _useState2[0],
       setUserInfo = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(true),
+  var _useState3 = (0, _react.useState)(false),
       _useState4 = _slicedToArray(_useState3, 2),
       isDisable = _useState4[0],
       setIsDisable = _useState4[1];
 
+  var _useState5 = (0, _react.useState)(false),
+      _useState6 = _slicedToArray(_useState5, 2),
+      isEdit = _useState6[0],
+      setIsEdit = _useState6[1];
+
   var handleSaveInfo = function handleSaveInfo() {
     //校验
     var err = formRef.current.verifing({
@@ -89,18 +94,21 @@ var BaseInfo = function BaseInfo() {
     setUserInfo(_objectSpread(_objectSpread({}, userInfo), {}, {
       name: value || ""
     }));
+    setIsEdit(true);
   };
 
   var handlePhoneChange = function handlePhoneChange(value) {
     setUserInfo(_objectSpread(_objectSpread({}, userInfo), {}, {
       mobile: value || ""
     }));
+    setIsEdit(true);
   };
 
   var handleEmailChange = function handleEmailChange(value) {
     setUserInfo(_objectSpread(_objectSpread({}, userInfo), {}, {
       email: value || ""
     }));
+    setIsEdit(true);
   };
 
   (0, _react.useEffect)(function () {
@@ -111,12 +119,12 @@ var BaseInfo = function BaseInfo() {
     });
   }, []);
   (0, _react.useEffect)(function () {
-    if (userInfo.name && userInfo.mobile) {
+    if (userInfo.name && userInfo.mobile && isEdit) {
       setIsDisable(false);
     } else {
       setIsDisable(true);
     }
-  }, [userInfo]);
+  }, [userInfo, isEdit]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
   }, /*#__PURE__*/_react["default"].createElement("div", {

package/lib/pages/personal-info/index.css

@@ -1,4 +1,3 @@
 .titaui-personal-info {
-  margin-top: 20px;
-  height: 100%;
+  height: calc(100% - 60px);
 }

package/lib/utils/auth.js

@@ -50,6 +50,11 @@ var BaseAuth = /*#__PURE__*/function () {
       // console.log('ismanager', this.loginUserInfor.IsOkrManager)
       return this.loginUserInfor.IsOkrManager;
     }
+  }, {
+    key: "isDepartmentLeader",
+    value: function isDepartmentLeader() {
+      return !this.loginUserInfor.IsBoss && this.loginUserInfor.IsLeader;
+    }
   }]);
 
   return BaseAuth;

package/package.json

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