@titaui/pc 1.13.8 → 1.13.10-beta.10

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/components/user-message/utils.js

@@ -18,6 +18,8 @@ exports.htmlToText = htmlToText;
 
 var deleteText = function deleteText(text) {
   var last = text.trim().slice(-4);
+  var pattern = /(查看详情|Details)(?!.*\1)/;
+  text = text.replace(pattern, '');
 
   if (last === "查看任务") {
     text = text.trim().slice(0, -4);

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

@@ -170,6 +170,42 @@
   color: #ffffff;
 }
 
+.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;
+  background-size: 87px 104px, 92px 53px !important;
+  background-position: 0% 0%,100% 100% !important;
+}
+
+.titaui-nav-top__invite-guide-content {
+  display: flex;
+  align-items: flex-start;
+}
+
+.titaui-nav-top__invite-guide-content-waring {
+  width: 18px;
+  margin-right: 6px;
+}
+
+.titaui-nav-top__invite-guide-content-point {
+  width: 14px;
+  margin-right: 8px;
+}
+
+.titaui-nav-top__invite-guide-content-title {
+  font-size: 14px;
+  color: #FFFFFF;
+  font-weight: 600;
+  line-height: 22px;
+}
+
+.titaui-nav-top__invite-guide-content-subTitle {
+  margin-top: 8px;
+  font-size: 12px;
+  color: #FFFFFF;
+  line-height: 22px;
+}
+
 .titaui-nav-top__app-guide-content {
   color: #fff;
   margin-bottom: 8px;

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

@@ -45,9 +45,13 @@ var _interface = require("../../components/help-card/interface");
 
 var _request2 = require("./request.apis");
 
-require("./index.css");
+var _auth = require("../../utils/auth");
+
+var _invitePoint = _interopRequireDefault(require("./images/invite-point.png"));
 
-var _excluded = ["hasSetting"];
+var _inviteTanhao = _interopRequireDefault(require("./images/invite-tanhao.png"));
+
+require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -57,10 +61,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -73,12 +73,13 @@ 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 newNavigation = (0, _bsGlobal.getBSGlobal)('newNavigation') || [];
 var hasOKRApp = newNavigation.find(function (item) {
   return item.appId === 113;
 });
-var preCls = "titaui-nav-top";
+var preCls = 'titaui-nav-top';
 
 var NavTop = function NavTop() {
   var _classNames4;
@@ -93,7 +94,7 @@ var NavTop = function NavTop() {
       menu = _useState2[0],
       setMenu = _useState2[1];
 
-  var versionInfo = (0, _bsGlobal.getBSGlobal)("tenantAuthentication");
+  var versionInfo = (0, _bsGlobal.getBSGlobal)('tenantAuthentication');
 
   var _useState3 = (0, _react.useState)(-1),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -140,44 +141,90 @@ 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 _useState21 = (0, _react.useState)(true),
+      _useState22 = _slicedToArray(_useState21, 2),
+      inviteVisible = _useState22[0],
+      setInviteVisible = _useState22[1];
+
+  var _useState23 = (0, _react.useState)(true),
+      _useState24 = _slicedToArray(_useState23, 2),
+      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;
   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);
-        }
-      });
+    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") {
+            // 调用人身份不符合
+            console.log(999, res.err_msg, inviteVisible);
+
+            if (!inviteVisible) {
+              setInviteVisible(true);
+            }
+
+            setInviteAuth(false);
+          }
+
+          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);
+          }
+        });
+      }
     }
-  }, []);
+  }, [inviteVisible]);
 
   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 +239,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 () {
@@ -217,6 +264,10 @@ var NavTop = function NavTop() {
     }
   }, [appCenterVisible]);
 
+  var handleCloseInviteGuide = function handleCloseInviteGuide() {
+    setInviteVisible(false);
+  };
+
   var handleCloseSummaryGuide = function handleCloseSummaryGuide() {
     setSummaryGuideVisible(false);
     var loginUserId = BSGlobal.loginUserInfo.Id;
@@ -278,9 +329,39 @@ var NavTop = function NavTop() {
     }
   };
 
