@titaui/pc 1.11.52-beta.2 → 1.11.52-beta.20

package/lib/components/okr-share/common-painter/utils.js

@@ -7,6 +7,14 @@ exports.breakLinesForCanvas = breakLinesForCanvas;
 exports.drawImage = drawImage;
 exports.drawTextMiddle = drawTextMiddle;
 
+var _openDataPainter = _interopRequireDefault(require("./openDataPainter"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+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 drawImage(ctx, url, x, y, width, height) {
   return new Promise(function (res) {
     var img = new Image();
@@ -19,30 +27,65 @@ function drawImage(ctx, url, x, y, width, height) {
   });
 }
 
-function drawTextMiddle(ctx, text, x, y, lineHeight, maxWidth, textAlign) {
-  ctx.textBaseline = "middle";
-
-  if (!maxWidth) {
-    ctx.fillText(text, x, y + lineHeight / 2);
-    return y + lineHeight;
-  }
-
-  var lines = breakLinesForCanvas(ctx, text, maxWidth);
-  lines.forEach(function (l) {
-    var _ctx$measureText = ctx.measureText(l),
-        width = _ctx$measureText.width;
-
-    var left = x;
-
-    if (textAlign == "center" && maxWidth) {
-      console.log(maxWidth, width);
-      left = (maxWidth - width) / 2 + x;
-    }
+function drawTextMiddle(_x, _x2, _x3, _x4, _x5, _x6, _x7) {
+  return _drawTextMiddle.apply(this, arguments);
+}
 
-    ctx.fillText(l, left, y + lineHeight / 2);
-    y += lineHeight;
-  });
-  return y;
+function _drawTextMiddle() {
+  _drawTextMiddle = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(ctx, text, x, y, lineHeight, maxWidth, textAlign) {
+    var lines;
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            ctx.textBaseline = 'middle';
+
+            if (maxWidth) {
+              _context.next = 4;
+              break;
+            }
+
+            ctx.fillText(text, x, y + lineHeight / 2);
+            return _context.abrupt("return", y + lineHeight);
+
+          case 4:
+            _context.next = 6;
+            return breakLinesForCanvas(ctx, text, maxWidth, lineHeight);
+
+          case 6:
+            lines = _context.sent;
+            lines.forEach(function (l) {
+              var width = l.width;
+              var left = x;
+
+              if (textAlign == 'center' && maxWidth) {
+                console.log(maxWidth - width);
+                console.log('m', maxWidth);
+                console.log('w', width);
+                left = (maxWidth - width) / 2 + x;
+              }
+
+              l.children.forEach(function (item) {
+                if (typeof item == 'string') {
+                  ctx.fillText(item, left, y + lineHeight / 2);
+                  left += ctx.measureText(item).width;
+                } else {
+                  item.draw(ctx, left, y);
+                  left += item.width;
+                }
+              });
+              y += lineHeight;
+            });
+            return _context.abrupt("return", y);
+
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _drawTextMiddle.apply(this, arguments);
 }
 
 function findBreakPoint(text, width, context) {
@@ -68,18 +111,122 @@ function findBreakPoint(text, width, context) {
   return -1;
 }
 
-function breakLinesForCanvas(ctx, text, width) {
-  var result = [];
-  var breakPoint = 0;
-
-  while ((breakPoint = findBreakPoint(text, width, ctx)) !== -1) {
-    result.push(text.substr(0, breakPoint));
-    text = text.substr(breakPoint);
-  }
-
-  if (text) {
-    result.push(text);
-  }
+function breakLinesForCanvas(_x8, _x9, _x10, _x11) {
+  return _breakLinesForCanvas.apply(this, arguments);
+}
 
-  return result;
+function _breakLinesForCanvas() {
+  _breakLinesForCanvas = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(ctx, text, width, lineHeight) {
+    var reg, strReg, openDatas, matchStr, OpenDataCompoent, commonStrs, result, breakPoint, w, line, i, t, subText, openData;
+    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            reg = /\$(userName|departmentName)\=(.+?)\$(\s|$)/g;
+            strReg = /\$(?:userName|departmentName)\=.+?\$(?:\s|$)/;
+            openDatas = [];
+            matchStr = reg.exec(text);
+
+          case 4:
+            if (!(matchStr != null)) {
+              _context2.next = 12;
+              break;
+            }
+
+            _context2.next = 7;
+            return (0, _openDataPainter["default"])(ctx, {
+              openId: matchStr[2],
+              type: matchStr[1]
+            }, lineHeight, width);
+
+          case 7:
+            OpenDataCompoent = _context2.sent;
+            openDatas.push(OpenDataCompoent);
+            matchStr = reg.exec(text);
+            _context2.next = 4;
+            break;
+
+          case 12:
+            commonStrs = text.split(strReg);
+            result = [];
+            breakPoint = 0;
+            w = width;
+            line = {
+              width: 0,
+              children: []
+            };
+            i = 0;
+
+          case 18:
+            if (!(i < commonStrs.length)) {
+              _context2.next = 29;
+              break;
+            }
+
+            t = commonStrs[i];
+
+            while ((breakPoint = findBreakPoint(t, w, ctx)) !== -1) {
+              subText = t.substring(0, breakPoint);
+              line.children.push(subText);
+              line.width += ctx.measureText(subText).width;
+              t = t.substring(breakPoint);
+              result.push(line);
+              line = {
+                width: 0,
+                children: []
+              };
+              w = width;
+            }
+
+            if (t) {
+              w = w - ctx.measureText(t).width;
+              line.children.push(t);
+              line.width += ctx.measureText(t).width;
+            }
+
+            openData = openDatas[i];
+
+            if (openData) {
+              _context2.next = 25;
+              break;
+            }
+
+            return _context2.abrupt("continue", 26);
+
+          case 25:
+            if (w > openData.width) {
+              line.children.push(openData);
+              line.width += openData.width;
+              w = w - openData.width;
+            } else {
+              if (line.width) {
+                result.push(line);
+                line = {
+                  width: 0,
+                  children: []
+                };
+              }
+
+              line.children.push(openData);
+              line.width += openData.width;
+              w = width - openData.width;
+            }
+
+          case 26:
+            i++;
+            _context2.next = 18;
+            break;
+
+          case 29:
+            if (line.width) result.push(line);
+            return _context2.abrupt("return", result);
+
+          case 31:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _breakLinesForCanvas.apply(this, arguments);
 }

package/lib/components/okr-share/index.css

@@ -30,7 +30,7 @@
 }
 
 .okr-share-card::after {
-  content: "";
+  content: '';
   position: absolute;
   height: 70px;
   bottom: 0;
@@ -70,10 +70,11 @@
   margin-top: 24px;
   margin-bottom: 28px;
   text-align: center;
+  word-break: break-all;
 }
 
 .okr-share-card .card-okr__name::before, .okr-share-card .card-okr__name::after {
-  content: "";
+  content: '';
   display: block;
   position: absolute;
   width: 16px;
@@ -114,7 +115,7 @@
 }
 
 .okr-share-card .card-kr__item::before {
-  content: "";
+  content: '';
   position: absolute;
   width: 6px;
   height: 6px;
@@ -169,7 +170,7 @@
 }
 
 .okr-share-card__selector .share-card-button.share::after {
-  content: "";
+  content: '';
   position: absolute;
   z-index: -1;
   background: linear-gradient(180deg, #88bcff 0%, #2879ff 100%);

package/lib/components/okr-share/pink-card/card.js

@@ -39,7 +39,7 @@ function Card(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
     name: data.user.name,
     id: data.user.userId
-  }), "\u7684"), (0, _getLocale.getLocale)("Menu_Title_OKRs")), /*#__PURE__*/_react["default"].createElement("div", {
+  }), "\u7684"), (0, _getLocale.getLocale)('Menu_Title_OKRs')), /*#__PURE__*/_react["default"].createElement("div", {
     className: "okr-share-card-user__dept"
   }, /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
     name: data.user.departmentName,
@@ -48,10 +48,10 @@ function Card(_ref) {
     className: "card-okr__content"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "card-okr__name"
-  }, data.okrName), data.krs.map(function (kr) {
+  }, (0, _openData.parseString)(data.okrName)), data.krs.map(function (kr) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "card-kr__item"
-    }, kr);
+    }, (0, _openData.parseString)(kr));
   })));
 }
 

