@titaui/pc 1.5.82 → 1.5.83

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

@@ -0,0 +1,228 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _reactDom = _interopRequireDefault(require("react-dom"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _enlarge = _interopRequireDefault(require("./icon/enlarge"));
+
+var _shrink = _interopRequireDefault(require("./icon/shrink"));
+
+var _leftRotate = _interopRequireDefault(require("./icon/left-rotate"));
+
+var _rightRotate = _interopRequireDefault(require("./icon/right-rotate"));
+
+var _tooltip = _interopRequireWildcard(require("../tooltip"));
+
+var _loading = _interopRequireDefault(require("./image/loading.gif"));
+
+require("./index.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 _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+var prefix = "titaui-img-viewer";
+var ImgViewer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+  var data = _ref.data,
+      _ref$showDownload = _ref.showDownload,
+      showDownload = _ref$showDownload === void 0 ? true : _ref$showDownload;
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(0),
+      _useState4 = _slicedToArray(_useState3, 2),
+      currentIndex = _useState4[0],
+      setCurrnetIndex = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(data[0]),
+      _useState6 = _slicedToArray(_useState5, 2),
+      currentImgData = _useState6[0],
+      setCurrentImgData = _useState6[1];
+
+  var _useState7 = (0, _react.useState)(0),
+      _useState8 = _slicedToArray(_useState7, 2),
+      currentRotateDeg = _useState8[0],
+      setCurrentRotateDeg = _useState8[1];
+
+  var _useState9 = (0, _react.useState)(1),
+      _useState10 = _slicedToArray(_useState9, 2),
+      currentScale = _useState10[0],
+      setCurrentScale = _useState10[1];
+
+  var _useState11 = (0, _react.useState)(true),
+      _useState12 = _slicedToArray(_useState11, 2),
+      isLoading = _useState12[0],
+      setIsLoading = _useState12[1];
+
+  var imgRef = (0, _react.useRef)(document.createElement("img"));
+
+  var showPreview = function showPreview() {
+    var index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+    setCurrnetIndex(index);
+    setCurrentImgData(data[index]);
+    setVisible(true);
+  };
+
+  var hidePreview = function hidePreview() {
+    setVisible(false);
+  };
+
+  var handlePreImgClick = function handlePreImgClick() {
+    if (currentIndex === 0) return;
+    setIsLoading(true);
+    setCurrentImgData(data[currentIndex - 1]);
+    setCurrnetIndex(currentIndex - 1);
+    setCurrentScale(1);
+    setCurrentRotateDeg(0);
+  };
+
+  var handleNextImgClick = function handleNextImgClick() {
+    if (currentIndex === data.length - 1) return;
+    setIsLoading(true);
+    setCurrentImgData(data[currentIndex + 1]);
+    setCurrnetIndex(currentIndex + 1);
+    setCurrentScale(1);
+    setCurrentRotateDeg(0);
+  };
+
+  var handleLeftRotate = function handleLeftRotate() {
+    setCurrentRotateDeg(currentRotateDeg - 90);
+  };
+
+  var handleRightRotate = function handleRightRotate() {
+    setCurrentRotateDeg(currentRotateDeg + 90);
+  };
+
+  var handleEnlarge = function handleEnlarge() {
+    if (currentScale === 5) return;
+    setCurrentScale(Number((currentScale + 0.1).toFixed(1)));
+  };
+
+  var handleShrink = function handleShrink() {
+    if (currentScale === 0.1) return;
+    setCurrentScale(Number((currentScale - 0.1).toFixed(1)));
+  };
+
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      show: showPreview,
+      hide: hidePreview
+    };
+  });
+  (0, _react.useEffect)(function () {
+    var timer = setInterval(function () {
+      if (imgRef.current.complete) {
+        setIsLoading(false);
+        clearInterval(timer);
+      }
+    }, 500);
+  }, [currentIndex]);
+
+  var renderPreviewer = function renderPreviewer() {
+    if (!visible) return null;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: prefix
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: prefix + "__header"
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: prefix + "__header-file-name"
+    }, /*#__PURE__*/_react["default"].createElement(_tooltip.TooltipText, {
+      text: currentImgData.fileName,
+      isPercent: true,
+      minusWidth: 60
+    })), /*#__PURE__*/_react["default"].createElement("span", null, showDownload && /*#__PURE__*/_react["default"].createElement("a", {
+      className: prefix + "__header-download",
+      href: currentImgData.downloadUrl
+    }, /*#__PURE__*/_react["default"].createElement("i", {
+      className: (0, _classnames["default"])("tu-icon-APP-xiazai", prefix + "__header-download-icon")
+    }), "\u4E0B\u8F7D"), /*#__PURE__*/_react["default"].createElement("span", {
+      className: (0, _classnames["default"])("tu-icon-close", prefix + "__header-close"),
+      onClick: hidePreview
+    }))), /*#__PURE__*/_react["default"].createElement("div", {
+      className: prefix + "__body"
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: (0, _classnames["default"])(prefix + "__body-operate-btn", prefix + "__body-operate-btn--left", _defineProperty({}, prefix + "__body-operate-btn--disable", currentIndex === 0)),
+      onClick: handlePreImgClick
+    }, /*#__PURE__*/_react["default"].createElement("i", {
+      className: "tu-icon-left"
+    })), /*#__PURE__*/_react["default"].createElement("span", {
+      className: (0, _classnames["default"])(prefix + "__body-operate-btn", prefix + "__body-operate-btn--right", _defineProperty({}, prefix + "__body-operate-btn--disable", currentIndex === data.length - 1)),
+      onClick: handleNextImgClick
+    }, /*#__PURE__*/_react["default"].createElement("i", {
+      className: "tu-icon-APP-xi"
+    })), isLoading && /*#__PURE__*/_react["default"].createElement("div", {
+      className: prefix + '__body--loading'
+    }, /*#__PURE__*/_react["default"].createElement("img", {
+      src: _loading["default"]
+    })), /*#__PURE__*/_react["default"].createElement("div", {
+      style: {
+        transform: "rotate(".concat(currentRotateDeg, "deg)")
+      }
+    }, /*#__PURE__*/_react["default"].createElement("img", {
+      ref: imgRef,
+      src: currentImgData.bigImageUrl,
+      style: {
+        transform: "scale(".concat(currentScale, ")")
+      }
+    }))), /*#__PURE__*/_react["default"].createElement("div", {
+      className: prefix + "__footer"
+    }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+      overlay: "缩小",
+      placement: "top"
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: prefix + "__footer-btn",
+      onClick: handleShrink
+    }, /*#__PURE__*/_react["default"].createElement(_shrink["default"], null))), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+      overlay: "放大",
+      placement: "top"
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: prefix + "__footer-btn",
+      onClick: handleEnlarge
+    }, /*#__PURE__*/_react["default"].createElement(_enlarge["default"], null))), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+      overlay: "顺时针旋转",
+      placement: "top"
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: prefix + "__footer-btn",
+      onClick: handleRightRotate
+    }, /*#__PURE__*/_react["default"].createElement(_rightRotate["default"], null))), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+      overlay: "逆时针旋转",
+      placement: "top"
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: prefix + "__footer-btn",
+      onClick: handleLeftRotate
+    }, /*#__PURE__*/_react["default"].createElement(_leftRotate["default"], null)))));
+  };
+
+  return /*#__PURE__*/_reactDom["default"].createPortal(renderPreviewer(), document.body);
+});
+var _default = ImgViewer;
+exports["default"] = _default;

