@titaui/pc 1.10.5 → 1.10.6-3.beta-1

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

@@ -3,7 +3,7 @@
 }
 
 .titaui-dynamic-reward-item__content {
-  margin-left: 69px;
+  margin-left: 88px;
 }
 
 .titaui-dynamic-reward-item__title {
@@ -56,8 +56,8 @@
   font-size: 14px;
   font-weight: 400;
   color: #89919f;
-  line-height: 22px;
-  margin: 0 8px 0 4px;
+  line-height: 24px;
+  margin-left: 4px;
   overflow: hidden;
 }
 
@@ -96,3 +96,8 @@
   cursor: default !important;
   color: #3f4755 !important;
 }
+
+.titaui-dynamic-reward-item__reward-img {
+  width: 25px;
+  margin-left: 8px;
+}

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

@@ -31,10 +31,14 @@ var _tools = require("../../../../utils/tools");
 
 var _openData = require("../../../../utils/open-data");
 
-var _util = require("../../util");
-
 var _getLocale = require("../../../../utils/getLocale");
 
+var _utils = require("../dynamic-progress/utils");
+
+var _reward = _interopRequireDefault(require("./img/reward.png"));
+
+var _utils2 = require("./utils");
+
 require("./index.css");
 
 var _excluded = ["data"];
@@ -62,18 +66,12 @@ var DynamicReward = function DynamicReward(_ref) {
   var rewardContent = data.rewardContent,
       rewardTags = data.rewardTags,
       obj = data.obj,
-      classify = data.classify,
-      feedType = data.feedType,
       rewardUser = data.rewardUser,
       publishUser = data.publishUser;
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
 
-  var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(feedType),
-      feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
-      feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
-
   var handleClickTitle = function handleClickTitle() {
     if (!obj) {
       return;
@@ -93,54 +91,13 @@ var DynamicReward = function DynamicReward(_ref) {
     } else if (objType === _constant.EObjType.Task) {
       window.Talent.app.vent.trigger("global-pull-screen", objId, "task");
     } else if (objType === _constant.EObjType.Project) {
-      window.open(window.location.href.replace(location.hash, "#work?iTalentNavCode=tita-work&work_id=".concat(objId)));
+      window.open(window.location.href.replace(window.location.hash, "#work?iTalentNavCode=tita-work&work_id=".concat(objId)));
     } else if (objType === _constant.EObjType.Assess) {
       var assessId = data.url.split("assessId=")[1];
-      window.open(window.location.href.replace(location.hash, "#performance?reactRouterName=detail&formId=".concat(assessId)));
+      window.open(window.location.href.replace(window.location.hash, "#performance?reactRouterName=detail&formId=".concat(assessId)));
     }
   };
 
-  var renderTitle = (0, _react.useMemo)(function () {
-    if (!obj) {
-      return "";
-    }
-
-    var objType = obj.objType,
-        objName = obj.objName;
-
-    if (objType === _constant.EObjType.Kr) {
-      return "KR\uFF1A".concat(objName);
-    }
-
-    if (objType === _constant.EObjType.O) {
-      return "O\uFF1A".concat(objName);
-    }
-
-    if (objType === _constant.EObjType.Task) {
-      return "".concat((0, _getLocale.getLocale)("Mod_Tasks"), "\uFF1A").concat(objName);
-    }
-
-    if (objType === _constant.EObjType.Project) {
-      return "".concat((0, _getLocale.getLocale)("Mod_Project"), "\uFF1A").concat(objName);
-    }
-
-    if (objType === _constant.EObjType.Assess) {
-      return "".concat((0, _getLocale.getLocale)("Mod_Performance"), "\uFF1A").concat(objName);
-    }
-
-    return "";
-  }, []);
-  var Classify = (0, _react.useMemo)(function () {
-    var _classNames;
-
-    if (!classify || Number(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))
-    });
-  }, [classify]);
   var renderDesc = (0, _react.useMemo)(function () {
     var url = ""; // const url = getUrlForUserPage({
     //   userId: rewardUser.name,
@@ -152,7 +109,7 @@ var DynamicReward = function DynamicReward(_ref) {
       window.open(url, "_blank");
     };
 
-    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
+    return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-desc")
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__reward")
@@ -162,12 +119,11 @@ var DynamicReward = function DynamicReward(_ref) {
     }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
       name: rewardUser.name,
       id: rewardUser.userId
-    })), (0, _getLocale.getLocale)("OKR_MyO_E_Reward"))), /*#__PURE__*/_react["default"].createElement("span", {
-      className: "".concat(prefix, "-desc-operate-type"),
-      style: {
-        background: feedTypeColor
-      }
-    }, feedTypeText));
+    })), (0, _getLocale.getLocale)("OKR_MyO_E_Reward"), /*#__PURE__*/_react["default"].createElement("img", {
+      alt: "",
+      src: _reward["default"],
+      className: "".concat(prefix, "__reward-img")
+    })));
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
@@ -179,26 +135,27 @@ var DynamicReward = function DynamicReward(_ref) {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__title")
-  }, renderTitle && /*#__PURE__*/_react["default"].createElement(_title["default"], {
-    content: renderTitle,
-    onClickTitle: handleClickTitle,
-    suffixContent: Classify
-  })), rewardContent && /*#__PURE__*/_react["default"].createElement("div", {
+  }, obj && obj.objName && (0, _utils2.isShowRewardObj)(obj.objType) && /*#__PURE__*/_react["default"].createElement(_title["default"], _extends({
+    content: (0, _tools.htmlDecodeByRegExp)(obj.objName),
+    onClickTitle: handleClickTitle
+  }, (0, _utils.getDynamicTitleProps)(obj)))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__description"),
     style: {
-      marginTop: renderTitle ? "12px" : "0"
+      marginTop: obj && obj.objName ? "12px" : "0"
     }
   }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", {
     className: (0, _classnames["default"])("".concat(prefix, "__description-quoto"), "".concat(prefix, "__description-quoto--left")),
