@titaui/pc 1.15.47-beta.1 → 1.15.48

package/lib/components/menus/components/menu-tree/tree-node/summary-follower/index.js

@@ -0,0 +1,77 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = _default;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _i18n = require("../../../../i18n");
+
+var _openData = require("../../../../../../utils/open-data");
+
+var _tooltip = _interopRequireDefault(require("../../../../../tooltip"));
+
+var _context = require("../../../../context");
+
+var _avatar = _interopRequireDefault(require("../avatar"));
+
+var _precls = _interopRequireDefault(require("../../precls"));
+
+var _getLocale = require("../../../../../../utils/getLocale");
+
+require("./index.css");
+
+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); }
+
+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 _default(props) {
+  var user = props.data,
+      _props$level = props.level,
+      level = _props$level === void 0 ? 0 : _props$level;
+
+  var _useContext = (0, _react.useContext)(_context.SummaryMenusContext),
+      onRemoveConcerner = _useContext.onRemoveConcerner;
+
+  var onCancelFollowHandler = function onCancelFollowHandler(e) {
+    e.stopPropagation();
+    onRemoveConcerner(user);
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    title: "",
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__follower-node")),
+    style: {
+      paddingLeft: 12 + level * 10
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
+    user: user
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    style: {
+      width: "calc(100% - ".concat(12 + 13 + 15 + level * 10, "px)")
+    },
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__follower-node-username"), "noselect")
+  }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+    name: user.name,
+    id: user.userId
+  })), /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__follower-node-cancel")),
+    onClick: onCancelFollowHandler
+  }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)(_i18n.locale.unsubscribe)),
+    placement: "top",
+    align: {
+      offset: [0, 5]
+    }
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "tu-icon-cross"
+  }))));
+}

package/lib/components/menus/components/menu-tree/tree-node/summary-user-concern.js

@@ -0,0 +1,95 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = _default;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _userSelector = _interopRequireDefault(require("../../../../user-selector"));
+
+var _requestApis = require("../../../request-apis");
+
+var _toast = _interopRequireDefault(require("../../../../toast"));
+
+var _context = require("../../../context");
+
+var _precls = _interopRequireDefault(require("../precls"));
+
+require("./index.css");
+
+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); }
+
+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 _default(props) {
+  var onExpand = props.onExpand,
+      title = props.title,
+      data = props.data;
+  var userRef = (0, _react.useRef)();
+
+  var _useContext = (0, _react.useContext)(_context.SummaryMenusContext),
+      onAddConcerner = _useContext.onAddConcerner;
+
+  var onExpandHander = function onExpandHander(e) {
+    onExpand(e);
+  };
+
+  var onAddConcernHandler = function onAddConcernHandler(e) {
+    e.stopPropagation(); // @ts-ignore
+
+    userRef.current && userRef.current.open();
+  };
+
+  var onUserSelectHandler = function onUserSelectHandler(users, _, e) {
+    (0, _requestApis.addSummaryFollower)(users[0].data.userId).then(function (res) {
+      if (res.Code != 1) {
+        _toast["default"].Error(res.Message, {});
+
+        return;
+      }
+
+      onAddConcerner(users[0]);
+    })["catch"](function (err) {
+      return console.log(err);
+    });
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__user-concern-node")),
+    onClick: onExpandHander,
+    title: ""
+  }, data.icon && /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__user-concern-node-icon"), data.icon)
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__user-concern-node-title"), "noselect")
+  }, title), /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__user-concern-node-add"), "noselect"),
+    onClick: onAddConcernHandler
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "tu-icon-add1"
+  })), /*#__PURE__*/_react["default"].createElement(_userSelector["default"], {
+    ref: userRef,
+    multiple: false,
+    position: "bottomLeft",
+    onSelect: onUserSelectHandler,
+    disabledDepartSelect: true,
+    showSearchInput: true,
+    searchedPanes: {
+      user: true,
+      depart: false,
+      group: false
+    },
+    trigger: /*#__PURE__*/_react["default"].createElement("span", null),
+    panes: {
+      depart: true
+    }
+  }));
+}

