@titaui/pc 1.5.69-beta.15 → 1.5.69-beta.19

package/lib/components/communication/index.js

@@ -345,6 +345,7 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           userSelectorPopAlign = _this$props8.userSelectorPopAlign,
           emotionsSelectorPopAlign = _this$props8.emotionsSelectorPopAlign,
           showAtAll = _this$props8.showAtAll,
+          commentCount = _this$props8.commentCount,
           useCustomMblog = _this$props8.useCustomMblog,
           _this$props8$submitTe = _this$props8.submitText,
           submitText = _this$props8$submitTe === void 0 ? "回复" : _this$props8$submitTe,
@@ -357,7 +358,7 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
         onMouseDown: function onMouseDown() {
           return _this2.handlerSwitchShowRecord();
         }
-      }, "\u5168\u90E8\u6C9F\u901A\xA0", /*#__PURE__*/_react["default"].createElement("span", null, communicationTrackTotal), /*#__PURE__*/_react["default"].createElement("i", {
+      }, "\u5168\u90E8\u6C9F\u901A\xA0", /*#__PURE__*/_react["default"].createElement("span", null, communicationTrackTotal), communicationTrackTotal > commentCount && /*#__PURE__*/_react["default"].createElement("i", {
         className: (0, _classnames["default"])(prefix + "__communication-total-icon", {
           "tu-icon-APP-xi": isShowAllCommunicationRecord,
           "tu-icon-arrow-down1": !isShowAllCommunicationRecord

package/lib/components/communication/style.js

@@ -33,7 +33,7 @@ var ReplyUser = _styledComponents["default"].div(_templateObject4 || (_templateO
 
 exports.ReplyUser = ReplyUser;
 
-var CommunicationItem = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  margin-left: -8px;\n  padding: 8px 8px 4px 8px;\n  margin-bottom: 4px;\n  font-size: 12px;\n  color: #83898f;\n  border-radius: 8px;\n  display: flex;\n  position: relative;\n\n  &:hover {\n    background: #eff5fb;\n    .communication__actionbar {\n      display: inline-block;\n    }\n  }\n"])));
+var CommunicationItem = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  margin-left: -8px;\n  padding: 8px 8px 4px 8px;\n  margin-bottom: 4px;\n  font-size: 12px;\n  color: #83898f;\n  border-radius: 8px;\n  display: flex;\n  position: relative;\n\n  &:hover {\n    background: #F7F9FB;\n    .communication__actionbar {\n      display: inline-block;\n    }\n  }\n"])));
 
 exports.CommunicationItem = CommunicationItem;
 

package/lib/components/create-okr/index.css

@@ -405,6 +405,10 @@
   visibility: hidden;
 }
 
+.modal-close-btn > span:hover {
+  color: #141c28 !important;
+}
+
 @keyframes create-success-rotate {
   0% {
     transform: rotateZ(0);

package/lib/components/create-okr/index.js

@@ -107,11 +107,17 @@ function CreateOkrModal(_ref, ref) {
       userInfo = _ref.userInfo,
       onSuccess = _ref.onSuccess,
       _ref$isPerformance = _ref.isPerformance,
-      isPerformance = _ref$isPerformance === void 0 ? false : _ref$isPerformance;
-
-  var _useState = (0, _react.useState)(false),
+      isPerformance = _ref$isPerformance === void 0 ? false : _ref$isPerformance,
+      _ref$handleCreatedClo = _ref.handleCreatedClose,
+      handleCreatedClose = _ref$handleCreatedClo === void 0 ? function () {} : _ref$handleCreatedClo,
+      _ref$visible = _ref.visible,
+      visible = _ref$visible === void 0 ? false : _ref$visible,
+      _ref$onClose = _ref.onClose,
+      onClose = _ref$onClose === void 0 ? function () {} : _ref$onClose;
+
+  var _useState = (0, _react.useState)(visible),
       _useState2 = _slicedToArray(_useState, 2),
-      visible = _useState2[0],
+      isVisible = _useState2[0],
       setVisible = _useState2[1]; // @ts-ignore
 
 
@@ -313,8 +319,12 @@ function CreateOkrModal(_ref, ref) {
     setVisible(true);
   }, []);
   var hideCreateOkrModal = (0, _react.useCallback)(function () {
+    onClose && onClose();
     setVisible(false);
   }, []);
+  (0, _react.useEffect)(function () {
+    setVisible(visible);
+  }, [visible]);
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       setCase: function setCase(data) {
@@ -353,12 +363,6 @@ function CreateOkrModal(_ref, ref) {
         duration: 3000
       });
 
-      if (!onSuccess) {
-        _manager["default"].open("okrDetail", {
-          okrId: data.workId
-        });
-      }
-
       onSuccess && onSuccess(data);
     }
   }, [userAvatarBase64Url, isApplyTpl]);
@@ -400,7 +404,7 @@ function CreateOkrModal(_ref, ref) {
               }
 
               _popDownNotification.Toast.Error("目标名称不能为空", {
-                canClose: true
+                canClose: false
               });
 
               return _context.abrupt("return");
@@ -412,7 +416,7 @@ function CreateOkrModal(_ref, ref) {
               }
 
               _popDownNotification.Toast.Error("目标名称不能超过500字", {
-                canClose: true
+                canClose: false
               });
 
               return _context.abrupt("return");
@@ -424,7 +428,7 @@ function CreateOkrModal(_ref, ref) {
               }
 
               _popDownNotification.Toast.Error("关键成果不能为空", {
-                canClose: true
+                canClose: false
               });
 
               setKrIsValidate(true);
@@ -441,7 +445,7 @@ function CreateOkrModal(_ref, ref) {
               }
 
               _popDownNotification.Toast.Error("关键成果不能超过500字", {
-                canClose: true
+                canClose: false
               });
 
               return _context.abrupt("return");
@@ -455,7 +459,7 @@ function CreateOkrModal(_ref, ref) {
               }
 
               _popDownNotification.Toast.Error("关键成果总权重不等于100%", {
-                canClose: true
+                canClose: false
               });
 
               return _context.abrupt("return");
@@ -469,8 +473,9 @@ function CreateOkrModal(_ref, ref) {
               return _context.abrupt("return");
 
             case 20:
+              handleCreatedClose();
               visibilityArea = formatVisiableLimit();
-              _context.next = 23;
+              _context.next = 24;
               return (0, _requestApi.createWidthKr)(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
                 krInfos: krDatas.map(function (kr) {
                   return _objectSpread(_objectSpread({}, kr), {}, {
@@ -492,11 +497,11 @@ function CreateOkrModal(_ref, ref) {
                 }]
               }, visibilityArea));
 
-            case 23:
+            case 24:
               data = _context.sent;
 
               if (!(data.Code === 0)) {
-                _context.next = 27;
+                _context.next = 28;
                 break;
               }
 
@@ -506,7 +511,7 @@ function CreateOkrModal(_ref, ref) {
 
               return _context.abrupt("return");
 
-            case 27:
+            case 28:
               hideCreateOkrModal();
 
               if (onSuccess || !isPerformance) {
@@ -536,7 +541,7 @@ function CreateOkrModal(_ref, ref) {
 
               setIsApplyTpl(false);
 
-            case 30:
+            case 31:
             case "end":
               return _context.stop();
           }
@@ -570,7 +575,7 @@ function CreateOkrModal(_ref, ref) {
   };
 
   (0, _react.useEffect)(function () {
-    if (!visible) {
+    if (!isVisible) {
       setKrDatas([{
         uuid: _uuid["default"].v1(),
         principalId: Id,
@@ -605,7 +610,7 @@ function CreateOkrModal(_ref, ref) {
         parentKrId: 0
       });
     }
-  }, [visible]);
+  }, [isVisible]);
   var handleONameSuggestClose = (0, _react.useCallback)(function () {
     setONameIsInput(false);
     setCustomCloseOSuggest(true);
@@ -745,21 +750,27 @@ function CreateOkrModal(_ref, ref) {
     }
 
     setShowCreatedSuccessInfo(false);
-
-    _manager["default"].open("okrDetail", {
-      okrId: workId
-    });
-
     onSuccess && onSuccess(newOkrDataRef.current);
   }, []);
   (0, _react.useEffect)(function () {
-    // @ts-ignore
+    if (!isVisible) return; // @ts-ignore
+
     (0, _requestApi.getImageBase64ByUrl)(user.id).then(function (data) {
       setUserAvatarBase64Url(data.obj);
     })["catch"](function (err) {
       _popDownNotification.Toast.Error(err);
     });
-  }, [user]);
+  }, [user, isVisible]);
+
+  var trackAction = function trackAction() {
+    // @ts-ignore
+    window.titaTracker && window.titaTracker('action').record({
+      actionName: '点击【教你写OKR】',
+      actionGroup: '创建OKR',
+      productName: 'OKR'
+    });
+  };
+
   var renderFooterTeachWriteOKr = (0, _react.useMemo)(function () {
     {
       /*钉钉用  https://wiki.tita.com/pages/viewpage.action?pageId=15696093 */
@@ -767,7 +778,8 @@ function CreateOkrModal(_ref, ref) {
     return /*#__PURE__*/_react["default"].createElement("a", {
       className: "teact-write-okr",
       href: (0, _helpers.isDingDing)() ? "https://wiki.tita.com/pages/viewpage.action?pageId=15696093" : "https://docs.tita.com/question/okr-write/",
-      target: "_blank"
+      target: "_blank",
+      onClick: trackAction
     }, /*#__PURE__*/_react["default"].createElement("img", {
       className: "teact-write-okr__icon",
       src: _teachOkr["default"]
@@ -789,7 +801,7 @@ function CreateOkrModal(_ref, ref) {
     onOk: onModalOkHandler,
     okText: "\u7ACB\u5373\u521B\u5EFA",
     title: ModalTitle,
-    visible: visible,
+    visible: isVisible,
     onCancel: hideCreateOkrModal,
     maskClosable: false,
     footerLeftContent: renderFooterTeachWriteOKr

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

@@ -27,6 +27,8 @@ var _openData = require("../../../../../utils/open-data");
 
 var _conditionRender = _interopRequireDefault(require("../../../components/condition-render"));
 
+var _tooltip = require("../../../../tooltip");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -229,9 +231,12 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])(prefix + "-desc-user", _defineProperty({}, prefix + "-desc-user--not-link", !url)),
     onClick: handleOpenUserPage
-  }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
-    name: publishUser.name,
-    id: publishUser.userId
+  }, /*#__PURE__*/_react["default"].createElement(_tooltip.TooltipText, {
+    maxWidth: 98,
+    text: /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+      name: publishUser.name,
+      id: publishUser.userId
+    })
   })), desc), /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "-desc-time"
   }, createDate))), /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/dynamic/dynamic-item/dynamic-create-o/index.css

@@ -3,11 +3,13 @@
 }
 
 .titaui-dynamic-create-o-item__content {
+  display: flex;
+  flex-direction: column;
   margin-left: 69px;
 }
 
 .titaui-dynamic-create-o-item__infos-wrapper {
-  margin-top: 8px;
+  margin-top: 12px;
 }
 
 .titaui-dynamic-create-o-item__okr {

package/lib/components/dynamic/dynamic-item/dynamic-create-o/index.js

@@ -107,12 +107,12 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
   var Classify = (0, _react.useMemo)(function () {
     var _classNames;
 
-    if (Number(classify) == 0) {
+    if (+classify == 0) {
       return;
     }
 
     return /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(prefix, "__classify"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "__classify--desire"), classify == 1), _defineProperty(_classNames, "".concat(prefix, "__classify--promise"), classify == 2), _classNames))
+      className: (0, _classnames["default"])("".concat(prefix, "__classify"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "__classify--desire"), classify == 2), _defineProperty(_classNames, "".concat(prefix, "__classify--promise"), classify == 1), _classNames))
     });
   }, [classify]);
   var renderDesc = (0, _react.useMemo)(function () {

package/lib/components/dynamic/dynamic-item/dynamic-kr/index.css

@@ -6,41 +6,22 @@
   margin-left: 69px;
 }
 
-.titaui-dynamic-kr-item__title {
+.titaui-dynamic-kr-item__content-time-range {
   display: flex;
   align-items: center;
-  overflow: hidden;
-}
-
-.titaui-dynamic-kr-item__description {
-  font-size: 14px;
-  color: #3F4755;
-  line-height: 22px;
-  display: flex;
-  margin-top: 12px;
-}
-
-.titaui-dynamic-kr-item__description-quoto {
-  width: 12px;
-  height: 12px;
-}
-
-.titaui-dynamic-kr-item__description-quoto--left {
-  margin-right: 8px;
-  margin-top: -6px;
-}
-
-.titaui-dynamic-kr-item__description-quoto--right {
-  margin-left: 8px;
-  margin-top: 4px;
+  font-size: 12px;
+  color: #89919f;
+  line-height: 18px;
 }
 
-.titaui-dynamic-kr-item__status-left {
-  margin-left: 12px;
+.titaui-dynamic-kr-item__content-time-range-icon {
+  margin-right: 4px;
 }
 
-.titaui-dynamic-kr-item__percent-left {
-  margin-left: 8px;
+.titaui-dynamic-kr-item__title {
+  display: flex;
+  align-items: center;
+  overflow: hidden;
 }
 
 .titaui-dynamic-kr-item__object-name {

package/lib/components/dynamic/dynamic-item/dynamic-kr/index.js

@@ -11,24 +11,12 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _dynamicLeftQuoto = _interopRequireDefault(require("../../img/dynamic-left-quoto.svg"));
-
-var _dynamicRightQuoto = _interopRequireDefault(require("../../img/dynamic-right-quoto.svg"));
-
 var _manager = _interopRequireDefault(require("../../../drawer/manager"));
 
-var _context = require("../../context");
-
-var _searchKeyHandle = _interopRequireDefault(require("../../../search-key-handle"));
-
 var _header = _interopRequireDefault(require("../components/header"));
 
 var _title = _interopRequireDefault(require("../../components/title"));
 
-var _percent = _interopRequireDefault(require("../../components/percent"));
-
-var _objStatus = _interopRequireDefault(require("../../components/obj-status"));
-
 var _util = require("../../util");
 
 var _constant = require("../../constant");
@@ -57,16 +45,11 @@ var DynamicKr = function DynamicKr(_ref) {
   var data = _ref.data,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
-  var progress = data.progress,
-      progressDescription = data.progressDescription,
-      progressGrow = data.progressGrow,
-      riskLevel = data.riskLevel,
+  var deadline = data.deadline,
+      startDate = data.startDate,
       name = data.name,
       krId = data.krId;
 
-  var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
-      searchKeyWord = _useContext.searchKeyWord;
-
   var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(data.feedType),
       feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
       feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
@@ -114,26 +97,11 @@ var DynamicKr = function DynamicKr(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_title["default"], {
     content: "KR\uFF1A".concat(name),
     onClickTitle: handleClickKrTitle
-  }), /*#__PURE__*/_react["default"].createElement(_objStatus["default"], {
-    oStatus: 1,
-    riskLevel: riskLevel,
-    extraClass: "".concat(prefix, "__status-left")
-  }), /*#__PURE__*/_react["default"].createElement(_percent["default"], {
-    percent: progress,
-    growPercent: progressGrow,
-    extraClass: "".concat(prefix, "__percent-left")
-  })), progressDescription && /*#__PURE__*/_react["default"].createElement("div", {
-    className: prefix + "__description"
-  }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", {
-    className: (0, _classnames["default"])(prefix + "__description-quoto", prefix + "__description-quoto--left"),
-    src: _dynamicLeftQuoto["default"]
-  })), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-    str: progressDescription,
-    keyWord: searchKeyWord
-  }), /*#__PURE__*/_react["default"].createElement("img", {
-    className: (0, _classnames["default"])(prefix + "__description-quoto", prefix + "__description-quoto--right"),
-    src: _dynamicRightQuoto["default"]
-  })))));
+  }), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__content-time-range")
+  }, /*#__PURE__*/_react["default"].createElement("i", {
+    className: (0, _classnames["default"])("tu-icon-deferred", "".concat(prefix, "__content-time-range-icon"))
+  }), /*#__PURE__*/_react["default"].createElement("span", null, startDate, "-", deadline)))));
 };
 
 var _default = DynamicKr;

