@titaui/pc 1.12.80 → 1.12.84

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

@@ -21,10 +21,6 @@ var _conditionRender = _interopRequireDefault(require("../../../../components/co
 
 var _useGlobalValue3 = _interopRequireDefault(require("../../useGlobalValue"));
 
-var _guideTip = _interopRequireDefault(require("../../../guide-tip"));
-
-var _getLocale = require("../../../../utils/getLocale");
-
 var _new = _interopRequireDefault(require("./img/new.svg"));
 
 require("./index.css");
@@ -126,18 +122,23 @@ var Menu = function Menu(_ref) {
       component: "span"
     }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
       condition: menu.id
-    }, menu.href === NEWMENUS && /*#__PURE__*/_react["default"].createElement(_guideTip["default"], {
-      visible: guideVisible,
-      classnames: "".concat(prefix, "__guide"),
-      type: "button",
-      content: /*#__PURE__*/_react["default"].createElement("span", {
-        className: "".concat(prefix, "__guide-content")
-      }, (0, _getLocale.getLocale)('Rep_NewS_SuyUgraOKR')),
-      popupAlign: {
-        offset: [0, 140]
-      },
-      onClickClose: handleClickClose
-    }, /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("a", {
+    }, menu.href === NEWMENUS &&
+    /*#__PURE__*/
+    // <GuideTip
+    //   visible={guideVisible}
+    //   classnames={`${prefix}__guide`}
+    //   type="button"
+    //   content={
+    //     <span className={`${prefix}__guide-content`}>
+    //       {getLocale('Rep_NewS_SuyUgraOKR')}
+    //     </span>
+    //   }
+    //   popupAlign={{
+    //     offset: [0, 140],
+    //   }}
+    //   onClickClose={handleClickClose}
+    // >
+    _react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("a", {
       className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), _defineProperty({}, "".concat(prefix, "__menu-show--active"), activeMenuId === menu.id)),
       href: href,
       target: "_self",
@@ -148,7 +149,8 @@ var Menu = function Menu(_ref) {
       src: _new["default"],
       alt: "",
       className: "".concat(prefix, "__tips-new")
-    })))), menu.href !== NEWMENUS && /*#__PURE__*/_react["default"].createElement("a", {
+    }))) // </GuideTip>
+    , menu.href !== NEWMENUS && /*#__PURE__*/_react["default"].createElement("a", {
       className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), _defineProperty({}, "".concat(prefix, "__menu-show--active"), activeMenuId === menu.id)),
       href: href,
       target: "_self",

package/lib/components/task-relation-modal/okr-relation/relation-task-model/search-form.js

@@ -21,6 +21,8 @@ var _taskStatusSelect = _interopRequireDefault(require("../../search/task-status
 
 var _taskRelation = _interopRequireDefault(require("../../search/task-relation"));
 
+var _helpers = require("../../../../utils/helpers");
+
 var _principal = _interopRequireDefault(require("../../search/principal"));
 
 var _formatTime = require("../../../../utils/format-time");
@@ -29,6 +31,8 @@ var _getLocale = require("../../../../utils/getLocale");
 
 require("./index.css");
 
+var _loginUser$UserAvatar;
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -53,6 +57,16 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+var loginUser = (0, _helpers.getLoginUserInfo)();
+var user = {
+  userId: loginUser.Id,
+  name: loginUser.Name,
+  avatar: {
+    original: loginUser === null || loginUser === void 0 ? void 0 : (_loginUser$UserAvatar = loginUser.UserAvatar) === null || _loginUser$UserAvatar === void 0 ? void 0 : _loginUser$UserAvatar.Original,
+    color: '#bc97eb'
+  }
+};
+
 function SearchForm(props) {
   var onChange = props.onChange;
 
@@ -78,7 +92,7 @@ function SearchForm(props) {
       keyWords = _useState6[0],
       setKeyWords = _useState6[1];
 
-  var _useState7 = (0, _react.useState)([]),
+  var _useState7 = (0, _react.useState)([user]),
       _useState8 = _slicedToArray(_useState7, 2),
       users = _useState8[0],
       setUsers = _useState8[1];
@@ -127,7 +141,7 @@ function SearchForm(props) {
     multiple: false,
     onChange: setUsers,
     position: "bottomLeft",
-    isInitSelf: true,
+    initValue: users,
     setRelation: setRelation
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "rel-okr-tree__search-item"

package/lib/components/task-relation-modal/search/principal.js

@@ -17,12 +17,8 @@ var _openData = require("../../../utils/open-data");
 
 var _getLocale = require("../../../utils/getLocale");
 
-var _helpers = require("../../../utils/helpers");
-
 require("./search-dropdown/index.css");
 
-var _loginUser$UserAvatar;
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -41,16 +37,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var loginUser = (0, _helpers.getLoginUserInfo)();
-var user = {
-  userId: loginUser.Id,
-  name: loginUser.Name,
-  avatar: {
-    original: loginUser === null || loginUser === void 0 ? void 0 : (_loginUser$UserAvatar = loginUser.UserAvatar) === null || _loginUser$UserAvatar === void 0 ? void 0 : _loginUser$UserAvatar.Original,
-    color: '#bc97eb'
-  }
-};
-
 function Principal(props) {
   var onChange = props.onChange,
       _props$initValue = props.initValue,
@@ -95,10 +81,6 @@ function Principal(props) {
 
   (0, _react.useEffect)(function () {
     setIsInit(true);
-
-    if (isInitSelf) {
-      setUsers([user]);
-    }
   }, []);
   (0, _react.useEffect)(function () {
     setRelation(0);

package/lib/components/user-selector/request-apis.js

@@ -47,7 +47,8 @@ var getDepartments = function getDepartments(_ref) {
   if (auth && !authType) authType = 'okr';
   if (authType == 'okr') authTypeId = '62';
   if (authType == 'performance') authTypeId = '31';
-  if (authType == 'total') authTypeId = '0'; // 获取根节点
+  if (authType == 'total') authTypeId = '0';
+  if (authType == 'summary') authTypeId = '8'; // 获取根节点
   // 第一次获取根部门 nodeId == -1
 
   var isGetRootNode = isGetRoot && !isLoadNodes;

package/package.json

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