+    alt: "",
     src: _dynamicLeftQuoto["default"]
   })), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-    str: rewardContent,
+    str: rewardContent || "赐予你力量!",
     keyWord: searchKeyWord
   }), /*#__PURE__*/_react["default"].createElement("img", {
     className: (0, _classnames["default"])("".concat(prefix, "__description-quoto"), "".concat(prefix, "__description-quoto--right")),
+    alt: "",
     src: _dynamicRightQuoto["default"]
   }), rewardTags && rewardTags.length && rewardTags.map(function (reward) {
-    return /*#__PURE__*/_react["default"].createElement("span", {
+    return reward.tagName && /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__reward-tag"),
       style: {
         background: (0, _tools.hexToRgba)(reward.color, 0.2),

package/lib/components/dynamic/dynamic-item/dynamic-reward/utils.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isShowRewardObj = exports["default"] = void 0;
+
+var _constant = require("../../constant");
+
+var _NeedShowObj;
+
+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; }
+
+var NeedShowObj = (_NeedShowObj = {}, _defineProperty(_NeedShowObj, _constant.EObjType.Assess, "1"), _defineProperty(_NeedShowObj, _constant.EObjType.Kr, "1"), _defineProperty(_NeedShowObj, _constant.EObjType.MileStone, "1"), _defineProperty(_NeedShowObj, _constant.EObjType.O, "1"), _defineProperty(_NeedShowObj, _constant.EObjType.Project, "1"), _defineProperty(_NeedShowObj, _constant.EObjType.Report, "1"), _defineProperty(_NeedShowObj, _constant.EObjType.Task, "1"), _NeedShowObj);
+
+var isShowRewardObj = function isShowRewardObj(type) {
+  if (NeedShowObj[type]) {
+    return true;
+  }
+
+  return false;
+};
+
+exports.isShowRewardObj = isShowRewardObj;
+var _default = {
+  isShowRewardObj: isShowRewardObj
+};
+exports["default"] = _default;

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

@@ -3,34 +3,23 @@
 }
 
 .titaui-dynamic-share-item__content {
-  display: flex;
   font-size: 14px;
   color: #3f4755;
-  line-height: 22px;
-  margin-left: 69px;
-}
-
-.titaui-dynamic-share-item__content-quoto {
-  width: 12px;
-  height: 12px;
+  line-height: 24px;
+  margin-left: 88px;
 }
 
-.titaui-dynamic-share-item__content-quoto--left {
-  margin-right: 8px;
-  margin-top: -6px;
-}
-
-.titaui-dynamic-share-item__content-quoto--right {
-  margin-left: 8px;
-  margin-top: 4px;
+.titaui-dynamic-share-item__content-obj {
+  display: flex;
+  margin-bottom: 4px;
 }
 
 .titaui-dynamic-share-item__operate-desc {
   font-size: 14px;
   font-weight: 400;
   color: #89919f;
-  line-height: 22px;
-  margin: 0 8px 0 4px;
+  line-height: 24px;
+  margin-left: 4px;
   overflow: hidden;
 }
 
@@ -48,7 +37,7 @@
 }
 
 .titaui-dynamic-share-item__files {
-  margin-left: 69px;
+  margin-left: 88px;
   margin-top: 12px;
 }
 

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

@@ -9,28 +9,28 @@ exports["default"] = void 0;
 
 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 _fileList = _interopRequireDefault(require("../../../file-list"));
 
 var _context = require("../../context");
 
 var _header = _interopRequireDefault(require("../components/header"));
 
-var _dangerousHtml = _interopRequireDefault(require("../../components/dangerous-html"));
-
-var _util = require("../../util");
-
 var _tools = require("../../../../utils/tools");
 
 var _getLocale = require("../../../../utils/getLocale");
 
+var _openData = require("../../../../utils/open-data");
+
+var _title = _interopRequireDefault(require("../../components/title"));
+
+var _drawerManager = _interopRequireDefault(require("../../../drawer-manager"));
+
+var _utils = require("../dynamic-progress/utils");
+
 require("./index.css");
 
+var _constant = require("../../constant");
+
 var _excluded = ["data", "dynamicShareIsShowToping", "hasDynamicOpereateAuth"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -39,8 +39,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -57,26 +55,56 @@ var DynamicShare = function DynamicShare(_ref) {
       hasDynamicOpereateAuth = _ref$hasDynamicOperea === void 0 ? false : _ref$hasDynamicOperea,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
+  var obj = data.obj;
+
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
 
   var contentRef = (0, _react.useRef)();
-
-  var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(data.feedType),
-      feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
-      feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
-
   var isPublisher = data.publishUser.userId === window.BSGlobal.loginUserInfo.Id;
   var renderDesc = (0, _react.useMemo)(function () {
-    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
+    var text = (0, _getLocale.getLocale)("Mod_postedshare"); // const { obj } = data;
+    // if (obj && obj.objType === EObjType.Kr) {
+    //   text = "";
+    // }
+    // if (obj && obj.objType === EObjType.O) {
+    //   text = `${getLocale("Mod_Updated")}${getLocale("Mod_objectiveprog")}`;
+    // }
+    // if (obj && obj.objType === EObjType.Task) {
+    //   text = `${getLocale("Mod_Updated")}${getLocale("Data_Taskprogress")}`;
+    // }
+    // if (obj && obj.objType === EObjType.Project) {
+    //   text = `${getLocale("Mod_Updated")}${getLocale("Mod_ProjectProgress")}`;
+    // }
+
+    return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-desc")
-    }, (0, _getLocale.getLocale)("Mod_postedshare")), /*#__PURE__*/_react["default"].createElement("span", {
-      className: "".concat(prefix, "-desc-operate-type"),
-      style: {
-        background: feedTypeColor
-      }
-    }, feedTypeText));
+    }, text);
   }, []);
