@titaui/pc 1.12.13 → 1.12.16

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

@@ -19,8 +19,6 @@ 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");
@@ -76,12 +74,10 @@ var Menu = function Menu(_ref) {
   var _useState3 = (0, _react.useState)(false),
       _useState4 = _slicedToArray(_useState3, 2),
       popupVisible = _useState4[0],
-      setPopupVisible = _useState4[1];
+      setPopupVisible = _useState4[1]; // const [feedNum] = useGlobalValue();
 
-  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/components/user-message/images/bell-1.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>切片</title>
+    <g id="导航" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="试用版-滑出一级菜单1" transform="translate(-967.000000, -16.000000)" stroke="#FFFFFF" stroke-width="1.6">
+            <g id="消息" transform="translate(964.000000, 10.000000)">
+                <g id="bell" transform="translate(3.000000, 6.000000)">
+                    <path d="M11.0147551,3.73333333 C11.2716347,3.73333333 11.5100213,3.81274976 11.7063493,3.94879059 C11.9087141,4.0890144 12.0668261,4.28879775 12.1546337,4.5230515 C13.7164592,5.35127212 14.628956,6.03022217 15.271064,6.91744287 C15.8964201,7.78151685 16.2647551,8.84360493 16.2647551,9.99166667 L16.2647551,9.99166667 L16.2647551,14.1995335 L17.2351572,15.7271908 L13.1381228,16.3419612 C13.0764552,16.9803581 12.7329879,17.5356623 12.2344854,17.8838935 C11.8888575,18.1253335 11.4682834,18.2666667 11.0147551,18.2666667 C10.5612267,18.2666667 10.1406527,18.1253335 9.79502475,17.8838935 C9.29652228,17.5356623 8.95305493,16.9803581 8.89138739,16.3419612 L8.89138739,16.3419612 L5.13199196,16.3416667 L5.76475508,14.1995335 L5.76475508,9.99166667 C5.76475508,8.84366279 6.13305178,7.78162343 6.75832153,6.91759709 C7.40033245,6.03043703 8.31267653,5.35153921 9.37484426,5.00264003 C9.9622003,4.2892328 10.1205014,4.08920232 10.3230866,3.94883346 C10.5194668,3.81276391 10.7578617,3.73333333 11.0147551,3.73333333 Z"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

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

@@ -25,7 +25,7 @@ var _redPack = _interopRequireDefault(require("./components/red-pack"));
 
 var _request = require("../../request.apis");
 
-var _bell3x = _interopRequireDefault(require("./images/bell@3x.png"));
+var _bell = _interopRequireDefault(require("./images/bell-1.svg"));
 
 var _useGlobalValue = _interopRequireDefault(require("../../useGlobalValue"));
 
@@ -51,7 +51,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var prefixCls = 'titaui-user-message';
+var prefixCls = "titaui-user-message";
 
 function UserMessage() {
   var _useState = (0, _react.useState)(0),
@@ -79,7 +79,7 @@ function UserMessage() {
       preData = _useState10[0],
       setPreData = _useState10[1];
 
-  var _useState11 = (0, _react.useState)('todos'),
+  var _useState11 = (0, _react.useState)("todos"),
       _useState12 = _slicedToArray(_useState11, 2),
       firstTab = _useState12[0],
       setFirstTab = _useState12[1];
@@ -96,16 +96,16 @@ function UserMessage() {
         setAllData(res.Data.indicators);
         var indicators = res.Data.indicators;
         var todos = indicators.find(function (item) {
-          return item.type === 'todoIndicator';
+          return item.type === "todoIndicator";
         });
         var informs = indicators.find(function (item) {
-          return item.type === 'messageIndicator';
+          return item.type === "messageIndicator";
         });
         var replys = indicators.find(function (item) {
-          return item.type === 'mLeaveandComment';
+          return item.type === "mLeaveandComment";
         });
         var reminds = indicators.find(function (item) {
-          return item.type === 'Tx';
+          return item.type === "Tx";
         });
         var total = 0; // @与回复的数量在通知里面包含了
 
@@ -125,17 +125,17 @@ function UserMessage() {
         setInfosNum(total);
 
         if (todos && todos.value) {
-          setFirstTab('todos');
+          setFirstTab("todos");
         } else if (informs && !replys && informs.value) {
-          setFirstTab('informs');
+          setFirstTab("informs");
         } else if (replys && informs.value - replys.value === 0) {
-          setFirstTab('replys');
+          setFirstTab("replys");
         } else if (replys && informs.value - replys.value > 0) {
-          setFirstTab('informs');
+          setFirstTab("informs");
         } else if (reminds && reminds.value) {
-          setFirstTab('reminds');
+          setFirstTab("reminds");
         } else {
-          setFirstTab('todos');
+          setFirstTab("todos");
         } // 判断是企业勋章
 
 
@@ -148,7 +148,7 @@ function UserMessage() {
         } // upaas 勋章
 
 
-        var medalDetail = (0, _bsGlobal.getBSGlobal)('medalDetail');
+        var medalDetail = (0, _bsGlobal.getBSGlobal)("medalDetail");
 
         if (medalDetail) {
           window.util.upaasMedal()(medalDetail);
@@ -156,7 +156,7 @@ function UserMessage() {
 
 
         var mRedPackIndicator = indicators.filter(function (item) {
-          return item.type === 'mRedPackIndicator';
+          return item.type === "mRedPackIndicator";
         });
 
         if (mRedPackIndicator.length > 0) {
@@ -165,10 +165,10 @@ function UserMessage() {
 
 
         var blessIndicator = indicators.filter(function (item) {
-          return item.type === 'mZhufu';
+          return item.type === "mZhufu";
         });
         var weeklyReportIndicator = indicators.filter(function (item) {
-          return item.type === 'mWeekStatisticIndicator';
+          return item.type === "mWeekStatisticIndicator";
         });
 
         if (blessIndicator.length === 1) {
@@ -185,11 +185,11 @@ function UserMessage() {
         if (weeklyReportIndicator.length) {
           var _window;
 
-          (_window = window) === null || _window === void 0 ? void 0 : _window.Talent.app.vent.trigger('open-weekly-report-modal');
+          (_window = window) === null || _window === void 0 ? void 0 : _window.Talent.app.vent.trigger("open-weekly-report-modal");
         }
 
         var feedInfo = indicators.find(function (item) {
-          return item.type === 'feedAboutMeIndicator';
+          return item.type === "feedAboutMeIndicator";
         });
 
         if (feedInfo) {
@@ -230,8 +230,8 @@ function UserMessage() {
     condition: infosNum !== 0
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(prefixCls, "__msg-total"))
-  }, infosNum > 100 ? '99+' : infosNum)), /*#__PURE__*/_react["default"].createElement("img", {
-    src: _bell3x["default"],
+  }, infosNum > 100 ? "99+" : infosNum)), /*#__PURE__*/_react["default"].createElement("img", {
+    src: _bell["default"],
     className: (0, _classnames["default"])(_defineProperty({}, "".concat(prefixCls, "__msg-dot"), infosNum !== preData)),
     alt: ""
   }))), /*#__PURE__*/_react["default"].createElement(_redPack["default"], {

package/lib/components/nav-top/images/home.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>切片</title>
+    <g id="导航" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="试用版-滑出一级菜单1" transform="translate(-835.000000, -16.000000)">
+            <g id="个人首页" transform="translate(832.000000, 13.000000)">
+                <g id="home" transform="translate(3.000000, 3.000000)">
+                    <g id="首页" transform="translate(3.025000, 2.383333)">
+                        <path d="M7.975,1.31064196 C8.2909739,1.31064196 8.60694781,1.41143718 8.87195063,1.61302763 L8.87195063,1.61302763 L14.332463,5.766897 C14.8849137,6.18715208 15.2092593,6.84141097 15.2092593,7.53554073 L15.2092593,7.53554073 L15.2092593,13.7203704 C15.2092593,14.3340201 14.9605286,14.8895756 14.5583854,15.2917188 C14.1562423,15.6938619 13.6006868,15.9425926 12.987037,15.9425926 L12.987037,15.9425926 L2.96296296,15.9425926 C2.34931324,15.9425926 1.79375769,15.6938619 1.39161456,15.2917188 C0.989471435,14.8895756 0.740740741,14.3340201 0.740740741,13.7203704 L0.740740741,13.7203704 L0.740740741,7.53554073 C0.740740741,6.84141097 1.06508631,6.18715208 1.61753702,5.766897 L1.61753702,5.766897 L7.07804937,1.61302763 C7.34305219,1.41143718 7.6590261,1.31064196 7.975,1.31064196 Z" id="矩形" stroke="#FFFFFF" stroke-width="1.48148148"></path>
+                        <path d="M5.40833333,11.3666667 L10.5416667,11.3666667 C10.9466755,11.3666667 11.275,11.6949912 11.275,12.1 C11.275,12.5050088 10.9466755,12.8333333 10.5416667,12.8333333 L5.40833333,12.8333333 C5.00332452,12.8333333 4.675,12.5050088 4.675,12.1 C4.675,11.6949912 5.00332452,11.3666667 5.40833333,11.3666667 Z" id="矩形" fill="#FFFFFF"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

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

@@ -10,22 +10,26 @@
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
 }
 
+.titaui-nav-top--position {
+  position: relative;
+  z-index: 1201;
+}
+
 .titaui-nav-top__left {
   display: inline-flex;
   justify-content: space-between;
   align-items: center;
-  min-width: 204px;
+  width: 120px;
   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 +37,8 @@
 }
 
 .titaui-nav-top__left-home-img {
-  width: 20px;
-  height: 20px;
+  width: 24px;
+  height: 24px;
 }
 
 .titaui-nav-top__left-home--hover:hover {
@@ -50,6 +54,55 @@
   cursor: pointer;
 }
 
+.titaui-nav-top__left-dynamic, .titaui-nav-top__left-app-center {
+  display: inline-block;
+  width: 24px;
+  height: 24px;
+  background: url("./images/app-center.png") no-repeat;
+  background-size: contain;
+  color: #ffffff;
+  padding: 2px;
+  border-radius: 8px;
+  transition: transform 0.3s;
+  cursor: pointer;
+}
+
+.titaui-nav-top__left-dynamic:hover, .titaui-nav-top__left-app-center:hover {
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
+.titaui-nav-top__left-dynamic--active, .titaui-nav-top__left-app-center--active {
+  transform: rotate(-90deg);
+}
+
+.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 +121,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.svg"));
 
-var _toast = _interopRequireDefault(require("../toast"));
+var _utils = require("./utils");
 
 require("./index.css");
 
@@ -61,11 +63,17 @@ var hasOKRApp = newNavigation.find(function (item) {
 var preCls = "titaui-nav-top";
 
 var NavTop = function NavTop() {
-  var _classNames2;
+  var _classNames3;
 
-  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))
+    className: (0, _classnames["default"])(preCls, _defineProperty({}, "".concat(preCls, "--position"), appCenterVisible))
   }, /*#__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", _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"), (_classNames3 = {}, _defineProperty(_classNames3, "".concat(preCls, "__left-home--active"), activeMenuId === 99999), _defineProperty(_classNames3, "".concat(preCls, "__left-home--hover"), hasOKRApp), _classNames3))
+  }, /*#__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