@titaui/pc 1.13.8 → 1.13.10-beta.2

package/lib/components/nav-top/components/user-message/components/inform/inform-item.js

@@ -108,7 +108,7 @@ function Inform(props) {
     } // 处理合并的消息
 
 
-    var isMessageMerging = [83, 94, 95, 96, 97, 98, 99, 100, 131, 136, 13018, 30362].includes(messageType);
+    var isMessageMerging = [83, 94, 95, 96, 97, 98, 99, 100, 131, 136, 180, 13018, 30362].includes(messageType);
 
     if (!isMessageMerging) {
       if (messageType === _constant.informType.details) {
@@ -217,7 +217,7 @@ function Inform(props) {
     } else if (Number(messageType) > 93 && Number(messageType) <= 100) {
       // OKR 仪表盘消息提醒
       notificationType = "okr-dashBoard";
-    } else if (messageType == 131 || messageType == 136) {
+    } else if ([131, 136, 180].includes(Number(messageType))) {
       notificationType = "performance";
       content = item.content;
     }

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

@@ -45,6 +45,8 @@ var _interface = require("../../components/help-card/interface");
 
 var _request2 = require("./request.apis");
 
+var _auth = require("../../utils/auth");
+
 require("./index.css");
 
 var _excluded = ["hasSetting"];
@@ -73,6 +75,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+var Role = new _auth.MyRole();
 var Logo = (0, _utils.getLogo)();
 var newNavigation = (0, _bsGlobal.getBSGlobal)("newNavigation") || [];
 var hasOKRApp = newNavigation.find(function (item) {
@@ -140,44 +143,73 @@ var NavTop = function NavTop() {
       bookDemoVisible = _useState20[0],
       setBookDemoVisible = _useState20[1];
 
-  var ua = navigator.userAgent.toLowerCase();
-  var showWxInvite = (0, _bsGlobal.getTenantInfo)().mainCorpId && ua.indexOf("micromessenger") !== -1;
+  var ua = navigator.userAgent.toLowerCase(); // const showWxInvite = getTenantInfo().mainCorpId && ua.indexOf("micromessenger") !== -1;
+
+  var showWxInvite = (0, _bsGlobal.getTenantInfo)().Source === 860;
   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);
-        }
-      });
+    debugger;
+    console.log(123, '我点击了');
+
+    if (Role.isSuperManager) {
+      if (window.WeixinJSBridge !== undefined) {
+        console.log(345, '我开始点击调用了');
+        window.WeixinJSBridge.invoke('openAppManage', {}, function (res) {
+          console.log(678, res.err_msg);
+
+          if (res.err_msg == 'openAppManage:ok') {// 调用成功
+          }
+
+          if (res.err_msg == 'openAppManage:fail:no permission') {// 调用人身份不符合
+          }
+
+          if (res.err_msg == 'openAppManage:fail:unknown app') {// 应用信息获取失败
+          }
+
+          if (res.err_msg == 'openAppManage:fail:unsupported app type') {// 应用类型不符合要求
+          }
+
+          if (res.err_msg == 'openAppManage:fail') {// 其它错误
+          }
+        });
+      }
+    } else {
+      if (window.WeixinJSBridge !== undefined) {
+        console.log(777, '普通员工调用');
+        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);
-    var hash = window.location.hash.split("?")[0] || "";
+    var hash = window.location.hash.split('?')[0] || '';
 
     if (hash) {
       var activeMenu = menu.find(function (item) {
         var _item$href$split, _item$href$split$;
 
-        return hash.includes((_item$href$split = item.href.split("#")) === null || _item$href$split === void 0 ? void 0 : (_item$href$split$ = _item$href$split[1]) === null || _item$href$split$ === void 0 ? void 0 : _item$href$split$.split("?")[0]);
+        return hash.includes((_item$href$split = item.href.split('#')) === null || _item$href$split === void 0 ? void 0 : (_item$href$split$ = _item$href$split[1]) === null || _item$href$split$ === void 0 ? void 0 : _item$href$split$.split('?')[0]);
       });
 
-      if (hash.includes("homepage")) {
+      if (hash.includes('homepage')) {
         setActiveMenuId(99999);
         return;
       }
@@ -192,9 +224,9 @@ var NavTop = function NavTop() {
 
   (0, _react.useEffect)(function () {
     handleHashChange();
-    window.addEventListener("hashchange", handleHashChange);
+    window.addEventListener('hashchange', handleHashChange);
     return function () {
-      window.removeEventListener("hashchange", handleHashChange);
+      window.removeEventListener('hashchange', handleHashChange);
     };
   }, [menu]);
   (0, _react.useEffect)(function () {
@@ -292,12 +324,12 @@ var NavTop = function NavTop() {
   };
 
   (0, _react.useEffect)(function () {
+    var version = window.BSGlobal.tenantAuthentication.Version;
     (0, _request2.getCycleSetting)().then(function (res) {
       var hasSetting = res.hasSetting,
           onthers = _objectWithoutProperties(res, _excluded);
 
-      if (isHasOkr() && !hasSetting) {
-        console.log(hasSetting, '66666666633');
+      if (version === 1 && isHasOkr() && !hasSetting) {
         setOkrGuideVisible(true);
       }
     });
@@ -332,7 +364,7 @@ var NavTop = function NavTop() {
     onClickClose: handleCloseSummaryGuide,
     width: 197
   }, /*#__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)),
+    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);
     }
@@ -343,6 +375,11 @@ var NavTop = function NavTop() {
   }, /*#__PURE__*/_react["default"].createElement(_menu["default"], {
     menus: menu,
     activeMenuId: activeMenuId
+  })), 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"))
   })), 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", {
@@ -351,12 +388,7 @@ var NavTop = function NavTop() {
     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", {
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__msg")
   }, /*#__PURE__*/_react["default"].createElement(_userMessage["default"], null)), versionInfo.Version === 1 && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__version")

package/lib/pages/aha2021/index.js

@@ -140,7 +140,6 @@ function PageLayout(props) {
     errorLevel: _errorLevel["default"].P0,
     errorTag: "\u7533\u8BF7\u9884\u7EA6\u6F14\u793A\u5F02\u5E38"
   }, /*#__PURE__*/_react["default"].createElement(_bookDemo["default"].BookDemoPC, {
-    autoShow: true,
     visible: false,
     type: getBookDemoVersion()
   })));

package/lib/utils/open-data.js

@@ -78,25 +78,23 @@ function openData() {
   // 企业微信租户 && 非自建应用
   if (getSource() === WX_SOURCE && ((_getBSGlobal = (0, _bsGlobal.getBSGlobal)('tenantInfo')) === null || _getBSGlobal === void 0 ? void 0 : _getBSGlobal.corpCreateType) !== 2 || getUA().includes(WX_UA_STR)) {
     // 企业微信初始化失败
-    if (!window.WWOpenData && !window.top.WWOpenData) {
-      return function (p) {
-        if (p.name == undefined || p.id == undefined) {
-          try {
-            (0, _helpers.errorLog)(1, JSON.stringify({
-              errorType: 'WWOpenData is undefined',
-              pName: p.name == undefined ? 'undefined' : p.name,
-              pId: p.id == undefined ? 'undefined' : p.id,
-              pType: p.type
-            }));
-          } catch (e) {
-            console.log(e);
-          }
-        }
-
-        return p.name || p.id || null;
-      };
-    }
-
+    // if (!window.WWOpenData && !window.top.WWOpenData) {
+    //   return (p) => {
+    //     if (p.name == undefined || p.id == undefined) {
+    //       try {
+    //         errorLog(1, JSON.stringify({
+    //           errorType: 'WWOpenData is undefined',
+    //           pName: p.name == undefined ? 'undefined' : p.name,
+    //           pId: p.id == undefined ? 'undefined' : p.id,
+    //           pType: p.type,
+    //         }))
+    //       } catch (e) {
+    //         console.log(e)
+    //       }
+    //     }
+    //     return p.name || p.id || null
+    //   }
+    // }
     return function (p) {
       var pId = p.id,
           pName = p.name,
@@ -164,14 +162,11 @@ function openData() {
           overflow: 'hidden',
           textOverflow: 'ellipsis'
         }
-      },
-      /*#__PURE__*/
-      // @ts-ignore
-      _react["default"].createElement("ww-open-data", {
+      }, (window.WWOpenData || window.top.WWOpenData) && /*#__PURE__*/_react["default"].createElement("ww-open-data", {
         ref: ref,
         type: pType,
         openid: openId
-      }), /*#__PURE__*/_react["default"].createElement("div", {
+      }), !window.WWOpenData && !window.top.WWOpenData && (pName || pId), /*#__PURE__*/_react["default"].createElement("div", {
         style: {
           position: 'absolute',
           top: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.13.8",
+  "version": "1.13.10-beta.2",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",