@titaui/pc 1.11.52-beta.3 → 1.11.52-beta.6

package/lib/pages/home/components/data-list/table/columns/okrName.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _openData = require("../../../../../../utils/open-data");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -25,11 +27,11 @@ function OkrNameColumn(_ref) {
     className: "".concat(preCls, "__tagO")
   }, "O"), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(preCls, "__contentO")
-  }, children)), type === "KR" && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+  }, (0, _openData.parseString)(children))), type === "KR" && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__tagKR")
   }, "KR"), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(preCls, "__contentKR")
-  }, children)));
+  }, (0, _openData.parseString)(children))));
 }
 
 var _default = OkrNameColumn;

package/lib/pages/new-okr-list/header/index.css

@@ -65,7 +65,7 @@
   align-items: center;
   padding: 5px 8px;
   box-sizing: border-box;
-  font-size: 16px;
+  font-size: 14px;
   color: #3f4755;
   line-height: 22px;
   cursor: pointer;

package/lib/utils/open-data.js

@@ -5,16 +5,22 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.parseTag = exports.parseString = exports.parseHtmlAndTextTag = exports.isWxTrial = exports.isWechat = exports.isPlatform = exports.getSource = exports.getOpenId = exports["default"] = exports.OpenUserName = exports.OpenDepartmentName = void 0;
+exports.parseTag = exports.parseStringV2 = exports.parseString = exports.parseOpenDataStringToImg = exports.parseHtmlAndTextTag = exports.isWxTrial = exports.isWechat = exports.isPlatform = exports.getSource = exports.getOpenId = exports["default"] = exports.OpenUserName = exports.OpenDepartmentName = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
 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); }
 
 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; }
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -65,8 +71,8 @@ exports.getOpenId = getOpenId;
 function openData(p) {
   if (getSource() == WX_SOURCE || getUA().includes(WX_UA_STR)) {
     return function (p) {
-      if (p.id === undefined) return p.name || null;
-      var openId = getOpenId(p.id, p.type);
+      if (p.id === undefined && p.corpId === undefined) return p.name || null;
+      var openId = p.corpId || getOpenId(p.id, p.type);
       if (!openId) return p.name || p.id || null;
       var ref = (0, _react.useRef)(null);
       (0, _react.useEffect)(function () {
@@ -79,11 +85,10 @@ function openData(p) {
       });
       return /*#__PURE__*/_react["default"].createElement("div", {
         style: {
-          display: 'inline-block',
+          display: 'inline',
           position: 'relative',
           overflow: 'hidden',
-          textOverflow: 'ellipsis',
-          verticalAlign: 'middle'
+          textOverflow: 'ellipsis'
         }
       }, /*#__PURE__*/_react["default"].createElement("ww-open-data", {
         ref: ref,
@@ -223,12 +228,14 @@ var parseString = function parseString(str) {
   var strReg = /\[\w+?\:\w+?\]/;
   var openDatas = [];
   var matchStr = reg.exec(str);
+  if (!matchStr) return parseStringV2(str);
 
   while (matchStr != null) {
     var OpenDataCompoent = openDataMap[matchStr[2]];
 
     if (!OpenDataCompoent) {
-      openDatas.push(matchStr[0]);
+      var v2Paresed = parseStringV2(matchStr[0]);
+      openDatas.push( /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, v2Paresed));
     } else {
       openDatas.push( /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(OpenDataCompoent, {
         id: matchStr[1]
@@ -241,6 +248,56 @@ var parseString = function parseString(str) {
   var commonStrs = str.split(strReg);
   var renderData = [];
 
+  for (var i = 0; i < commonStrs.length; i++) {
+    var _v2Paresed = parseStringV2(commonStrs[i]);
+
+    openDatas.push( /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _v2Paresed)); // renderData.push(
+    //   <span dangerouslySetInnerHTML={{ __html: commonStrs[i] }} />,
+    // )
+
+    renderData.push(openDatas[i]);
+  }
+
+  return renderData;
+};
+
+exports.parseString = parseString;
+var openDataMapV2 = {
+  userName: OpenUserName,
+  departmentName: OpenDepartmentName
+};
+
+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
+    }
+  });
+  var reg = /\$(userName|departmentName)\=(.+?)(\s|$)/g;
+  var strReg = /\$(?:userName|departmentName)\=.+?(?:\s|$)/;
+  var openDatas = [];
+  var matchStr = reg.exec(str);
+
+  while (matchStr != null) {
+    var OpenDataCompoent = openDataMapV2[matchStr[1]];
+
+    if (!OpenDataCompoent) {
+      openDatas.push(matchStr[0]);
+    } else {
+      openDatas.push( /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(OpenDataCompoent, {
+        corpId: matchStr[2]
+      })));
+    }
+
+    matchStr = reg.exec(str);
+  }
+
+  var commonStrs = str.split(strReg);
+  var renderData = [];
+
   for (var i = 0; i < commonStrs.length; i++) {
     renderData.push( /*#__PURE__*/_react["default"].createElement("span", {
       dangerouslySetInnerHTML: {
@@ -253,33 +310,163 @@ var parseString = function parseString(str) {
   return renderData;
 };
 
-exports.parseString = parseString;
+exports.parseStringV2 = parseStringV2;
+
+var parseOpenDataStringToImg = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(str) {
+    var font,
+        reg,
+        strReg,
+        openDatas,
+        matchStr,
+        commonStrs,
+        renderData,
+        i,
+        _args = arguments;
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            font = _args.length > 1 && _args[1] !== undefined ? _args[1] : {
+              lineHeight: 20,
+              fontSize: 18,
+              fontWeight: '500',
+              color: '#3f4755'
+            };
+            font = _objectSpread(_objectSpread({}, {
+              lineHeight: 20,
+              fontSize: 18,
+              fontWeight: '500',
+              color: '#3f4755'
+            }), font || {});
+            reg = /\$(userName|departmentName)\=(.+?)(\s|$)/g;
+            strReg = /\$(?:userName|departmentName)\=.+?(?:\s|$)/;
+            openDatas = [];
+            matchStr = reg.exec(str);
+
+          case 6:
+            if (!(matchStr != null)) {
+              _context.next = 15;
+              break;
+            }
+
+            _context.t0 = openDatas;
+            _context.next = 10;
+            return getCanvasImg(matchStr[2], matchStr[1], font);
+
+          case 10:
+            _context.t1 = _context.sent;
+
+            _context.t0.push.call(_context.t0, _context.t1);
+
+            matchStr = reg.exec(str);
+            _context.next = 6;
+            break;
+
+          case 15:
+            commonStrs = str.split(strReg);
+            renderData = [];
+
+            for (i = 0; i < commonStrs.length; i++) {
+              renderData.push( /*#__PURE__*/_react["default"].createElement("span", {
+                dangerouslySetInnerHTML: {
+                  __html: commonStrs[i]
+                }
+              }));
+              renderData.push(openDatas[i]);
+            }
+
+            return _context.abrupt("return", renderData);
+
+          case 19:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function parseOpenDataStringToImg(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+exports.parseOpenDataStringToImg = parseOpenDataStringToImg;
+
+var getCanvasImg = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(id, type, _ref2) {
+    var lineHeight, fontSize, fontWeight, color, font, canvas, ctx, name, img, _ctx$measureText, width, actualWidth, src;
+
+    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          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');
+
+            if (ctx) {
+              _context2.next = 6;
+              break;
+            }
+
+            return _context2.abrupt("return", null);
+
+          case 6:
+            _context2.next = 8;
+            return (0, _openDataPainter.getOpenData)({
+              openId: id,
+              type: type
+            });
+
+          case 8:
+            name = _context2.sent;
+            img = document.createElement('img');
+            ctx.font = font; // const fitStr = fittingString(ctx, name, 92);
+
+            _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.font = font;
+            ctx.fillStyle = color;
+            ctx.fillText(name || '', 0, lineHeight / 2);
+            src = canvas.toDataURL();
+            return _context2.abrupt("return", /*#__PURE__*/_react["default"].createElement("img", {
+              src: src,
+              width: actualWidth,
+              height: lineHeight
+            }));
+
+          case 20:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+
+  return function getCanvasImg(_x2, _x3, _x4) {
+    return _ref3.apply(this, arguments);
+  };
+}();
 
 var parseHtmlAndTextTag = function parseHtmlAndTextTag(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);
-  var openDatareg = /\[(\w+?)\:(\w+?)\]/g;
-  var openDataStrReg = /\[\w+?\:\w+?\]/;
-  var openDataMatchStr = openDatareg.exec(str);
-  var hasMatchStr = false;
   var renderData = [];
+  if (matchStr == null) return parseString(str);
 
   while (matchStr != null) {
     if (matchStr) {
-      hasMatchStr = true;
       var OpenDataCompoent = matchStr[1] == 'userId' ? OpenUserName : OpenDepartmentName;
 
       if (!OpenDataCompoent) {
-        openDatas.push( /*#__PURE__*/_react["default"].createElement("span", {
-          dangerouslySetInnerHTML: {
-            __html: matchStr[0]
-          },
-          onClick: function onClick(e) {
-            return e.stopPropagation();
-          }
-        }));
+        var strParsed = parseString(matchStr[0]);
+        openDatas.push( /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, strParsed));
       } else {
         openDatas.push( /*#__PURE__*/_react["default"].createElement("span", {
           style: {
@@ -299,56 +486,17 @@ var parseHtmlAndTextTag = function parseHtmlAndTextTag(str) {
     }
   }
 
-  if (hasMatchStr) {
-    var commonStrs = str.split(strReg);
-
-    for (var i = 0; i < commonStrs.length; i++) {
-      renderData.push( /*#__PURE__*/_react["default"].createElement("span", {
-        dangerouslySetInnerHTML: {
-          __html: commonStrs[i]
-        }
-      }));
-      renderData.push(openDatas[i]);
-    }
-  }
-
-  while (openDataMatchStr != null) {
-    if (openDataMatchStr) {
-      var _OpenDataCompoent = openDataMap[openDataMatchStr[2]];
-
-      if (!_OpenDataCompoent) {
-        openDatas.push(openDataMatchStr[0]);
-      } else {
-        openDatas.push( /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_OpenDataCompoent, {
-          id: openDataMatchStr[1]
-        })));
-      }
-
-      openDataMatchStr = openDatareg.exec(str);
-    }
-  }
+  var commonStrs = str.split(strReg);
 
-  var newCommonStrs = str.split(openDataStrReg);
+  for (var i = 0; i < commonStrs.length; i++) {
+    var _strParsed = parseString(commonStrs[i]);
 
-  for (var _i = 0; _i < newCommonStrs.length; _i++) {
-    renderData.push( /*#__PURE__*/_react["default"].createElement("span", {
-      dangerouslySetInnerHTML: {
-        __html: newCommonStrs[_i]
-      }
-    }));
-    renderData.push(openDatas[_i]);
+    renderData.push( /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _strParsed));
+    renderData.push(openDatas[i]);
   }
 
   return renderData.filter(function (item) {
     return item !== undefined;
-  }).map(function (item) {
-    if (typeof item === 'string') {
-      return item.replace('，', '');
-    } else {
-      return item;
-    }
-  }).filter(function (item) {
-    return item !== '';
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.11.52-beta.3",
+  "version": "1.11.52-beta.6",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -34,6 +34,7 @@
     "@storybook/addon-knobs": "6.0.10",
     "@storybook/addon-links": "6.0.10",
     "@storybook/react": "6.0.10",
+    "@titaui/rich-editor": "^0.1.29",
     "@types/prosemirror-state": "1.2.8",
     "@types/styled-components": "5.1.2",
     "@typescript-eslint/eslint-plugin": "5.10.0",
@@ -144,7 +145,7 @@
     "react-transition-group": "4.4.2",
     "resize-observer-polyfill": "1.5.1",
     "slick-carousel": "1.8.1",
-    "tita-ui": "1.2.56",
+    "tita-ui": "1.2.52",
     "url-parse": "1.5.1",
     "uuid": "3.1.0",
     "viewerjs": "1.10.1",

package/lib/components/contact-kefu/index.css

@@ -1,85 +0,0 @@
-.contact-kefu {
-  position: relative;
-  height: 100vh;
-  background: #f0f4fa;
-  overflow: hidden;
-}
-
-.contact-kefu__kefu {
-  position: absolute;
-  bottom: 74px;
-  right: 24px;
-  z-index: 2;
-}
-
-.contact-kefu__try-kefu {
-  position: absolute;
-  bottom: 134px;
-  right: 24px;
-  z-index: 2;
-}
-
-.contact-kefu__kefu {
-  width: 42px;
-  height: 42px;
-  background: url("./img/kefu.svg") no-repeat;
-  background-color: #fff;
-  background-size: 42px;
-  box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
-  cursor: pointer;
-  border-radius: 50%;
-}
-
-.contact-kefu__hidden {
-  background-image: none;
-}
-
-.contact-kefu__cancel {
-  height: 100%;
-  background: url("./img/canceled.svg") 50% 50% no-repeat;
-  animation-duration: 0.3s;
-  animation-name: kefuActive;
-}
-
-.contact-kefu__popup {
-  width: 332px;
-  height: 376px;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  background: #ffffff;
-  box-shadow: 0px 8px 24px 0px rgba(127, 145, 180, 0.16);
-  border-radius: 24px;
-}
-
-.contact-kefu__popup-title {
-  font-size: 20px;
-  font-weight: 600;
-  color: #141c28;
-  line-height: 30px;
-}
-
-.contact-kefu__popup-content {
-  margin-top: 4px;
-  font-size: 14px;
-  font-weight: normal;
-  color: #6f7886;
-  line-height: 22px;
-}
-
-.contact-kefu__popup-img {
-  width: 200px;
-  height: 200px;
-  margin-top: 24px;
-}
-
-@keyframes contentOpacity {
-  from {
-    opacity: 0;
-  }
-
-  to {
-    opacity: 1;
-  }
-}