+
+  var handleClickTitle = function handleClickTitle() {
+    if (!obj) {
+      return;
+    }
+
+    var objType = obj.objType,
+        objId = obj.objId;
+
+    if (objType === _constant.EObjType.Kr) {
+      _drawerManager["default"].open("krDetail", {
+        krId: objId
+      });
+    } else if (objType === _constant.EObjType.O) {
+      _drawerManager["default"].open("okrDetail", {
+        okrId: objId
+      });
+    } else if (objType === _constant.EObjType.Task) {
+      window.Talent.app.vent.trigger("global-pull-screen", objId, "task");
+    } else if (objType === _constant.EObjType.Project) {
+      window.open(window.location.href.replace(window.location.hash, "#work?iTalentNavCode=tita-work&work_id=".concat(objId)));
+    }
+  };
+
   (0, _react.useEffect)(function () {
     (0, _tools.highLightWord)({
       parentDom: contentRef.current,
@@ -93,19 +121,14 @@ var DynamicShare = function DynamicShare(_ref) {
     user: data.publishUser
   }, restProps)), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
-  }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", _defineProperty({
-    className: (0, _classnames["default"])("".concat(prefix, "__content-quoto"), "".concat(prefix, "__content-quoto--left")),
-    alt: "",
-    src: _dynamicLeftQuoto["default"]
-  }, "alt", "left"))), /*#__PURE__*/_react["default"].createElement("div", {
+  }, obj && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__content-obj")
+  }, /*#__PURE__*/_react["default"].createElement(_title["default"], _extends({
+    content: (0, _tools.htmlDecodeByRegExp)(obj === null || obj === void 0 ? void 0 : obj.objName),
+    onClickTitle: handleClickTitle
+  }, (0, _utils.getDynamicTitleProps)(obj)))), /*#__PURE__*/_react["default"].createElement("div", {
     ref: contentRef
-  }, /*#__PURE__*/_react["default"].createElement(_dangerousHtml["default"], {
-    htmlText: data.content
-  }), /*#__PURE__*/_react["default"].createElement("img", _defineProperty({
-    className: (0, _classnames["default"])("".concat(prefix, "__content-quoto"), "".concat(prefix, "__content-quoto--right")),
-    alt: "",
-    src: _dynamicRightQuoto["default"]
-  }, "alt", "right")))), data.attachments && /*#__PURE__*/_react["default"].createElement("div", {
+  }, (0, _openData.parseTag)(data.content))), data.attachments && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__files")
   }, /*#__PURE__*/_react["default"].createElement(_fileList["default"], {
     data: data.attachments

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

@@ -8,30 +8,27 @@
 }
 
 .titaui-dynamic-task-item__content {
-  height: 78px;
+  height: 64px;
+  background: rgba(40, 121, 255, 0.06);
+  border-radius: 12px;
   display: flex;
   align-items: center;
-  border-radius: 8px;
-  background: rgba(240, 244, 250, 0.5);
-  padding: 16px 12px 16px 16px;
+  padding: 8px 12px;
   box-sizing: border-box;
-  margin-left: 69px;
-}
-
-.titaui-dynamic-task-item__content-img {
-  display: inline-block;
-  width: 36px;
-  border-radius: 6px;
+  margin-left: 88px;
 }
 
 .titaui-dynamic-task-item__content-info {
   flex: 1;
   display: flex;
   flex-direction: column;
-  margin-left: 16px;
   overflow: hidden;
 }
 
+.titaui-dynamic-task-item__content-status-icon {
+  font-size: 14px;
+}
+
 .titaui-dynamic-task-item__content-status-and-time-range {
   display: flex;
   align-items: center;
@@ -59,10 +56,30 @@
   font-weight: 600;
   color: #3f4755;
   line-height: 24px;
+  display: flex;
+  margin-bottom: 4px;
+  align-items: center;
+}
+
+.titaui-dynamic-task-item__content-title-type {
+  border-radius: 18px;
+  background: rgba(92, 142, 255, 0.5);
+  color: #ffffff;
+  margin-right: 8px;
+  font-size: 14px;
+  line-height: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 6px;
+  font-weight: 400;
+  height: 20px;
 }
 
 .titaui-dynamic-task-item__content-title-text {
+  flex: 1;
   cursor: pointer;
+  overflow: hidden;
 }
 
 .titaui-dynamic-task-item__content-title-text:hover {
@@ -78,7 +95,7 @@
 .titaui-dynamic-task-item__object-name {
   font-size: 14px;
   color: #2879ff;
-  line-height: 22px;
+  line-height: 24px;
   margin: 0 4px;
   overflow: hidden;
 }
@@ -92,24 +109,11 @@
   font-size: 14px;
   font-weight: 400;
   color: #89919f;
-  line-height: 22px;
-  margin: 0 8px 0 4px;
+  line-height: 24px;
+  margin-left: 4px;
   overflow: hidden;
 }
 
 .titaui-dynamic-task-item__operate-desc-wrapper {
   display: flex;
 }
-
-.titaui-dynamic-task-item-desc-operate-type {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0 6px;
-  height: 18px;
-  min-width: 40px;
-  border-radius: 10px 10px 10px 2px;
-  font-size: 12px;
-  color: #ffffff;
-  line-height: 18px;
-}

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

@@ -15,8 +15,6 @@ var _header = _interopRequireDefault(require("../components/header"));
 
 var _constant = require("./constant");
 
-var _taskIcon = _interopRequireDefault(require("./img/task-icon.png"));
-
 var _constant2 = require("../../constant");
 
 var _context = require("../../context");
@@ -25,8 +23,6 @@ var _searchKeyHandle = _interopRequireDefault(require("../../../search-key-handl
 
 var _tooltip = _interopRequireDefault(require("../../../tooltip"));
 
-var _util = require("../../util");
-
 var _drawerManager = _interopRequireDefault(require("../../../drawer-manager"));
 
 var _getLocale = require("../../../../utils/getLocale");
@@ -59,7 +55,6 @@ var DynamicTask = function DynamicTask(_ref) {
       taskName = data.taskName,
       startDate = data.startDate,
       deadline = data.deadline,
-      feedType = data.feedType,
       obj = data.obj,
       principalUser = data.principalUser,
       workId = data.workId;
@@ -67,10 +62,6 @@ var DynamicTask = function DynamicTask(_ref) {
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
 
-  var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(feedType),
-      feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
-      feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
-
   var handleClickTaskTitle = function handleClickTaskTitle() {
     window.Talent.app.vent.trigger("global-pull-screen", data.taskId, "task");
   };
@@ -118,7 +109,7 @@ var DynamicTask = function DynamicTask(_ref) {
   var renderDesc = (0, _react.useMemo)(function () {
     var dom;
 
-    if (obj === null) {
+    if (obj === null || !obj.objName) {
       dom = "".concat((0, _getLocale.getLocale)("Mod_InChargeof")).concat((0, _getLocale.getLocale)("Mod_Tasks"));
     } else {
       dom = /*#__PURE__*/_react["default"].createElement("span", {
@@ -132,14 +123,9 @@ var DynamicTask = function DynamicTask(_ref) {
       })), (0, _getLocale.getLocale)("Mod_stask"));
     }
 
-    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
+    return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-desc")
-    }, dom), /*#__PURE__*/_react["default"].createElement("span", {
-      className: "".concat(prefix, "-desc-operate-type"),
-      style: {
-        background: feedTypeColor
-      }
-    }, feedTypeText));
+    }, dom);
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
@@ -150,26 +136,26 @@ var DynamicTask = function DynamicTask(_ref) {
     user: principalUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
-  }, /*#__PURE__*/_react["default"].createElement("img", {
-    className: "".concat(prefix, "__content-img"),
-    src: _taskIcon["default"],
-    alt: ""
-  }), /*#__PURE__*/_react["default"].createElement("div", {
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content-info")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content-title")
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__content-title-type")
+  }, (0, _getLocale.getLocale)("Feed_Tab_Title_Task")), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__content-title-text")
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     isPercent: true,
     text: renderName,
     minusWidth: 30
-  })), /*#__PURE__*/_react["default"].createElement("div", {
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content-status-and-time-range")
   }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])(_constant2.EStatusStatus2ClassType[status])
+    className: (0, _classnames["default"])(_constant2.EStatusStatus2ClassType[status], "".concat(prefix, "__content-status-icon"))
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__content-status-text")
   }, (0, _constant.getEStatusClass2StatusTypeText)()[status]), /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("tu-icon-deferred")
+    className: (0, _classnames["default"])("tu-icon-deferred", "".concat(prefix, "__content-status-icon"))
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__content-time-range")
   }, startDate, "-", deadline)))));