@titaui/pc 1.12.7 → 1.12.8

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

@@ -124,45 +124,45 @@ function Header(props, ref) {
     var rootNode = {
       rootId: 0,
       // @ts-ignore
-      rootName: window.BSGlobal.tenantInfo.Name || ""
+      rootName: window.BSGlobal.tenantInfo.Name || ''
     };
     var level2Selected = {
       id: 0,
       // @ts-ignore
-      name: window.BSGlobal.tenantInfo.Name || ""
+      name: window.BSGlobal.tenantInfo.Name || ''
     };
-    var searchType = "company";
+    var searchType = 'company';
 
     if (departmentId && departmentId !== -1) {
       rootNode.rootId = departmentId;
-      rootNode.rootName = departmentName || "";
-      searchType = "depart";
+      rootNode.rootName = departmentName || '';
+      searchType = 'depart';
       level2Selected.id = departmentId;
-      level2Selected.name = departmentName || "";
+      level2Selected.name = departmentName || '';
     }
 
     if (toUserId) {
       rootNode.rootId = toUserId;
-      rootNode.rootName = userInfo.name || "";
-      searchType = "user";
+      rootNode.rootName = userInfo.name || '';
+      searchType = 'user';
       level2Selected.id = toUserId;
-      level2Selected.name = userInfo.name || "";
+      level2Selected.name = userInfo.name || '';
     }
 
     if (parseInt(relation, 10) === 1) {
       rootNode.rootId = (0, _bsGlobal.getUserInfo)().Id;
-      rootNode.rootName = (0, _bsGlobal.getUserInfo)().Name || "";
-      searchType = "user";
+      rootNode.rootName = (0, _bsGlobal.getUserInfo)().Name || '';
+      searchType = 'user';
       level2Selected.id = (0, _bsGlobal.getUserInfo)().Id;
-      level2Selected.name = (0, _bsGlobal.getUserInfo)().Name || "";
+      level2Selected.name = (0, _bsGlobal.getUserInfo)().Name || '';
     }
 
     var urlQuery = ["searchType=".concat(searchType), "period=".concat(JSON.stringify({
       cycleType: cycleType,
       annualNum: annualNum,
       yqmNum: yqmNum
-    })), "rootNode=".concat(JSON.stringify(rootNode)), "level2Selected=".concat(JSON.stringify(level2Selected))].join("&");
-    var origin = window.location.href.split("#")[0];
+    })), "rootNode=".concat(JSON.stringify(rootNode)), "level2Selected=".concat(JSON.stringify(level2Selected))].join('&');
+    var origin = window.location.href.split('#')[0];
     window.location.href = "".concat(origin, "/#okr/map?").concat(urlQuery);
   };
 
@@ -221,7 +221,7 @@ function Header(props, ref) {
     className: "".concat(_precls.precls, "__header-item"),
     onClick: gotoOkrMap
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-    overlay: (0, _getLocale.getLocale)("OKR_MyO_Text_Alignment"),
+    overlay: (0, _getLocale.getLocale)('OKR_MyO_Text_Alignment'),
     placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(_precls.precls, "__header-icon")

package/lib/utils/hooks.js

@@ -24,15 +24,15 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function parseUrl(fragmentStr) {
   var queryObject = {};
   if (!fragmentStr) return queryObject;
-  var markIndex = fragmentStr.indexOf("?"); // contain query string in fragments
+  var markIndex = fragmentStr.indexOf('?'); // contain query string in fragments
 
   if (markIndex > -1) {
     // build query object
     var queryString = fragmentStr.slice(markIndex + 1);
-    var queryArray = queryString.split("&");
+    var queryArray = queryString.split('&');
 
     for (var i = 0; i < queryArray.length; i += 1) {
-      var queryPair = queryArray[i].split("=");
+      var queryPair = queryArray[i].split('=');
       queryObject[queryPair[0]] = decodeURIComponent(queryPair[1]);
     }
   }
@@ -64,9 +64,9 @@ function useQuery(name) {
     }
   }, []);
   (0, _react.useEffect)(function () {
-    window.addEventListener("hashchange", hashChangeHandler);
+    window.addEventListener('hashchange', hashChangeHandler);
     return function () {
-      window.removeEventListener("hashchange", hashChangeHandler);
+      window.removeEventListener('hashchange', hashChangeHandler);
     };
   }, []);
   return state;

package/lib/utils/open-data.js

@@ -5,16 +5,24 @@ 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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+
+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 +73,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 +87,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 +230,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]
@@ -238,7 +247,57 @@ var parseString = function parseString(str) {
     matchStr = reg.exec(str);
   }
 
-  var commonStrs = str.split(strReg);
+  var commonStrs = str === null || str === void 0 ? void 0 : str.split(strReg);
+  var renderData = [];
+
+  for (var i = 0; i < commonStrs.length; i++) {
+    var _v2Paresed = parseStringV2(commonStrs[i]);
+
+    renderData.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)\=(.+?)\$/g;
+  var strReg = /\$(?:userName|departmentName)\=.+?\$/;
+  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 === null || str === void 0 ? void 0 : str.split(strReg)) || [];
   var renderData = [];
 
   for (var i = 0; i < commonStrs.length; i++) {
@@ -253,33 +312,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)\=(.+?)\$/g;
+            strReg = /\$(?:userName|departmentName)\=.+?\$/;
+            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 === null || str === void 0 ? void 0 : 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 +488,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/lib/utils/tita-okr-cycle.js

@@ -17,8 +17,8 @@ exports.cycleType = void 0;
 var cycleType = {
   '-1': '全部周期',
   '1': '年度',
-  "2": "季度",
-  "4": "双月",
-  "5": "半年度"
+  '2': '季度',
+  '4': '双月',
+  '5': '半年度'
 };
 exports.cycleType = cycleType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.7",
+  "version": "1.12.8",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -78,6 +78,7 @@
     "@titaui/rc-trigger": "5.2.5",
     "@titaui/react-flow-renderer": "9.5.4",
     "@titaui/request": "^1.0.1",
+    "@titaui/rich-editor": "^0.1.46",
     "@titaui/toast": "1.0.0",
     "@types/color": "3.0.3",
     "@types/prosemirror-commands": "1.0.4",