package/lib/components/dynamic/dynamic-item/dynamic-milestone/constant.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EStatusClass2StatusTypeText = void 0;
+var EStatusClass2StatusTypeText = {
+  2: '已完成',
+  1: '进行中',
+  4: '已取消',
+  3: '已延迟',
+  6: '暂停中',
+  0: '未开始',
+  5: '未接受'
+};
+exports.EStatusClass2StatusTypeText = EStatusClass2StatusTypeText;

package/lib/components/dynamic/dynamic-item/dynamic-milestone/index.css

@@ -0,0 +1,111 @@
+.titaui-dynamic-milestone-item {
+  border-radius: 12px;
+  box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
+  background: #ffffff;
+  box-sizing: border-box;
+  overflow: hidden;
+  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
+}
+
+.titaui-dynamic-milestone-item__content {
+  height: 78px;
+  display: flex;
+  align-items: center;
+  border-radius: 8px;
+  background: #f6f7f9;
+  padding: 16px 12px 16px 16px;
+  box-sizing: border-box;
+  margin-left: 69px;
+}
+
+.titaui-dynamic-milestone-item__content-info {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  margin-left: 16px;
+  overflow: hidden;
+}
+
+.titaui-dynamic-milestone-item__content-status-and-time-range {
+  display: flex;
+  align-items: center;
+  font-size: 12px;
+  font-weight: 400;
+  color: #89919f;
+  line-height: 18px;
+}
+
+.titaui-dynamic-milestone-item__content-status-text {
+  margin-left: 4px;
+  margin-right: 20px;
+}
+
+.titaui-dynamic-milestone-item__content-time-range {
+  margin-left: 4px;
+}
+
+.titaui-dynamic-milestone-item__content-title {
+  flex: 1;
+  word-break: keep-all;
+  white-space: nowrap;
+  overflow: hidden;
+  font-size: 16px;
+  font-weight: 600;
+  color: #3f4755;
+  line-height: 24px;
+}
+
+.titaui-dynamic-milestone-item__content-title-text {
+  cursor: pointer;
+}
+
+.titaui-dynamic-milestone-item__content-title-text:hover {
+  color: #2879ff;
+}
+
+.titaui-dynamic-milestone-item__content-title-priority {
+  width: 18px;
+  height: 26px;
+  margin-right: 4px;
+}
+
+.titaui-dynamic-milestone-item__object-name {
+  font-size: 14px;
+  color: #2879ff;
+  line-height: 22px;
+  margin: 0 4px;
+  overflow: hidden;
+}
+
+.titaui-dynamic-milestone-item__object-name:hover {
+  cursor: pointer;
+  color: #5c8eff;
+}
+
+.titaui-dynamic-milestone-item__operate-desc {
+  font-size: 14px;
+  font-weight: 400;
+  color: #89919f;
+  line-height: 22px;
+  margin: 0 8px 0 4px;
+  overflow: hidden;
+}
+
+.titaui-dynamic-milestone-item__operate-desc-wrapper {
+  display: flex;
+}
+
+.titaui-dynamic-milestone-item-desc-operate-type {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 40px;
+  height: 18px;
+  min-width: 40px;
+  clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);
+  -webkit-clip-path: polygon(0 100%, 100% 100%, 100% 0, 15% 0);
+  border-radius: 14px 10px 10px 4px;
+  font-size: 12px;
+  color: #ffffff;
+  line-height: 18px;
+}