@titaui/pc 1.15.5 → 1.15.6-beta.3

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

@@ -162,14 +162,21 @@
 
 .titaui-nav-top__invite {
   margin-right: 24px;
-  width: 20px;
-  height: 20px;
+  width: 28px;
+  height: 28px;
+  border-radius: 4px;
   cursor: pointer;
   display: inline-flex;
+  align-items: center;
+  justify-content: center;
   font-size: 20px;
   color: #ffffff;
 }
 
+.titaui-nav-top__invite:hover {
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
 .titaui-nav-top__invite-guide {
   background-image: url("./images/invite-bkg.jpg"), url("./images/invite-person.jpg") !important;
   background-repeat: no-repeat,no-repeat !important;

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

@@ -157,49 +157,53 @@ var NavTop = function NavTop() {
       inviteAuth = _useState24[0],
       setInviteAuth = _useState24[1];
 
-  var ua = navigator.userAgent.toLowerCase(); // const showWxInvite = getTenantInfo().mainCorpId && ua.indexOf("micromessenger") !== -1;
-
-  var showWxInvite = (0, _bsGlobal.getTenantInfo)().Source === 860 && ua.indexOf('micromessenger') !== -1 && isTry;
-  var openWxInvite = (0, _react.useCallback)(function () {
-    if (Role.isSuperManager) {
-      if (window.WeixinJSBridge !== undefined) {
-        window.WeixinJSBridge.invoke('openAppManage', {}, function (res) {
-          console.log(res.err_msg);
-
-          if (res.err_msg == 'openAppManage:ok') {// 调用成功
-          } else {
-            if (!inviteVisible) {
-              setInviteVisible(true);
-            }
-
-            setInviteAuth(false);
-          }
-        });
-      }
-    } else {
-      if (window.WeixinJSBridge !== undefined) {
-        window.WeixinJSBridge.invoke('selectPrivilegedContact', {
-          fromDepartmentId: -1,
-          // 必填，表示打开的通讯录从指定的部门开始展示，-1表示自己所在部门开始, 0表示从最上层开始
-          mode: 'multi',
-          // 必填，选择模式，single表示单选，multi表示多选
-          selectedContextContact: 0 // 是否勾选当前环境的参与者。例如在群+号聊天附件栏打开，默认勾选当前群成员。
-
-        }, function (res) {
-          if (res.err_msg === 'selectPrivilegedContact:ok') {
-            var selectedTicket = res.result.selectedTicket.replace(/['"]/g, ''); // 已选的集合Ticket
-
-            (0, _request.rpost)('v1')("wx/send/templateMessage?selectedTickets=".concat(selectedTicket)).then(function () {
-              _toast["default"].Success('邀请成功');
-            })["catch"](function () {
-              _toast["default"].Error('邀请失败');
-            });
-          } else {// console.log(res);
+  var ua = navigator.userAgent.toLowerCase();
+  var showWxInvite = true || (0, _bsGlobal.getTenantInfo)().mainCorpId && ua.indexOf('micromessenger') !== -1;
+  var showMangeAdd = !(0, _bsGlobal.getTenantInfo)().mainCorpId && ua.indexOf('micromessenger') !== -1 && isTry && Role.isSuperManager; // const canShowInvite = getTenantInfo().mainCorpId || Role.isSuperManager
+  // const showWxInvite =
+  //   getTenantInfo().Source === 860 &&
+  //   ua.indexOf('micromessenger') !== -1 &&
+  //   isTry && canShowInvite
+
+  var manageAdd = (0, _react.useCallback)(function () {
+    if (window.WeixinJSBridge !== undefined) {
+      window.WeixinJSBridge.invoke('openAppManage', {}, function (res) {
+        console.log(res.err_msg);
+
+        if (res.err_msg == 'openAppManage:ok') {// 调用成功
+        } else {
+          if (!inviteVisible) {
+            setInviteVisible(true);
           }
-        });
-      }
+
+          setInviteAuth(false);
+        }
+      });
     }
   }, [inviteVisible]);
+  var openWxInvite = (0, _react.useCallback)(function () {
+    if (window.WeixinJSBridge !== undefined) {
+      window.WeixinJSBridge.invoke('selectPrivilegedContact', {
+        fromDepartmentId: -1,
+        // 必填，表示打开的通讯录从指定的部门开始展示，-1表示自己所在部门开始, 0表示从最上层开始
+        mode: 'multi',
+        // 必填，选择模式，single表示单选，multi表示多选
+        selectedContextContact: 0 // 是否勾选当前环境的参与者。例如在群+号聊天附件栏打开，默认勾选当前群成员。
+
+      }, function (res) {
+        if (res.err_msg === 'selectPrivilegedContact:ok') {
+          var selectedTicket = res.result.selectedTicket.replace(/['"]/g, ''); // 已选的集合Ticket
+
+          (0, _request.rpost)('v1')("wx/send/templateMessage?selectedTickets=".concat(selectedTicket)).then(function () {
+            _toast["default"].Success('邀请成功');
+          })["catch"](function () {
+            _toast["default"].Error('邀请失败');
+          });
+        } else {// console.log(res);
+        }
+      });
+    }
+  }, []);
 
   var handleHashChange = function handleHashChange() {
     setAppCenterVisible(false);
@@ -254,6 +258,10 @@ var NavTop = function NavTop() {
 
   var handleCloseInviteGuide = function handleCloseInviteGuide() {
     setInviteVisible(false);
+
+    if (!inviteAuth) {
+      setInviteAuth(true);
+    }
   };
 
   var handleCloseSummaryGuide = function handleCloseSummaryGuide() {
@@ -330,7 +338,7 @@ var NavTop = function NavTop() {
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(preCls, "__invite-guide-content-title")
     }, title)));
-    title = Role.isSuperManager ? '点击这里进入企业微信后台，添加公司员工，体验更多功能' : '邀请同事一起体验吧';
+    title = showMangeAdd ? '点击这里进入企业微信后台，添加公司员工，体验更多功能' : '邀请同事一起体验吧';
     var subtitle = '试用 7 天内成功邀请 3 人加入，即可免费开启试用 OKR 案例库';
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(preCls, "__invite-guide-content")
@@ -415,7 +423,7 @@ var NavTop = function NavTop() {
     menus: menu,
     activeMenuId: activeMenuId
   })), showWxInvite && (staffCount > 3 ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-    overlay: Role.isSuperManager ? '添加员工' : '邀请同事',
+    overlay: '邀请同事',
     placement: "bottom",
     align: {
       offset: [0, 5]
@@ -442,6 +450,34 @@ var NavTop = function NavTop() {
     onClick: openWxInvite
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])('tu-icon-add-people', "".concat(preCls, "__invite-icon"))
+  })))), showMangeAdd && (staffCount > 3 && inviteAuth ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: '添加员工',
+    placement: "bottom",
+    align: {
+      offset: [0, 5]
+    }
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__invite"),
+    onClick: manageAdd
+  }, /*#__PURE__*/_react["default"].createElement("i", {
+    className: (0, _classnames["default"])('tu-icon-add-people', "".concat(preCls, "__invite-icon"))
+  }))) : /*#__PURE__*/_react["default"].createElement(_guideTip["default"], {
+    visible: inviteVisible,
+    content: renderInviteContent(),
+    type: inviteAuth ? 'default' : 'button',
+    popupPlacement: "bottom",
+    classnames: inviteAuth ? "".concat(preCls, "__invite-guide") : '',
+    onClickClose: handleCloseInviteGuide,
+    popupAlign: {
+      offset: [0, 5]
+    },
+    zIndex: 1000,
+    width: 308
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__invite"),
+    onClick: manageAdd
+  }, /*#__PURE__*/_react["default"].createElement("i", {
+    className: (0, _classnames["default"])('tu-icon-add-people', "".concat(preCls, "__invite-icon"))
   })))), hasOKRApp && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__left-home"), (_classNames4 = {}, _defineProperty(_classNames4, "".concat(preCls, "__left-home--active"), activeMenuId === 99999), _defineProperty(_classNames4, "".concat(preCls, "__left-home--hover"), hasOKRApp), _classNames4))
   }, /*#__PURE__*/_react["default"].createElement("a", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.15.5",
+  "version": "1.15.6-beta.3",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",