@titaui/pc 1.10.6 → 1.10.7-2.beta-1

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

@@ -83,11 +83,21 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 // status=3 已过期 status=2 已完成
 function ETaskNode(props) {
+  var _okrInfo$authority;
+
   var index = props.index,
       title = props.title,
       data = props.data,
       createUserId = props.createUserId,
-      krUser = props.krUser;
+      krUser = props.krUser,
+      _props$hasProgress = props.hasProgress,
+      hasProgress = _props$hasProgress === void 0 ? true : _props$hasProgress,
+      _props$hasRelation = props.hasRelation,
+      hasRelation = _props$hasRelation === void 0 ? true : _props$hasRelation,
+      _props$isPushScreen = props.isPushScreen,
+      isPushScreen = _props$isPushScreen === void 0 ? false : _props$isPushScreen,
+      _props$hasPrinciple = props.hasPrinciple,
+      hasPrinciple = _props$hasPrinciple === void 0 ? true : _props$hasPrinciple;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -150,7 +160,7 @@ function ETaskNode(props) {
     principalUser: okrInfo.principalUser,
     createUserId: okrInfo.createUserId
   }).hasAuth()) && data.status !== 5;
-  var isParticipant = okrInfo.authority.roleRelation && okrInfo.authority.roleRelation.roleType === 2;
+  var isParticipant = ((_okrInfo$authority = okrInfo.authority) === null || _okrInfo$authority === void 0 ? void 0 : _okrInfo$authority.roleRelation) && okrInfo.authority.roleRelation.roleType === 2;
   var hasRelativeAuth = new _auth.KRAuth({
     user: krUser,
     createUserId: createUserId
@@ -324,7 +334,18 @@ function ETaskNode(props) {
       _drawerManager["default"].close();
     }
 
-    window.open("//".concat(window.location.host).concat(window.location.pathname, "#more/taskinfo?id=").concat(data.taskId));
+    if (isPushScreen) {
+      var _window$Talent, _window$Talent2;
+
+      (_window$Talent = window.Talent) === null || _window$Talent === void 0 ? void 0 : _window$Talent.app.vent.off("global-pull-screen:closed:".concat(data.taskId));
+      (_window$Talent2 = window.Talent) === null || _window$Talent2 === void 0 ? void 0 : _window$Talent2.app.vent.on("global-pull-screen:closed:".concat(data.taskId), function () {
+        refreshEList && refreshEList();
+      }); // 任务：打开推屏
+
+      window.Talent.app.vent.trigger('global-pull-screen', data.taskId, 'task');
+    } else {
+      window.open("//".concat(window.location.host).concat(window.location.pathname, "#more/taskinfo?id=").concat(data.taskId));
+    }
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -351,7 +372,7 @@ function ETaskNode(props) {
     isPercent: true
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-task-node-actions"))
-  }, /*#__PURE__*/_react["default"].createElement("span", {
+  }, hasPrinciple && /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-task-node-actions-user"))
   }, /*#__PURE__*/_react["default"].createElement(_avatar["default"].Text, {
     name: user === null || user === void 0 ? void 0 : user.name,
@@ -369,7 +390,7 @@ function ETaskNode(props) {
     isLongTerm: dataInfo.isLongTerm,
     isCancel: dataInfo.status === 4,
     isComplete: dataInfo.status === 2
-  })), /*#__PURE__*/_react["default"].createElement("span", {
+  })), hasProgress && /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-task-node-actions-progress ").concat((isGray || isCancel) && "".concat(_precls["default"], "__e-project-node-gray")))
   }, /*#__PURE__*/_react["default"].createElement(_progress["default"].Circle, {
     size: 22,
@@ -380,7 +401,7 @@ function ETaskNode(props) {
     linearStartColor: (0, _getProcessColor["default"])(dataInfo.riskLevel, "linearStartColor", dataInfo.status),
     linearEndColor: (0, _getProcessColor["default"])(dataInfo.riskLevel, "linearEndColor", dataInfo.status),
     backgroundColor: (0, _getProcessColor["default"])(dataInfo.riskLevel, "backgroundColor", dataInfo.status)
-  })), okrInfo.status === 1 && (hasRelativeAuth || isParticipant) ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  })), okrInfo.status === 1 && hasRelation && (hasRelativeAuth || isParticipant) ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     overlay: (0, _getLocale.getLocale)("OKR_MyO_Text_Cancel"),
     placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("span", {

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

@@ -84,13 +84,13 @@
   line-height: 18px;
   display: inline-flex;
   align-items: center;
+  justify-content: flex-end;
   box-sizing: border-box;
   width: 78px;
   height: 26px;
   padding: 4px;
   text-align: left;
   line-height: 26px;
-  margin-left: 16px;
 }
 
 .tita-okrdt-tree__e-task-node-actions-date > span {
@@ -103,7 +103,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -147,7 +147,7 @@
 }
 
 .tita-okrdt-tree__e-project-node-title {
-  display: inline-block;
+  display: inline-flex;
   font-size: 14px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #3f4755;
@@ -158,8 +158,27 @@
   flex: 1;
 }
 
+.tita-okrdt-tree__e-project-node-title-name {
+  overflow: hidden;
+}
+
+.tita-okrdt-tree__e-project-node-title-approvaling {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 36px;
+  padding: 0 6px;
+  height: 20px;
+  font-size: 12px;
+  font-weight: 400;
+  color: #f05e5e;
+  background: rgba(240, 94, 94, 0.1);
+  border-radius: 10px;
+  margin-left: 8px;
+}
+
 .tita-okrdt-tree__e-project-node-gray {
-  color: #BFC7D5 !important;
+  color: #bfc7d5 !important;
 }
 
 .tita-okrdt-tree__e-project-node-priority {
@@ -216,13 +235,13 @@
   line-height: 18px;
   display: inline-flex;
   align-items: center;
+  justify-content: flex-end;
   box-sizing: border-box;
   width: 78px;
   height: 26px;
   padding: 4px;
   text-align: left;
   line-height: 26px;
-  margin-left: 16px;
 }
 
 .tita-okrdt-tree__e-project-node-actions-date > span {
@@ -235,7 +254,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -338,13 +357,13 @@
   line-height: 18px;
   display: inline-flex;
   align-items: center;
+  justify-content: flex-end;
   box-sizing: border-box;
   width: 78px;
   height: 26px;
   padding: 4px;
   text-align: left;
   line-height: 26px;
-  margin-left: 16px;
 }
 
 .tita-okrdt-tree__e-task-level2-node-actions-date > span {
@@ -357,7 +376,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -379,7 +398,7 @@
 .tita-okrdt-tree__e-empty-node {
   font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
-  color: #A4ACB9;
+  color: #a4acb9;
   line-height: 18px;
   padding-left: 12px;
 }
@@ -389,5 +408,5 @@
 }
 
 .e-node-status-icon {
-  color: #89919F;
+  color: #89919f;
 }

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

@@ -332,7 +332,7 @@ function _default(props) {
     editable: krCanEdit,
     onEditUser: onEditUserHandler,
     nameTips: function nameTips(name) {
-      return /*#__PURE__*/_react["default"].createElement("span", null, "\u8D1F\u8D23\u4EBA\uFF1A");
+      return /*#__PURE__*/_react["default"].createElement("span", null, "\u8D1F\u8D23\u4EBA\uFF1A", name);
     }
   })), showKrWeight && /*#__PURE__*/_react["default"].createElement(OkrRowColumn, {
     width: 60,

package/lib/components/okr-detail/e-list/index.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = _default;
+exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -51,10 +51,33 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var preCls = "okr-detail-e";
 
-function _default(props) {
-  var okrId = props.okrId;
+function Elist(props, ref) {
+  var okrId = props.okrId,
+      _props$hasSearch = props.hasSearch,
+      hasSearch = _props$hasSearch === void 0 ? true : _props$hasSearch,
+      _props$formatTree = props.formatTree,
+      formatTree = _props$formatTree === void 0 ? _util.formatEListDataToSelectTree : _props$formatTree,
+      _props$startDate = props.startDate,
+      startDate = _props$startDate === void 0 ? '' : _props$startDate,
+      _props$endDate = props.endDate,
+      endDate = _props$endDate === void 0 ? '' : _props$endDate,
+      _props$toLevel = props.toLevel,
+      toLevel = _props$toLevel === void 0 ? 999 : _props$toLevel,
+      _props$hasdivider = props.hasdivider,
+      hasdivider = _props$hasdivider === void 0 ? false : _props$hasdivider,
+      className = props.className,
+      _props$IncludeNoTaskK = props.IncludeNoTaskKr,
+      IncludeNoTaskKr = _props$IncludeNoTaskK === void 0 ? true : _props$IncludeNoTaskK,
+      _props$hasLoading = props.hasLoading,
+      hasLoading = _props$hasLoading === void 0 ? true : _props$hasLoading,
+      _props$IsDateFilter = props.IsDateFilter,
+      IsDateFilter = _props$IsDateFilter === void 0 ? false : _props$IsDateFilter,
+      emptyPage = props.emptyPage,
+      setIsEmpty = props.setIsEmpty,
+      _props$layoutPadding = props.layoutPadding,
+      layoutPadding = _props$layoutPadding === void 0 ? '0 32px 0 18px' : _props$layoutPadding;
   var loginUser = (0, _bsGlobal.getUserInfo)().Id;
-  var hasCondition = localStorage.getItem("hasRememberCondition".concat(loginUser));
+  var hasCondition = hasSearch && localStorage.getItem("hasRememberCondition".concat(loginUser));
 
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -111,8 +134,9 @@ function _default(props) {
       totalDataNum = _useState22[0],
       setTotalDataNum = _useState22[1];
 
-  var getKrEsData = function getKrEsData() {
+  var getKrEsData = function getKrEsData(formatTree) {
     setLoading(true);
+    var formatEList = formatTree ? formatTree : _util.formatEListDataToSelectTree;
     (0, _requestApis.getKrsByCondition)({
       okrId: okrId,
       condition: (0, _util.formatCondition)({
@@ -121,38 +145,53 @@ function _default(props) {
         selectName: selectName,
         checkedStatus: checkedStatus,
         users: selectUsers,
-        keyWord: searchKey
+        keyWord: searchKey,
+        startDate: startDate,
+        endDate: endDate,
+        toLevel: toLevel,
+        IncludeNoTaskKr: IncludeNoTaskKr,
+        IsDateFilter: IsDateFilter
       })
     }).then(function (krs) {
-      var formatKrs = (0, _util.formatEListDataToSelectTree)(krs, okrId, (0, _util.getIfInitCondition)(selectName, checkedStatus, selectUsers, searchKey));
-      var expandedKrEs = (formatKrs.krsEList || []).map(function (it) {
+      var formatKrs = formatEList(krs, okrId, (0, _util.getIfInitCondition)(selectName, checkedStatus, selectUsers, searchKey));
+      var newexpandedKrEs = (formatKrs.krsEList || []).map(function (it) {
         return it.key;
       });
-      var expandedOEs = (formatKrs.oEList[0] || []).map(function (it) {
+      var newexpandedOEs = (formatKrs.oEList[0] || []).map(function (it) {
         return it.key;
       });
-      setExpandedKrEs(expandedKrEs);
-      setExpandedOEs(expandedOEs);
+      setExpandedKrEs(newexpandedKrEs);
+      setExpandedOEs(newexpandedOEs);
       setKrList(formatKrs.krsEList);
       setOEList(formatKrs.oEList);
       setLoading(false);
     });
   };
 
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      getKrEsData: getKrEsData
+    };
+  });
   (0, _react.useEffect)(function () {
-    getKrEsData();
-  }, [noteOrder, searchKey, selectName, checkedStatus, selectUsers]);
+    // 可以接收一个格式化方法
+    getKrEsData(formatTree);
+  }, [noteOrder, searchKey, selectName, checkedStatus, selectUsers, startDate, endDate, okrId]);
   (0, _react.useEffect)(function () {
     var oElistLength = oEList[0] && oEList[0].length || 0;
-    setTotalDataNum(krList.length + oElistLength);
+    var totalLength = krList.length + oElistLength;
+    setTotalDataNum(totalLength);
+    setIsEmpty && setIsEmpty(!totalLength);
   }, [krList, oEList]);
   return /*#__PURE__*/_react["default"].createElement(_context.EListContext.Provider, {
     value: {
-      refreshEList: getKrEsData
+      refreshEList: function refreshEList() {
+        return getKrEsData(formatTree);
+      }
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: preCls
-  }, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], null, /*#__PURE__*/_react["default"].createElement(_searchForm["default"], {
+    className: "".concat(preCls, " ").concat(className)
+  }, hasSearch && /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], null, /*#__PURE__*/_react["default"].createElement(_searchForm["default"], {
     checkedStatus: checkedStatus,
     setCheckedStatus: setCheckedStatus,
     selectName: selectName,
@@ -163,28 +202,30 @@ function _default(props) {
     selectUsers: selectUsers,
     setSelectUsers: setSelectUsers,
     okrId: okrId
-  })), !loading ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+  })), !loading || !hasLoading ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: totalDataNum !== 0
   }, krList.map(function (kr, index) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], {
-      padding: "0 32px 0 18px"
+      padding: layoutPadding
     }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
+      key: Math.random(),
       data: [kr],
       defaultExpandedKeys: expandedKrEs
     })), // kr左后一个节点 && 没有 OE 时，不显示横线
