@titaui/pc 1.11.17 → 1.11.20

package/lib/components/communication/index.js

@@ -71,7 +71,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
-var prefix = "titaui-communication";
+var prefix = 'titaui-communication';
 
 var Communication = /*#__PURE__*/function (_PureComponent) {
   _inherits(Communication, _PureComponent);
@@ -90,14 +90,14 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           commentType = _this$props.commentType,
           okrFeedParams = _this$props.okrFeedParams;
       var url = commentType == 1 ? (0, _requestV.getApiUrl2)("comment/Get?feed_id=".concat(feedId, "&comment_type=0")) : (0, _requestV.getApiUrl)("okr/cycle/getFeed?objId=".concat(okrFeedParams && okrFeedParams.objId, "&objType=").concat(okrFeedParams && okrFeedParams.objType, "&cycleType=").concat(okrFeedParams && okrFeedParams.cycleType, "&yqmNum=").concat(okrFeedParams && okrFeedParams.yqmNum, "&annualNum=").concat(okrFeedParams && okrFeedParams.annualNum, "&commentCount=").concat(commentCount));
-      (0, _requestV.taker)(url, "GET").then(function (res) {
+      (0, _requestV.taker)(url, 'GET').then(function (res) {
         if (res.Code === 1) {
           var data = res.Data && (res.Data.feedComments || res.Data);
 
           _this.setState({
             communicationTrackList: data.comments ? data.comments : [],
             communicationTrackTotal: data.total,
-            okrCommentFeedId: commentType === 2 ? res.Data.feedId : ""
+            okrCommentFeedId: commentType === 2 ? res.Data.feedId : ''
           });
         } else {
           _this.setState({
@@ -137,10 +137,10 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
 
       var communicationTrackList = _toConsumableArray(_this.state.communicationTrackList);
 
-      if (actionType === "delete") {
+      if (actionType === 'delete') {
         // 删除
         var url = (0, _requestV.getApiUrl2)("comment/Delete?comment_id=".concat(communicationTrackList[index].commentId, "&feed_id=").concat(feedId || _this.state.okrCommentFeedId));
-        (0, _requestV.taker)(url, "DELETE").then(function (res) {
+        (0, _requestV.taker)(url, 'DELETE').then(function (res) {
           if (res.Code === 1) {
             isShowAllCommunicationRecord ? _this.getFeedInfo(feedId, communicationTrackTotal - 1) : _this.getFeedInfo(feedId, commentCount);
 
@@ -151,7 +151,7 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
             }
           }
         });
-      } else if (actionType === "reply") {
+      } else if (actionType === 'reply') {
         // 沟通里的回复
         if (_this.props.useCustomMblog && _this.props.onComment) {
           _this.props.onComment({
@@ -178,7 +178,7 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           isShowDefaultInput: false,
           needAutoFocus: true
         });
-      } else if (actionType === "praise") {
+      } else if (actionType === 'praise') {
         // 沟通里的点赞
         var isPraise = communicationTrackList[index].isPraise;
         isPraise = !isPraise;
@@ -189,7 +189,7 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
 
         var _url = isPraise ? (0, _requestV.getApiUrl)("praise/add?objId=".concat(communicationTrackList[index].commentId, "&objType=19&praiseType=1")) : (0, _requestV.getApiUrl)("praise/cancel?objId=".concat(communicationTrackList[index].commentId, "&objType=19"));
 
-        (0, _requestV.taker)(_url, "POST").then(function (res) {
+        (0, _requestV.taker)(_url, 'POST').then(function (res) {
           if (res.Code === 1) {
             var praiseTotal = communicationTrackList[index].praiseTotal;
             communicationTrackList[index].isPraise = isPraise;
@@ -205,7 +205,7 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
             });
           }
         });
-      } else if (actionType === "showPraiseRecord") {
+      } else if (actionType === 'showPraiseRecord') {
         // 显示点赞记录
         _this.setState({
           isShowPraiseRecordPop: true,
@@ -241,13 +241,13 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           communicationTrackTotal = _this$state3.communicationTrackTotal,
           isShowAllCommunicationRecord = _this$state3.isShowAllCommunicationRecord;
 
-      if (submitType === "submit") {
+      if (submitType === 'submit') {
         // 发送
         sentData.FeedId = feedId;
         sentData.CommentId = 0;
         sentData.ObjId = 0;
         sentData.ObjType = 0;
-        sentData.Content = sentData.Content || " ";
+        sentData.Content = sentData.Content || ' ';
 
         if (isShowReplyToUser) {
           sentData.CommentId = replyUserCommentId;
@@ -257,8 +257,8 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           submitStatus: 2
         });
 
-        var url = commentType === 1 ? (0, _requestV.getApiUrl2)("comment/Add") : (0, _requestV.getApiUrl)("okr/cycle/addComment?objId=".concat(okrFeedParams && okrFeedParams.objId, "&objType=").concat(okrFeedParams && okrFeedParams.objType, "&cycleType=").concat(okrFeedParams && okrFeedParams.cycleType, "&yqmNum=").concat(okrFeedParams && okrFeedParams.yqmNum, "&annualNum=").concat(okrFeedParams && okrFeedParams.annualNum));
-        (0, _requestV.taker)(url, "POST", sentData).then(function (res) {
+        var url = commentType === 1 ? (0, _requestV.getApiUrl2)('comment/Add') : (0, _requestV.getApiUrl)("okr/cycle/addComment?objId=".concat(okrFeedParams && okrFeedParams.objId, "&objType=").concat(okrFeedParams && okrFeedParams.objType, "&cycleType=").concat(okrFeedParams && okrFeedParams.cycleType, "&yqmNum=").concat(okrFeedParams && okrFeedParams.yqmNum, "&annualNum=").concat(okrFeedParams && okrFeedParams.annualNum));
+        (0, _requestV.taker)(url, 'POST', sentData).then(function (res) {
           if (res.Code === 1) {
             isShowAllCommunicationRecord ? _this.getFeedInfo(feedId, communicationTrackTotal + 1) : _this.getFeedInfo(feedId, commentCount);
 
@@ -313,17 +313,17 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
       isShowAllCommunicationRecord: false,
       // 是否显示所有记录
       // 回复
-      replyUser: "",
-      replyUserId: "",
-      replyUserCommentId: "0",
+      replyUser: '',
+      replyUserId: '',
+      replyUserCommentId: '0',
       isShowReplyToUser: false,
       // 是否显示回复谁
       submitStatus: 0,
       praiseStatus: 0,
       // 点赞记录
-      praiseObjId: "",
+      praiseObjId: '',
       isShowPraiseRecordPop: false,
-      okrCommentFeedId: "",
+      okrCommentFeedId: '',
       isShowDefaultInput: showDefaultInput && communicationLength !== 0 ? true : false,
       needAutoFocus: false
     };
@@ -389,9 +389,9 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           commentCount = _this$props7.commentCount,
           useCustomMblog = _this$props7.useCustomMblog,
           _this$props7$submitTe = _this$props7.submitText,
-          submitText = _this$props7$submitTe === void 0 ? (0, _getLocale.getLocale)("Mod_Reply") : _this$props7$submitTe,
+          submitText = _this$props7$submitTe === void 0 ? (0, _getLocale.getLocale)('Mod_Reply') : _this$props7$submitTe,
           _this$props7$highLigh = _this$props7.highLightKeyWord,
-          highLightKeyWord = _this$props7$highLigh === void 0 ? "" : _this$props7$highLigh,
+          highLightKeyWord = _this$props7$highLigh === void 0 ? '' : _this$props7$highLigh,
           _this$props7$autoFocu = _this$props7.autoFocus,
           autoFocus = _this$props7$autoFocu === void 0 ? false : _this$props7$autoFocu,
           _this$props7$showUser = _this$props7.showUser,
@@ -404,10 +404,10 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
         onMouseDown: function onMouseDown() {
           return _this2.handlerSwitchShowRecord();
         }
-      }, (0, _getLocale.getLocale)("Mod_Allcommu"), "\xA0", /*#__PURE__*/_react["default"].createElement("span", null, communicationTrackTotal), communicationTrackTotal > commentCount && /*#__PURE__*/_react["default"].createElement("i", {
+      }, (0, _getLocale.getLocale)('Mod_Allcommu'), "\xA0", /*#__PURE__*/_react["default"].createElement("span", null, communicationTrackTotal), communicationTrackTotal > commentCount && /*#__PURE__*/_react["default"].createElement("i", {
         className: (0, _classnames["default"])("".concat(prefix, "__communication-total-icon"), {
-          "tu-icon-APP-xi": !isShowAllCommunicationRecord,
-          "tu-icon-arrow-down1": isShowAllCommunicationRecord
+          'tu-icon-APP-xi': !isShowAllCommunicationRecord,
+          'tu-icon-arrow-down1': isShowAllCommunicationRecord
         })
       }))), /*#__PURE__*/_react["default"].createElement("div", {
         className: (0, _classnames["default"])(_defineProperty({}, "".concat(prefix, "__communication-list"), communicationTrackList.length > 0))
@@ -432,12 +432,12 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
       }))), !useCustomMblog && /*#__PURE__*/_react["default"].createElement("div", {
         className: "".concat(prefix, "__reply-container")
       }, isShowReplyToUser && /*#__PURE__*/_react["default"].createElement(_style.ReplyToUser, {
-        height: isShowReplyToUser ? "auto" : "0",
-        padding: isShowReplyToUser ? "4px 0" : "0",
+        height: isShowReplyToUser ? 'auto' : '0',
+        padding: isShowReplyToUser ? '4px 0' : '0',
         className: (0, _classnames["default"])(_defineProperty({}, "".concat(prefix, "__reply-container--show-user"), showUser))
       }, /*#__PURE__*/_react["default"].createElement(_style.ReplyUser, null, /*#__PURE__*/_react["default"].createElement("span", {
         className: "".concat(prefix, "__reply-container-text")
-      }, (0, _getLocale.getLocale)("Mod_Reply")), /*#__PURE__*/_react["default"].createElement("span", {
+      }, (0, _getLocale.getLocale)('Mod_Reply')), /*#__PURE__*/_react["default"].createElement("span", {
         className: "name"
       }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
         name: replyUser,
@@ -457,14 +457,15 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
         },
         name: user.Name,
         color: user.UserAvatar.Color,
-        src: user.UserAvatar.Medium
+        src: user.UserAvatar.Medium,
+        userId: user.Id
       })), /*#__PURE__*/_react["default"].createElement("span", {
         onClick: this.handleShowMblog,
         className: "".concat(prefix, "__reply-default-input-text")
       }, "\u8F93\u5165\u6C9F\u901A\u5185\u5BB9")), !isShowDefaultInput && /*#__PURE__*/_react["default"].createElement(_mblog["default"], {
         setTextareaRef: setTextareaRef || function () {},
         isHasPlaceholder: true,
-        placeholderText: (0, _getLocale.getLocale)("Mod_contentofyour"),
+        placeholderText: (0, _getLocale.getLocale)('Mod_contentofyour'),
         isShowRange: false,
         isShowBtnCancel: false,
         isShowSendSms: isShowSendSms,
@@ -486,7 +487,7 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
         onSubmit: function onSubmit() {
           return _this2.setState({
             isShowPraiseRecordPop: false,
-            praiseObjId: ""
+            praiseObjId: ''
           });
         }
       }));

package/lib/components/dynamic/dynamic-item/components/feed-operate/index.css

@@ -68,6 +68,4 @@
 .titaui-dynamic-operation__operate-content {
   color: #6f7886;
   white-space: pre-wrap;
-  display: inline-flex;
-  align-items: center;
 }

package/lib/components/mblog/index.js

@@ -99,7 +99,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
       var atAll = !!contentValue.match(/@\[所有同事:all_members\]/g);
 
       _this.setState({
-        isInputAt: contentValue.charAt(start - 1) == "@",
+        isInputAt: contentValue.charAt(start - 1) == '@',
         // isInputEnterSubmit: contentValue === 'isInputEnterSubmit',
         textareaValue: contentValue,
         isAllowSubmit: _this.allowSubmit(contentValue),
@@ -111,25 +111,25 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
     };
 
     _this.onActionsTextChange = function (actionValue) {
-      if (actionValue === "allowSendSMS") {
+      if (actionValue === 'allowSendSMS') {
         return _this.setState({
           isSendSMS: true
         });
       }
 
-      if (actionValue === "public") {
+      if (actionValue === 'public') {
         return _this.setState({
           visibility: 1
         });
       }
 
-      if (actionValue === "private") {
+      if (actionValue === 'private') {
         return _this.setState({
           visibility: 2
         });
       }
 
-      if (actionValue === "department") {
+      if (actionValue === 'department') {
         return _this.setState({
           visibility: 3
         });
@@ -172,7 +172,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
       var _this$refs$textEditor2;
 
       var successFilesPath = uploadSuccessFilesPath.filter(function (item) {
-        return item !== "";
+        return item !== '';
       });
       var successFilesPathLen = successFilesPath.length; // @ts-ignore
 
@@ -223,7 +223,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
           submitStatus = _this$props2.submitStatus;
       var sentData = {}; // 发送的数据
 
-      var FileUrl = uploadSuccessFilesPath.join(","); // 附件链接
+      var FileUrl = uploadSuccessFilesPath.join(','); // 附件链接
 
       if (isShowAttachment) {
         // @ts-ignore
@@ -243,10 +243,10 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
 
       sentData.Content = (0, _index.htmlEncodeByRegExp)(textareaValue); // @ts-ignore
 
-      if (submitType === "submit" && submitStatus !== 2) {
+      if (submitType === 'submit' && submitStatus !== 2) {
         // 发送
         _this.props.onMblogSubmit(submitType, sentData);
-      } else if (submitType === "cancel") {
+      } else if (submitType === 'cancel') {
         // 取消
         _this.props.onMblogSubmit(submitType);
       }
@@ -323,9 +323,9 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
     _this.state = {
       uploadSuccessFilesPath: [],
       isAllowSubmit: false,
-      localStroageKey: "",
+      localStroageKey: '',
       // 本地存储key
-      textareaValue: "",
+      textareaValue: '',
       isSendSMS: false,
       visibility: 1,
       isInputAt: false,
@@ -359,7 +359,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
       if (submitStatus === 1) {
         // 发送成功，清空内容
         this.setState({
-          textareaValue: "",
+          textareaValue: '',
           uploadSuccessFilesPath: [],
           isSendSMS: false,
           isAllowSubmit: false
@@ -379,7 +379,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
           contentClassName = _this$props3.contentClassName,
           isHasPlaceholder = _this$props3.isHasPlaceholder,
           _this$props3$placehol = _this$props3.placeholderText,
-          placeholderText = _this$props3$placehol === void 0 ? "有事需要提醒ta，请@ta" : _this$props3$placehol,
+          placeholderText = _this$props3$placehol === void 0 ? '有事需要提醒ta，请@ta' : _this$props3$placehol,
           maxLength = _this$props3.maxLength,
           autoResizing = _this$props3.autoResizing,
           initialTextHeight = _this$props3.initialTextHeight,
@@ -387,36 +387,36 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
           actionClassName = _this$props3.actionClassName,
           isShowAttachment = _this$props3.isShowAttachment,
           _this$props3$attachme = _this$props3.attachmentText,
-          attachmentText = _this$props3$attachme === void 0 ? (0, _getLocale.getLocale)("Mod_Annexes") : _this$props3$attachme,
+          attachmentText = _this$props3$attachme === void 0 ? (0, _getLocale.getLocale)('Mod_Annexes') : _this$props3$attachme,
           attachmentTipText = _this$props3.attachmentTipText,
           fileNumLimit = _this$props3.fileNumLimit,
           attachmentPreviewBox = _this$props3.attachmentPreviewBox,
           _this$props3$atAllTex = _this$props3.atAllText,
-          atAllText = _this$props3$atAllTex === void 0 ? (0, _getLocale.getLocale)("Mod_AllColleagues") : _this$props3$atAllTex,
+          atAllText = _this$props3$atAllTex === void 0 ? (0, _getLocale.getLocale)('Mod_AllColleagues') : _this$props3$atAllTex,
           _this$props3$atAllVal = _this$props3.atAllValue,
-          atAllValue = _this$props3$atAllVal === void 0 ? "@[所有同事:all_members] " : _this$props3$atAllVal,
+          atAllValue = _this$props3$atAllVal === void 0 ? '@[所有同事:all_members] ' : _this$props3$atAllVal,
           _this$props3$atAllTip = _this$props3.atAllTipText,
-          atAllTipText = _this$props3$atAllTip === void 0 ? (0, _getLocale.getLocale)("OKR_MyO_Popup_Allcolleagues") : _this$props3$atAllTip,
+          atAllTipText = _this$props3$atAllTip === void 0 ? (0, _getLocale.getLocale)('OKR_MyO_Popup_Allcolleagues') : _this$props3$atAllTip,
           isShowAt = _this$props3.isShowAt,
           showAtAll = _this$props3.showAtAll,
           _this$props3$atText = _this$props3.atText,
-          atText = _this$props3$atText === void 0 ? (0, _getLocale.getLocale)("Mod_colleague") : _this$props3$atText,
+          atText = _this$props3$atText === void 0 ? (0, _getLocale.getLocale)('Mod_colleague') : _this$props3$atText,
           _this$props3$atTipTex = _this$props3.atTipText,
-          atTipText = _this$props3$atTipTex === void 0 ? (0, _getLocale.getLocale)("OKR_MyO_Popup_Butt_Colleagues") : _this$props3$atTipTex,
+          atTipText = _this$props3$atTipTex === void 0 ? (0, _getLocale.getLocale)('OKR_MyO_Popup_Butt_Colleagues') : _this$props3$atTipTex,
           userSelectorPopAlign = _this$props3.userSelectorPopAlign,
           isShowEmotion = _this$props3.isShowEmotion,
           _this$props3$emotionT = _this$props3.emotionText,
-          emotionText = _this$props3$emotionT === void 0 ? (0, _getLocale.getLocale)("Mod_Expressions") : _this$props3$emotionT,
+          emotionText = _this$props3$emotionT === void 0 ? (0, _getLocale.getLocale)('Mod_Expressions') : _this$props3$emotionT,
           emotionTipText = _this$props3.emotionTipText,
           emotionsSelectorPopAlign = _this$props3.emotionsSelectorPopAlign,
           isShowSendSms = _this$props3.isShowSendSms,
           _this$props3$sendSmsT = _this$props3.sendSmsTipText,
-          sendSmsTipText = _this$props3$sendSmsT === void 0 ? (0, _getLocale.getLocale)("Tasks_Tab_MyS_Thecollenotified") : _this$props3$sendSmsT,
+          sendSmsTipText = _this$props3$sendSmsT === void 0 ? (0, _getLocale.getLocale)('Tasks_Tab_MyS_Thecollenotified') : _this$props3$sendSmsT,
           isShowRange = _this$props3.isShowRange,
           isShowRangeDropDown = _this$props3.isShowRangeDropDown,
           isShowBtnCancel = _this$props3.isShowBtnCancel,
           _this$props3$submitTe = _this$props3.submitText,
-          submitText = _this$props3$submitTe === void 0 ? (0, _getLocale.getLocale)("Mod_Publish") : _this$props3$submitTe,
+          submitText = _this$props3$submitTe === void 0 ? (0, _getLocale.getLocale)('Mod_Publish') : _this$props3$submitTe,
           setTextareaRef = _this$props3.setTextareaRef,
           disableRangeSelect = _this$props3.disableRangeSelect,
           showUser = _this$props3.showUser;
@@ -431,7 +431,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
           isShowDragMask = _this$state2.isShowDragMask,
           isAtAll = _this$state2.isAtAll;
       var fSize = (0, _bsGlobal.getUploadMaxSize)();
-      var fTip = attachmentTipText || (0, _getLocale.getLocale)("OKR_MyO_KRP_Draganddropu").replace("50MB", "".concat(fSize, "MB"));
+      var fTip = attachmentTipText || (0, _getLocale.getLocale)('OKR_MyO_KRP_Draganddropu').replace('50MB', "".concat(fSize, "MB"));
       var user = (0, _bsGlobal.getUserInfo)();
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: prefix
@@ -445,7 +445,8 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
         },
         name: user.Name,
         color: user.UserAvatar.Color,
-        src: user.UserAvatar.Medium
+        src: user.UserAvatar.Medium,
+        userId: user.Id
       })), /*#__PURE__*/_react["default"].createElement(_style.MBlogBox, {
         className: className,
         ref: "mblogbox",
@@ -523,7 +524,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
         }
       }), /*#__PURE__*/_react["default"].createElement(_style.PreviewBox, {
         id: this.previewid
-      }), !(0, _platform.isPlatform)("wx") && isShowDragMask && /*#__PURE__*/_react["default"].createElement(_style.DragEffect, {
+      }), !(0, _platform.isPlatform)('wx') && isShowDragMask && /*#__PURE__*/_react["default"].createElement(_style.DragEffect, {
         className: "tu-icon-inbox-upload"
       })));
     }
@@ -535,12 +536,12 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
 exports["default"] = MBlog;
 MBlog.defaultProps = {
   // 样式相关
-  contentClassName: "",
+  contentClassName: '',
   // 输入框class
-  actionClassName: "",
+  actionClassName: '',
   // 功能栏class
   // 输入相关
-  defaultContent: "",
+  defaultContent: '',
   isHasPlaceholder: false,
   maxLength: 2000,
   autoFocus: false,
@@ -550,7 +551,7 @@ MBlog.defaultProps = {
   // 附件
   isShowAttachment: true,
   // attachmentTipText: `<p>支持拖拽上传</p><p>单次最多支持上传20个</p><p>每个不超过50MB</p>`,
-  attachmentTipText: "",
+  attachmentTipText: '',
   fileNumLimit: 20,
   fileSizeLimit: 50,
   // @同事
@@ -558,7 +559,7 @@ MBlog.defaultProps = {
   // @所有同事
   // @表情
   isShowEmotion: true,
-  emotionTipText: "",
+  emotionTipText: '',
   // @按钮相关
   isShowSendSms: true,
   isShowRange: true,

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

@@ -38,6 +38,7 @@
   position: relative;
   padding: 12px 12px;
   width: 340px;
+  border: 1px solid #fff;
   background: #ffffff;
   box-shadow: 0px 4px 10px 0px rgba(127, 145, 180, 0.1);
   border-radius: 12px;
@@ -124,7 +125,7 @@
 }
 
 .titaui-okr-flow--node-title {
-  max-width: 252px;
+  max-width: 270px;
   margin-right: 54px;
   margin-bottom: 4px;
   line-height: 24px;

package/lib/components/okr-flow/utils/index.js

@@ -29,10 +29,9 @@ exports.nodeTypes = nodeTypes;
 
 var getLayoutedElements = function getLayoutedElements(elements) {
   var direction = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "horizontal";
-  var isHorizontal = direction === "horizontal";
-  var g = new _dagre["default"].graphlib.Graph({
-    compound: true
-  });
+  var isHorizontal = direction === "horizontal"; // const g = new dagre.graphlib.Graph({compound: true });
+
+  var g = new _dagre["default"].graphlib.Graph();
   g.setGraph({
     rankdir: isHorizontal ? "LR" : "TB",
     nodesep: 12,
@@ -70,8 +69,8 @@ var getLayoutedElements = function getLayoutedElements(elements) {
         targetPosition: isHorizontal ? "left" : "top",
         sourcePosition: isHorizontal ? "right" : "bottom",
         position: {
-          x: node.x - node.width / 2,
-          y: node.y - node.height / 2
+          x: node ? (node === null || node === void 0 ? void 0 : node.x) - (node === null || node === void 0 ? void 0 : node.width) / 2 : 0,
+          y: node ? (node === null || node === void 0 ? void 0 : node.y) - (node === null || node === void 0 ? void 0 : node.height) / 2 : 0
         }
       });
     }

package/lib/components/period-selector/index.css

@@ -2,6 +2,12 @@
   display: inline-block;
 }
 
+.titaui-period-selector__down-icon {
+  font-size: 16px;
+  transform: scale(0.5);
+  margin-left: 4px;
+}
+
 .titaui-period-selector__down-arrow {
   display: inline-block;
   vertical-align: baseline;

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

@@ -189,7 +189,7 @@ function PeriodSelector(_ref) {
       whiteSpace: "nowrap"
     }
   }, (0, _common.formatPeriod)(selectedPeriod)), /*#__PURE__*/_react["default"].createElement("span", {
-    className: "titaui-period-selector__down-arrow"
+    className: "tu-icon-caret-down titaui-period-selector__down-icon"
   })))));
 }
 

package/lib/components/scroll-container/index.js

@@ -0,0 +1,423 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _lodash = require("lodash");
+
+var _easyBem = _interopRequireDefault(require("easy-bem"));
+
+require("./style.css");
+
+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); }
+
+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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+var cn = (0, _easyBem["default"])('indiana-scroll-container');
+var SCROLL_END_DEBOUNCE = 300;
+var LEFT_BUTTON = 0;
+
+var ScrollContainer = /*#__PURE__*/function (_PureComponent) {
+  _inherits(ScrollContainer, _PureComponent);
+
+  var _super = _createSuper(ScrollContainer);
+
+  function ScrollContainer(props) {
+    var _this;
+
+    _classCallCheck(this, ScrollContainer);
+
+    _this = _super.call(this, props);
+
+    _this.onEndScroll = function () {
+      _this.scrolling = false;
+
+      if (!_this.pressed && _this.started) {
+        _this.processEnd();
+      }
+    };
+
+    _this.onScroll = function (e) {
+      var container = _this.container.current; // Ignore the internal scrolls
+
+      if (container.scrollLeft !== _this.scrollLeft || container.scrollTop !== _this.scrollTop) {
+        _this.scrolling = true;
+
+        _this.processScroll(e);
+
+        _this.onEndScroll();
+      }
+    };
+
+    _this.onTouchStart = function (e) {
+      var nativeMobileScroll = _this.props.nativeMobileScroll;
+
+      if (_this.isDraggable(e.target)) {
+        _this.internal = true;
+
+        if (nativeMobileScroll && _this.scrolling) {
+          _this.pressed = true;
+        } else {
+          var touch = e.touches[0];
+
+          _this.processClick(e, touch.clientX, touch.clientY);
+
+          if (!nativeMobileScroll && _this.props.stopPropagation) {
+            e.stopPropagation();
+          }
+        }
+      }
+    };
+
+    _this.onTouchEnd = function (e) {
+      var nativeMobileScroll = _this.props.nativeMobileScroll;
+
+      if (_this.pressed) {
+        if (_this.started && (!_this.scrolling || !nativeMobileScroll)) {
+          _this.processEnd();
+        } else {
+          _this.pressed = false;
+        }
+
+        _this.forceUpdate();
+      }
+    };
+
+    _this.onTouchMove = function (e) {
+      var nativeMobileScroll = _this.props.nativeMobileScroll;
+
+      if (_this.pressed && (!nativeMobileScroll || !_this.isMobile)) {
+        var touch = e.touches[0];
+
+        if (touch) {
+          _this.processMove(e, touch.clientX, touch.clientY);
+        } // e.preventDefault(); // 处理无法拖动选中文字的问题，先屏蔽禁止默认事件
+
+
+        if (_this.props.stopPropagation) {
+          e.stopPropagation();
+        }
+      }
+    };
+
+    _this.onMouseDown = function (e) {
+      if (_this.isDraggable(e.target) && _this.isScrollable()) {
+        _this.internal = true;
+
+        if (_this.props.buttons.indexOf(e.button) !== -1) {
+          _this.processClick(e, e.clientX, e.clientY); // e.preventDefault();
+
+
+          if (_this.props.stopPropagation) {
+            e.stopPropagation();
+          }
+        }
+      }
+    };
+
+    _this.onMouseMove = function (e) {
+      if (_this.pressed) {
+        _this.processMove(e, e.clientX, e.clientY); // e.preventDefault();
+
+
+        if (_this.props.stopPropagation) {
+          e.stopPropagation();
+        }
+      }
+    };
+
+    _this.onMouseUp = function (e) {
+      if (_this.pressed) {
+        if (_this.started) {
+          _this.processEnd();
+        } else {
+          _this.internal = false;
+          _this.pressed = false;
+
+          _this.forceUpdate();
+
+          if (_this.props.onClick) {
+            _this.props.onClick(e);
+          }
+        } // e.preventDefault();
+
+
+        if (_this.props.stopPropagation) {
+          e.stopPropagation();
+        }
+      }
+    };
+
+    _this.container = /*#__PURE__*/_react["default"].createRef();
+    _this.onEndScroll = (0, _lodash.debounce)(_this.onEndScroll, SCROLL_END_DEBOUNCE); // Is container scrolling now (for example by inertia)
+
+    _this.scrolling = false; // Is scrolling started
+
+    _this.started = false; // Is touch active or mouse pressed down
+
+    _this.pressed = false; // Is event internal
+
+    _this.internal = false; // Bind callbacks
+
+    _this.getRef = _this.getRef.bind(_assertThisInitialized(_this));
+    return _this;
+  }
+
+  _createClass(ScrollContainer, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      var nativeMobileScroll = this.props.nativeMobileScroll;
+      var container = this.container.current;
+      window.addEventListener('mouseup', this.onMouseUp, {
+        capture: true
+      });
+      window.addEventListener('mousemove', this.onMouseMove, {
+        capture: true
+      });
+      window.addEventListener('touchmove', this.onTouchMove, {
+        passive: false,
+        capture: true
+      });
+      window.addEventListener('touchend', this.onTouchEnd, {
+        capture: true
+      }); // due to https://github.com/facebook/react/issues/9809#issuecomment-414072263
+
+      container.addEventListener('touchstart', this.onTouchStart, {
+        passive: false
+      });
+      container.addEventListener('mousedown', this.onMouseDown, {
+        passive: false
+      });
+
+      if (nativeMobileScroll) {
+        // We should check if it's the mobile device after page was loaded
+        // to prevent breaking SSR
+        this.isMobile = this.isMobileDevice(); // If it's the mobile device, we should rerender to change styles
+
+        if (this.isMobile) {
+          this.forceUpdate();
+        }
+      }
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      window.removeEventListener('mouseup', this.onMouseUp);
+      window.removeEventListener('mousemove', this.onMouseMove);
+      window.removeEventListener('touchmove', this.onTouchMove);
+      window.removeEventListener('touchend', this.onTouchEnd);
+    }
+  }, {
+    key: "getElement",
+    value: function getElement() {
+      return this.container.current;
+    }
+  }, {
+    key: "isMobileDevice",
+    value: function isMobileDevice() {
+      return typeof window.orientation !== 'undefined' || navigator.userAgent.indexOf('IEMobile') !== -1;
+    }
+  }, {
+    key: "isDraggable",
+    value: function isDraggable(target) {
+      var ignoreElements = this.props.ignoreElements;
+
+      if (ignoreElements) {
+        var closest = target.closest(ignoreElements);
+        return closest === null || closest.contains(this.getElement());
+      }
+
+      return true;
+    }
+  }, {
+    key: "isScrollable",
+    value: function isScrollable() {
+      var container = this.container.current;
+      return container && (container.scrollWidth > container.clientWidth || container.scrollHeight > container.clientHeight);
+    } // Simulate 'onEndScroll' event that fires when scrolling is stopped
+
+  }, {
+    key: "processClick",
+    value: function processClick(e, clientX, clientY) {
+      var container = this.container.current;
+      this.scrollLeft = container.scrollLeft;
+      this.scrollTop = container.scrollTop;
+      this.clientX = clientX;
+      this.clientY = clientY;
+      this.pressed = true;
+    }
+  }, {
+    key: "processStart",
+    value: function processStart() {
+      var changeCursor = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+      var onStartScroll = this.props.onStartScroll;
+      this.started = true; // Add the class to change displayed cursor
+
+      if (changeCursor) {
+        document.body.classList.add('indiana-dragging');
+      }
+
+      if (onStartScroll) {
+        onStartScroll({
+          external: !this.internal
+        });
+      }
+
+      this.forceUpdate();
+    } // Process native scroll (scrollbar, mobile scroll)
+
+  }, {
+    key: "processScroll",
+    value: function processScroll(e) {
+      if (this.started) {
+        var onScroll = this.props.onScroll;
+
+        if (onScroll) {
+          onScroll({
+            external: !this.internal
+          });
+        }
+      } else {
+        this.processStart(false);
+      }
+    } // Process non-native scroll
+
+  }, {
+    key: "processMove",
+    value: function processMove(e, newClientX, newClientY) {
+      var _this$props = this.props,
+          horizontal = _this$props.horizontal,
+          vertical = _this$props.vertical,
+          activationDistance = _this$props.activationDistance,
+          onScroll = _this$props.onScroll;
+      var container = this.container.current;
+
+      if (!this.started) {
+        if (horizontal && Math.abs(newClientX - this.clientX) > activationDistance || vertical && Math.abs(newClientY - this.clientY) > activationDistance) {
+          this.clientX = newClientX;
+          this.clientY = newClientY;
+          this.processStart();
+        }
+      } else {
+        if (horizontal) {
+          container.scrollLeft -= newClientX - this.clientX;
+        }
+
+        if (vertical) {
+          container.scrollTop -= newClientY - this.clientY;
+        }
+
+        if (onScroll) {
+          onScroll({
+            external: !this.internal
+          });
+        }
+
+        this.clientX = newClientX;
+        this.clientY = newClientY;
+        this.scrollLeft = container.scrollLeft;
+        this.scrollTop = container.scrollTop;
+      }
+    }
+  }, {
+    key: "processEnd",
+    value: function processEnd() {
+      var onEndScroll = this.props.onEndScroll;
+      var container = this.container.current;
+
+      if (container && onEndScroll) {
+        onEndScroll({
+          external: !this.internal
+        });
+      }
+
+      this.pressed = false;
+      this.started = false;
+      this.scrolling = false;
+      this.internal = false;
+      document.body.classList.remove('indiana-dragging');
+      this.forceUpdate();
+    }
+  }, {
+    key: "getRef",
+    value: function getRef(el) {
+      ;
+      [this.container, this.props.innerRef].forEach(function (ref) {
+        if (ref) {
+          if (typeof ref === 'function') {
+            ref(el);
+          } else {
+            ;
+            ref.current = el;
+          }
+        }
+      });
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this$props2 = this.props,
+          children = _this$props2.children,
+          draggingClassName = _this$props2.draggingClassName,
+          className = _this$props2.className,
+          style = _this$props2.style,
+          hideScrollbars = _this$props2.hideScrollbars,
+          Component = _this$props2.component;
+      return /*#__PURE__*/_react["default"].createElement(Component, {
+        className: (0, _classnames["default"])(className, this.pressed && draggingClassName, cn({
+          dragging: this.pressed,
+          'hide-scrollbars': hideScrollbars,
+          'native-scroll': this.isMobile
+        })),
+        style: style,
+        ref: this.getRef,
+        onScroll: this.onScroll
+      }, children);
+    }
+  }]);
+
+  return ScrollContainer;
+}(_react.PureComponent);
+
+exports["default"] = ScrollContainer;
+ScrollContainer.defaultProps = {
+  nativeMobileScroll: true,
+  hideScrollbars: true,
+  activationDistance: 10,
+  vertical: true,
+  horizontal: true,
+  stopPropagation: false,
+  style: {},
+  component: 'div',
+  buttons: [LEFT_BUTTON]
+};

package/lib/components/scroll-container/style.css

@@ -0,0 +1,35 @@
+.indiana-scroll-container {
+  overflow: auto;
+}
+
+.indiana-scroll-container--dragging {
+  scroll-behavior: auto !important;
+}
+
+.indiana-scroll-container--dragging > * {
+  pointer-events: none;
+  cursor: grab;
+}
+
+.indiana-scroll-container--hide-scrollbars {
+  overflow: hidden;
+  overflow: -moz-scrollbars-none;
+  -ms-overflow-style: none;
+  scrollbar-width: none;
+}
+
+.indiana-scroll-container--hide-scrollbars::-webkit-scrollbar {
+  display: none !important;
+  height: 0 !important;
+  width: 0 !important;
+  background: transparent !important;
+  -webkit-appearance: none !important;
+}
+
+.indiana-scroll-container--native-scroll {
+  overflow: auto;
+}
+
+.indiana-dragging {
+  cursor: grab;
+}

package/lib/components/superset-charts/components/chart/index.js

@@ -19,7 +19,7 @@ var Chart = function Chart(props) {
   //   });
   // }, []);
   var Chart = (_window = window) === null || _window === void 0 ? void 0 : (_window$SupersetChart = _window.SupersetChart) === null || _window$SupersetChart === void 0 ? void 0 : _window$SupersetChart.SupersetChart;
-  return /*#__PURE__*/_react["default"].createElement("div", null, Chart && /*#__PURE__*/_react["default"].createElement(Chart, props));
+  return Chart && /*#__PURE__*/_react["default"].createElement(Chart, props);
 };
 
 var _default = Chart;

package/lib/index.js

@@ -393,6 +393,12 @@ Object.defineProperty(exports, "RichEditor", {
     return _richEditor["default"];
   }
 });
+Object.defineProperty(exports, "ScrollContainer", {
+  enumerable: true,
+  get: function get() {
+    return _scrollContainer["default"];
+  }
+});
 Object.defineProperty(exports, "Scrollbar", {
   enumerable: true,
   get: function get() {
@@ -746,6 +752,8 @@ var _selectTags = _interopRequireDefault(require("./components/select-tags"));
 
 var _surveyModel = _interopRequireDefault(require("./components/survey-model"));
 
+var _scrollContainer = _interopRequireDefault(require("./components/scroll-container"));
+
 var _tree = _interopRequireDefault(require("./components/tree"));
 
 var _table = _interopRequireDefault(require("./components/table"));

package/lib/pages/okr-map/export-modules/okr-map/header/index.css

@@ -159,7 +159,7 @@
   background: #ffffff;
   box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
   border: 1px solid #e9ecf0;
-  border-radius: 2px;
+  border-radius: 12px;
 }
 
 .titapage-okr-map__dark .titapage-okr-map__content-search:before {

package/lib/pages/okr-map/export-modules/okr-map/header/index.js

@@ -107,7 +107,7 @@ function _default(props) {
   var onConfirmHandler = function onConfirmHandler(checked) {
     onShowKrClick(checked);
 
-    if (showCardKr) {
+    if (showCardKr && checked) {
       _toast["default"].Warning('仅允许开启一项');
 
       onShowCardKr(false);
@@ -117,7 +117,7 @@ function _default(props) {
   var onhandleShowCardKr = function onhandleShowCardKr(checked) {
     onShowCardKr(checked);
 
-    if (showkr) {
+    if (showkr && checked) {
       _toast["default"].Warning('仅允许开启一项');
 
       onShowKrClick(false);

package/lib/pages/okr-map/export-modules/share-okr-page/header/index.css

@@ -4,6 +4,7 @@
   align-items: center;
   padding-left: 25px;
   box-sizing: border-box;
+  border-radius: 12px;
   height: 76px;
   background: #ffffff;
   box-shadow: 0px 0px 8px 0px #e9eef3;
@@ -23,18 +24,6 @@
   line-height: 28px;
 }
 
-.titapage-okr-map-share-okr__header-title:after {
-  display: inline-block;
-  position: absolute;
-  content: '';
-  right: 0;
-  top: 0;
-  background: linear-gradient(180deg, rgba(191, 199, 213, 0) 0%, #bfc7d5 50%, rgba(191, 199, 213, 0) 100%);
-  border-radius: 1px;
-  width: 1px;
-  height: 100%;
-}
-
 .titapage-okr-map-share-okr__header-dark {
   display: inline-block;
   position: absolute;
@@ -71,6 +60,29 @@
   right: 25px;
 }
 
+.titapage-okr-map-share-okr__header-showMore {
+  box-sizing: border-box;
+  position: absolute;
+  right: 110px;
+  padding: 0 12px;
+  height: 30px;
+  line-height: 30px;
+  cursor: pointer;
+  color: #3f4755;
+  font-size: 12px;
+}
+
+.titapage-okr-map-share-okr__header-showMore::after {
+  position: absolute;
+  display: inline-block;
+  background: url("../../../images/line-down-arrow.svg") transparent no-repeat 50% 50%;
+  content: '';
+  height: 6px;
+  width: 10px;
+  right: 0;
+  top: calc(50% - 3px);
+}
+
 .titapage-okr-map__dark .titapage-okr-map-share-okr__header {
   background: #3f4755;
   box-shadow: none;

package/lib/pages/okr-map/export-modules/share-okr-page/header/index.js

@@ -17,6 +17,10 @@ var _switch = _interopRequireDefault(require("../../../../../components/switch")
 
 var _getLocale = require("../../../../../utils/getLocale");
 
+var _popup = _interopRequireDefault(require("../../../../../components/popup"));
+
+var _toast = _interopRequireDefault(require("../../../../../components/toast"));
+
 var _precls = _interopRequireDefault(require("../../../precls"));
 
 require("./index.css");
@@ -31,6 +35,8 @@ function _default(props) {
   var setDarkTheme = props.setDarkTheme,
       darkTheme = props.darkTheme,
       showkr = props.showkr,
+      showCardKr = props.showCardKr,
+      setShowCardKr = props.setShowCardKr,
       setShowKr = props.setShowKr,
       setDirection = props.setDirection,
       onBtnClick = props.onBtnClick,
@@ -46,24 +52,58 @@ function _default(props) {
     placement: "topRight",
     rotate: direction == "horizontal" ? 0 : -90,
     type: direction == "horizontal" ? "vertical" : "horizontal"
-  } // { icon: direction == "horizontal" ? "vertical" : "horizontal", overlay: direction == "horizontal" ? `${getLocale("OKR_Ali_Butt_Toggleportrait")}` : `${getLocale("OKR_Ali_Butt_Togglelandscape")}` },
-  ]; // 获取地图数据
+  }]; // 获取地图数据
 
   (0, _react.useEffect)(function () {// ...
   }, []);
+
+  var onhandleShowCardKr = function onhandleShowCardKr(checked) {
+    if (showkr && checked) {
+      setShowKr(false);
+
+      _toast["default"].Warning('仅允许开启一项');
+    }
+
+    setShowCardKr(checked);
+  };
+
+  var onConfirmHandler = function onConfirmHandler(checked) {
+    if (showCardKr && checked) {
+      setShowCardKr(false);
+
+      _toast["default"].Warning('仅允许开启一项');
+    }
+
+    setShowKr(checked);
+  };
+
+  var popup = function popup() {
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: (0, _classnames["default"])("".concat(_precls["default"], "__show-more-popup"))
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: (0, _classnames["default"])("".concat(_precls["default"], "__header-action-showkr"))
+    }, /*#__PURE__*/_react["default"].createElement(_switch["default"], {
+      label: (0, _getLocale.getLocale)("OKR_Db_KRDetails"),
+      checked: showCardKr,
+      onChange: onhandleShowCardKr
+    })), /*#__PURE__*/_react["default"].createElement("div", {
+      className: (0, _classnames["default"])("".concat(_precls["default"], "__header-action-showkr"))
+    }, /*#__PURE__*/_react["default"].createElement(_switch["default"], {
+      label: (0, _getLocale.getLocale)("OKR_Ali_Butt_ExhibitionKRs"),
+      checked: showkr,
+      onChange: onConfirmHandler
+    })));
+  };
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "-share-okr__header"))
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "-share-okr__header-title"))
-  }, (0, _getLocale.getLocale)("OKR_Menu_Title_Alignment")), /*#__PURE__*/_react["default"].createElement("span", {
-    className: (0, _classnames["default"])("".concat(_precls["default"], "-share-okr__header-showkr"))
-  }, /*#__PURE__*/_react["default"].createElement(_switch["default"], {
-    label: (0, _getLocale.getLocale)("OKR_Ali_Butt_ExhibitionKRs"),
-    checked: showkr,
-    onChange: function onChange(checked) {
-      return setShowKr(checked);
-    }
-  })), /*#__PURE__*/_react["default"].createElement("span", {
+  }, (0, _getLocale.getLocale)("OKR_Menu_Title_Alignment")), /*#__PURE__*/_react["default"].createElement(_popup["default"], {
+    popup: popup
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "-share-okr__header-showMore"))
+  }, (0, _getLocale.getLocale)("OKR_Ali_Butt_Exhibitionmore"))), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "-share-okr__header-direction"))
   }, /*#__PURE__*/_react["default"].createElement(_iconButtonList["default"], {
     items: iconButtons,

package/lib/pages/okr-map/export-modules/share-okr-page/share-okr-map.js

@@ -83,25 +83,30 @@ function _default() {
       showkr = _useState8[0],
       setShowKr = _useState8[1];
 
-  var _useState9 = (0, _react.useState)(hashQuery.darkTheme),
+  var _useState9 = (0, _react.useState)(hashQuery.showCardKr),
       _useState10 = _slicedToArray(_useState9, 2),
-      darkTheme = _useState10[0],
-      setDarkTheme = _useState10[1];
+      showCardKr = _useState10[0],
+      setShowCardKr = _useState10[1];
 
-  var _useState11 = (0, _react.useState)(hashQuery.direction),
+  var _useState11 = (0, _react.useState)(hashQuery.darkTheme),
       _useState12 = _slicedToArray(_useState11, 2),
-      direction = _useState12[0],
-      setDirection = _useState12[1];
+      darkTheme = _useState12[0],
+      setDarkTheme = _useState12[1];
 
-  var _useState13 = (0, _react.useState)(hashQuery.rootNode),
+  var _useState13 = (0, _react.useState)(hashQuery.direction),
       _useState14 = _slicedToArray(_useState13, 2),
-      rootNode = _useState14[0],
-      setRootNode = _useState14[1];
+      direction = _useState14[0],
+      setDirection = _useState14[1];
 
-  var _useState15 = (0, _react.useState)(false),
+  var _useState15 = (0, _react.useState)(hashQuery.rootNode),
       _useState16 = _slicedToArray(_useState15, 2),
-      forceRender = _useState16[0],
-      setForceRender = _useState16[1];
+      rootNode = _useState16[0],
+      setRootNode = _useState16[1];
+
+  var _useState17 = (0, _react.useState)(false),
+      _useState18 = _slicedToArray(_useState17, 2),
+      forceRender = _useState18[0],
+      setForceRender = _useState18[1];
 
   var okrMapRef = (0, _react.useRef)();
 
@@ -144,9 +149,11 @@ function _default() {
       className: (0, _classnames["default"])(_precls["default"], "".concat(_precls["default"], "-share"))
     }, /*#__PURE__*/_react["default"].createElement(_header["default"], {
       showkr: showkr,
+      showCardKr: showCardKr,
       darkTheme: darkTheme,
       direction: direction,
       setShowKr: setShowKr,
+      setShowCardKr: setShowCardKr,
       setDirection: setDirection,
       onBtnClick: onMapActionsHandler,
       setDarkTheme: setDarkTheme
@@ -158,6 +165,7 @@ function _default() {
         ref: okrMapRef,
         searchType: searchType,
         showkr: showkr,
+        showCardKr: showCardKr,
         direction: direction,
         darkTheme: darkTheme
       }, period, rootNode, {

package/lib/pages/okr-map/number-select/index.css

@@ -1,7 +1,7 @@
 .titaui-number-select {
   font-size: 14px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
-  color: #3F4755;
+  color: #3f4755;
   position: relative;
 }
 
@@ -22,12 +22,12 @@
 
 .titaui-number-select--action-icon {
   display: inline-block;
-  width: 12px;
-  height: 12px;
-  background: #BFC7D5;
+  width: 16px;
+  height: 16px;
+  background: #bfc7d5;
   border-radius: 10px;
   text-align: center;
-  line-height: 10px;
+  line-height: 14px;
   color: #fff;
   cursor: pointer;
   vertical-align: middle;
@@ -39,11 +39,11 @@
 }
 
 .titaui-number-select--action-icon-right {
-  line-height: 12px;
+  line-height: 16px;
 }
 
 .titaui-number-select--action-icon:hover {
-  background: #2879FF;
+  background: #2879ff;
 }
 
 .titaui-number-select--action-icon__disable {
@@ -51,13 +51,13 @@
 }
 
 .titaui-number-select--action-icon__disable:hover {
-  background: #BFC7D5;
+  background: #bfc7d5;
   opacity: 0.4;
   cursor: not-allowed;
 }
 
 .titaui-number-select--value {
-  margin: 0  4px;
+  margin: 0 4px;
   vertical-align: middle;
   -webkit-touch-callout: none;
   -webkit-user-select: none;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.11.17",
+  "version": "1.11.20",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -90,6 +90,7 @@
     "color": "4.2.1",
     "cos-js-sdk-v5": "1.3.3",
     "dayjs": "1.10.4",
+    "easy-bem": "^1.1.1",
     "html2canvas": "1.3.2",
     "less": "4.1.2",
     "less-loader": "6.0.0",