package/lib/components/img-viewer/interface.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/components/img-viewer/util.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isImg = void 0;
+
+var isImg = function isImg(fileType) {
+  if (/^(jpg|png|gif|jpeg|image|JPG|PNG|GIF|JPEG)$/.test(fileType)) {
+    return true;
+  }
+
+  return false;
+};
+
+exports.isImg = isImg;

package/lib/components/mblog/components/MblogAction.js

@@ -159,7 +159,9 @@ var MblogAction = /*#__PURE__*/function (_PureComponent) {
           emotionsSelectorPopAlign = _this$props.emotionsSelectorPopAlign,
           visibility = _this$props.visibility,
           onActionsSelectedUserChange = _this$props.onActionsSelectedUserChange,
-          dragFilesList = _this$props.dragFilesList;
+          dragFilesList = _this$props.dragFilesList,
+          _this$props$disableRa = _this$props.disableRangeSelect,
+          disableRangeSelect = _this$props$disableRa === void 0 ? true : _this$props$disableRa;
       return /*#__PURE__*/_react["default"].createElement(_style.MblogActionWrapper, {
         className: className
       }, /*#__PURE__*/_react["default"].createElement(_style.LeftBtnGroupWrapper, {
@@ -240,21 +242,23 @@ var MblogAction = /*#__PURE__*/function (_PureComponent) {
       }), /*#__PURE__*/_react["default"].createElement("span", null, "\u77ED\u4FE1\u901A\u77E5"))), this.props.isShowRange && /*#__PURE__*/_react["default"].createElement(_style.BtnPrivate, {
         id: "1",
         "data-name": "range",
-        className: "disabled",
-        disabled: true
+        className: disableRangeSelect ? 'disabled' : '',
+        disabled: disableRangeSelect
       }, /*#__PURE__*/_react["default"].createElement(_RangeSelectorPop["default"], {
         align: "bottom left",
-        isDisabled: true,
+        isDisabled: disableRangeSelect,
         container: this.context.popContainer,
         onSubmit: function onSubmit(visibility) {
           return onActionsTextChange(visibility);
         }
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: 'mblog-visiblity-range'
       }, /*#__PURE__*/_react["default"].createElement("span", {
         "data-name": "range-cont"
       }, visibilityMap[visibility || 1]), this.props.isShowRangeDropDown && /*#__PURE__*/_react["default"].createElement("i", {
-        className: "tu-icon-sort-down range-cont-icon tu-ft_m3",
+        className: "tu-icon-caret-down range-cont-icon",
         "data-name": "range-caret"
-      }))), this.props.isShowBtnCancel && /*#__PURE__*/_react["default"].createElement(_style.BtnCancel, {
+      })))), this.props.isShowBtnCancel && /*#__PURE__*/_react["default"].createElement(_style.BtnCancel, {
         onMouseDown: function onMouseDown() {
           return onActionSubmit('cancel');
         }

package/lib/components/mblog/index.js

@@ -72,10 +72,13 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
 
       var textareaValue = (0, _index.htmlDecodeByRegExp)(localStorage.getItem(localStroageKey) || defaultContent); // 获取本地缓存内容
 
+      var atAll = textareaValue.match(/@\[所有同事:all_members\]/g) ? true : false;
+
       _this.setState({
+        isAtAll: atAll,
         localStroageKey: localStroageKey,
         textareaValue: textareaValue.trim(),
-        visibility: privateValue || 1,
+        visibility: atAll ? 1 : privateValue || 1,
         isAllowSubmit: _this.allowSubmit(textareaValue) // 根据内容判断是否可以提交
 
       });
@@ -85,12 +88,15 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
       // @ts-ignore
       var textareaInput = _this.refs.textEditor.refs.textareaInput;
       var start = textareaInput.selectionStart;
+      var atAll = contentValue.match(/@\[所有同事:all_members\]/g) ? true : false;
 
       _this.setState({
         isInputAt: contentValue.charAt(start - 1) == '@',
         // isInputEnterSubmit: contentValue === 'isInputEnterSubmit',
         textareaValue: contentValue,
-        isAllowSubmit: _this.allowSubmit(contentValue)
+        isAllowSubmit: _this.allowSubmit(contentValue),
+        isAtAll: atAll,
+        visibility: atAll ? 1 : _this.state.visibility
       });
 
       localStorage.setItem(_this.state.localStroageKey, contentValue);
@@ -127,9 +133,13 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
       textareaValue = (0, _index.insertTextAtPointer)(textareaInput, actionValue);
       localStorage.setItem(_this.state.localStroageKey, textareaValue); // 输入内容进行本地缓存
 
+      var atAll = textareaValue.match(/@\[所有同事:all_members\]/g) ? true : false;
+
       _this.setState({
         textareaValue: textareaValue,
-        isAllowSubmit: _this.allowSubmit(textareaValue)
+        isAllowSubmit: _this.allowSubmit(textareaValue),
+        isAtAll: atAll,
+        visibility: atAll ? 1 : _this.state.visibility
       }, function () {
         _this.focus();
       });
@@ -157,8 +167,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
       var successFilesPathLen = successFilesPath.length; // @ts-ignore
 
       var textareaInput = _this.refs.textEditor.refs.textareaInput;
-      var textareaValue = _this.state.textareaValue;
-      textareaValue = (0, _index.dealWithLoadedFileTips)(textareaValue, successFilesPathLen); // 更新输入框内容
+      var textareaValue = _this.state.textareaValue; // textareaValue = dealWithLoadedFileTips(textareaValue, successFilesPathLen); // 更新输入框内容
 
       localStorage.setItem(_this.state.localStroageKey, textareaValue); // 将输入框内容进行本地缓存
 
@@ -166,7 +175,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
 
       _this.setState({
         textareaValue: textareaValue,
-        isAllowSubmit: textareaValue.trim().length > 0 && textareaValue.trim().length <= (_this.props.maxLength || 2000),
+        isAllowSubmit: textareaValue.trim().length > 0 && textareaValue.trim().length <= (_this.props.maxLength || 2000) || successFilesPath.length > 0,
         uploadSuccessFilesPath: successFilesPath,
         dragFilesList: []
       });
@@ -181,7 +190,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
     };
 
     _this.allowSubmit = function (content) {
-      return content.trim().length > 0 && content.trim().length <= _this.props.maxLength;
+      return content.trim().length > 0 && content.trim().length <= _this.props.maxLength || _this.state.uploadSuccessFilesPath.length > 0;
     };
 
     _this.onActionSubmit = function (submitType) {
@@ -300,7 +309,8 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
       isInputAt: false,
       isInputEnterSubmit: false,
       dragFilesList: [],
-      isShowDragMask: false
+      isShowDragMask: false,
+      isAtAll: false
     };
     return _this;
   } // @ts-ignore @所有同事权限设置，有权限的：超管、老板、助理、目标负责人、目标管理员