-    !(index + 1 == krList.length && oEList.length == 0) && /*#__PURE__*/_react["default"].createElement("div", {
+    !(index + 1 == krList.length && oEList.length == 0) && hasdivider && /*#__PURE__*/_react["default"].createElement("div", {
       className: "e__divider"
     }));
-  }), oEList.map(function (kr) {
+  }), !!oEList && !!oEList.length && oEList.map(function (kr) {
     return /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], {
-      padding: "0 32px 0 18px"
+      padding: layoutPadding
     }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
+      key: Math.random(),
       data: kr,
       defaultExpandedKeys: expandedOEs
     }));
   })), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: totalDataNum === 0
-  }, /*#__PURE__*/_react["default"].createElement("div", {
+  }, emptyPage ? emptyPage() : /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__empty")
   }, /*#__PURE__*/_react["default"].createElement("img", {
     className: "".concat(preCls, "__empty-img"),
@@ -194,4 +235,9 @@ function _default(props) {
   }, "\u6CA1\u6709\u641C\u7D22\u5230\u7B26\u5408\u6761\u4EF6\u7684E-\u6267\u884C")))) : /*#__PURE__*/_react["default"].createElement(_loading["default"], {
     type: "panel"
   })));
-}
+} // @ts-ignore
+
+
+Elist = /*#__PURE__*/(0, _react.forwardRef)(Elist);
+var _default = Elist;
+exports["default"] = _default;

