@titaui/pc 1.13.5-beta.1 → 1.13.7

package/lib/utils/open-data.js

@@ -15,6 +15,8 @@ var _bsGlobal = require("./bs-global");
 
 var _openDataPainter = require("../components/open-data-painter");
 
+var _helpers = require("./helpers");
+
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -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];
@@ -74,7 +76,27 @@ 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 && ((_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;
+      };
+    }
+
     return function (p) {
       var pId = p.id,
           pName = p.name,
@@ -89,18 +111,39 @@ function openData() {
       var openId = pCorpId || getOpenId(pId, pType);
 
       if (!openId) {
-        if (!pId) {
+        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);
+            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);
           });
         }
 
@@ -113,28 +156,24 @@ function openData() {
 
         // @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);
-
-        if (!openId) {}
       }, []);
       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
       _react["default"].createElement("ww-open-data", {
         ref: ref,
-        type: p.type,
+        type: pType,
         openid: openId
       }), /*#__PURE__*/_react["default"].createElement("div", {
         style: {
-          position: "absolute",
+          position: 'absolute',
           top: 0,
           left: 0,
           right: 0,
@@ -154,7 +193,7 @@ var getOpenData = openData();
 
 var OpenUserName = function OpenUserName(p) {
   return getOpenData(_objectSpread(_objectSpread({}, p), {}, {
-    type: "userName"
+    type: 'userName'
   }));
 };
 
@@ -162,7 +201,7 @@ exports.OpenUserName = OpenUserName;
 
 var OpenDepartmentName = function OpenDepartmentName(p) {
   return getOpenData(_objectSpread(_objectSpread({}, p), {}, {
-    type: "departmentName"
+    type: 'departmentName'
   }));
 };
 
@@ -173,22 +212,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;
       }
@@ -210,7 +249,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", {
@@ -224,8 +263,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();
@@ -261,7 +300,7 @@ var parseString = function parseString(str) {
   var source = window.BSGlobal.tenantInfo.Source;
   var ua = navigator.userAgent.toLowerCase();
 
-  if (source != WX_SOURCE && ua.indexOf("wxwork") == -1) {
+  if (source != WX_SOURCE && ua.indexOf('wxwork') == -1) {
     return /*#__PURE__*/_react["default"].createElement("span", {
       dangerouslySetInnerHTML: {
         __html: str
@@ -319,7 +358,7 @@ var parseStringV2 = function parseStringV2(str) {
   var source = window.BSGlobal.tenantInfo.Source;
   var ua = navigator.userAgent.toLowerCase();
 
-  if (source != WX_SOURCE && ua.indexOf("micromessenger") == -1) {
+  if (source != WX_SOURCE && ua.indexOf('micromessenger') == -1) {
     return /*#__PURE__*/_react["default"].createElement("span", {
       dangerouslySetInnerHTML: {
         __html: str
@@ -381,14 +420,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)\=.+?\$/;
@@ -454,8 +493,8 @@ var getCanvasImg = /*#__PURE__*/function () {
           case 0:
             lineHeight = _ref3.lineHeight, fontSize = _ref3.fontSize, fontWeight = _ref3.fontWeight, color = _ref3.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;
@@ -473,16 +512,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,
@@ -513,7 +552,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]);
@@ -521,8 +560,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/lib/utils/tools.js

@@ -10,7 +10,9 @@ exports.htmlDecodeByHtmlRegExp = htmlDecodeByHtmlRegExp;
 exports.htmlDecodeByRegExp = htmlDecodeByRegExp;
 exports.htmlEncodeByRegExp = htmlEncodeByRegExp;
 exports.htmlEncodeToHtmlByRegExp = htmlEncodeToHtmlByRegExp;
-exports.unHighLight = exports.openPage = exports.htmlToText = void 0;
+exports.openPage = exports.htmlToText = void 0;
+exports.openUrl = openUrl;
+exports.unHighLight = void 0;
 
 var _platform = require("./platform");
 
@@ -34,6 +36,14 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function openUrl(url) {
+  if (typeof url !== 'string') return;
+  var newTab = window.open();
+  if (!newTab) return;
+  newTab.opener = null;
+  newTab.location = url;
+}
+
 function htmlEncodeByRegExp(str) {
   if (!str) return "";
   var htmlString = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.13.5-beta.1",
+  "version": "1.13.7",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -38,6 +38,7 @@
     "@types/styled-components": "5.1.2",
     "@typescript-eslint/eslint-plugin": "5.10.0",
     "@typescript-eslint/parser": "5.10.0",
+    "@webpack-cli/serve": "^1.7.0",
     "babel-loader": "8.1.0",
     "babel-plugin-import": "1.13.3",
     "babel-plugin-module-resolver": "4.1.0",
@@ -78,7 +79,7 @@
     "@titaui/rc-trigger": "5.2.5",
     "@titaui/react-flow-renderer": "9.5.4",
     "@titaui/request": "^1.0.1",
-    "@titaui/rich-editor": "0.1.56",
+    "@titaui/rich-editor": "0.1.63",
     "@titaui/toast": "1.0.0",
     "@types/color": "3.0.3",
     "@types/prosemirror-commands": "1.0.4",