@titaui/pc 1.6.32 → 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/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

@@ -135,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;
         }
       }
@@ -167,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': {}
@@ -191,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
@@ -226,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
@@ -236,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) {

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/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/pages/new-okr-list/header/index.css

@@ -156,3 +156,7 @@
 .tita-okr-list-v2__period-selector {
   border-radius: 12px;
 }
+
+.tita-okr-list-v2__period-selector .titaui-period-selector button {
+  color: #374755;
+}

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/package.json

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