@titaui/pc 1.15.28-beta.7 → 1.15.28-beta.8

package/lib/components/book-demo/components/pc/components/content/index.js

@@ -178,7 +178,12 @@ var BookDemoPCContent = function BookDemoPCContent(_ref) {
       if (res.data.Code) {
         (0, _request.sendBookDemoJson)((0, _utils.bookDemoTransformDataToJson)(result, source > 0 ? source : Source, _constant.DemoTypeTextMap[type], content, uid));
 
-        _toast["default"].Success("提交成功");
+        _toast["default"].Success("提交成功", {
+          style: {
+            position: "fixed"
+          },
+          canClose: false
+        });
 
         if (onSubmitSuccess) {
           onSubmitSuccess();

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/expiration-reminder/img/emoji.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="34px" height="34px" viewBox="0 0 34 34" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 27</title>
+    <g id="到期时间页面优化" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="合作客户---已过期" transform="translate(-424.000000, -362.000000)">
+            <g id="编组-27备份-2" transform="translate(390.000000, 167.000000)">
+                <g id="编组-27" transform="translate(34.000000, 195.000000)">
+                    <rect id="矩形" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="34" height="34"></rect>
+                    <text id="😭" font-family="AppleColorEmoji, Apple Color Emoji" font-size="28" font-weight="normal" line-spacing="28" fill="#141C28">
+                        <tspan x="3" y="31.2419314">😭</tspan>
+                    </text>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

package/lib/components/expiration-reminder/index.css

@@ -37,15 +37,15 @@
 
 .titaui-expiration-reminder__description {
   margin: 24px 0 28px;
-  font-size: 16px;
-  line-height: 32px;
-  color: #3f4755;
+  font-size: 18px;
+  line-height: 36px;
+  color: #141C28;
   text-align: center;
 }
 
 .titaui-expiration-reminder__description .titaui-text-btn {
-  font-size: 16px;
-  line-height: 32px;
+  font-size: 18px;
+  line-height: 36px;
 }
 
 .titaui-expiration-reminder__footer {
@@ -54,9 +54,9 @@
 
 .titaui-expiration-reminder__footer .titaui-rect-btn {
   width: 356px;
-  height: 48px;
+  height: 52px;
   margin: 0 auto 10px;
-  font-size: 16px;
+  font-size: 18px;
   line-height: 24px;
   border-radius: 26px;
 }
@@ -93,12 +93,12 @@
 }
 
 .titaui-expiration-reminder__remain-day {
-  font-size: 32px;
+  font-size: 36px;
   color: #2879ff;
 }
 
 .titaui-expiration-reminder__title {
-  font-size: 24px;
+  font-size: 28px;
   font-weight: 600;
   line-height: 34px;
   color: #141C28;
@@ -106,6 +106,7 @@
 }
 
 .titaui-expiration-reminder__title img {
-  width: 28px;
-  margin-right: 4px;
+  position: relative;
+  top: -4px;
+  left: -4px;
 }

package/lib/components/expiration-reminder/index.js

@@ -31,7 +31,7 @@ var _mirroring = _interopRequireDefault(require("../mirroring"));
 
 var _toast = _interopRequireDefault(require("../toast"));
 
-var _emojiWail = _interopRequireDefault(require("./img/emoji-wail.png"));
+var _emoji = _interopRequireDefault(require("./img/emoji.svg"));
 
 var _qrcodeTrial = _interopRequireDefault(require("./img/qrcode-trial.png"));
 
@@ -161,7 +161,7 @@ var ExpirationReminder = function ExpirationReminder() {
           return setMirrorSwitch('on');
         },
         type: "primary",
-        text: " \u8BF7\u8054\u7CFB\u987E\u95EE "
+        text: " \u8054\u7CFB\u987E\u95EE "
       }), /*#__PURE__*/_react["default"].createElement("span", null, "\u7D22\u53D6\u4F18\u60E0~")))
     }), _defineProperty(_trialVersion, _utils.ApplicationState.Expired, {
       closeEnable: false,
@@ -170,7 +170,7 @@ var ExpirationReminder = function ExpirationReminder() {
       title: /*#__PURE__*/_react["default"].createElement("h2", {
         className: "".concat(prefixCls, "__title")
       }, /*#__PURE__*/_react["default"].createElement("img", {
-        src: _emojiWail["default"],
+        src: _emoji["default"],
         alt: "Emoji"
       }), "\u60A8\u7684 Tita \u8BD5\u7528\u5DF2\u5230\u671F"),
       content: /*#__PURE__*/_react["default"].createElement("div", {
@@ -180,7 +180,7 @@ var ExpirationReminder = function ExpirationReminder() {
           return setMirrorSwitch('on');
         },
         type: "primary",
-        text: " \u8BF7\u8054\u7CFB\u987E\u95EE"
+        text: " \u8054\u7CFB\u987E\u95EE"
       })))
     }), _defineProperty(_trialVersion, "button", /*#__PURE__*/_react["default"].createElement(_button["default"].Rect, {
       onClick: showBookDemo,
@@ -203,7 +203,7 @@ var ExpirationReminder = function ExpirationReminder() {
       }, " ", Day, " "), "\u5929"),
       content: /*#__PURE__*/_react["default"].createElement("div", {
         className: "".concat(prefixCls, "__description")
-      }, /*#__PURE__*/_react["default"].createElement("p", null, "\u7EED\u8D39\u670D\u52A1 \u8BF7\u8054\u7CFB\u987E\u95EE"))
+      }, /*#__PURE__*/_react["default"].createElement("p", null, "\u7EED\u8D39\u670D\u52A1 \u8054\u7CFB\u987E\u95EE"))
     }), _defineProperty(_officialVersion, _utils.ApplicationState.Expired, {
       closeEnable: false,
       height: 466,
@@ -211,12 +211,12 @@ var ExpirationReminder = function ExpirationReminder() {
       title: /*#__PURE__*/_react["default"].createElement("h2", {
         className: "".concat(prefixCls, "__title")
       }, /*#__PURE__*/_react["default"].createElement("img", {
-        src: _emojiWail["default"],
+        src: _emoji["default"],
         alt: "Emoji"
       }), "\u60A8\u7684 Tita \u7CFB\u7EDF\u4F7F\u7528\u5DF2\u5230\u671F"),
       content: /*#__PURE__*/_react["default"].createElement("div", {
         className: "".concat(prefixCls, "__description")
-      }, /*#__PURE__*/_react["default"].createElement("p", null, "\u9519\u8FC7\u4E86\u4E00\u5927\u6CE2\u4EA7\u54C1\u5347\u7EA7\u54E6~"), /*#__PURE__*/_react["default"].createElement("p", null, "\u4E86\u89E3 Tita \u65B0\u529F\u80FD \u8BF7\u9884\u7EA6\u987E\u95EE\u6F14\u793A"))
+      }, /*#__PURE__*/_react["default"].createElement("p", null, "\u9519\u8FC7\u4E86\u4E00\u5927\u6CE2\u4EA7\u54C1\u5347\u7EA7\u54E6~"), /*#__PURE__*/_react["default"].createElement("p", null, "\u4E86\u89E3 Tita \u65B0\u529F\u80FD \u9884\u7EA6\u987E\u95EE\u6F14\u793A"))
     }), _defineProperty(_officialVersion, "button", /*#__PURE__*/_react["default"].createElement(_button["default"].Rect, {
       onClick: function onClick() {
         return setMirrorSwitch('on');
@@ -282,7 +282,7 @@ var ExpirationReminder = function ExpirationReminder() {
       className: "".concat(prefixCls, "__qrcode-title")
     }, "\u5FAE\u4FE1/\u4F01\u4E1A\u5FAE\u4FE1\u626B\u4E00\u626B"), /*#__PURE__*/_react["default"].createElement("h3", {
       className: "".concat(prefixCls, "__qrcode-subtitle")
-    }, "\u4E13\u5C5E\u5BA2\u670D\u4E3A\u60A8\u63D0\u4F9B\u54A8\u8BE2\u670D\u52A1"), /*#__PURE__*/_react["default"].createElement("img", {
+    }, "\u4E13\u5C5E\u5BA2\u670D\u4E3A\u4F60\u63D0\u4F9B\u54A8\u8BE2\u670D\u52A1"), /*#__PURE__*/_react["default"].createElement("img", {
       className: "".concat(prefixCls, "__qrcode-img"),
       src: qrCode,
       alt: "\u5FAE\u4FE1/\u4F01\u4E1A\u5FAE\u4FE1\u626B\u4E00\u626B",

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/nav-top/components/app-center/index.css

@@ -121,6 +121,10 @@
   margin-left: 8px;
 }
 
+.app-center__app-item-name__right-btn__guide-tip {
+  color: #fff;
+}
+
 .app-center__app-item-name__right-btn:hover {
   background-color: rgba(40, 121, 255, 0.1);
 }

package/lib/components/nav-top/components/app-center/index.js

@@ -31,6 +31,8 @@ var _yuyueAward = _interopRequireDefault(require("./images/yuyue-award.png"));
 
 var _quickEntrance = _interopRequireDefault(require("../../../quick-entrance"));
 
+var _guideTip = _interopRequireDefault(require("../../../guide-tip"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 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); }
@@ -248,6 +250,41 @@ var AppCenter = function AppCenter(props) {
     (_QuickEntranceDialogR = QuickEntranceDialogRef.current) === null || _QuickEntranceDialogR === void 0 ? void 0 : _QuickEntranceDialogR.showDialog();
   };
 
+  var RenderSettingBtn = function RenderSettingBtn(props) {
+    var app = props.app;
+
+    var _useState9 = (0, _react.useState)(false),
+        _useState10 = _slicedToArray(_useState9, 2),
+        settingGuideVisible = _useState10[0],
+        setSettingGuideVisible = _useState10[1];
+
+    (0, _react.useEffect)(function () {
+      var cacheIsKonw = localStorage.getItem("AppCenterSettingGuide_".concat((0, _helpers.getLoginUserInfo)().Id));
+      !cacheIsKonw && setSettingGuideVisible(true);
+    });
+
+    var handleSettingGuideClose = function handleSettingGuideClose() {
+      localStorage.setItem("AppCenterSettingGuide_".concat((0, _helpers.getLoginUserInfo)().Id), (0, _helpers.getLoginUserInfo)().Id);
+    };
+
+    if (app.appId === 1) {
+      return /*#__PURE__*/_react["default"].createElement(_guideTip["default"], {
+        visible: settingGuideVisible,
+        content: /*#__PURE__*/_react["default"].createElement("div", {
+          className: "".concat(precls, "__app-item-name__right-btn__guide-tip")
+        }, "\uD83D\uDC46\u70B9\u51FB\u8FD9\u91CC\uFF0C\u53EF\u300C\u8BBE\u7F6E\u300D\u81EA\u5DF1\u5E38\u7528\u7684\u5FEB\u6377\u83DC\u5355"),
+        onClickClose: handleSettingGuideClose,
+        popupPlacement: 'bottom',
+        type: 'button'
+      }, /*#__PURE__*/_react["default"].createElement("span", {
+        className: "".concat(precls, "__app-item-name__right-btn"),
+        onClick: handleSetting
+      }, "\u8BBE\u7F6E"));
+    }
+
+    return /*#__PURE__*/_react["default"].createElement("span", null);
+  };
+
   return /*#__PURE__*/_react["default"].createElement(_drawer["default"], {
     className: "".concat(precls, "__drawer"),
     placement: "top",
@@ -274,10 +311,9 @@ var AppCenter = function AppCenter(props) {
       className: "".concat(precls, "__app-item-desc")
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(precls, "__app-item-name")
-    }, /*#__PURE__*/_react["default"].createElement("span", null, app.title), app.appId === 1 && /*#__PURE__*/_react["default"].createElement("span", {
-      className: "".concat(precls, "__app-item-name__right-btn"),
-      onClick: handleSetting
-    }, "\u8BBE\u7F6E")), isTrial && /*#__PURE__*/_react["default"].createElement("span", {
+    }, /*#__PURE__*/_react["default"].createElement("span", null, app.title), /*#__PURE__*/_react["default"].createElement(RenderSettingBtn, {
+      app: app
+    })), isTrial && /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(precls, "__app-item-sub-title")
     }, app.subTitle)));
   }), new Array(20).fill(1).map(function () {

package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.js

@@ -137,12 +137,12 @@ var EKrNode = function EKrNode(props) {
                     allowObjectOptions: true,
                     labelOption: {
                       isOnlyCurrent: true,
-                      labelId: data.mileStoneId,
+                      labelId: data.mileStoneId === 0 ? data.workId : data.mileStoneId,
                       workId: data.workId,
                       workName: okrInfo.workName,
-                      name: data.mileStoneName,
+                      name: data.mileStoneId === 0 ? okrInfo.workName : data.mileStoneName,
                       krId: data.mileStoneId,
-                      type: "kr"
+                      type: data.mileStoneId === 0 ? 'okr' : 'kr'
                     }
                   }
                 }).then(function () {

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.28-beta.7",
+  "version": "1.15.28-beta.8",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",