package/lib/components/okr-share/pink-card/drawKrs.js

@@ -9,22 +9,97 @@ var _index = require("./index");
 
 var _utils = require("../common-painter/utils");
 
-function _default(ctx, krs, y) {
-  if (!krs || !krs.length) return y;
-  y += 12;
-  var lineHeight = 22;
-  var space = 43;
-  var dotRadius = 7 / 2;
-  var dotSpace = 8;
-  ctx.font = "normal 14px/".concat(lineHeight, "px arial,sans-serif");
-  krs.forEach(function (kr) {
-    ctx.beginPath();
-    ctx.arc(space - dotSpace - dotRadius, y + lineHeight / 2, dotRadius, 0, Math.PI * 2);
-    ctx.fillStyle = "#FECCC6";
-    ctx.fill();
-    ctx.closePath();
-    ctx.fillStyle = "#3F4755";
-    y = (0, _utils.drawTextMiddle)(ctx, kr, space, y, lineHeight, _index.pinkCardwidth - space * 2) + 8;
-  });
-  return y - 8;
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+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 _default(_x, _x2, _x3) {
+  return _ref.apply(this, arguments);
+}
+
+function _ref() {
+  _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(ctx, krs, y) {
+    var lineHeight, space, dotRadius, dotSpace, _iterator, _step, kr;
+
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            if (!(!krs || !krs.length)) {
+              _context.next = 2;
+              break;
+            }
+
+            return _context.abrupt("return", y);
+
+          case 2:
+            y += 12;
+            lineHeight = 22;
+            space = 43;
+            dotRadius = 7 / 2;
+            dotSpace = 8;
+            ctx.font = "normal 14px/".concat(lineHeight, "px arial,sans-serif");
+            _iterator = _createForOfIteratorHelper(krs);
+            _context.prev = 9;
+
+            _iterator.s();
+
+          case 11:
+            if ((_step = _iterator.n()).done) {
+              _context.next = 25;
+              break;
+            }
+
+            kr = _step.value;
+            ctx.beginPath();
+            ctx.arc(space - dotSpace - dotRadius, y + lineHeight / 2, dotRadius, 0, Math.PI * 2);
+            ctx.fillStyle = '#FECCC6';
+            ctx.fill();
+            ctx.closePath();
+            ctx.fillStyle = '#3F4755';
+            _context.next = 21;
+            return (0, _utils.drawTextMiddle)(ctx, kr, space, y, lineHeight, _index.pinkCardwidth - space * 2);
+
+          case 21:
+            _context.t0 = _context.sent;
+            y = _context.t0 + 8;
+
+          case 23:
+            _context.next = 11;
+            break;
+
+          case 25:
+            _context.next = 30;
+            break;
+
+          case 27:
+            _context.prev = 27;
+            _context.t1 = _context["catch"](9);
+
+            _iterator.e(_context.t1);
+
+          case 30:
+            _context.prev = 30;
+
+            _iterator.f();
+
+            return _context.finish(30);
+
+          case 33:
+            return _context.abrupt("return", y - 8);
+
+          case 34:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[9, 27, 30, 33]]);
+  }));
+  return _ref.apply(this, arguments);
 }