@@ -375,7 +385,8 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
           isShowRangeDropDown = _this$props3.isShowRangeDropDown,
           isShowBtnCancel = _this$props3.isShowBtnCancel,
           submitText = _this$props3.submitText,
-          setTextareaRef = _this$props3.setTextareaRef;
+          setTextareaRef = _this$props3.setTextareaRef,
+          disableRangeSelect = _this$props3.disableRangeSelect;
       var _this$state2 = this.state,
           localStroageKey = _this$state2.localStroageKey,
           visibility = _this$state2.visibility,
@@ -384,7 +395,8 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
           isAllowSubmit = _this$state2.isAllowSubmit,
           textareaValue = _this$state2.textareaValue,
           dragFilesList = _this$state2.dragFilesList,
-          isShowDragMask = _this$state2.isShowDragMask;
+          isShowDragMask = _this$state2.isShowDragMask,
+          isAtAll = _this$state2.isAtAll;
       var fSize = (0, _bsGlobal.getUploadMaxSize)();
       var fTip = attachmentTipText || '<p>支持拖拽上传</p><p>单次最多支持上传20个，总数不可超过50个</p><p>每个不超过' + fSize + 'MB</p>';
       return /*#__PURE__*/_react["default"].createElement(_style.MBlogBox, {
@@ -441,7 +453,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
         sendSmsTipText: sendSmsTipText,
         isShowRange: isShowRange,
         isShowRangeDropDown: isShowRangeDropDown,
-        visibility: visibility,
+        visibility: isAtAll ? 1 : visibility,
         dragFilesList: dragFilesList,
         isShowBtnCancel: isShowBtnCancel,
         isInputEnterSubmit: isInputEnterSubmit,
@@ -449,6 +461,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
         submitText: submitText,
         submitStatus: submitStatus,
         localStroageKey: localStroageKey,
+        disableRangeSelect: disableRangeSelect || isAtAll,
         onActionsTextChange: function onActionsTextChange(actionValue) {
           _this2.onActionsTextChange(actionValue);
         },

package/lib/components/mblog/style.js

@@ -13,12 +13,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
-var MBlogBox = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n\n  .uploadFile__preview__list {\n    padding-bottom: 10px;\n    background: #ffffff;\n    display: flex;\n    flex-wrap: wrap;\n\n    .preview__content {\n      margin-top: 10px;\n      margin-right: 10px;\n    }\n  }\n"]))); // MblogContent
+var MBlogBox = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n\n  .uploadFile__preview__list {\n    padding-bottom: 10px;\n    background: #ffffff;\n    display: flex;\n    flex-wrap: wrap;\n    max-height: 300px;\n    overflow-y: auto;\n\n    .preview__content {\n      margin-top: 10px;\n      margin-right: 10px;\n      border-radius: 8px;\n    }\n  }\n"]))); // MblogContent
 
 
 exports.MBlogBox = MBlogBox;
 
-var DivMblogContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding: 8px 10px 6px;\n  border: 1px solid #E9ECF0;\n  border-radius: 2px;\n  background-color: #fff;\n  position: relative;\n  transition: all .2s ease-in-out;\n\n  &.input_default-active {\n    border-color: #2879ff;\n  }\n"])));
+var DivMblogContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding: 8px 10px 6px;\n  border: 1px solid #E9ECF0;\n  border-radius: 4px;\n  background-color: #fff;\n  position: relative;\n  transition: all .2s ease-in-out;\n  height: 124px;\n  box-sizing: border-box;\n\n  &.input_default-active {\n    box-shadow: inset 0px 0px 4px 0px rgba(40, 121, 255, 0.3);\n    border-color: #2879ff;\n  }\n"])));
 
 exports.DivMblogContent = DivMblogContent;
 
@@ -28,7 +28,7 @@ var LabelWrapper = _styledComponents["default"].div(_templateObject3 || (_templa
 
 exports.LabelWrapper = LabelWrapper;
 
-var Label = _styledComponents["default"].label(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  position: absolute;\n  top: 13px;\n  left: 10px;\n  color: #acb7bf;\n  font-size: 14px;\n  cursor: text;\n"])));
+var Label = _styledComponents["default"].label(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  position: absolute;\n  top: 8px;\n  left: 10px;\n  color: #BFC7D5;\n  font-size: 14px;\n  cursor: text;\n"])));
 
 exports.Label = Label;
 
@@ -36,7 +36,7 @@ var TextareaWrapper = _styledComponents["default"].div(_templateObject5 || (_tem
 
 exports.TextareaWrapper = TextareaWrapper;
 
-var Textarea = _styledComponents["default"].textarea(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  width: 100%;\n  padding: 0;\n  border: 0 none;\n  background-color: transparent;\n  color: #34434e;\n  resize: none;\n  word-break: break-all;\n  word-wrap: break-word;\n\n  &.textarea-setheight {\n    visibility: hidden;\n    position: absolute;\n  }\n\n  &.private__bg {\n    background: url(", ") no-repeat right top;\n  }\n"])), require("./assets/lock-radius.png"));
+var Textarea = _styledComponents["default"].textarea(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  width: 100%;\n  padding: 0;\n  border: 0 none;\n  background-color: transparent;\n  color: #3F4755;\n  resize: none;\n  word-break: break-all;\n  word-wrap: break-word;\n  height: 86px;\n\n  &.textarea-setheight {\n    visibility: hidden;\n    position: absolute;\n  }\n/* \n  &.private__bg {\n    background: url(", ") no-repeat right top;\n  } */\n"])), require("./assets/lock-radius.png"));
 
 exports.Textarea = Textarea;
 
@@ -47,7 +47,7 @@ var Tips = _styledComponents["default"].div(_templateObject7 || (_templateObject
 
 exports.Tips = Tips;
 
-var MblogActionWrapper = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n  height: 30px;\n  padding: 9px 0;\n  font-size: 13px;\n  line-height: 20px;\n  color: #565E66;\n  background-color: #ffffff;\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n"]))); // 左侧按钮
+var MblogActionWrapper = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n  height: 30px;\n  padding: 9px 0 8px 0;\n  font-size: 13px;\n  line-height: 20px;\n  color: #565E66;\n  background-color: #ffffff;\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n"]))); // 左侧按钮
 
 
 exports.MblogActionWrapper = MblogActionWrapper;
@@ -56,13 +56,13 @@ var LeftBtnGroupWrapper = _styledComponents["default"].div(_templateObject9 || (
 
 exports.LeftBtnGroupWrapper = LeftBtnGroupWrapper;
 
-var LeftBtn = _styledComponents["default"].div(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n  height: 100%;\n  margin-right: 12px;\n  padding: 0 5px;\n  display: flex;\n  align-items: center;\n  white-space: nowrap;\n  cursor: pointer;\n  position: relative;\n\n  &:last-child {\n    margin-right: 0;\n  }\n\n  &:hover {\n    border-radius: 2px;\n    background-color: #fff;\n    box-shadow: 0 1px 2px rgba(0,0,0,0.3);\n    [class*=\"tu-icon-\"] {\n        color: #2879ff;\n    }\n  }\n\n  &.action__tips {\n    position: relative;\n    &:hover {\n      &::before,\n      &::after {\n        opacity: 1;\n        visibility: visible;\n      }\n    }\n\n    &::before,\n    &::after {\n      opacity: 0;\n      visibility: hidden;\n      transition: all .3 ease-in-out;\n      position: absolute;\n      left: 50%;\n      transform: translateX(-50%);\n    }\n\n    &::before {\n      content: '';\n      border: 6px solid;\n      border-color: #3e4e59 transparent transparent;\n      top: -9px;\n    }\n\n    &::after {\n      content: '", "';\n      white-space: nowrap;\n      color: #fff;\n      background: #3e4e59;\n      padding: 4px 10px;\n      border-radius: 4px;\n      top: -37px;\n    }\n  }\n"])), function (p) {
+var LeftBtn = _styledComponents["default"].div(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n  height: 100%;\n  margin-right: 12px;\n  display: flex;\n  align-items: center;\n  white-space: nowrap;\n  cursor: pointer;\n  position: relative;\n\n  &:last-child {\n    margin-right: 0;\n  }\n\n  &:hover {\n    color: #2879FF;\n    cursor: pointer;\n  }\n\n  &.action__tips {\n    position: relative;\n    &:hover {\n      &::before,\n      &::after {\n        opacity: 1;\n        visibility: visible;\n      }\n    }\n\n    &::before,\n    &::after {\n      opacity: 0;\n      visibility: hidden;\n      transition: all .3 ease-in-out;\n      position: absolute;\n      left: 50%;\n      transform: translateX(-50%);\n    }\n\n    &::before {\n      content: '';\n      border: 6px solid;\n      border-color: #3e4e59 transparent transparent;\n      top: -9px;\n    }\n\n    &::after {\n      content: '", "';\n      white-space: nowrap;\n      color: #fff;\n      background: #3e4e59;\n      padding: 4px 10px;\n      border-radius: 4px;\n      top: -37px;\n    }\n  }\n"])), function (p) {
   return p.tips;
 });
 
 exports.LeftBtn = LeftBtn;
 
-var IconSpan = _styledComponents["default"].span(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n  margin-right: 5px;\n  position: relative;\n  top: 1px;\n"])));
+var IconSpan = _styledComponents["default"].span(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n  margin-right: 4px;\n  position: relative;\n  line-height: 20px;\n  vertical-align: middle;\n"])));
 
 exports.IconSpan = IconSpan;
 
@@ -82,7 +82,7 @@ var BtnConfirm = _styledComponents["default"].button(_templateObject15 || (_temp
 
 exports.BtnConfirm = BtnConfirm;
 
-var BtnPrivate = _styledComponents["default"].button(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n  \n  color: #565E66;\n  background: #ffffff;\n\n  &.disabled {\n    cursor: default;\n  }\n"])));
+var BtnPrivate = _styledComponents["default"].button(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n  \n  color: #565E66;\n  background: #ffffff;\n  cursor: pointer;\n\n  &.disabled {\n    cursor: not-allowed;\n    .mblog-visiblity-range {\n      color: #A4ACB9;\n    }\n  }\n  .mblog-visiblity-range {\n    display: flex;\n    align-items: center;\n    color: #3F4755;\n  }\n  .range-cont-icon {\n    font-size: 16px;\n    display: inline-block;\n    transform: scale(0.5);\n  }\n"])));
 
 exports.BtnPrivate = BtnPrivate;
 

package/lib/components/okr-detail/components/header/index.css

@@ -175,3 +175,7 @@
 .okr-drawer-header__classify-popup-item:hover {
   color: #2879ff;
 }
+
+.okr-drawer-header .titaui-period-selector {
+  width: auto !important;
+}

package/lib/components/okr-detail/components/header/o-cycle.js

@@ -52,7 +52,7 @@ var OCycle = function OCycle(props) {
     refreshKrs();
   };
 
-  return /*#__PURE__*/_react["default"].createElement(_okrPeriodSelector["default"], {
+  return /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_okrPeriodSelector["default"], {
     renderInnerContent: renderInnerContent,
     okrId: okrId,
     cycle: generalCycle,
@@ -62,7 +62,7 @@ var OCycle = function OCycle(props) {
     popupAlign: {
       offset: [0, 8]
     }
-  });
+  }));
 };
 
 var _default = OCycle;

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

@@ -70,20 +70,27 @@ var _default = function _default(props) {
 
   var openCreate = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(name) {
+      var params;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               if (name == "addTask") {
+                params = {
+                  'objId': data.workId,
+                  'objType': 4,
+                  'AppId': 1,
+                  'AppType': 1,
+                  'TaskType': 0,
+                  'WorkMileStoneId': data.mileStoneId
+                };
+
+                if (data.mileStoneId > 0) {
+                  params.WorkMileStoneName = data.mileStoneName;
+                }
+
                 window.openCreateTaskPop(btnRef.current, {
-                  "createParams": {
-                    "objId": data.workId,
-                    "objType": 4,
-                    "AppId": 1,
-                    "AppType": 1,
-                    "TaskType": 0,
-                    "WorkMileStoneId": data.mileStoneId
-                  },
+                  "createParams": params,
                   "createTaskOption": {
                     "allowObjectOptions": false
                   }

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

@@ -179,7 +179,7 @@ var WorkNode = function WorkNode(_ref) {
         modelType = data.modelType,
         KrIndex = data.KrIndex; // modelType = 2 是KR
 
-    var cycleTypeCopy = modelType ? modelType === 2 ? 4 : cycleType : cycleType;
+    var cycleTypeCopy = modelType ? modelType === 2 ? -1 : cycleType : cycleType;
 
     switch (cycleTypeCopy) {
       case 0:
@@ -195,6 +195,12 @@ var WorkNode = function WorkNode(_ref) {
         return yqmnum + '月';
 
       case 4:
+        return "".concat(yqmnum, "-").concat((yqmnum + 1) % 12 || 12, "\u6708");
+
+      case 5:
+        return "".concat(yqmnum == 1 ? '上' : '下', "\u534A\u5E74");
+
+      case -1:
         return KrIndex ? 'KR' + KrIndex : 'KR';
     }
   }; // 1：正常 2：有风险 3：过期 4:完成 5：过期完成 ,