@titaui/pc 1.5.78 → 1.5.82

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

@@ -159,9 +159,7 @@ var MblogAction = /*#__PURE__*/function (_PureComponent) {
           emotionsSelectorPopAlign = _this$props.emotionsSelectorPopAlign,
           visibility = _this$props.visibility,
           onActionsSelectedUserChange = _this$props.onActionsSelectedUserChange,
-          dragFilesList = _this$props.dragFilesList,
-          _this$props$disableRa = _this$props.disableRangeSelect,
-          disableRangeSelect = _this$props$disableRa === void 0 ? true : _this$props$disableRa;
+          dragFilesList = _this$props.dragFilesList;
       return /*#__PURE__*/_react["default"].createElement(_style.MblogActionWrapper, {
         className: className
       }, /*#__PURE__*/_react["default"].createElement(_style.LeftBtnGroupWrapper, {
@@ -242,23 +240,21 @@ 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: disableRangeSelect ? 'disabled' : '',
-        disabled: disableRangeSelect
+        className: "disabled",
+        disabled: true
       }, /*#__PURE__*/_react["default"].createElement(_RangeSelectorPop["default"], {
         align: "bottom left",
-        isDisabled: disableRangeSelect,
+        isDisabled: true,
         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-caret-down range-cont-icon",
+        className: "tu-icon-sort-down range-cont-icon tu-ft_m3",
         "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,13 +72,10 @@ 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: atAll ? 1 : privateValue || 1,
+        visibility: privateValue || 1,
         isAllowSubmit: _this.allowSubmit(textareaValue) // 根据内容判断是否可以提交
 
       });
@@ -88,15 +85,12 @@ 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),
-        isAtAll: atAll,
-        visibility: atAll ? 1 : _this.state.visibility
+        isAllowSubmit: _this.allowSubmit(contentValue)
       });
 
       localStorage.setItem(_this.state.localStroageKey, contentValue);
@@ -133,13 +127,9 @@ 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),
-        isAtAll: atAll,
-        visibility: atAll ? 1 : _this.state.visibility
+        isAllowSubmit: _this.allowSubmit(textareaValue)
       }, function () {
         _this.focus();
       });
@@ -167,7 +157,8 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
       var successFilesPathLen = successFilesPath.length; // @ts-ignore
 
       var textareaInput = _this.refs.textEditor.refs.textareaInput;
-      var textareaValue = _this.state.textareaValue; // textareaValue = dealWithLoadedFileTips(textareaValue, successFilesPathLen); // 更新输入框内容
+      var textareaValue = _this.state.textareaValue;
+      textareaValue = (0, _index.dealWithLoadedFileTips)(textareaValue, successFilesPathLen); // 更新输入框内容
 
       localStorage.setItem(_this.state.localStroageKey, textareaValue); // 将输入框内容进行本地缓存
 
@@ -175,7 +166,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
 
       _this.setState({
         textareaValue: textareaValue,
-        isAllowSubmit: textareaValue.trim().length > 0 && textareaValue.trim().length <= (_this.props.maxLength || 2000) || successFilesPath.length > 0,
+        isAllowSubmit: textareaValue.trim().length > 0 && textareaValue.trim().length <= (_this.props.maxLength || 2000),
         uploadSuccessFilesPath: successFilesPath,
         dragFilesList: []
       });
@@ -190,7 +181,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
     };
 
     _this.allowSubmit = function (content) {
-      return content.trim().length > 0 && content.trim().length <= _this.props.maxLength || _this.state.uploadSuccessFilesPath.length > 0;
+      return content.trim().length > 0 && content.trim().length <= _this.props.maxLength;
     };
 
     _this.onActionSubmit = function (submitType) {
@@ -309,8 +300,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
       isInputAt: false,
       isInputEnterSubmit: false,
       dragFilesList: [],
-      isShowDragMask: false,
-      isAtAll: false
+      isShowDragMask: false
     };
     return _this;
   } // @ts-ignore @所有同事权限设置，有权限的：超管、老板、助理、目标负责人、目标管理员
@@ -385,8 +375,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
           isShowRangeDropDown = _this$props3.isShowRangeDropDown,
           isShowBtnCancel = _this$props3.isShowBtnCancel,
           submitText = _this$props3.submitText,
-          setTextareaRef = _this$props3.setTextareaRef,
-          disableRangeSelect = _this$props3.disableRangeSelect;
+          setTextareaRef = _this$props3.setTextareaRef;
       var _this$state2 = this.state,
           localStroageKey = _this$state2.localStroageKey,
           visibility = _this$state2.visibility,
@@ -395,8 +384,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
           isAllowSubmit = _this$state2.isAllowSubmit,
           textareaValue = _this$state2.textareaValue,
           dragFilesList = _this$state2.dragFilesList,
-          isShowDragMask = _this$state2.isShowDragMask,
-          isAtAll = _this$state2.isAtAll;
+          isShowDragMask = _this$state2.isShowDragMask;
       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, {
@@ -453,7 +441,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
         sendSmsTipText: sendSmsTipText,
         isShowRange: isShowRange,
         isShowRangeDropDown: isShowRangeDropDown,
-        visibility: isAtAll ? 1 : visibility,
+        visibility: visibility,
         dragFilesList: dragFilesList,
         isShowBtnCancel: isShowBtnCancel,
         isInputEnterSubmit: isInputEnterSubmit,
@@ -461,7 +449,6 @@ 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    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
+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
 
 
 exports.MBlogBox = MBlogBox;
 
-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"])));
+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"])));
 
 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: 8px;\n  left: 10px;\n  color: #BFC7D5;\n  font-size: 14px;\n  cursor: text;\n"])));
+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"])));
 
 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: #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"));
+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"));
 
 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 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"]))); // 左侧按钮
+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"]))); // 左侧按钮
 
 
 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  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) {
+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) {
   return p.tips;
 });
 
 exports.LeftBtn = LeftBtn;
 
-var IconSpan = _styledComponents["default"].span(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n  margin-right: 4px;\n  position: relative;\n  line-height: 20px;\n  vertical-align: middle;\n"])));
+var IconSpan = _styledComponents["default"].span(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n  margin-right: 5px;\n  position: relative;\n  top: 1px;\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  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"])));
+var BtnPrivate = _styledComponents["default"].button(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n  \n  color: #565E66;\n  background: #ffffff;\n\n  &.disabled {\n    cursor: default;\n  }\n"])));
 
 exports.BtnPrivate = BtnPrivate;
 

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

@@ -175,7 +175,3 @@
 .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("span", null, /*#__PURE__*/_react["default"].createElement(_okrPeriodSelector["default"], {
+  return /*#__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,27 +70,20 @@ 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": params,
+                  "createParams": {
+                    "objId": data.workId,
+                    "objType": 4,
+                    "AppId": 1,
+                    "AppType": 1,
+                    "TaskType": 0,
+                    "WorkMileStoneId": data.mileStoneId
+                  },
                   "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 ? -1 : cycleType : cycleType;
+    var cycleTypeCopy = modelType ? modelType === 2 ? 4 : cycleType : cycleType;
 
     switch (cycleTypeCopy) {
       case 0:
@@ -195,12 +195,6 @@ 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：过期完成 ,