package/lib/components/okr-share/pink-card/index.js

@@ -50,12 +50,12 @@ function _drawPinkCard() {
               window.WWOpenData.initCanvas();
             }
 
-            canvas = document.createElement("canvas");
-            ctx = canvas.getContext("2d");
+            canvas = document.createElement('canvas');
+            ctx = canvas.getContext('2d');
             (0, _setSize["default"])(canvas, ctx, pinkCardwidth, pinkCardMaxHeight);
             ctx.beginPath();
             ctx.rect(0, 0, pinkCardwidth, pinkCardMaxHeight);
-            ctx.fillStyle = "#FFF3ED";
+            ctx.fillStyle = '#FFF3ED';
             ctx.fill();
             ctx.closePath();
             y = 54;
@@ -88,29 +88,37 @@ function _drawPinkCard() {
           case 20:
             y = _context.sent;
             _context.next = 23;
-            return (0, _drawQuote["default"])(ctx, y, "left");
+            return (0, _drawQuote["default"])(ctx, y, 'left');
 
           case 23:
             y = _context.sent;
-            y = (0, _drawOKrName["default"])(ctx, shareData.okrName, y);
-            _context.next = 27;
-            return (0, _drawQuote["default"])(ctx, y, "right");
+            _context.next = 26;
+            return (0, _drawOKrName["default"])(ctx, shareData.okrName, y);
 
-          case 27:
+          case 26:
+            y = _context.sent;
+            _context.next = 29;
+            return (0, _drawQuote["default"])(ctx, y, 'right');
+
+          case 29:
+            y = _context.sent;
+            _context.next = 32;
+            return (0, _drawKrs["default"])(ctx, shareData.krs, y);
+
+          case 32:
             y = _context.sent;
-            y = (0, _drawKrs["default"])(ctx, shareData.krs, y);
             height = Math.min(Math.max(y + 143, pinkCardMinHeight), pinkCardMaxHeight);
             data = ctx.getImageData(0, 0, pinkCardwidth, height);
             (0, _setSize["default"])(canvas, ctx, pinkCardwidth, height);
             ctx.putImageData(data, 0, 0);
-            _context.next = 35;
+            _context.next = 39;
             return (0, _utils.drawImage)(ctx, _images.bottom, 0, height - 128, pinkCardwidth, 128);
 
-          case 35:
+          case 39:
             dataUrl = canvas.toDataURL();
             return _context.abrupt("return", dataUrl);
 
-          case 37:
+          case 41:
           case "end":
             return _context.stop();
         }

