@titaui/pc 1.13.2 → 1.13.5

package/lib/components/okr-detail/schedule/components/kr-progress/index.js

@@ -31,7 +31,10 @@ var renderTitle = function renderTitle(index, title, id) {
   };
 
   return /*#__PURE__*/_react["default"].createElement("span", {
-    onClick: handleTitleClick
+    onClick: handleTitleClick,
+    style: {
+      whiteSpace: "nowrap"
+    }
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "kr-progress__order"
   }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {

package/lib/components/okr-review/ReviewPop/components/ReviewBody/index.js

@@ -605,7 +605,7 @@ var ReviewBody = /*#__PURE__*/function (_PureComponent) {
           data = _this$state.data,
           popContainer = _this$state.popContainer;
       var maxHeight = 595;
-      screenHeight <= 768 ? maxHeight = 300 : maxHeight = 595;
+      screenHeight <= 768 ? maxHeight = 300 : maxHeight = 500;
       return /*#__PURE__*/_react["default"].createElement(_style.ReviewBodyContainer, null, /*#__PURE__*/_react["default"].createElement(_style.ReviewBodyScroll, {
         maxHeight: maxHeight
       }, /*#__PURE__*/_react["default"].createElement(_style.ReviewTarget, null, /*#__PURE__*/_react["default"].createElement(_style.ReviewCatalog, null, (0, _getLocale.getLocale)("OKR_MyO_KRP_Pop_Reviewobject")), /*#__PURE__*/_react["default"].createElement(_style.ReviewContent, {

package/lib/utils/open-data.js

@@ -9,10 +9,10 @@ exports.parseTag = exports.parseStringV2 = exports.parseString = exports.parseOp
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _bsGlobal = require("./bs-global");
-
 var Sentry = _interopRequireWildcard(require("@sentry/browser"));
 
+var _bsGlobal = require("./bs-global");
+
 var _openDataPainter = require("../components/open-data-painter");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -43,13 +43,13 @@ var getSource = function getSource() {
 exports.getSource = getSource;
 
 var isWechat = function isWechat() {
-  return getSource() == 860;
+  return getSource() === WX_SOURCE;
 };
 
 exports.isWechat = isWechat;
 
 var isWxTrial = function isWxTrial() {
-  return getSource() == 860 && (0, _bsGlobal.getVersion)() == 1;
+  return getSource() === WX_SOURCE && (0, _bsGlobal.getVersion)() === 1;
 };
 
 exports.isWxTrial = isWxTrial;
@@ -72,50 +72,48 @@ var getOpenId = function getOpenId(id, type) {
 
 exports.getOpenId = getOpenId;
 
-function openData(p) {
-  //@ts-ignore
-  if (getSource() == WX_SOURCE || getUA().includes(WX_UA_STR)) {
+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)) {
     return function (p) {
-      if (p.id === undefined && p.corpId === undefined) {
-        Sentry.withScope(function (scope) {
-          scope.setTag("error-level", "P1");
-          scope.setTag("error-type", "企业微信openData调用失败");
-          scope.setExtra("fail_type", p.type);
-          scope.setExtra("p_id", p.id);
-          scope.setExtra("corp_id", p.corp_id);
-          scope.setExtra("p_name", p.name);
-          p.callFunc && scope.setExtra("fail_callFunc", p.callFunc);
-          p.extra && scope.setExtra("fail_extra", p.extra);
-          Sentry.captureException(new Error("企业微信openData调用失败"), scope);
-        });
-        return p.name || null;
-      } //@ts-ignore
-
-
-      var openId = p.corpId || getOpenId(p.id, p.type);
+      var pId = p.id,
+          pName = p.name,
+          pCorpId = p.corpId,
+          pType = p.type;
+
+      if (pId === undefined && pCorpId === undefined) {
+        return pName || null;
+      } // @ts-ignore
+
+
+      var openId = pCorpId || getOpenId(pId, pType);
 
       if (!openId) {
-        Sentry.withScope(function (scope) {
-          scope.setTag("error-level", "P1");
-          scope.setTag("error-type", "企业微信openData调用失败");
-          scope.setExtra("fail_type", p.type);
-          scope.setExtra("p_id", p.id);
-          scope.setExtra("p_name", p.name);
-          scope.setExtra("corp_id", p.corp_id);
-          scope.setExtra('open_id', getOpenId(p.id, p.type));
-          p.callFunc && scope.setExtra("fail_callFunc", p.callFunc);
-          p.extra && scope.setExtra("fail_extra", p.extra);
-          Sentry.captureException(new Error("企业微信openData调用失败"), scope);
-        });
-        return p.name || p.id || null;
-      } //<span style={{color:'red'}}>OPENID_EMPTY</span>;
+        if (!pId) {
+          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);
+          });
+        }
 
+        return pName || pId || null;
+      }
 
       var ref = (0, _react.useRef)(null);
-      (0, _react.useEffect)(function () {
+      (0, _react.useLayoutEffect)(function () {
         var _ref;
 
-        //@ts-ignore
+        // @ts-ignore
         (_ref = window.WWOpenData && window.WWOpenData || window.top.WWOpenData) === null || _ref === void 0 ? void 0 : _ref.bind(ref.current);
         if (!p.id) return;
         var openId = getOpenId(p.id, p.type);
@@ -124,21 +122,21 @@ function openData(p) {
       }, []);
       return /*#__PURE__*/_react["default"].createElement("div", {
         style: {
-          display: 'inline',
-          position: 'relative',
-          overflow: 'hidden',
-          textOverflow: 'ellipsis'
+          display: "inline",
+          position: "relative",
+          overflow: "hidden",
+          textOverflow: "ellipsis"
         }
       },
       /*#__PURE__*/
-      //@ts-ignore
+      // @ts-ignore
       _react["default"].createElement("ww-open-data", {
         ref: ref,
         type: p.type,
         openid: openId
       }), /*#__PURE__*/_react["default"].createElement("div", {
         style: {
-          position: 'absolute',
+          position: "absolute",
           top: 0,
           left: 0,
           right: 0,
@@ -147,11 +145,11 @@ function openData(p) {
         }
       }));
     };
-  } else {
-    return function (p) {
-      return p.name || p.id || null;
-    };
   }
+
+  return function (p) {
+    return p.name || p.id || null;
+  };
 }
 
 var getOpenData = openData();
@@ -182,20 +180,23 @@ var isPlatform = function isPlatform(name) {
   switch (name) {
     case "wx":
       {
-        if (type == "source") return getSource() == WX_SOURCE;
+        if (type == "source") return getSource() === WX_SOURCE;
         if (type == "env") return getUA().includes(WX_UA_STR);
-        return getSource() == WX_SOURCE || getUA().includes(WX_UA_STR);
+        return getSource() === WX_SOURCE || getUA().includes(WX_UA_STR);
       }
 
     case "dd":
       {
-        return getSource() == DINGTALK_SOURCE;
+        return getSource() === DINGTALK_SOURCE;
       }
 
     case "feishu":
       {
-        return getSource() == FEISHU_SOURCE;
+        return getSource() === FEISHU_SOURCE;
       }
+
+    default:
+      return false;
   }
 };
 
@@ -207,7 +208,7 @@ var parseTag = function parseTag(str) {
   var reg = /<\w+[\w\W]*?(userId|departmentId)=["'](\S+?)["'][\w\W]*?>@([\w\W]*?)<\/\w+>/g;
   var strReg = /<\w+[\w\s"'\/=\:\.]*?(?:userId|departmentId)=["']\S+?["'][\w\s"'\/=\:\.]*?>[\w\W]*?<\/\w+?>/;
   var openDatas = [];
-  var matchStr = reg.exec(str); // if (source != 860 && ua.indexOf('micromessenger') == -1)
+  var matchStr = reg.exec(str); // if (source != WX_SOURCE && ua.indexOf('micromessenger') == -1)
   //   return <span dangerouslySetInnerHTML={{ '__html': str }} />;
 
   while (matchStr != null) {
@@ -258,14 +259,18 @@ var parseTag = function parseTag(str) {
 exports.parseTag = parseTag;
 
 var parseString = function parseString(str) {
-  //@ts-ignore
-  var source = window.BSGlobal.tenantInfo.Source,
-      ua = navigator.userAgent.toLowerCase();
-  if (source != 860 && ua.indexOf('wxwork') == -1) return /*#__PURE__*/_react["default"].createElement("span", {
-    dangerouslySetInnerHTML: {
-      __html: str
-    }
-  });
+  // @ts-ignore
+  var source = window.BSGlobal.tenantInfo.Source;
+  var ua = navigator.userAgent.toLowerCase();
+
+  if (source != WX_SOURCE && ua.indexOf("wxwork") == -1) {
+    return /*#__PURE__*/_react["default"].createElement("span", {
+      dangerouslySetInnerHTML: {
+        __html: str
+      }
+    });
+  }
+
   var reg = /\[(\w+?)\:(\w+?)\]/g;
   var strReg = /\[\w+?\:\w+?\]/;
   var openDatas = [];
@@ -315,11 +320,15 @@ var parseStringV2 = function parseStringV2(str) {
   // @ts-ignore
   var source = window.BSGlobal.tenantInfo.Source;
   var ua = navigator.userAgent.toLowerCase();
-  if (source != 860 && ua.indexOf('micromessenger') == -1) return /*#__PURE__*/_react["default"].createElement("span", {
-    dangerouslySetInnerHTML: {
-      __html: str
-    }
-  });
+
+  if (source != WX_SOURCE && ua.indexOf("micromessenger") == -1) {
+    return /*#__PURE__*/_react["default"].createElement("span", {
+      dangerouslySetInnerHTML: {
+        __html: str
+      }
+    });
+  }
+
   var reg = /\$(userName|departmentName)\=(.+?)\$/g;
   var strReg = /\$(?:userName|departmentName)\=.+?\$/;
   var openDatas = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.13.2",
+  "version": "1.13.5",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",