@titaui/pc 1.12.8 → 1.12.9-beta.11

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

@@ -8,24 +8,25 @@
   word-break: keep-all;
   white-space: nowrap;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
+  position: relative;
+  z-index: 1201;
 }
 
 .titaui-nav-top__left {
   display: inline-flex;
   justify-content: space-between;
   align-items: center;
-  min-width: 204px;
   height: 54px;
   border-radius: 0px 0px 0px 24px;
   box-sizing: border-box;
-  padding: 0 10px 0 20px;
+  padding: 0 20px;
   cursor: default;
 }
 
 .titaui-nav-top__left-home {
   display: inline-flex;
   border-radius: 4px;
-  padding: 4px;
+  margin-right: 24px;
 }
 
 .titaui-nav-top__left-home--active {
@@ -33,8 +34,8 @@
 }
 
 .titaui-nav-top__left-home-img {
-  width: 20px;
-  height: 20px;
+  width: 24px;
+  height: 24px;
 }
 
 .titaui-nav-top__left-home--hover:hover {
@@ -50,6 +51,46 @@
   cursor: pointer;
 }
 
+.titaui-nav-top__left-dynamic, .titaui-nav-top__left-app-center {
+  font-size: 24px;
+  color: #ffffff;
+  padding: 2px;
+  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;
+  margin-right: -6px;
+  margin-left: 20px;
+}
+
+.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__left-app-center {
+  margin-right: 12px;
+}
+
 .titaui-nav-top__line {
   width: 1px;
   min-width: 1px;
@@ -68,8 +109,8 @@
 
 .titaui-nav-top__msg {
   margin-right: 24px;
-  width: 20px;
-  height: 20px;
+  width: 24px;
+  height: 24px;
   cursor: pointer;
   display: inline-flex;
 }

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

@@ -11,25 +11,27 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _toast = _interopRequireDefault(require("../toast"));
+
 var _bsGlobal = require("../../utils/bs-global");
 
-var _userOwnMenu = _interopRequireDefault(require("./components/user-own-menu"));
+var _request = require("../../utils/request");
 
-var _useGlobalValue = _interopRequireDefault(require("./useGlobalValue"));
+var _appCenter = _interopRequireDefault(require("./components/app-center"));
+
+var _userOwnMenu = _interopRequireDefault(require("./components/user-own-menu"));
 
 var _menu = _interopRequireDefault(require("./components/menu"));
 
 var _userMessage = _interopRequireDefault(require("./components/user-message"));
 
-var _home = _interopRequireDefault(require("./images/home.png"));
-
 var _version = _interopRequireDefault(require("./components/version"));
 
-var _utils = require("./utils");
+var _useGlobalValue = _interopRequireDefault(require("./useGlobalValue"));
 
-var _request = require("../../utils/request");
+var _home = _interopRequireDefault(require("./images/home.png"));
 
-var _toast = _interopRequireDefault(require("../toast"));
+var _utils = require("./utils");
 
 require("./index.css");
 
@@ -63,9 +65,15 @@ var preCls = "titaui-nav-top";
 var NavTop = function NavTop() {
   var _classNames2;
 
-  var _useState = (0, _react.useState)((0, _utils.getMenus)()),
-      _useState2 = _slicedToArray(_useState, 1),
-      menu = _useState2[0];
+  var isUseNewMenu = window.BSGlobal.isUseNewMenu;
+
+  var _useState = (0, _react.useState)(function () {
+    if (isUseNewMenu) return [];
+    return (0, _utils.getMenus)();
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      menu = _useState2[0],
+      setMenu = _useState2[1];
 
   var versionInfo = (0, _bsGlobal.getBSGlobal)("tenantAuthentication");
 
@@ -74,6 +82,11 @@ var NavTop = function NavTop() {
       activeMenuId = _useState4[0],
       setActiveMenuId = _useState4[1];
 
+  var _useState5 = (0, _react.useState)(false),
+      _useState6 = _slicedToArray(_useState5, 2),
+      appCenterVisible = _useState6[0],
+      setAppCenterVisible = _useState6[1];
+
   var ua = navigator.userAgent.toLowerCase();
   var showWxInvite = (0, _bsGlobal.getTenantInfo)().mainCorpId && ua.indexOf("micromessenger") !== -1;
   var openWxInvite = (0, _react.useCallback)(function () {
@@ -84,15 +97,9 @@ var NavTop = function NavTop() {
         mode: "multi",
         // 必填，选择模式，single表示单选，multi表示多选
         selectedContextContact: 0 // 是否勾选当前环境的参与者。例如在群+号聊天附件栏打开，默认勾选当前群成员。
-        // "selectedOpenUserIds"["xxx","yyy"], // 非必填，已选用户OpenID列表。single模式忽略该参数。
-        // "selectedTickets"["ticket1","ticket2"] // 非必填，已选ticket列表。single模式忽略该参数
 
       }, function (res) {
         if (res.err_msg === "selectPrivilegedContact:ok") {
-          // var selectedUserList = res.result.userList; // 已选的成员列表
-          // for (var i = 0; i < selectedUserList.length; i++) {
-          //   var openUserId = selectedUserList[i].openUserId; //成员openUserId
-          // }
           var selectedTicket = res.result.selectedTicket.replace(/['"]/g, ""); // 已选的集合Ticket
 
           (0, _request.rpost)("v1")("wx/send/templateMessage?selectedTickets=".concat(selectedTicket)).then(function () {
@@ -107,6 +114,7 @@ var NavTop = function NavTop() {
   }, []);
 
   var handleHashChange = function handleHashChange() {
+    setAppCenterVisible(false);
     var hash = window.location.hash.split("?")[0] || "";
 
     if (hash) {
@@ -135,41 +143,54 @@ var NavTop = function NavTop() {
     return function () {
       window.removeEventListener("hashchange", handleHashChange);
     };
-  }, []);
+  }, [menu]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls))
   }, /*#__PURE__*/_react["default"].createElement("a", {
-    className: (0, _classnames["default"])("".concat(preCls, "__left")),
-    href: hasOKRApp ? "#homepage" : ""
+    className: "".concat(preCls, "__left"),
+    href: "#dynamic"
   }, /*#__PURE__*/_react["default"].createElement("img", {
     alt: "logo",
     src: Logo,
-    className: (0, _classnames["default"])("".concat(preCls, "__left-logo"), _defineProperty({}, "".concat(preCls, "__left-logo--hover"), hasOKRApp))
-  }), hasOKRApp && /*#__PURE__*/_react["default"].createElement("span", {
-    className: (0, _classnames["default"])("".concat(preCls, "__left-home"), (_classNames2 = {}, _defineProperty(_classNames2, "".concat(preCls, "__left-home--active"), activeMenuId === 99999), _defineProperty(_classNames2, "".concat(preCls, "__left-home--hover"), hasOKRApp), _classNames2))
-  }, /*#__PURE__*/_react["default"].createElement("img", {
-    alt: "home-img",
-    src: _home["default"],
-    className: (0, _classnames["default"])("".concat(preCls, "__left-home-img"))
-  }))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__left-logo")
+  })), isUseNewMenu && /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(preCls, "__left-app-center"), "document-mouse-event-ignore", "tu-icon-work-m", _defineProperty({}, "".concat(preCls, "__left-app-center--active"), appCenterVisible)),
+    onClick: function onClick() {
+      return setAppCenterVisible(!appCenterVisible);
+    }
+  }), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__line"))
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__middle"))
   }, /*#__PURE__*/_react["default"].createElement(_menu["default"], {
     menus: menu,
     activeMenuId: activeMenuId
-  })), showWxInvite && /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(preCls, "__invite")),
+  })), hasOKRApp && /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__left-home"), (_classNames2 = {}, _defineProperty(_classNames2, "".concat(preCls, "__left-home--active"), activeMenuId === 99999), _defineProperty(_classNames2, "".concat(preCls, "__left-home--hover"), hasOKRApp), _classNames2))
+  }, /*#__PURE__*/_react["default"].createElement("a", {
+    href: "#homepage"
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    alt: "home-img",
+    src: _home["default"],
+    className: "".concat(preCls, "__left-home-img")
+  }))), showWxInvite && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__invite"),
     onClick: openWxInvite
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])("tu-icon-add-people", "".concat(preCls, "__invite-icon"))
   })), /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(preCls, "__msg"))
+    className: "".concat(preCls, "__msg")
   }, /*#__PURE__*/_react["default"].createElement(_userMessage["default"], null)), versionInfo.Version === 1 && /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(preCls, "__version"))
+    className: "".concat(preCls, "__version")
   }, /*#__PURE__*/_react["default"].createElement(_version["default"], null)), /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(preCls, "__photo"))
-  }, /*#__PURE__*/_react["default"].createElement(_userOwnMenu["default"], null)));
+    className: "".concat(preCls, "__photo")
+  }, /*#__PURE__*/_react["default"].createElement(_userOwnMenu["default"], null)), isUseNewMenu && /*#__PURE__*/_react["default"].createElement(_appCenter["default"], {
+    appCenterVisible: appCenterVisible,
+    closeAppCenter: function closeAppCenter() {
+      return setAppCenterVisible(false);
+    },
+    setMenu: setMenu
+  }));
 };
 
 var _default = NavTop; // @ts-ignore