package/lib/components/open-data-painter/index.js

@@ -53,7 +53,7 @@ function _ref() {
               height: lineHeight,
               draw: function draw(ctx, x, y) {
                 ctx.save();
-                ctx.textBaseline = "middle";
+                ctx.textBaseline = 'middle';
                 ctx.beginPath();
                 ctx.rect(x, y, actualWidth, lineHeight);
                 ctx.clip();
@@ -76,8 +76,9 @@ function _ref() {
 var getOpenData = function getOpenData(_ref2) {
   var id = _ref2.id,
       name = _ref2.name,
-      type = _ref2.type;
-  var openId = (0, _openData.getOpenId)(id, type);
+      type = _ref2.type,
+      openId = _ref2.openId;
+  openId = openId || (0, _openData.getOpenId)(id, type);
   if (!window.WWOpenData || !openId) return Promise.resolve(name);
   return new Promise(function (resolve, reject) {
     window.WWOpenData.prefetch({
@@ -93,7 +94,7 @@ var getOpenData = function getOpenData(_ref2) {
       if (data && data.items[0]) {
         resolve(data.items[0].data);
       } else {
-        resolve(name);
+        resolve(name || '');
       }
     });
   });
@@ -119,7 +120,7 @@ exports.setSize = setSize;
 var fittingString = function fittingString(_ctx, str, maxWidth) {
   var strWidth = _ctx.measureText(str).width;
 
-  var ellipsis = "…";
+  var ellipsis = '…';
 
   var ellipsisWidth = _ctx.measureText(ellipsis).width;
 

package/lib/components/period-selector/interface.js

@@ -0,0 +1,7 @@
+// annualNum: "2022" 年份
+// cycleType: "-1" 全部周期
+// endDate: ""
+// startDate: ""
+// yqmNum: "0"
+//
+"use strict";

package/lib/components/progress/circle-progress/index.css

@@ -7,4 +7,6 @@
 .titaui-progress-circle .text-content {
   font-size: 12px;
   color: #89919f;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }

package/lib/components/search-input/index.css

@@ -41,7 +41,7 @@
 .search-input-box > input {
   background: #ffffff;
   border: 1px solid #e9edf0;
-  border-radius: 5px;
+  border-radius: 16px;
   width: 100%;
   height: 100%;
   padding: 0 44px 0 11px;

package/lib/components/search-key-handle/index.js

@@ -5,36 +5,38 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
+var _openData = require("../../utils/open-data");
+
 var _react = _interopRequireDefault(require("react"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var SearchKeyHandle = function SearchKeyHandle(_ref) {
   var _ref$str = _ref.str,
-      str = _ref$str === void 0 ? "" : _ref$str,
+      str = _ref$str === void 0 ? '' : _ref$str,
       _ref$keyWord = _ref.keyWord,
-      keyWord = _ref$keyWord === void 0 ? "" : _ref$keyWord,
+      keyWord = _ref$keyWord === void 0 ? '' : _ref$keyWord,
       _ref$color = _ref.color,
-      color = _ref$color === void 0 ? "#F05E5E" : _ref$color;
-  if (!str || !keyWord) return /*#__PURE__*/_react["default"].createElement("span", null, str);
+      color = _ref$color === void 0 ? '#F05E5E' : _ref$color;
+  if (!str || !keyWord) return /*#__PURE__*/_react["default"].createElement("span", null, (0, _openData.parseString)(str));
   var result = str.split(keyWord);
   return /*#__PURE__*/_react["default"].createElement("span", null, result.map(function (item, index) {
     if (index !== result.length - 1) {
-      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item, /*#__PURE__*/_react["default"].createElement("span", {
+      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, (0, _openData.parseString)(item), /*#__PURE__*/_react["default"].createElement("span", {
         style: {
           color: color
         }
-      }, keyWord));
+      }, (0, _openData.parseString)(keyWord)));
     }
 
-    return item;
+    return (0, _openData.parseString)(item);
   }));
 };
 
 SearchKeyHandle.defaultProps = {
-  str: "",
-  keyWord: "",
-  color: ""
+  str: '',
+  keyWord: '',
+  color: ''
 };
 var _default = SearchKeyHandle;
 exports["default"] = _default;

package/lib/components/select-layer/index.css

@@ -42,7 +42,7 @@
   box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
   border: 1px solid #f0f2f5;
   position: relative;
-  border-radius: 4px;
+  border-radius: 12px;
   padding: 16px 0;
   font-weight: 400;
   width: 100%;