@titaui/pc 1.15.30 → 1.15.33

package/lib/components/dynamic/dynamic-item/components/summary-header/index.js

@@ -49,14 +49,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 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; }
@@ -120,7 +112,6 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       summaryVisible = data.summaryVisible,
       visibilityScope = data.visibilityScope,
       publishUser = data.publishUser;
-  console.log('data', data);
 
   var _useState = (0, _react.useState)(isCollect),
       _useState2 = _slicedToArray(_useState, 2),
@@ -169,11 +160,28 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       departmentName = _ref3.departmentName,
       departmentId = _ref3.departmentId;
 
+  console.log('users', users);
+  var departmentsRender = (0, _react.useMemo)(function () {
+    return (departments === null || departments === void 0 ? void 0 : departments.length) !== 0 && departments.map(function (item, index) {
+      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
+        name: item.name,
+        id: item.id
+      }), /*#__PURE__*/_react["default"].createElement("span", null, ","));
+    });
+  }, [departments]);
+  var usersRender = (0, _react.useMemo)(function () {
+    return (users === null || users === void 0 ? void 0 : users.length) !== 0 && users.map(function (item, index) {
+      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+        name: item.name,
+        id: item.userId
+      }), /*#__PURE__*/_react["default"].createElement("span", null, ","));
+    });
+  }, [users]);
   var typeTootips = {
     2: (0, _getLocale.getLocale)('Rep_NewS_RefeSummary'),
     3: /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('Per_Ass_New_Appr_detail_Affiliat'), (0, _getLocale.getLocale)('OKR_MyO_Text_Visible')),
     1: /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_Pop_Company'), (0, _getLocale.getLocale)('Rep_Tab_Subor_EveryoneSee')),
-    5: str
+    5: /*#__PURE__*/_react["default"].createElement("span", null, departmentsRender, usersRender, str)
   };
   var url = '';
   var loginUserId = (0, _bsGlobal.getUserInfo)().Id;
@@ -346,18 +354,10 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
     });
   }, []);
   (0, _react.useEffect)(function () {
-    var _ref6;
-
-    var departmentsStr = (departments === null || departments === void 0 ? void 0 : departments.length) !== 0 ? departments === null || departments === void 0 ? void 0 : departments.map(function (item) {
-      return item.name;
-    }) : [];
     var groupsStr = (groups === null || groups === void 0 ? void 0 : groups.length) !== 0 ? groups === null || groups === void 0 ? void 0 : groups.map(function (item) {
       return item.name;
     }) : [];
-    var usersStr = (users === null || users === void 0 ? void 0 : users.length) !== 0 ? users === null || users === void 0 ? void 0 : users.map(function (item) {
-      return item.name;
-    }) : [];
-    setStr((_ref6 = [].concat(_toConsumableArray(departmentsStr), _toConsumableArray(groupsStr), _toConsumableArray(usersStr))) === null || _ref6 === void 0 ? void 0 : _ref6.join(','));
+    setStr(groupsStr === null || groupsStr === void 0 ? void 0 : groupsStr.join(','));
   }, [visibilityScope]);
   (0, _react.useEffect)(function () {
     if (dailyContent) {

package/lib/components/img-viewer/index.css

@@ -80,6 +80,7 @@
 
 .titaui-img-viewer__body-img {
   max-width: 800px;
+  max-height: 100%;
   position: absolute;
   top: 0;
   left: 0;

package/lib/components/okr-flow/child-node/fields/creator.js

@@ -116,7 +116,7 @@ function Creator(_ref) {
   var generalCanvas = function generalCanvas() {
     var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "text";
     var userName = arguments.length > 1 ? arguments[1] : undefined;
-    var font = "normal 12px/24px Arial,Verdana,Helvetica Neue,Helvetica,sans-serif,PingFang SC,Microsoft YaHei";
+    var font = "normal 24px/30px Arial,Verdana,Helvetica Neue,Helvetica,sans-serif,PingFang SC,Microsoft YaHei";
     var canvas = document.createElement("canvas");
     var ctx = canvas.getContext("2d");
     ctx.font = font;
@@ -124,14 +124,14 @@ function Creator(_ref) {
     var _ctx$measureText = ctx.measureText(userName),
         width = _ctx$measureText.width;
 
-    var actualWidth = Math.min(width, 92);
-    (0, _openDataPainter.setSize)(canvas, ctx, actualWidth, 24); // 设置画布尺寸
+    var actualWidth = Math.min(width, 184);
+    (0, _openDataPainter.setSize)(canvas, ctx, actualWidth, 48); // 设置画布尺寸
 
     setImgwidth(actualWidth);
     ctx.textBaseline = "middle";
     ctx.font = font;
     ctx.fillStyle = type == "text" ? "#6f7886" : "#FFFFFF";
-    ctx.fillText(userName, 0, 12);
+    ctx.fillText(userName, 0, 36);
     type == "text" ? setNormalImg(canvas.toDataURL()) : setWhiteImg(canvas.toDataURL());
   };
 
@@ -167,9 +167,10 @@ function Creator(_ref) {
     src: darkTheme ? whiteImg : normalImg,
     style: {
       maxWidth: 92,
-      marginLeft: 4
+      marginLeft: 4,
+      transform: 'translateY(-20%)'
     },
-    width: imgWidth
+    width: Number(imgWidth) / 2
   }));
 }
 

package/lib/components/okr-flow/child-node/index.css

@@ -144,7 +144,7 @@
 .titaui-okr-flow--node-right {
   position: absolute;
   right: 0;
-  top: 0;
+  top: 2px;
 }
 
 .titaui-okr-flow--node-type {
@@ -152,6 +152,7 @@
 }
 
 .titaui-okr-flow--node-cycle, .titaui-okr-flow--node-type {
+  height: 22px;
   display: inline-block !important;
   background: #f7f9fb;
   border-radius: 12px;
@@ -163,7 +164,7 @@
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  line-height: 20px;
+  line-height: 22px;
   max-width: 96px;
 }
 

package/lib/components/okr-flow/child-node/work-node.js

@@ -165,7 +165,7 @@ function WorkNode(_ref) {
     var name = arguments.length > 1 ? arguments[1] : undefined;
     var canvas = document.createElement('canvas');
     var ctx = canvas.getContext('2d');
-    var font = 'normal 12px/24px -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei';
+    var font = '400 12px/12px  OPPOSans, Arial, Verdana, "Helvetica Neue", Helvetica, sans-serif, "PingFang SC", "Microsoft YaHei"';
     ctx.font = font; // const fitStr = fittingString(ctx, name, 92);
 
     var _ctx$measureText = ctx.measureText(name),

package/lib/components/task-relation-modal/relation-single-okr/index.css

@@ -5,11 +5,16 @@
   box-shadow: 0px 4px 16px 0px rgba(127, 145, 180, 0.2);
   border: 1px solid #F0F2F5;
   border-radius: 24px;
-  padding: 20px 4px 16px 16px;
+  padding: 20px 10px 16px 16px;
   box-sizing: border-box;
   overflow: auto;
 }
 
+.relation-single-okr__pop::-webkit-scrollbar {
+  width: 10px !important;
+  height: 10px !important;
+}
+
 .relation-single-okr__pop-O {
   display: flex;
   align-items: flex-start;

package/package.json

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