package/lib/components/okr-detail/e-list/util.js

@@ -163,7 +163,12 @@ var formatCondition = function formatCondition(_ref) {
       selectName = _ref.selectName,
       checkedStatus = _ref.checkedStatus,
       users = _ref.users,
-      keyWord = _ref.keyWord;
+      keyWord = _ref.keyWord,
+      startDate = _ref.startDate,
+      endDate = _ref.endDate,
+      toLevel = _ref.toLevel,
+      IncludeNoTaskKr = _ref.IncludeNoTaskKr,
+      IsDateFilter = _ref.IsDateFilter;
   var resultStatus = [];
 
   if (checkedStatus.includes("all")) {
@@ -189,10 +194,14 @@ var formatCondition = function formatCondition(_ref) {
     pageIndex: 1,
     FeedId: 0,
     filter: 1,
-    toLevel: 999,
+    toLevel: toLevel || 999,
     app_id: 1,
     app_type: 1,
     FilterKey: keyWord,
+    startDate: startDate || '',
+    endDate: endDate || '',
+    IncludeNoTaskKr: IncludeNoTaskKr,
+    IsDateFilter: IsDateFilter,
     status: resultStatus.join(","),
     userObjects: users.map(function (user) {
       return {

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

@@ -422,5 +422,7 @@ function OkrDetail(props) {
   }))));
 }
 
+OkrDetail.EList = _eList["default"];
+OkrDetail.CommonContext = _context.CommonContext;
 var _default = OkrDetail;
 exports["default"] = _default;

package/lib/components/okr-detail/okr-list/index.js

@@ -345,11 +345,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
             avatar: SuperiorUser.UserAvatar
           });
         } else {
-          setToUser({
-            name: Name,
-            userId: Id,
-            avatar: UserAvatar
-          });
+          setToUser({});
         }
 
         parenOkrtRef.current && parenOkrtRef.current.show(document.body, 0);