+  var renderInviteContent = (0, _react.useCallback)(function () {
+    var title = '你没有权限，快去联系企业微信超级管理员操';
+    if (!inviteAuth) return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__invite-guide-content")
+    }, /*#__PURE__*/_react["default"].createElement("img", {
+      src: _inviteTanhao["default"],
+      alt: "",
+      className: "".concat(preCls, "__invite-guide-content-waring")
+    }), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__invite-guide-content-right")
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__invite-guide-content-title")
+    }, title)));
+    title = Role.isSuperManager ? '点击这里进入企业微信后台，添加公司员工，体验更多功能' : '邀请同事一起体验吧';
+    var subtitle = '试用 7 天内成功邀请 3 人加入，即可免费开启试用 OKR 案例库';
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__invite-guide-content")
+    }, /*#__PURE__*/_react["default"].createElement("img", {
+      src: _invitePoint["default"],
+      alt: "",
+      className: "".concat(preCls, "__invite-guide-content-point")
+    }), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__invite-guide-content-right")
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__invite-guide-content-title")
+    }, title), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__invite-guide-content-subTitle")
+    }, subtitle)));
+  }, [inviteAuth]);
+
   var isHasOkr = function isHasOkr() {
     //判断是否安装了OKR
-    var okrIndex = window.BSGlobal.WebHead.AppHead.findIndex(function (item) {
+    var okrIndex = (0, _bsGlobal.getBSGlobal)('WebHead').AppHead.findIndex(function (item) {
       return item.AppId === '113';
     });
 
@@ -292,12 +373,14 @@ var NavTop = function NavTop() {
   };
 
   (0, _react.useEffect)(function () {
+    var version = (0, _bsGlobal.getBSGlobal)('tenantAuthentication').Version;
+    if (localStorage.getItem("cycle_setting_stop_show".concat((0, _bsGlobal.getUserInfo)().Id)) === 'true') return;
+    localStorage.removeItem("OKR_CYCLE_SETTING");
     (0, _request2.getCycleSetting)().then(function (res) {
-      var hasSetting = res.hasSetting,
-          onthers = _objectWithoutProperties(res, _excluded);
+      localStorage.setItem("OKR_CYCLE_SETTING", JSON.stringify(res || {}));
+      var hasSetting = res.hasSetting;
 
-      if (isHasOkr() && !hasSetting) {
-        console.log(hasSetting, '66666666633');
+      if (version === 1 && isHasOkr() && !hasSetting) {
         setOkrGuideVisible(true);
       }
     });
@@ -332,7 +415,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,7 +426,24 @@ var NavTop = function NavTop() {
   }, /*#__PURE__*/_react["default"].createElement(_menu["default"], {
     menus: menu,
     activeMenuId: activeMenuId
-  })), hasOKRApp && /*#__PURE__*/_react["default"].createElement("div", {
+  })), showWxInvite && /*#__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: 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", {
     href: "#homepage"
@@ -351,12 +451,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/components/picker/range-picker/index.js

@@ -33,7 +33,7 @@ var _picker = _interopRequireDefault(require("../picker"));
 
 var _pickerTrigger = _interopRequireDefault(require("./components/picker-trigger"));
 
-var _excluded = ["onChange", "format", "values", "picker", "children", "popupPlacement", "direction", "onPopupVisibleChange", "visible", "canEmpty"];
+var _excluded = ["onChange", "format", "values", "picker", "children", "popupPlacement", "direction", "onPopupVisibleChange", "visible", "canEmpty", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -72,6 +72,7 @@ var RangePicker = function RangePicker(props) {
       visible = _props$visible === void 0 ? false : _props$visible,
       _props$canEmpty = props.canEmpty,
       canEmpty = _props$canEmpty === void 0 ? true : _props$canEmpty,
+      className = props.className,
       restProps = _objectWithoutProperties(props, _excluded);
 
   var initValues = (0, _react.useCallback)(function () {
@@ -204,7 +205,7 @@ var RangePicker = function RangePicker(props) {
       return !!v;
     }).length !== 2;
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: _utils.PickerRangesClass
+      className: (0, _classnames["default"])(_utils.PickerRangesClass, className)
     }, /*#__PURE__*/_react["default"].createElement(_placeholder["default"], {
       viewDate: viewDate,
       onChange: setViewDate,

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/pages/new-okr-list/index.js

@@ -27,8 +27,6 @@ var _list = _interopRequireDefault(require("./list"));
 
 var _loading = _interopRequireDefault(require("./loading"));
 
-var _initCycleSetting = _interopRequireDefault(require("./init-cycle-setting"));
-
 var _bsGlobal = require("../../utils/bs-global");
 
 var _tools = require("../../utils/tools");
@@ -365,9 +363,7 @@ var NewOkrList = function NewOkrList(props) {
       cycleType: query.cycleType,
       yqmNum: query.yqmNum
     }
-  })), /*#__PURE__*/_react["default"].createElement(_initCycleSetting["default"], {
-    SetCycleModal: SetCycleModal
-  }), !loading && /*#__PURE__*/_react["default"].createElement("div", {
+  })), !loading && /*#__PURE__*/_react["default"].createElement("div", {
     className: "okr-list__check-filter-tips"
   }, (0, _getLocale.getLocale)("OKR_MyO_Text_CanfindOKR"), /*#__PURE__*/_react["default"].createElement("span", {
     className: "okr-list__check-filter-btn",

package/lib/utils/open-data.js

@@ -9,8 +9,6 @@ exports.parseTag = exports.parseStringV2 = exports.parseString = exports.parseOp
 
 var _react = _interopRequireWildcard(require("react"));
 
-var Sentry = _interopRequireWildcard(require("@sentry/browser"));
-
 var _bsGlobal = require("./bs-global");
 
 var _openDataPainter = require("../components/open-data-painter");
@@ -35,6 +33,7 @@ var WX_SOURCE = 860;
 var WX_UA_STR = 'micromessenger';
 var FEISHU_SOURCE = 862;
 var DINGTALK_SOURCE = 861;
+var ignorePIds = [-1, 0, 10000];
 
 var getSource = function getSource() {
   return (0, _bsGlobal.getBSGlobal)('tenantInfo').Source;
@@ -76,32 +75,59 @@ function openData() {
   var _getBSGlobal;
 
   // 企业微信租户 && 非自建应用
-  if (getSource() === WX_SOURCE && ((_getBSGlobal = (0, _bsGlobal.getBSGlobal)('tenantInfo')) === null || _getBSGlobal === void 0 ? void 0 : _getBSGlobal.corpCreateType) !== 2 || getUA().includes(WX_UA_STR)) {
+  if ((getSource() === WX_SOURCE || getUA().includes(WX_UA_STR)) && ((_getBSGlobal = (0, _bsGlobal.getBSGlobal)('tenantInfo')) === null || _getBSGlobal === void 0 ? void 0 : _getBSGlobal.corpCreateType) !== 2 // 2:自建应用
+  ) {
     // 企业微信初始化失败
-    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,
           pCorpId = p.corpId,
           pType = p.type;
+      (0, _react.useEffect)(function () {
+        var openId = pCorpId || getOpenId(pId, pType);
+
+        if (!openId) {
+          if (pId !== undefined && !ignorePIds.includes(pId)) {
+            try {
+              // BSGlobal
+              var openIds;
+
+              if (pType === 'userName') {
+                openIds = (0, _bsGlobal.getBSGlobal)('openIds');
+              } else if (pType === 'departmentName') {
+                openIds = (0, _bsGlobal.getBSGlobal)('openDepartmentIds');
+              }
+
+              (0, _helpers.errorLog)(1, JSON.stringify({
+                errorType: 'openId 不存在',
+                pName: pName === undefined ? 'undefined' : pName,
+                pId: pId === undefined ? 'undefined' : pId,
+                pType: pType,
+                openIds: openIds
+              }));
+            } catch (e) {
+              console.log(e);
+            }
+          }
+        }
+      }, [pId, pName]);
 
       if (pId === undefined && pCorpId === undefined) {
         return pName || null;
@@ -111,40 +137,21 @@ function openData() {
       var openId = pCorpId || getOpenId(pId, pType);
 
       if (!openId) {
-        if (pId) {
-          try {
-            // BSGlobal
-            var openIds;
-
-            if (pType === 'userName') {
-              openIds = (0, _bsGlobal.getBSGlobal)('openIds');
-            } else if (pType === 'departmentName') {
-              openIds = (0, _bsGlobal.getBSGlobal)('openDepartmentIds');
-            }
-
-            (0, _helpers.errorLog)(1, JSON.stringify({
-              errorType: 'openId 不存在',
-              pName: pName == undefined ? 'undefined' : pName,
-              pId: pId == undefined ? 'undefined' : pId,
-              pType: pType,
-              openIds: openIds
-            }));
-          } catch (e) {
-            console.log(e);
-          }
-
-          Sentry.withScope(function (scope) {
-            scope.setTag('error-level', 'P1');
-            scope.setTag('error-type', '企业微信openData调用失败');
-            scope.setExtra('fail_type', pType);
-            scope.setExtra('p_id', pId);
-            scope.setExtra('p_name', pName);
-            scope.setExtra('corp_id', pCorpId);
-            scope.setExtra('open_id', getOpenId(pId, pType));
-            p.callFunc && scope.setExtra('fail_callFunc', p.callFunc);
-            p.extra && scope.setExtra('fail_extra', p.extra);
-            Sentry.captureException(new Error('企业微信openData调用失败'), scope);
-          });
+        if (pId !== undefined && !ignorePIds.includes(pId)) {// Sentry.withScope((scope) => {
+          //   scope.setTag('error-level', 'P1')
+          //   scope.setTag('error-type', '企业微信openData调用失败')
+          //   scope.setExtra('fail_type', pType)
+          //   scope.setExtra('p_id', pId)
+          //   scope.setExtra('p_name', pName)
+          //   scope.setExtra('corp_id', pCorpId)
+          //   scope.setExtra('open_id', getOpenId(pId, pType))
+          //   p.callFunc && scope.setExtra('fail_callFunc', p.callFunc)
+          //   p.extra && scope.setExtra('fail_extra', p.extra)
+          //   Sentry.captureException(
+          //     new Error('企业微信openData调用失败'),
+          //     scope,
+          //   )
+          // })
         }
 
         return pName || pId || null;
@@ -156,7 +163,7 @@ function openData() {
 
         // @ts-ignore
         (_ref = window.WWOpenData && window.WWOpenData || window.top.WWOpenData) === null || _ref === void 0 ? void 0 : _ref.bind(ref.current);
-      }, []);
+      }, [pId, pName]);
       return /*#__PURE__*/_react["default"].createElement("div", {
         style: {
           display: 'inline',
@@ -164,14 +171,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.10",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",