package/lib/components/menus/context.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.OkrMenusContext = exports.FlipContext = void 0;
+exports.SummaryMenusContext = exports.OkrMenusContext = exports.FlipContext = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -15,4 +15,8 @@ exports.OkrMenusContext = OkrMenusContext;
 
 var FlipContext = /*#__PURE__*/_react["default"].createContext();
 
-exports.FlipContext = FlipContext;
+exports.FlipContext = FlipContext;
+
+var SummaryMenusContext = /*#__PURE__*/_react["default"].createContext();
+
+exports.SummaryMenusContext = SummaryMenusContext;

package/lib/components/menus/export-modules/summary-menus/menus.js

@@ -13,6 +13,18 @@ var _getLocale = require("../../../../utils/getLocale");
 
 var _bsGlobal = require("../../../../utils/bs-global");
 
+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."); }
+
+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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -61,6 +73,7 @@ var summaryMenus = /*#__PURE__*/function () {
     _classCallCheck(this, summaryMenus);
 
     this.COMPANYALL = _index.COMPANY_ALL_NODE;
+    this.USERCONCERN = _index.SUMMARY_USER_CONCERN_NODE;
     this.SHARE = _index.SHARE_NODE;
     this.TONGJI = _index.TONGJI_NODE;
     this.SUBORDINATES = _index.SUBORDINATES_NODE;
@@ -105,6 +118,13 @@ var summaryMenus = /*#__PURE__*/function () {
       children: [],
       href: "#/summary/share",
       isShow: props.isShowShare
+    }, {
+      icon: "guanzhu",
+      label: _i18n.locale.menu_concerned_user,
+      key: this.USERCONCERN,
+      type: this.USERCONCERN,
+      href: "#/summary/all",
+      isShow: true
     }, {
       icon: "bumen",
       label: _i18n.locale.menu_department,
@@ -278,6 +298,108 @@ var summaryMenus = /*#__PURE__*/function () {
 
       this.menus[3].children = treeNodeUsers;
     }
+  }, {
+    key: "setConcernLoading",
+    value: function setConcernLoading(loading) {
+      this.menus[5].children = [];
+
+      if (loading) {
+        this.menus[5].children.push({
+          icon: '',
+          label: 'loading',
+          key: 'loading-concern',
+          type: _index.LOADING_NODE,
+          href: '',
+          data: {}
+        });
+      }
+    }
+  }, {
+    key: "checkConcernExist",
+    value: function checkConcernExist(user) {
+      var concerns = this.menus[5].children;
+
+      for (var i = 0; i < concerns.length; i++) {
+        var it = concerns[i];
+
+        if (it.key == "concern-".concat(user.userId)) {
+          return true;
+        }
+      }
+
+      return false;
+    }
+  }, {
+    key: "insertConcern",
+    value: function insertConcern(users) {
+      var treeNodeUsers = []; // 如果没有关注者，显示空
+
+      this.setEmptyConcerners(false);
+
+      if (!users || !users.length) {
+        this.setEmptyConcerners(true);
+      }
+
+      for (var i = 0; i < users.length; i++) {
+        var user = users[i];
+        if (this.checkConcernExist(user)) continue;
+        treeNodeUsers.push({
+          icon: '',
+          label: user.name,
+          key: "concern-".concat(user.userId),
+          type: _index.SUMMARY_FOLLOWER_NODE,
+          href: '',
+          data: user
+        });
+      }
+
+      this.menus[5].children = this.menus[5].children.concat(treeNodeUsers);
+    }
+  }, {
+    key: "addConcerner",
+    value: function addConcerner(user) {
+      if (this.menus[5].children.length && this.menus[5].children[0].key == 'empty-concerners') {
+        this.menus[5].children = [];
+      }
+
+      this.menus[5].children.push({
+        icon: '',
+        label: user.name,
+        key: "concern-".concat(user.userId),
+        type: _index.SUMMARY_FOLLOWER_NODE,
+        href: '',
+        data: user
+      });
+    }
+  }, {
+    key: "setEmptyConcerners",
+    value: function setEmptyConcerners(empty) {
+      this.menus[5].children = [];
+
+      if (empty) {
+        this.menus[5].children.push({
+          icon: '',
+          label: 'empty-concerners',
+          key: 'empty-concerners',
+          type: _index.NO_FOLLOWER_NODE,
+          href: '',
+          data: {}
+        });
+      }
+    }
+  }, {
+    key: "removeConcerner",
+    value: function removeConcerner(user) {
+      var newChildren = _toConsumableArray(this.menus[5].children).filter(function (it) {
+        return it.key != "concern-".concat(user.userId);
+      });
+
+      if (!newChildren.length) {
+        this.setEmptyConcerners(true);
+      } else {
+        this.menus[5].children = newChildren;
+      }
+    }
   }, {
     key: "getMenus",
     value: function getMenus() {

package/lib/components/menus/export-modules/summary-menus/summary-front-menus.js

@@ -25,6 +25,8 @@ var _requestApis = require("../../request-apis");
 
 var _requestApi = require("./request-api");
 
+var _context = require("../../context");
+
 var _auth = require("../../../../utils/auth");
 
 require("../../index.css");
@@ -122,7 +124,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var nodeType = node.nodeType,
         data = node.data;
 
-    if (nodeType == _index.USER_NODE || nodeType == _index.FOLLOWER_NODE || nodeType == _index.SAME_LEVEL_USER_NODE) {
+    if (nodeType == _index.USER_NODE || nodeType == _index.FOLLOWER_NODE || nodeType == _index.SAME_LEVEL_USER_NODE || nodeType == _index.SUMMARY_FOLLOWER_NODE) {
       location.href = "#/summary/manage?toUserId=".concat(data.userId, "&subordinates=1");
     }
 
@@ -196,6 +198,23 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         resolve(true);
       })["catch"](reject);
     });