package/lib/components/okr-flow/export-modal/index.js

@@ -222,9 +222,9 @@ var ExportMapModal = function ExportMapModal(props) {
       });
 
       return;
-    } // setIsExport(true);
-
+    }
 
+    setIsExport(true);
     downloadImg();
   };
 
@@ -264,7 +264,7 @@ var ExportMapModal = function ExportMapModal(props) {
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "export-map-modal__color-trans",
     onClick: colorChangeHandler
-  })), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_context2.CommonContext.Provider, {
+  })), /*#__PURE__*/_react["default"].createElement("div", null, visible && /*#__PURE__*/_react["default"].createElement(_context2.CommonContext.Provider, {
     value: {
       direction: direction,
       showkr: showkr,

package/lib/components/okr-flow/root-node/index.js

@@ -102,7 +102,20 @@ function RootNode(props) {
         style: {
           backgroundColor: color
         }
-      }, rootName[0]);
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          height: '24px',
+          width: '12px',
+          overflow: 'hidden',
+          margin: '0px auto'
+        }
+      }, /*#__PURE__*/_react["default"].createElement("img", {
+        src: whiteRootImg,
+        style: {
+          maxWidth: 268
+        },
+        width: imgWidth
+      })));
     }
 
     if (searchType == "depart") {

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

@@ -6,6 +6,7 @@
   display: flex;
   align-items: center;
   position: relative;
+  height: 24px;
 }
 
 .okr-progress-item-wrapper .okr-progress-item-content__icon-state {
@@ -15,7 +16,7 @@
 .okr-progress-item-wrapper .okr-progress-item__percent {
   font-size: 16px;
   font-weight: 600;
-  color: #3F4755;
+  color: #3f4755;
   line-height: 24px;
   margin-left: 12px;
 }
@@ -28,11 +29,11 @@
 }
 
 .okr-progress-item-wrapper .okr-progress-item__percent--advance {
-  color: #5AD8A6;
+  color: #5ad8a6;
 }
 
 .okr-progress-item-wrapper .okr-progress-item__percent--delay {
-  color: #F05E5E;
+  color: #f05e5e;
 }
 
 .okr-progress-item-wrapper .okr-progress-item-content--edit {
@@ -42,7 +43,7 @@
 }
 
 .okr-progress-item-wrapper .okr-progress-item-content--edit:hover {
-  background: #F7F8FA;
+  background: #f7f8fa;
 }
 
 .okr-progress-item-wrapper .okr-progress-item-content__body-wrapper {
@@ -60,7 +61,7 @@
 
 .okr-progress-item-wrapper .okr-progress-item-content__body-wrapper .okr-progress-item-content__body .okr-progress-item__content {
   font-size: 14px;
-  color: #3F4755;
+  color: #3f4755;
   line-height: 22px;
   white-space: pre-wrap;
 }
@@ -73,7 +74,7 @@
 
 .okr-progress-item-wrapper .okr-progress-item__content-bottom {
   font-size: 12px;
-  color: #A4ACB9;
+  color: #a4acb9;
   line-height: 18px;
   margin-top: 6px;
   display: flex;
@@ -88,12 +89,12 @@
 }
 
 .okr-progress-item-wrapper .okr-progress-item__content-bottom .okr-progress-item__bottom-func-btns .okr-progress-item__bottom-btn--edit:hover {
-  color: #2879FF;
+  color: #2879ff;
   cursor: pointer;
 }
 
 .okr-progress-item-wrapper .okr-progress-item__content-bottom .okr-progress-item__bottom-func-btns .okr-progress-item__bottom-btn--delete:hover {
-  color: #F05E5E;
+  color: #f05e5e;
   cursor: pointer;
 }
 
@@ -106,7 +107,7 @@
   display: inline-block;
   width: 1px;
   height: 16px;
-  background: linear-gradient(180deg, rgba(213, 219, 226, 0) 0%, #D5DBE2 49%, rgba(213, 219, 226, 0) 100%);
+  background: linear-gradient(180deg, rgba(213, 219, 226, 0) 0%, #d5dbe2 49%, rgba(213, 219, 226, 0) 100%);
   border-radius: 2px;
 }
 
@@ -129,7 +130,7 @@
   right: 0;
   font-size: 12px;
   font-weight: 400;
-  color: #A4ACB9;
+  color: #a4acb9;
   line-height: 24px;
   padding-right: 16px;
 }

package/lib/components/okr-progress-detail/index.js

@@ -25,6 +25,8 @@ var _utils = require("./utils");
 
 var _getLocale = require("../../utils/getLocale");
 
+var _dangerousHtml = _interopRequireDefault(require("../dangerous-html"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -128,7 +130,9 @@ var Detail = function Detail(_ref) {
     src: _progressLeftQuoto["default"]
   }) : null, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat($prefix, "__content")
-  }, content && content.trim())), /*#__PURE__*/_react["default"].createElement("div", {
+  }, content && /*#__PURE__*/_react["default"].createElement(_dangerousHtml["default"], {
+    htmlText: content.trim()
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat($prefix, "__content-bottom")
   }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _utils.getTimeString)(time, nowTime)), canEdit && isMouseEnterDetail ? /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat($prefix, "__bottom-func-btns")

