@titaui/pc 1.12.22 → 1.12.24

package/lib/components/task-relation-modal/okr-relation/relation-task-model/index.js

@@ -188,7 +188,7 @@ function OkrRelationTaskModal(props) {
   };
 
   var onOkHandler = function onOkHandler() {
-    if (krId && selected !== null && selected !== void 0 && selected.length) {
+    if ((krId || okrId) && selected !== null && selected !== void 0 && selected.length) {
       (0, _requestApi.relateOkr)(selected, krId, okrId).then(function (res) {
         if (res.Code) {
           _toast["default"].Success((0, _getLocale.getLocale)('Per_Ass_New_Ass_text_Succe'));

package/lib/components/task-relation-modal/okr-relation/relation-work-model/index.js

@@ -83,7 +83,7 @@ function OkrRelationWorkModal(props) {
   }, [defaultVisible]);
 
   var onOkHandler = function onOkHandler() {
-    if (krId && selected !== null && selected !== void 0 && selected.length) {
+    if ((krId || okrId) && selected !== null && selected !== void 0 && selected.length) {
       (0, _requestApi.workRelateOkr)(selected, krId, okrId).then(function (res) {
         if (res.Code) {
           _toast["default"].Success((0, _getLocale.getLocale)('Per_Ass_New_Ass_text_Succe'));

package/lib/utils/open-data.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _bsGlobal = require("./bs-global");
 
+var Sentry = _interopRequireWildcard(require("@sentry/browser"));
+
 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); }
@@ -30,12 +32,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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; }
 
 var WX_SOURCE = 860;
-var WX_UA_STR = 'micromessenger';
+var WX_UA_STR = "micromessenger";
 var FEISHU_SOURCE = 862;
 var DINGTALK_SOURCE = 861;
 
 var getSource = function getSource() {
-  return (0, _bsGlobal.getBSGlobal)('tenantInfo').Source;
+  return (0, _bsGlobal.getBSGlobal)("tenantInfo").Source;
 };
 
 exports.getSource = getSource;
@@ -59,10 +61,10 @@ var getUA = function getUA() {
 var getOpenId = function getOpenId(id, type) {
   var openIds;
 
-  if (type == 'userName') {
-    openIds = (0, _bsGlobal.getBSGlobal)('openIds');
-  } else if (type == 'departmentName') {
-    openIds = (0, _bsGlobal.getBSGlobal)('openDepartmentIds');
+  if (type == "userName") {
+    openIds = (0, _bsGlobal.getBSGlobal)("openIds");
+  } else if (type == "departmentName") {
+    openIds = (0, _bsGlobal.getBSGlobal)("openDepartmentIds");
   }
 
   return openIds && openIds[id];
@@ -73,9 +75,40 @@ exports.getOpenId = getOpenId;
 function openData(p) {
   if (getSource() == WX_SOURCE || getUA().includes(WX_UA_STR)) {
     return function (p) {
-      if (p.id === undefined && p.corpId === undefined) return p.name || null;
+      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);
-      if (!openId) return p.name || p.id || null;
+
+      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;
+      }
+
       var ref = (0, _react.useRef)(null);
       (0, _react.useEffect)(function () {
         var wWOpenData = window.top.WWOpenData; // // 如果当前页面中没有 WWOpenData 则去 top 上尝试获取
@@ -87,10 +120,10 @@ 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__*/_react["default"].createElement("ww-open-data", {
         ref: ref,
@@ -98,7 +131,7 @@ function openData(p) {
         openid: openId
       }), /*#__PURE__*/_react["default"].createElement("div", {
         style: {
-          position: 'absolute',
+          position: "absolute",
           top: 0,
           left: 0,
           right: 0,
@@ -118,7 +151,7 @@ var getOpenData = openData();
 
 var OpenUserName = function OpenUserName(p) {
   return getOpenData(_objectSpread(_objectSpread({}, p), {}, {
-    type: 'userName'
+    type: "userName"
   }));
 };
 
@@ -126,7 +159,7 @@ exports.OpenUserName = OpenUserName;
 
 var OpenDepartmentName = function OpenDepartmentName(p) {
   return getOpenData(_objectSpread(_objectSpread({}, p), {}, {
-    type: 'departmentName'
+    type: "departmentName"
   }));
 };
 
@@ -137,22 +170,22 @@ var openDataMap = {
 }; // name:'wx'|'dd'|'feishu',type:'source'|'env'|'all' = 'all'
 
 var isPlatform = function isPlatform(name) {
-  var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'all';
+  var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "all";
 
   switch (name) {
-    case 'wx':
+    case "wx":
       {
-        if (type == 'source') return getSource() == WX_SOURCE;
-        if (type == 'env') return getUA().includes(WX_UA_STR);
+        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);
       }
 
-    case 'dd':
+    case "dd":
       {
         return getSource() == DINGTALK_SOURCE;
       }
 
-    case 'feishu':
+    case "feishu":
       {
         return getSource() == FEISHU_SOURCE;
       }
@@ -171,7 +204,7 @@ var parseTag = function parseTag(str) {
   //   return <span dangerouslySetInnerHTML={{ '__html': str }} />;
 
   while (matchStr != null) {
-    var OpenDataCompoent = matchStr[1] == 'userId' ? OpenUserName : OpenDepartmentName;
+    var OpenDataCompoent = matchStr[1] == "userId" ? OpenUserName : OpenDepartmentName;
 
     if (!OpenDataCompoent) {
       openDatas.push( /*#__PURE__*/_react["default"].createElement("span", {
@@ -185,8 +218,8 @@ var parseTag = function parseTag(str) {
     } else {
       openDatas.push( /*#__PURE__*/_react["default"].createElement("span", {
         style: {
-          color: '#1890ff',
-          margin: '0 4px'
+          color: "#1890ff",
+          margin: "0 4px"
         },
         onClick: function onClick(e) {
           return e.stopPropagation();
@@ -221,11 +254,15 @@ var parseString = function parseString(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 != 860 && ua.indexOf("micromessenger") == -1) {
+    return /*#__PURE__*/_react["default"].createElement("span", {
+      dangerouslySetInnerHTML: {
+        __html: str
+      }
+    });
+  }
+
   var reg = /\[(\w+?)\:(\w+?)\]/g;
   var strReg = /\[\w+?\:\w+?\]/;
   var openDatas = [];
@@ -273,11 +310,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 != 860 && ua.indexOf("micromessenger") == -1) {
+    return /*#__PURE__*/_react["default"].createElement("span", {
+      dangerouslySetInnerHTML: {
+        __html: str
+      }
+    });
+  }
+
   var reg = /\$(userName|departmentName)\=(.+?)\$/g;
   var strReg = /\$(?:userName|departmentName)\=.+?\$/;
   var openDatas = [];
@@ -332,14 +373,14 @@ var parseOpenDataStringToImg = /*#__PURE__*/function () {
             font = _args.length > 1 && _args[1] !== undefined ? _args[1] : {
               lineHeight: 20,
               fontSize: 18,
-              fontWeight: '500',
-              color: '#3f4755'
+              fontWeight: "500",
+              color: "#3f4755"
             };
             font = _objectSpread(_objectSpread({}, {
               lineHeight: 20,
               fontSize: 18,
-              fontWeight: '500',
-              color: '#3f4755'
+              fontWeight: "500",
+              color: "#3f4755"
             }), font || {});
             reg = /\$(userName|departmentName)\=(.+?)\$/g;
             strReg = /\$(?:userName|departmentName)\=.+?\$/;
@@ -405,8 +446,8 @@ var getCanvasImg = /*#__PURE__*/function () {
           case 0:
             lineHeight = _ref2.lineHeight, fontSize = _ref2.fontSize, fontWeight = _ref2.fontWeight, color = _ref2.color;
             font = "".concat(fontWeight, " ").concat(fontSize, "px/").concat(lineHeight, "px arial,sans-serif");
-            canvas = document.createElement('canvas');
-            ctx = canvas.getContext('2d');
+            canvas = document.createElement("canvas");
+            ctx = canvas.getContext("2d");
 
             if (ctx) {
               _context2.next = 6;
@@ -424,16 +465,16 @@ var getCanvasImg = /*#__PURE__*/function () {
 
           case 8:
             name = _context2.sent;
-            img = document.createElement('img');
+            img = document.createElement("img");
             ctx.font = font; // const fitStr = fittingString(ctx, name, 92);
 
-            _ctx$measureText = ctx.measureText(name || ''), width = _ctx$measureText.width;
+            _ctx$measureText = ctx.measureText(name || ""), width = _ctx$measureText.width;
             actualWidth = Math.min(width, 92);
             (0, _openDataPainter.setSize)(canvas, ctx, actualWidth, lineHeight);
-            ctx.textBaseline = 'middle';
+            ctx.textBaseline = "middle";
             ctx.font = font;
             ctx.fillStyle = color;
-            ctx.fillText(name || '', 0, lineHeight / 2);
+            ctx.fillText(name || "", 0, lineHeight / 2);
             src = canvas.toDataURL();
             return _context2.abrupt("return", /*#__PURE__*/_react["default"].createElement("img", {
               src: src,
@@ -464,7 +505,7 @@ var parseHtmlAndTextTag = function parseHtmlAndTextTag(str) {
 
   while (matchStr != null) {
     if (matchStr) {
-      var OpenDataCompoent = matchStr[1] == 'userId' ? OpenUserName : OpenDepartmentName;
+      var OpenDataCompoent = matchStr[1] == "userId" ? OpenUserName : OpenDepartmentName;
 
       if (!OpenDataCompoent) {
         var strParsed = parseString(matchStr[0]);
@@ -472,8 +513,8 @@ var parseHtmlAndTextTag = function parseHtmlAndTextTag(str) {
       } else {
         openDatas.push( /*#__PURE__*/_react["default"].createElement("span", {
           style: {
-            color: '#1890ff',
-            margin: '0 4px'
+            color: "#1890ff",
+            margin: "0 4px"
           },
           onClick: function onClick(e) {
             return e.stopPropagation();

package/package.json

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