+  }; // 获取关注的人数据列表
+
+
+  var getConcerners = function getConcerners() {
+    return new Promise(function (resolve, reject) {
+      var mdata = summaryMenusData.current; // 初始化 Loading
+
+      mdata.setConcernLoading(true);
+      setMenus(mdata.getMenus());
+      resolve(true); // 获取数据
+
+      (0, _requestApis.getSummaryFollowerList)().then(function (user) {
+        mdata.setConcernLoading(false);
+        mdata.insertConcern(user);
+        setMenus(mdata.getMenus());
+      })["catch"](reject);
+    });
   };
 
   var onLoadTreeNodeDataHandler = function onLoadTreeNodeDataHandler(treeNode) {
@@ -218,6 +237,12 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         })["catch"](function () {
           return resolve(true);
         });
+      } else if (treeNode.key == summaryMenusData.current.USERCONCERN) {
+        getConcerners().then(function () {
+          return resolve(true);
+        })["catch"](function () {
+          return resolve(true);
+        });
       } else {
         resolve(true);
       }
@@ -230,6 +255,22 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     setExpandedKeys(expandKeys);
   };
 
+  var onAddConcerner = function onAddConcerner(user) {
+    var mdata = summaryMenusData.current;
+    mdata.addConcerner(user.data);
+    setMenus(mdata.getMenus());
+  };
+
+  var onRemoveConcerner = function onRemoveConcerner(user) {
+    (0, _requestApis.removeSummaryFollower)(user.userId).then(function (res) {
+      if (res.Code == 1) {
+        var mdata = summaryMenusData.current;
+        mdata.removeConcerner(user);
+        setMenus(mdata.getMenus());
+      }
+    });
+  };
+
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       setSelectedMenuKeys: setSelectedMenuKeys
@@ -279,7 +320,12 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       obs.unobserve(document.body);
     };
   }, []);
-  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_scrollbar["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_context.SummaryMenusContext.Provider, {
+    value: {
+      onAddConcerner: onAddConcerner,
+      onRemoveConcerner: onRemoveConcerner
+    }
+  }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_scrollbar["default"], {
     style: {
       maxHeight: maxHeight
     }
@@ -290,7 +336,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     onSelect: onSelectHandler,
     onExpand: onExpandHandler,
     loadData: onLoadTreeNodeDataHandler
-  })));
+  }))));
 });
 
 exports["default"] = _default;

package/lib/components/menus/index.js

@@ -23,8 +23,6 @@ var _demoMenus = _interopRequireDefault(require("./export-modules/demo-menus"));
 
 var _summaryMenus = _interopRequireDefault(require("./export-modules/summary-menus"));
 