package/lib/components/okr-progress-detail/utils.js

@@ -22,8 +22,8 @@ var getTimeString = function getTimeString(time, nowTime) {
   var timeYear = timeDateObj.getFullYear();
   var timeMonth = timeDateObj.getMonth() + 1;
   var timeDate = timeDateObj.getDate();
-  var timeHours = timeDateObj.getHours();
-  var timeMinutes = timeDateObj.getMinutes();
+  var timeHours = timeDateObj.getHours() < 10 ? "0".concat(timeDateObj.getHours()) : timeDateObj.getHours();
+  var timeMinutes = timeDateObj.getMinutes() < 10 ? "0".concat(timeDateObj.getMinutes()) : timeDateObj.getMinutes();
   var nowMilliSecond = nowTime.getTime();
   var nowYear = nowTime.getFullYear();
   var nowDate = nowTime.getDate();
@@ -56,11 +56,11 @@ var getTimeString = function getTimeString(time, nowTime) {
   if (timeYear === nowYear) {
     var _dateStr = months[timeMonth - 1] + (_getLocale.isEn ? " ".concat(timeDate, " ") : "".concat(timeDate, "\u65E5"));
 
-    return "".concat(_dateStr, " ").concat(timeHours < 10 ? "0".concat(timeHours) : timeHours, ":").concat(timeMinutes < 10 ? "0".concat(timeMinutes) : timeMinutes);
+    return "".concat(_dateStr, " ", "".concat(timeHours, ":").concat(timeMinutes));
   }
 
   var dateStr = (_getLocale.isEn ? "" : "".concat(timeYear, "\u5E74")) + months[timeMonth - 1] + (_getLocale.isEn ? " ".concat(timeDate, " ") : "".concat(timeDate, "\u65E5")) + (_getLocale.isEn ? ",".concat(timeYear) : "");
-  return "".concat(dateStr, " ").concat(timeHours < 10 ? "0".concat(timeHours) : timeHours, ":").concat(timeMinutes < 10 ? "0".concat(timeMinutes) : timeMinutes);
+  return "".concat(dateStr, " ", "".concat(timeHours, ":").concat(timeMinutes));
 };
 
 exports.getTimeString = getTimeString;