@titaui/pc 1.12.9-beta.3 → 1.12.11

package/lib/components/drawer/index.css

@@ -10,10 +10,6 @@
   box-shadow: 0px 0px 24px 0px rgba(127, 145, 180, 0.2);
 }
 
-.titaui-drawer.drawer-open.drawer-top .drawer-content-wrapper {
-  box-shadow: 0px 0px 24px 0px rgba(127, 145, 180, 0.2);
-}
-
 .titaui-drawer-content {
   height: 100%;
   display: flex;
@@ -207,8 +203,3 @@
 .drawer-right .drawer-content {
   border-radius: 24px 0 0 24px;
 }
-
-.drawer-top .drawer-content-wrapper,
-.drawer-top .drawer-content {
-  border-radius: 0 0 24px 24px;
-}

package/lib/components/drawer/index.js

@@ -56,7 +56,7 @@ var Drawer = function Drawer(props) {
 
   var visible = props.visible,
       _props$placement = props.placement,
-      placement = _props$placement === void 0 ? "right" : _props$placement,
+      placement = _props$placement === void 0 ? 'right' : _props$placement,
       children = props.children,
       _props$mask = props.mask,
       mask = _props$mask === void 0 ? false : _props$mask,
@@ -94,30 +94,27 @@ var Drawer = function Drawer(props) {
   }
 
   var autoClose = function autoClose(e) {
-    if ((0, _dom.hasAncestorElement)(e.target, "document-mouse-event-ignore,rc-tooltip,titaui-popup,rc-dialog-root,common-modal,in-modal,task-hot-add")) {
-      return;
-    }
-
+    if ((0, _dom.hasAncestorElement)(e.target, 'document-mouse-event-ignore,rc-tooltip,titaui-popup,rc-dialog-root,common-modal,in-modal,task-hot-add')) return;
     onClose();
   };
 
   (0, _react.useEffect)(function () {
     if (autoClosable) {
-      document.addEventListener("mousedown", autoClose);
+      document.addEventListener('mousedown', autoClose);
     }
 
     return function () {
-      document.removeEventListener("mousedown", autoClose);
+      document.removeEventListener('mousedown', autoClose);
     };
   }, []);
   return /*#__PURE__*/_react["default"].createElement(DrawerContext.Provider, {
     value: {
       close: function close() {
-        onClose();
+        props.onClose();
       }
     }
   }, /*#__PURE__*/_react["default"].createElement(_rcDrawer["default"], _extends({
-    className: (0, _classnames["default"])("titaui-drawer", "document-mouse-event-ignore", className),
+    className: (0, _classnames["default"])('titaui-drawer', 'document-mouse-event-ignore', className),
     style: _objectSpread(_objectSpread({}, style), {}, {
       zIndex: zIndex
     })
@@ -170,7 +167,7 @@ function DrawerHeader(_ref) {
     onClick: manager && manager.goBack
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "tu-icon-fanhui"
-  }), (0, _getLocale.getLocale)("Mod_Back")), showBackBtn && hasContent && /*#__PURE__*/_react["default"].createElement("div", {
+  }), (0, _getLocale.getLocale)('Mod_Back')), showBackBtn && hasContent && /*#__PURE__*/_react["default"].createElement("div", {
     className: "titaui-drawer-header-divider"
   }), hasContent && content, /*#__PURE__*/_react["default"].createElement("div", {
     style: {
@@ -181,7 +178,7 @@ function DrawerHeader(_ref) {
   }), !!collapsedActions.length && /*#__PURE__*/_react["default"].createElement(_headerAction["default"], {
     approvalSetting: approvalSetting,
     detailInfo: detailInfo,
-    title: (0, _getLocale.getLocale)("Mod_MoreOperate"),
+    title: (0, _getLocale.getLocale)('Mod_MoreOperate'),
     icon: "tu-icon-10",
     children: collapsedActions
   }), showClose && /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -29,8 +29,6 @@ var _precls = _interopRequireDefault(require("../../precls"));
 
 var _getLocale = require("../../../../utils/getLocale");
 
-var _tools = require("../../../../utils/tools");
-
 require("../../index.css");
 
 require("./index.css");
@@ -83,45 +81,30 @@ function AppraisalMenus(props) {
     okrMenusData.current = new _menus["default"]();
     return okrMenusData.current.getMenus();
   }),
-      _useState6 = _slicedToArray(_useState5, 2),
-      menus = _useState6[0],
-      setMenus = _useState6[1];
+      _useState6 = _slicedToArray(_useState5, 1),
+      menus = _useState6[0]; // 判断路由高亮菜单
 
-  (0, _react.useEffect)(function () {
-    okrMenusData.current = new _menus["default"]();
-    var newMenus = okrMenusData.current.getMenus();
-    setMenus(newMenus);
-
-    var _getQueryString = (0, _tools.getQueryString)(),
-        _getQueryString$react = _getQueryString.reactRouterName,
-        reactRouterName = _getQueryString$react === void 0 ? "" : _getQueryString$react;
-
-    if (!reactRouterName) {
-      window.location.href = newMenus[0].data.href;
-    }
-  }, [history.location.pathname]); // 判断路由高亮菜单
 
   (0, _react.useEffect)(function () {
     var menuHighlight = new _menuHighlight["default"](history);
     menuHighlight.highlight(function (menu) {
-      setSelectedMenuKeys([menu]);
+      return setSelectedMenuKeys([menu]);
     });
-  }, [history.location.pathname, history.location.search, menus]);
+  }, [history.location.pathname, history.location.search]);
 
   var onSelectHandler = function onSelectHandler(selectedKyes, _ref) {
     var node = _ref.node;
     onSelect(node); // 处理菜单选中
 
     if (!selectedKyes.length) return;
-    setSelectedMenuKeys(selectedKyes);
-
-    if (window.titaTracker) {
-      window.titaTracker("action").record({
-        actionName: "\u7EE9\u6548\u8003\u6838__".concat(node.title),
-        actionGroup: (0, _getLocale.getLocale)("Menu_Title_Performance"),
-        productName: (0, _getLocale.getLocale)("Menu_Title_Performance")
-      });
-    }
+    setSelectedMenuKeys(selectedKyes); // @ts-ignore
+
+    window.titaTracker // @ts-ignore
+    && window.titaTracker("action").record({
+      actionName: "\u7EE9\u6548\u8003\u6838__".concat(node.title),
+      actionGroup: (0, _getLocale.getLocale)("Menu_Title_Performance"),
+      productName: (0, _getLocale.getLocale)("Menu_Title_Performance")
+    });
   };
 
   var collapseMenu = function collapseMenu(isHide) {
@@ -134,7 +117,6 @@ function AppraisalMenus(props) {
 
   (0, _react.useEffect)(function () {
     var obs = new _resizeObserverPolyfill["default"](function (entries) {
-      // eslint-disable-next-line no-restricted-syntax
       var _iterator = _createForOfIteratorHelper(entries),
           _step;
 

package/lib/components/menus/export-modules/appraisal-menus/menu-highlight.js

@@ -25,7 +25,7 @@ var _default = /*#__PURE__*/function () {
     key: "highlight",
     value: function highlight(cb) {
       if (this.isMy()) cb(_menus.PAGE_MY_APPRAISAL);else if (this.isEvaluate()) cb(_menus.PAGE_EVALUATE_APPRAISAL);else if (this.isSubordinate()) cb(_menus.PAGE_SUBORDINATE_APPRAISAL);else if (this.isDepart()) cb(_menus.PAGE_DEPART_APPRAISAL);else if (this.isManage()) cb(_menus.PAGE_MANAGE_APPRAISAL);else if (this.isLibrary()) cb(_menus.PAGE_LIBRARY_APPRAISAL); // template library 正则匹配优先级
-      else if (this.isTemplate()) cb(_menus.PAGE_TEMPLATE_APPRAISAL);else if (this.isDashboard()) cb(_menus.PAGE_DASHBOARD_APPRAISAL);else if (this.isReport()) cb(_menus.PAGE_STATISTICS_APPRAISAL);else if (this.isScore()) cb(_menus.PAGE_SCORE_APPRAISAL);else if (this.isHelp()) cb(_menus.PAGE_HELP_APPRAISAL);
+      else if (this.isTemplate()) cb(_menus.PAGE_TEMPLATE_APPRAISAL);else if (this.isScore()) cb(_menus.PAGE_SCORE_APPRAISAL);else if (this.isHelp()) cb(_menus.PAGE_HELP_APPRAISAL);
     }
   }, {
     key: "isMy",
@@ -84,35 +84,19 @@ var _default = /*#__PURE__*/function () {
       return pathname.match(/performance/) && search.match(/reactRouterName[\s]*?=[\s]*?templateLibrary/);
     }
   }, {
-    key: "isDashboard",
-    value: function isDashboard() {
+    key: "isScore",
+    value: function isScore() {
       var _this$history$locatio8 = this.history.location,
           pathname = _this$history$locatio8.pathname,
           search = _this$history$locatio8.search;
-      return pathname.match(/performance/) && search.match(/reactRouterName[\s]*?=[\s]*?dashboard/);
-    }
-  }, {
-    key: "isReport",
-    value: function isReport() {
-      var _this$history$locatio9 = this.history.location,
-          pathname = _this$history$locatio9.pathname,
-          search = _this$history$locatio9.search;
-      return pathname.match(/performance/) && search.match(/reactRouterName[\s]*?=[\s]*?report/);
-    }
-  }, {
-    key: "isScore",
-    value: function isScore() {
-      var _this$history$locatio10 = this.history.location,
-          pathname = _this$history$locatio10.pathname,
-          search = _this$history$locatio10.search;
       return pathname.match(/performance/) && search.match(/reactRouterName[\s]*?=[\s]*?setting/);
     }
   }, {
     key: "isHelp",
     value: function isHelp() {
-      var _this$history$locatio11 = this.history.location,
-          pathname = _this$history$locatio11.pathname,
-          search = _this$history$locatio11.search;
+      var _this$history$locatio9 = this.history.location,
+          pathname = _this$history$locatio9.pathname,
+          search = _this$history$locatio9.search;
       return pathname.match(/performance/) && search.match(/reactRouterName[\s]*?=[\s]*?help/);
     }
   }]);

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultRefObject = exports["default"] = exports.PAGE_TEMPLATE_APPRAISAL = exports.PAGE_SUBORDINATE_APPRAISAL = exports.PAGE_STATISTICS_APPRAISAL = exports.PAGE_SCORE_APPRAISAL = exports.PAGE_MY_APPRAISAL = exports.PAGE_MANAGE_APPRAISAL = exports.PAGE_LIBRARY_APPRAISAL = exports.PAGE_HELP_APPRAISAL = exports.PAGE_EVALUATE_APPRAISAL = exports.PAGE_DEPART_APPRAISAL = exports.PAGE_DASHBOARD_APPRAISAL = void 0;
+exports.defaultRefObject = exports["default"] = exports.PAGE_TEMPLATE_APPRAISAL = exports.PAGE_SUBORDINATE_APPRAISAL = exports.PAGE_SCORE_APPRAISAL = exports.PAGE_MY_APPRAISAL = exports.PAGE_MANAGE_APPRAISAL = exports.PAGE_LIBRARY_APPRAISAL = exports.PAGE_HELP_APPRAISAL = exports.PAGE_EVALUATE_APPRAISAL = exports.PAGE_DEPART_APPRAISAL = void 0;
 
 var _bsGlobal = require("../../../../utils/bs-global");
 
@@ -60,10 +60,6 @@ var PAGE_SCORE_APPRAISAL = "score-appraisal";
 exports.PAGE_SCORE_APPRAISAL = PAGE_SCORE_APPRAISAL;
 var PAGE_HELP_APPRAISAL = "help-appraisal";
 exports.PAGE_HELP_APPRAISAL = PAGE_HELP_APPRAISAL;
-var PAGE_DASHBOARD_APPRAISAL = "dashboard-appraisal";
-exports.PAGE_DASHBOARD_APPRAISAL = PAGE_DASHBOARD_APPRAISAL;
-var PAGE_STATISTICS_APPRAISAL = "statistics-appraisal";
-exports.PAGE_STATISTICS_APPRAISAL = PAGE_STATISTICS_APPRAISAL;
 
 var AppraisalMenus = /*#__PURE__*/function () {
   function AppraisalMenus() {
@@ -117,13 +113,13 @@ var AppraisalMenus = /*#__PURE__*/function () {
     }, {
       icon: "yibiao",
       label: _i18n.locale.menu_dashboard_ass,
-      key: PAGE_DASHBOARD_APPRAISAL,
+      key: "dashboard-appraisal",
       href: "#/performance?reactRouterName=dashboard",
       isShow: performanceStatisticsAuthority
     }, {
       icon: "baobiao",
       label: _i18n.locale.menu_statistics_ass,
-      key: PAGE_STATISTICS_APPRAISAL,
+      key: "statistics-appraisal",
       href: "#/performance?reactRouterName=report",
       isShow: performanceStatisticsAuthority
     }, {
@@ -152,112 +148,21 @@ var AppraisalMenus = /*#__PURE__*/function () {
       href: "#/performance?reactRouterName=help",
       isShow: IsAssessManager
     }];
-    this.newMenus = {
-      myPerformance: [{
-        icon: "kaohe",
-        label: _i18n.locale.menu_myass,
-        key: PAGE_MY_APPRAISAL,
-        href: "#/performance/my?reactRouterName=self",
-        isShow: true
-      }, {
-        icon: "mypingjia",
-        label: _i18n.locale.menu_evaluated_ass,
-        key: PAGE_EVALUATE_APPRAISAL,
-        href: "#/performance/my?reactRouterName=evaluated",
-        isShow: true
-      }, {
-        icon: "caidan-xiashu",
-        label: _i18n.locale.menu_subordinate_ass,
-        key: PAGE_SUBORDINATE_APPRAISAL,
-        href: "#/performance/my?reactRouterName=subordinate",
-        isShow: HasSub
-      }, {
-        icon: "bumen",
-        label: _i18n.locale.menu_department_ass,
-        key: PAGE_DEPART_APPRAISAL,
-        href: "#/performance/my?reactRouterName=department",
-        isShow: IsLeader || IsHrbp
-      }],
-      performanceManage: [{
-        icon: "uniEA10",
-        label: _i18n.locale.menu_template_ass,
-        key: PAGE_TEMPLATE_APPRAISAL,
-        type: _index.MENU_ASSESS_TEMPLATE,
-        href: "#/performance/manage?reactRouterName=template",
-        isShow: performanceManageAuthority
-      }, {
-        icon: "untitled",
-        label: _i18n.locale.menu_management_ass,
-        key: PAGE_MANAGE_APPRAISAL,
-        type: _index.MENU_ASSESS_MANAGE,
-        href: "#/performance/manage?reactRouterName=manage",
-        isShow: performanceManageAuthority
-      }, {
-        icon: "",
-        label: _i18n.locale.menu_basesetting,
-        key: "base-appraisal-group",
-        type: _index.GROUP_NAME_NODE,
-        href: "",
-        isShow: performanceManageAuthority || IsAssessManager
-      }, {
-        icon: "ZBmuban",
-        label: _i18n.locale.menu_library_ass,
-        key: PAGE_LIBRARY_APPRAISAL,
-        href: "#/performance/manage?reactRouterName=templateLibrary",
-        isShow: performanceManageAuthority
-      }, {
-        icon: "PF-shezhi",
-        label: _i18n.locale.menu_score_ass,
-        key: PAGE_SCORE_APPRAISAL,
-        href: "#/performance/manage?reactRouterName=setting",
-        isShow: IsAssessManager
-      }],
-      performanceDashboard: [{
-        icon: "yibiao",
-        label: _i18n.locale.menu_dashboard_ass,
-        key: "dashboard-appraisal",
-        href: "#/performance/dashboard?reactRouterName=dashboard",
-        isShow: performanceStatisticsAuthority
-      }, {
-        icon: "baobiao",
-        label: _i18n.locale.menu_statistics_ass,
-        key: "statistics-appraisal",
-        href: "#/performance/dashboard?reactRouterName=report",
-        isShow: performanceStatisticsAuthority
-      }]
-    };
   }
 
   _createClass(AppraisalMenus, [{
     key: "getMenus",
     value: function getMenus() {
-      var isUseNewMenu = window.BSGlobal.isUseNewMenu;
-      var menus = this.menus;
-
-      if (isUseNewMenu) {
-        var hash = window.location.hash.split("?")[0] || "";
-
-        if (hash) {
-          if (hash.includes("performance/my")) {
-            menus = this.newMenus.myPerformance;
-          } else if (hash.includes("performance/manage")) {
-            menus = this.newMenus.performanceManage;
-          } else {
-            menus = this.newMenus.performanceDashboard;
-          }
-        }
-      }
-
-      return this.formateToTreeNodeData(menus);
-    } // eslint-disable-next-line class-methods-use-this
-
+      var menus = this.formateToTreeNodeData();
+      return menus;
+    }
   }, {
     key: "formateToTreeNodeData",
-    value: function formateToTreeNodeData(menus) {
+    value: function formateToTreeNodeData() {
       var treeNodes = [];
 
-      for (var i = 0; i < menus.length; i += 1) {
-        var menu = menus[i];
+      for (var i = 0; i < this.menus.length; i += 1) {
+        var menu = this.menus[i];
 
         if (menu.isShow) {
           treeNodes.push({

package/lib/components/menus/export-modules/demo-menus/menu-highlight.js

@@ -25,7 +25,7 @@ var _default = /*#__PURE__*/function () {
   _createClass(_default, [{
     key: "highlight",
     value: function highlight(cb) {
-      if (this.isUnAssigned()) cb(_menus.PAGE_UNASSIGNED_DEMOFREE);else if (this.isAssigned()) cb(_menus.PAGE_ASSIGNED_DEMOFREE);else if (this.isReserved()) cb(_menus.PAGE_RESERVED_DEMOFREE);else if (this.isDone()) cb(_menus.PAGE_DONE_DEMOFREE);else if (this.isIgnore()) cb(_menus.PAGE_IGNORED_DEMOFREE);else if (this.isChart()) cb(_menus.PAGE_CHARTS_DEMOFREE);else if (this.isRechargeList()) cb(_menus.PAGE_RECHARGE_LIST);else if (this.isRechargeStatistics()) cb(_menus.PAGE_RECHARGE_STATISTICS);else if (this.isRechargeStatus()) cb(_menus.PAGE_RECHARGE_STATUS);else if (this.isDueDateOrder()) cb(_menus.PAGE_DUEDATE_ORDER);
+      if (this.isUnAssigned()) cb(_menus.PAGE_UNASSIGNED_DEMOFREE);else if (this.isAssigned()) cb(_menus.PAGE_ASSIGNED_DEMOFREE);else if (this.isReserved()) cb(_menus.PAGE_RESERVED_DEMOFREE);else if (this.isDone()) cb(_menus.PAGE_DONE_DEMOFREE);else if (this.isIgnore()) cb(_menus.PAGE_IGNORED_DEMOFREE);else if (this.isChart()) cb(_menus.PAGE_CHARTS_DEMOFREE);else if (this.isRechargeList()) cb(_menus.PAGE_RECHARGE_LIST);else if (this.isRechargeStatistics()) cb(_menus.PAGE_RECHARGE_STATISTICS);else if (this.isRechargeStatus()) cb(_menus.PAGE_RECHARGE_STATUS);else if (this.isDueDateOrder()) cb(_menus.PAGE_DUEDATE_ORDER);else if (this.isAllCustomer()) cb(_menus.PAGE_ALL_CUSTOMER);else if (this.isPublicCustomer()) cb(_menus.PAGE_PUBLIC_CUSTOMER);else if (this.isMyCustomer()) cb(_menus.PAGE_MY_CUSTOMER);
     }
   }, {
     key: "isChart",
@@ -102,6 +102,24 @@ var _default = /*#__PURE__*/function () {
           search = _this$history$locatio5.search;
       return pathname.match(/demofree/) && search.match(/selected[\s]*?=[\s]*?ignore/);
     }
+  }, {
+    key: "isPublicCustomer",
+    value: function isPublicCustomer() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/demofree\/customer\/public/);
+    }
+  }, {
+    key: "isMyCustomer",
+    value: function isMyCustomer() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/demofree\/customer\/my/);
+    }
+  }, {
+    key: "isAllCustomer",
+    value: function isAllCustomer() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/demofree\/customer\/all/);
+    }
   }]);
 
   return _default;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultRefObject = exports["default"] = exports.PAGE_UNASSIGNED_DEMOFREE = exports.PAGE_RESERVED_DEMOFREE = exports.PAGE_RECHARGE_STATUS = exports.PAGE_RECHARGE_STATISTICS = exports.PAGE_RECHARGE_LIST = exports.PAGE_IGNORED_DEMOFREE = exports.PAGE_DUEDATE_ORDER = exports.PAGE_DONE_DEMOFREE = exports.PAGE_CHARTS_DEMOFREE = exports.PAGE_ASSIGNED_DEMOFREE = void 0;
+exports.defaultRefObject = exports["default"] = exports.PAGE_UNASSIGNED_DEMOFREE = exports.PAGE_RESERVED_DEMOFREE = exports.PAGE_RECHARGE_STATUS = exports.PAGE_RECHARGE_STATISTICS = exports.PAGE_RECHARGE_LIST = exports.PAGE_PUBLIC_CUSTOMER = exports.PAGE_MY_CUSTOMER = exports.PAGE_IGNORED_DEMOFREE = exports.PAGE_DUEDATE_ORDER = exports.PAGE_DONE_DEMOFREE = exports.PAGE_CHARTS_DEMOFREE = exports.PAGE_CHARTS = exports.PAGE_ASSIGNED_DEMOFREE = exports.PAGE_ALL_CUSTOMER = void 0;
 
 var _index = require("../../components/menu-tree/tree-node/index");
 
@@ -40,6 +40,14 @@ var PAGE_IGNORED_DEMOFREE = "ignore";
 exports.PAGE_IGNORED_DEMOFREE = PAGE_IGNORED_DEMOFREE;
 var PAGE_CHARTS_DEMOFREE = "charts";
 exports.PAGE_CHARTS_DEMOFREE = PAGE_CHARTS_DEMOFREE;
+var PAGE_ALL_CUSTOMER = "allCustomer";
+exports.PAGE_ALL_CUSTOMER = PAGE_ALL_CUSTOMER;
+var PAGE_PUBLIC_CUSTOMER = "publicCustomer";
+exports.PAGE_PUBLIC_CUSTOMER = PAGE_PUBLIC_CUSTOMER;
+var PAGE_MY_CUSTOMER = "myCustomer";
+exports.PAGE_MY_CUSTOMER = PAGE_MY_CUSTOMER;
+var PAGE_CHARTS = "charts";
+exports.PAGE_CHARTS = PAGE_CHARTS;
 var PAGE_RECHARGE_LIST = "rechargeList";
 exports.PAGE_RECHARGE_LIST = PAGE_RECHARGE_LIST;
 var PAGE_DUEDATE_ORDER = "dueDateOrder";
@@ -91,6 +99,31 @@ var DemoMenuData = /*#__PURE__*/function () {
         href: "#/demofree/list?selected=ignore",
         isShow: this.isManager === EManagerType.Manager
       }]
+    }, {
+      icon: "KH-help",
+      label: "公海资源",
+      key: "customer",
+      href: "#/demofree/customer/public",
+      isShow: true,
+      children: [{
+        icon: "",
+        label: "全部客户",
+        key: PAGE_ALL_CUSTOMER,
+        href: "#/demofree/customer/all",
+        isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager
+      }, {
+        icon: "",
+        label: "公海资源",
+        key: PAGE_PUBLIC_CUSTOMER,
+        href: "#/demofree/customer/public",
+        isShow: this.isManager !== EManagerType.ReCharge
+      }, {
+        icon: "",
+        label: "我的资源",
+        key: PAGE_MY_CUSTOMER,
+        href: "#/demofree/customer/my",
+        isShow: this.isManager !== EManagerType.ReCharge
+      }]
     }, {
       icon: "KH-help",
       label: "客户续费",

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

@@ -78,7 +78,6 @@ var okrMenus = /*#__PURE__*/function () {
       hasDashboardAuth = true;
     }
 
-    var isUseNewMenu = window.BSGlobal.isUseNewMenu;
     this.menus = [{
       icon: "okr",
       label: _i18n.locale.menu_myokr,
@@ -133,22 +132,20 @@ var okrMenus = /*#__PURE__*/function () {
       label: _i18n.locale.menu_okrmap,
       key: PAGE_OKR_MAP,
       type: _index.MENU_ITEM_NOE,
-      href: "#/okr/map",
-      isShow: !isUseNewMenu
+      href: "#/okr/map"
     }, {
       icon: "panel",
       label: _i18n.locale.menu_okr_working_method,
       type: _index.MENU_ITEM_NOE,
       key: PAGE_OKR_FUNCTION,
-      href: "#/okr/panel",
-      isShow: !isUseNewMenu
+      href: "#/okr/panel"
     }, {
       icon: "yibiao",
       label: _i18n.locale.menu_okrdashboard,
       key: PAGE_OKR_DASHBOARD,
       type: _index.MENU_ITEM_NOE,
       href: "#/okr/chart?iTalentFrameType=iframe&iTalentFrame=%2F%2Fwww.tita.gift%2Fmenuroute%3FmenuId%3D44269%26roleId%3D",
-      isShow: hasDashboardAuth && !isUseNewMenu
+      isShow: hasDashboardAuth
     }, {
       icon: "cases",
       label: _i18n.locale.menu_okrcases,

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

@@ -19,6 +19,8 @@ var _popup = _interopRequireDefault(require("../../../popup"));
 
 var _conditionRender = _interopRequireDefault(require("../../../../components/condition-render"));
 
+var _useGlobalValue3 = _interopRequireDefault(require("../../useGlobalValue"));
+
 var _new = _interopRequireDefault(require("./img/new.svg"));
 
 require("./index.css");
@@ -74,10 +76,12 @@ var Menu = function Menu(_ref) {
   var _useState3 = (0, _react.useState)(false),
       _useState4 = _slicedToArray(_useState3, 2),
       popupVisible = _useState4[0],
-      setPopupVisible = _useState4[1]; // const [feedNum] = useGlobalValue();
+      setPopupVisible = _useState4[1];
 
+  var _useGlobalValue = (0, _useGlobalValue3["default"])(),
+      _useGlobalValue2 = _slicedToArray(_useGlobalValue, 1),
+      feedNum = _useGlobalValue2[0];
 
-  var feedNum = 20;
   var containerRef = (0, _react.useRef)();
   var apiPath = (0, _bsGlobal.getBSGlobal)("apiPath");
   var userId = (0, _bsGlobal.getUserInfo)().Id;

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

@@ -18,14 +18,14 @@
   height: 54px;
   border-radius: 0px 0px 0px 24px;
   box-sizing: border-box;
-  padding-left: 20px;
+  padding: 0 10px 0 20px;
   cursor: default;
 }
 
 .titaui-nav-top__left-home {
   display: inline-flex;
   border-radius: 4px;
-  margin-right: 24px;
+  padding: 4px;
 }
 
 .titaui-nav-top__left-home--active {
@@ -33,8 +33,8 @@
 }
 
 .titaui-nav-top__left-home-img {
-  width: 24px;
-  height: 24px;
+  width: 20px;
+  height: 20px;
 }
 
 .titaui-nav-top__left-home--hover:hover {
@@ -50,41 +50,6 @@
   cursor: pointer;
 }
 
-.titaui-nav-top__left-dynamic, .titaui-nav-top__left-app-center {
-  font-size: 24px;
-  color: #ffffff;
-  padding: 2px;
-  margin-right: 14px;
-  border-radius: 8px;
-  cursor: pointer;
-}
-
-.titaui-nav-top__left-dynamic:hover, .titaui-nav-top__left-dynamic--active, .titaui-nav-top__left-app-center:hover, .titaui-nav-top__left-app-center--active {
-  background: rgba(255, 255, 255, 0.2);
-}
-
-.titaui-nav-top__left-dynamic {
-  position: relative;
-}
-
-.titaui-nav-top__left-dynamic-feed-num {
-  position: absolute;
-  right: -6px;
-  top: -2px;
-  background: #fe5042;
-  border-radius: 18px;
-  height: 16px;
-  font-size: 12px;
-  color: #ffffff;
-  line-height: 18px;
-  padding: 0 4px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  min-width: 8px;
-  font-weight: 400;
-}
-
 .titaui-nav-top__line {
   width: 1px;
   min-width: 1px;
@@ -103,8 +68,8 @@
 
 .titaui-nav-top__msg {
   margin-right: 24px;
-  width: 24px;
-  height: 24px;
+  width: 20px;
+  height: 20px;
   cursor: pointer;
   display: inline-flex;
 }