-var _surveyMenu = _interopRequireDefault(require("./export-modules/survey-menu"));
-
 var _excluded = ["type"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -64,10 +62,6 @@ var Menus = function Menus(props) {
       return /*#__PURE__*/_react["default"].createElement(_summaryMenus["default"], restProps);
     }
 
-    if (type === 'survey') {
-      return /*#__PURE__*/_react["default"].createElement(_surveyMenu["default"], restProps);
-    }
-
     return undefined;
   };
 

package/lib/components/menus/request-apis.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.removeFollower = exports.getTongjiUsersData = exports.getSubordinates = exports.getShareUsersData = exports.getMyDepartMent = exports.getFollowerList = exports.getDepsAndUsers = exports.addFollower = void 0;
+exports.removeSummaryFollower = exports.removeFollower = exports.getTongjiUsersData = exports.getSummaryFollowerList = exports.getSubordinates = exports.getShareUsersData = exports.getMyDepartMent = exports.getFollowerList = exports.getDepsAndUsers = exports.addSummaryFollower = exports.addFollower = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
@@ -41,6 +41,14 @@ var getFollowerList = function getFollowerList() {
 
 exports.getFollowerList = getFollowerList;
 
+var getSummaryFollowerList = function getSummaryFollowerList() {
+  return _axios["default"].post("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/follow/general/getFollower?moduleType=8")).then(function (res) {
+    return res.data.Data;
+  });
+};
+
+exports.getSummaryFollowerList = getSummaryFollowerList;
+
 // export const checkHasSubordinates = () => {
 //   return axios.get(`${requestDomain()}/api/v2/${tenantId}/${userId}/user/getSubUserCount?toUserId=${userId}&countType=1`, {
 //     'headers': {
@@ -173,4 +181,32 @@ var getMyDepartMent = function getMyDepartMent() {
   return (0, _request.rget)('v2')("department/sub/depsAndUsersByPrivilege?objType=8&isGetUser=false");
 };
 
-exports.getMyDepartMent = getMyDepartMent;
+exports.getMyDepartMent = getMyDepartMent;
+
+var addSummaryFollower = function addSummaryFollower(id) {
+  return _axios["default"].post("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/follow/general/addFollower?followerId=").concat(id, "&moduleType=8"), null, {
+    headers: {
+      "Content-Type": "application/json; charset=utf-8",
+      Accept: "application/json, application/xml, text/play, text/html, *.*"
+    },
+    withCredentials: true
+  }).then(function (res) {
+    return res.data;
+  });
+};
+
+exports.addSummaryFollower = addSummaryFollower;
+
+var removeSummaryFollower = function removeSummaryFollower(id) {
+  return _axios["default"].post("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/follow/general/delFollower?followerId=").concat(id, "&moduleType=8"), null, {
+    headers: {
+      "Content-Type": "application/json; charset=utf-8",
+      Accept: "application/json, application/xml, text/play, text/html, *.*"
+    },
+    withCredentials: true
+  }).then(function (res) {
+    return res.data;
+  });
+};
+
+exports.removeSummaryFollower = removeSummaryFollower;

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

@@ -91,7 +91,6 @@ var AppCenter = function AppCenter(props) {
       isTrial = _useState6[0];
 
   var _useState7 = (0, _react.useState)(function () {
-    console.log(apps);
     var localCurrentAppId = sessionStorage.getItem("LocalCurrentAppId_".concat(userId));
 
     if (localCurrentAppId) {
@@ -125,7 +124,6 @@ var AppCenter = function AppCenter(props) {
       return app.id === currentAppId;
     })) === null || _apps$find === void 0 ? void 0 : _apps$find.children) || [];
     var navigations = (0, _utils.getMenus)();
-    console.log(currentAppId, 'currentAppId');
     sessionStorage.setItem("LocalCurrentAppId_".concat(userId), currentAppId.toString());
     var dynamic = navigations.filter(function (item) {
       return item.code === 'dynamic';
@@ -154,7 +152,6 @@ var AppCenter = function AppCenter(props) {
       return;
     }
 
-    console.log(app, 'app');
     setCurrentAppId(app.id);
     closeAppCenter();
   };
@@ -235,7 +232,7 @@ var AppCenter = function AppCenter(props) {
         });
       }
 
-      if (!activeMenu) {
+      if (!activeMenu && newQuickMenu.length > 0) {
         var _newQuickMenu$2;
 
         window.location.href = (_newQuickMenu$2 = newQuickMenu[0]) === null || _newQuickMenu$2 === void 0 ? void 0 : _newQuickMenu$2.href;
@@ -243,15 +240,9 @@ var AppCenter = function AppCenter(props) {
     }
   };
 
-  var handleSetting = function handleSetting(e) {
-    var _QuickEntranceDialogR;
-
-    e.stopPropagation();
-    (_QuickEntranceDialogR = QuickEntranceDialogRef.current) === null || _QuickEntranceDialogR === void 0 ? void 0 : _QuickEntranceDialogR.showDialog();
-  };
-
   var RenderSettingBtn = function RenderSettingBtn(props) {
-    var app = props.app;
+    var app = props.app,
+        QuickEntranceDialogRef = props.QuickEntranceDialogRef;
 
     var _useState9 = (0, _react.useState)(false),
         _useState10 = _slicedToArray(_useState9, 2),
@@ -261,14 +252,39 @@ var AppCenter = function AppCenter(props) {
     (0, _react.useEffect)(function () {
       var cacheIsKonw = localStorage.getItem("AppCenterSettingGuide_".concat((0, _helpers.getLoginUserInfo)().Id));
       !cacheIsKonw && setSettingGuideVisible(true);
-    });
+    }, []);
 
     var handleSettingGuideClose = function handleSettingGuideClose() {
       localStorage.setItem("AppCenterSettingGuide_".concat((0, _helpers.getLoginUserInfo)().Id), (0, _helpers.getLoginUserInfo)().Id);
+      setSettingGuideVisible(false);
+    };
+
+    var onHandleClickGuideTip = function onHandleClickGuideTip(e) {
+      //用来阻止事件冒泡
+      e.stopPropagation();
+    };
+
+    var handleSetting = function handleSetting(e) {
+      var _QuickEntranceDialogR;
+
+      e.stopPropagation();
+      (_QuickEntranceDialogR = QuickEntranceDialogRef.current) === null || _QuickEntranceDialogR === void 0 ? void 0 : _QuickEntranceDialogR.showDialog();
+      handleSettingGuideClose();
+
+      if (window.titaTracker) {
+        window.titaTracker('action').record({
+          actionName: '快捷入口设置',
+          actionGroup: '新菜单设置',
+          productName: '系统菜单'
+        });
+      }
     };
 
     if (app.appId === 1) {
-      return /*#__PURE__*/_react["default"].createElement(_guideTip["default"], {
+      return /*#__PURE__*/_react["default"].createElement("span", {
+        className: "".concat(precls, "__app-item-name__right-btn"),
+        onClick: onHandleClickGuideTip
+      }, /*#__PURE__*/_react["default"].createElement(_guideTip["default"], {
         visible: settingGuideVisible,
         content: /*#__PURE__*/_react["default"].createElement("div", {
           className: "".concat(precls, "__app-item-name__right-btn__guide-tip")
@@ -277,9 +293,8 @@ var AppCenter = function AppCenter(props) {
         popupPlacement: 'bottom',
         type: 'button'
       }, /*#__PURE__*/_react["default"].createElement("span", {
-        className: "".concat(precls, "__app-item-name__right-btn"),
         onClick: handleSetting
-      }, "\u8BBE\u7F6E"));
+      }, "\u8BBE\u7F6E")));
     }
 
     return /*#__PURE__*/_react["default"].createElement("span", null);
@@ -312,7 +327,8 @@ var AppCenter = function AppCenter(props) {
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(precls, "__app-item-name")
     }, /*#__PURE__*/_react["default"].createElement("span", null, app.title), /*#__PURE__*/_react["default"].createElement(RenderSettingBtn, {
-      app: app
+      app: app,
+      QuickEntranceDialogRef: QuickEntranceDialogRef
     })), isTrial && /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(precls, "__app-item-sub-title")
     }, app.subTitle)));

package/lib/components/okr-detail/auth.js

@@ -11,7 +11,7 @@ var _bsGlobal = require("../../utils/bs-global");
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -21,7 +21,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }