@titaui/pc 1.10.4 → 1.10.6-3.beta-2

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

@@ -0,0 +1,72 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDynamicTitleProps = exports["default"] = void 0;
+
+var _constant = require("../../constant");
+
+var _getLocale = require("../../../../utils/getLocale");
+
+var getDynamicTitleProps = function getDynamicTitleProps(obj) {
+  if (!obj) {
+    return {
+      type: "",
+      typeBgColor: "#ffffff",
+      titleBgColor: "#ffffff",
+      contentColor: ""
+    };
+  }
+
+  var objType = obj.objType;
+
+  if (objType === _constant.EObjType.Kr) {
+    return {
+      type: "KR",
+      typeBgColor: "rgba(90, 216, 166, 0.5)",
+      titleBgColor: "rgba(90, 216, 166, 0.1)",
+      contentColor: "#5AD8A6"
+    };
+  }
+
+  if (objType === _constant.EObjType.O) {
+    return {
+      type: (0, _getLocale.getLocale)("Mod_Objective"),
+      typeBgColor: "rgba(40, 121, 255, 0.5)",
+      titleBgColor: "rgba(40, 121, 255, 0.1)",
+      contentColor: "#2879FF"
+    };
+  }
+
+  if (objType === _constant.EObjType.Task) {
+    return {
+      type: (0, _getLocale.getLocale)("Mod_Tasks"),
+      typeBgColor: "rgba(92, 142, 255, 0.5)",
+      titleBgColor: "rgba(92, 142, 255, 0.1)",
+      contentColor: "#5C8EFF"
+    };
+  }
+
+  if (objType === _constant.EObjType.Project) {
+    return {
+      type: (0, _getLocale.getLocale)("Mod_Project"),
+      typeBgColor: "rgba(98, 77, 255, 0.5)",
+      titleBgColor: "rgba(98, 77, 255, 0.1)",
+      contentColor: "#624DFF"
+    };
+  }
+
+  return {
+    type: "",
+    typeBgColor: "#ffffff",
+    titleBgColor: "#ffffff",
+    contentColor: ""
+  };
+};
+
+exports.getDynamicTitleProps = getDynamicTitleProps;
+var _default = {
+  getDynamicTitleProps: getDynamicTitleProps
+};
+exports["default"] = _default;

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

@@ -8,30 +8,27 @@
 }
 
 .titaui-dynamic-project-item__content {
-  height: 78px;
+  height: 68px;
   display: flex;
   align-items: center;
-  border-radius: 8px;
-  background: rgba(240, 244, 250, 0.5);
-  padding: 16px 12px 16px 16px;
+  border-radius: 12px;
+  background: rgba(98, 77, 255, 0.06);
+  padding: 8px 12px;
   box-sizing: border-box;
-  margin-left: 69px;
-}
-
-.titaui-dynamic-project-item__content-img {
-  display: inline-block;
-  width: 36px;
-  border-radius: 6px;
+  margin-left: 88px;
 }
 
 .titaui-dynamic-project-item__content-info {
   flex: 1;
   display: flex;
   flex-direction: column;
-  margin-left: 16px;
   overflow: hidden;
 }
 
+.titaui-dynamic-project-item__content-status-icon {
+  font-size: 14px;
+}
+
 .titaui-dynamic-project-item__content-status-and-time-range {
   display: flex;
   align-items: center;
@@ -59,10 +56,33 @@
   font-weight: 600;
   color: #3f4755;
   line-height: 24px;
+  display: flex;
+  margin-bottom: 4px;
+  align-items: center;
 }
 
-.titaui-dynamic-project-item__content-title-text:hover {
+.titaui-dynamic-project-item__content-title-type {
+  border-radius: 18px;
+  background: rgba(98, 77, 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-project-item__content-title-text {
+  flex: 1;
   cursor: pointer;
+  overflow: hidden;
+}
+
+.titaui-dynamic-project-item__content-title-text:hover {
   color: #2879ff;
 }
 
@@ -76,20 +96,7 @@
   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-project-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-project/index.js

@@ -23,12 +23,10 @@ var _searchKeyHandle = _interopRequireDefault(require("../../../search-key-handl
 
 var _tooltip = _interopRequireDefault(require("../../../tooltip"));
 
-var _dynamicProject = _interopRequireDefault(require("./img/dynamic-project.png"));
-
-var _util = require("../../util");
-
 var _getLocale = require("../../../../utils/getLocale");
 
+var _tools = require("../../../../utils/tools");
+
 require("./index.css");
 
 var _excluded = ["data"];
@@ -60,10 +58,6 @@ var DynamicProject = function DynamicProject(_ref) {
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
 
-  var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(data.feedType),
-      feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
-      feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
-
   var handleClickTitle = function handleClickTitle() {
     window.open(window.location.href.replace(window.location.hash, "#work?iTalentNavCode=tita-work&work_id=".concat(data.obj.objId)));
   };
@@ -73,19 +67,14 @@ var DynamicProject = function DynamicProject(_ref) {
       className: "".concat(prefix, "__content-title-text"),
       onClick: handleClickTitle
     }, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: workName,
+      str: (0, _tools.htmlDecodeByRegExp)(workName),
       keyWord: searchKeyWord
     }));
   }, [workName, searchKeyWord]);
   var renderDesc = (0, _react.useMemo)(function () {
-    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")
-    }, (0, _getLocale.getLocale)("Mod_InChargeof"), (0, _getLocale.getLocale)("Feed_Set_Project")), /*#__PURE__*/_react["default"].createElement("span", {
-      className: "".concat(prefix, "-desc-operate-type"),
-      style: {
-        background: feedTypeColor
-      }
-    }, feedTypeText));
+    }, (0, _getLocale.getLocale)("Mod_InChargeof"), (0, _getLocale.getLocale)("Feed_Set_Project"));
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
@@ -96,26 +85,26 @@ var DynamicProject = function DynamicProject(_ref) {
     user: principalUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
-  }, /*#__PURE__*/_react["default"].createElement("img", {
-    className: "".concat(prefix, "__content-img"),
-    src: _dynamicProject["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_Set_Project")), /*#__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)))));

package/lib/components/dynamic/dynamic-item/dynamic-relative/img/dynamic-rela.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
+    <title>形状结合</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="65.0566151%" gradientTransform="translate(0.500000,0.500000),scale(0.777778,1.000000),rotate(88.840962),scale(1.000000,1.351545),translate(-0.500000,-0.500000)" id="radialGradient-1">
+            <stop stop-color="#A7B2C4" offset="0%"></stop>
+            <stop stop-color="#BFC7D5" stop-opacity="0" offset="100%"></stop>
+        </radialGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="动态-任务" transform="translate(-115.000000, -865.000000)" fill="url(#radialGradient-1)" fill-rule="nonzero">
+            <g id="新建目标-负责目标" transform="translate(11.000000, 715.000000)">
+                <g id="编组-3" transform="translate(93.000000, 102.000000)">
+                    <g id="形状结合-2" transform="translate(11.000000, 48.000000)">
+                        <path d="M3.8056793,2.14936144 C3.96786934,2.33036776 3.94952786,2.60864824 3.764451,2.76625129 C1.94131475,4.32153569 0.893246686,6.5928146 0.893246686,8.9999467 C0.893246686,11.4071772 1.94131475,13.680267 3.764451,15.2328548 C3.8652491,15.3211141 3.9174703,15.4417521 3.9174703,15.5624689 C3.9174703,15.6633451 3.88172841,15.7695948 3.8056793,15.85065 C3.64354933,16.0325618 3.36135866,16.0505916 3.17445966,15.8921028 C1.1552737,14.1719719 -1.11185559e-15,11.661149 -1.6007069e-15,8.99996636 C-2.08888207e-15,6.34246451 1.15525366,3.82894496 3.17353858,2.10971955 C3.36043758,1.94943961 3.64352929,1.96654427 3.8056793,2.14936144 Z M14.1943207,2.14936144 C14.3564707,1.96654427 14.6395624,1.94943961 14.8264614,2.10971955 C16.8447463,3.82894496 18,6.34246451 18,8.99996636 C18,11.661149 16.8447263,14.1719719 14.8255403,15.8921028 C14.6386413,16.0505916 14.3564507,16.0325618 14.1943207,15.85065 C14.1182716,15.7695948 14.0825297,15.6633451 14.0825297,15.5624689 C14.0825297,15.4417521 14.1347509,15.3211141 14.235549,15.2328548 C16.0586852,13.680267 17.1067533,11.4071772 17.1067533,8.9999467 C17.1067533,6.5928146 16.0586852,4.32153569 14.235549,2.76625129 C14.0504721,2.60864824 14.0321307,2.33036776 14.1943207,2.14936144 Z M5.60410658,3.96491623 C5.76079018,4.15042999 5.73237689,4.42601388 5.53999147,4.57908979 C4.18682589,5.6543807 3.40903452,7.26824215 3.40903452,8.99994668 C3.40903452,10.7326747 4.18682589,12.3437806 5.53999147,13.4226932 C5.65082133,13.5073504 5.7049047,13.6352122 5.7049047,13.7613025 C5.7049047,13.858557 5.67190603,13.9549061 5.60594876,14.035981 C5.45018624,14.2260022 5.16803563,14.251236 4.97563018,14.098101 C3.41085666,12.8571173 2.5130046,11.0001295 2.5130046,8.9999467 C2.5130046,7.00346433 3.41085666,5.14287449 4.97378801,3.90096565 C5.16619345,3.74696462 5.44838412,3.77578077 5.60410658,3.96491623 Z M12.3958934,3.96491623 C12.5516159,3.77578077 12.8338065,3.74696462 13.026212,3.90096565 C14.5891433,5.14287449 15.4869954,7.00346433 15.4869954,8.9999467 C15.4869954,11.0001295 14.5891433,12.8571173 13.0243698,14.098101 C12.8319644,14.251236 12.5498138,14.2260022 12.3940512,14.035981 C12.328094,13.9549061 12.2950953,13.858557 12.2950953,13.7613025 C12.2950953,13.6352122 12.3491787,13.5073504 12.4600085,13.4226932 C13.8131741,12.3437806 14.5909655,10.7326747 14.5909655,8.99994668 C14.5909655,7.26824215 13.8131741,5.6543807 12.4600085,4.57908979 C12.2676231,4.42601388 12.2392098,4.15042999 12.3958934,3.96491623 Z M7.42724285,5.80389397 C7.48036509,5.88136688 7.50421303,5.96783499 7.50421303,6.05066172 C7.50421303,6.19116011 7.43455141,6.32894221 7.30816331,6.41450489 C6.43964564,6.98905627 5.92292017,7.95630632 5.92292017,8.9999467 C5.92292017,10.0293168 6.4304749,10.9883983 7.2760657,11.5639142 C7.48036509,11.7008106 7.52894201,11.9763354 7.3869356,12.1744857 C7.2476524,12.3726164 6.96546175,12.4194426 6.7639256,12.2798694 C5.67557032,11.5423021 5.02693028,10.3138762 5.02693028,8.9999467 C5.02693028,7.66629467 5.6902275,6.42891296 6.80609501,5.69042057 C7.00853222,5.5535242 7.28705858,5.60759385 7.42724285,5.80389397 Z M10.5727572,5.80389397 C10.7129414,5.60759385 10.9914678,5.5535242 11.193905,5.69042057 C12.3097725,6.42891296 12.9730697,7.66629467 12.9730697,8.9999467 C12.9730697,10.3138762 12.3244297,11.5423021 11.2360744,12.2798694 C11.0345383,12.4194426 10.7523476,12.3726164 10.6130644,12.1744857 C10.471058,11.9763354 10.5196349,11.7008106 10.7239343,11.5639142 C11.5695251,10.9883983 12.0770798,10.0293168 12.0770798,8.9999467 C12.0770798,7.95630632 11.5603544,6.98905627 10.6918367,6.41450489 C10.5654486,6.32894221 10.495787,6.19116011 10.495787,6.05066172 C10.495787,5.96783499 10.5196349,5.88136688 10.5727572,5.80389397 Z M8.97643591,8.12261234 C9.46179035,8.12261234 9.85567513,8.51609834 9.85567513,8.99786332 C9.85567513,9.4814785 9.46179033,9.87230728 8.97643591,9.87230728 C8.48930362,9.87230728 8.09535892,9.48149818 8.09535892,8.99786332 C8.09535892,8.51609834 8.48930364,8.12261234 8.97643591,8.12261234 Z" id="形状结合" transform="translate(9.000000, 9.000000) rotate(-90.000000) translate(-9.000000, -9.000000) "></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

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

@@ -1,12 +1,10 @@
-@charset "UTF-8";
-
 .titaui-dynamic-relative-item {
   position: relative;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
 }
 
 .titaui-dynamic-relative-item__content {
-  margin-left: 69px;
+  margin-left: 88px;
   position: relative;
 }
 
@@ -15,16 +13,51 @@
   flex-direction: column;
 }
 
+.titaui-dynamic-relative-item__obj-other-info {
+  line-height: 18px;
+}
+
 .titaui-dynamic-relative-item__obj-base-info {
   display: flex;
   align-items: center;
   width: 100%;
 }
 
-.titaui-dynamic-relative-item__obj-base-info-icon {
-  color: #89919F;
-  font-size: 18px;
-  margin-right: 8px;
+.titaui-dynamic-relative-item__obj-base-info-left {
+  width: 40px;
+  height: 40px;
+  min-width: 40px;
+  border-radius: 50%;
+  margin-right: 12px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.titaui-dynamic-relative-item__obj-base-info-left--o {
+  background: rgba(40, 121, 255, 0.16);
+}
+
+.titaui-dynamic-relative-item__obj-base-info-left--kr {
+  background: rgba(90, 216, 166, 0.16);
+}
+
+.titaui-dynamic-relative-item__obj-base-info-left--task {
+  background: rgba(40, 121, 255, 0.16);
+}
+
+.titaui-dynamic-relative-item__obj-base-info-left--project {
+  background: rgba(98, 77, 255, 0.16);
+}
+
+.titaui-dynamic-relative-item__obj-base-info-left-img {
+  width: 20px;
+  height: 20px;
+}
+
+.titaui-dynamic-relative-item__obj-base-info-right {
+  flex: 1;
+  overflow: hidden;
 }
 
 .titaui-dynamic-relative-item__obj-title {
@@ -33,7 +66,7 @@
   word-break: keep-all;
   font-size: 14px;
   font-weight: 600;
-  color: #3F4755;
+  color: #3f4755;
   line-height: 22px;
 }
 
@@ -44,50 +77,42 @@
 
 .titaui-dynamic-relative-item__obj-principal-user {
   font-size: 12px;
-  color: #89919F;
+  color: #89919f;
   line-height: 18px;
-  margin-left: 26px;
 }
 
 .titaui-dynamic-relative-item__obj-principal-user::after {
-  content: '·';
+  content: '';
+  width: 1px;
+  height: 14px;
+  background: linear-gradient(180deg, rgba(191, 199, 213, 0) 0%, #bfc7d5 50%, rgba(240, 242, 245, 0) 100%);
   display: inline-block;
-  margin: 0 4px;
+  margin: 0 8px;
+  vertical-align: text-top;
 }
 
 .titaui-dynamic-relative-item__obj-cycle {
   font-size: 12px;
-  color: #89919F;
+  color: #89919f;
   line-height: 18px;
 }
 
-.titaui-dynamic-relative-item__align-img {
+.titaui-dynamic-relative-item__rela-img {
   position: absolute;
-  top: 38px;
+  top: 51px;
+  width: 18px;
+  left: 10px;
 }
 
 .titaui-dynamic-relative-item__space {
-  height: 20px;
+  height: 30px;
 }
 
 .titaui-dynamic-relative-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;
 }
-
-.titaui-dynamic-relative-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-relative/index.js

@@ -19,18 +19,26 @@ var _openData = require("../../../../utils/open-data");
 
 var _constant = require("../../constant");
 
-var _dynamicRelative = _interopRequireDefault(require("./img/dynamic-relative.svg"));
+var _dynamicRela = _interopRequireDefault(require("./img/dynamic-rela.svg"));
 
 var _drawerManager = _interopRequireDefault(require("../../../drawer-manager"));
 
-var _util = require("../../util");
-
 var _context = require("../../context");
 
 var _searchKeyHandle = _interopRequireDefault(require("../../../search-key-handle"));
 
 var _getLocale = require("../../../../utils/getLocale");
 
+var _dynamicRelaO = _interopRequireDefault(require("./img/dynamic-rela-o.png"));
+
+var _dynamicRelaKr = _interopRequireDefault(require("./img/dynamic-rela-kr.png"));
+
+var _dynamicRelaProject = _interopRequireDefault(require("./img/dynamic-rela-project.png"));
+
+var _dynamicRelaTask = _interopRequireDefault(require("./img/dynamic-rela-task.png"));
+
+var _tools = require("../../../../utils/tools");
+
 require("./index.css");
 
 var _excluded = ["data"];
@@ -41,8 +49,22 @@ 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 _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; }
+
 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; }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -50,6 +72,8 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 var prefix = "titaui-dynamic-relative-item";
 
 var DynamicRelative = function DynamicRelative(_ref) {
+  var _classNames, _classNames2;
+
   var data = _ref.data,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
@@ -68,9 +92,10 @@ var DynamicRelative = function DynamicRelative(_ref) {
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
 
-  var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(data.feedType),
-      feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
-      feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
+  var _useState = (0, _react.useState)(null),
+      _useState2 = _slicedToArray(_useState, 2),
+      relatedImgUrl = _useState2[0],
+      setRelatedImgUrl = _useState2[1];
 
   var handleClickTitle = function handleClickTitle(id, type) {
     if (type === _constant.EObjType.Kr) {
@@ -86,7 +111,7 @@ var DynamicRelative = function DynamicRelative(_ref) {
     }
 
     if (type === _constant.EObjType.Project) {
-      window.open(window.location.href.replace(location.hash, "#work?iTalentNavCode=tita-work&work_id=".concat(id)));
+      window.open(window.location.href.replace(window.location.hash, "#work?iTalentNavCode=tita-work&work_id=".concat(id)));
     }
 
     if (type === _constant.EObjType.Task) {
@@ -105,14 +130,22 @@ var DynamicRelative = function DynamicRelative(_ref) {
       text = "".concat((0, _getLocale.getLocale)("Mod_Connected")).concat((0, _getLocale.getLocale)("Mod_Objective"));
     }
 
-    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
+    if (relateObjType === _constant.EObjType.Project) {
+      text = "".concat((0, _getLocale.getLocale)("Mod_Connected")).concat((0, _getLocale.getLocale)("Feed_Set_Project"));
+    }
+
+    return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-desc")
-    }, text), /*#__PURE__*/_react["default"].createElement("span", {
-      className: "".concat(prefix, "-desc-operate-type"),
-      style: {
-        background: feedTypeColor
-      }
-    }, feedTypeText));
+    }, text);
+  }, []);
+  (0, _react.useEffect)(function () {
+    if (relateObjType === _constant.EObjType.O) {
+      setRelatedImgUrl(_dynamicRelaO["default"]);
+    } else if (relateObjType === _constant.EObjType.Kr) {
+      setRelatedImgUrl(_dynamicRelaKr["default"]);
+    } else {
+      setRelatedImgUrl(_dynamicRelaProject["default"]);
+    }
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
@@ -127,12 +160,15 @@ var DynamicRelative = function DynamicRelative(_ref) {
     className: "".concat(prefix, "__obj")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__obj-base-info")
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("".concat(prefix, "__obj-base-info-icon"), {
-      "tu-icon-okr": relateObjType === _constant.EObjType.O,
-      "tu-icon-KR": relateObjType === _constant.EObjType.Kr
-    })
-  }), /*#__PURE__*/_react["default"].createElement("span", {
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(prefix, "__obj-base-info-left"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "__obj-base-info-left--o"), relateObjType === _constant.EObjType.O), _defineProperty(_classNames, "".concat(prefix, "__obj-base-info-left--kr"), relateObjType === _constant.EObjType.Kr), _defineProperty(_classNames, "".concat(prefix, "__obj-base-info-left--project"), relateObjType === _constant.EObjType.Project), _classNames))
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    alt: "",
+    className: "".concat(prefix, "__obj-base-info-left-img"),
+    src: relatedImgUrl || ""
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__obj-base-info-right")
+  }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__obj-title"),
     onClick: function onClick() {
       handleClickTitle(relateObjId, relateObjType);
@@ -140,46 +176,54 @@ var DynamicRelative = function DynamicRelative(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     isPercent: true,
     text: /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: relateObjName,
+      str: (0, _tools.htmlDecodeByRegExp)(relateObjName),
       keyWord: searchKeyWord
     })
-  }))), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", {
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__obj-other-info")
+  }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__obj-principal-user")
   }, rObjprincipalUser && /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
     id: rObjprincipalUser.userId,
     name: rObjprincipalUser.name
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__obj-cycle")
-  }, rObjCycleName))), /*#__PURE__*/_react["default"].createElement("img", {
-    className: "".concat(prefix, "__relative-img"),
-    src: _dynamicRelative["default"]
+  }, rObjCycleName))))), /*#__PURE__*/_react["default"].createElement("img", {
+    className: "".concat(prefix, "__rela-img"),
+    src: _dynamicRela["default"],
+    alt: ""
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__space")
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__obj")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__obj-base-info")
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("".concat(prefix, "__obj-base-info-icon"), {
-      "tu-icon-renwu-s": objType === _constant.EObjType.Task,
-      "tu-icon-project-s": objType === _constant.EObjType.Project
-    })
-  }), /*#__PURE__*/_react["default"].createElement("span", {
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(prefix, "__obj-base-info-left"), (_classNames2 = {}, _defineProperty(_classNames2, "".concat(prefix, "__obj-base-info-left--task"), objType === _constant.EObjType.Task), _defineProperty(_classNames2, "".concat(prefix, "__obj-base-info-left--project"), objType === _constant.EObjType.Project), _classNames2))
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    alt: "",
+    className: "".concat(prefix, "__obj-base-info-left-img"),
+    src: objType === _constant.EObjType.Task ? _dynamicRelaTask["default"] : _dynamicRelaProject["default"]
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__obj-base-info-right")
+  }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__obj-title"),
     onClick: function onClick() {
       handleClickTitle(objId, objType);
     }
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     isPercent: true,
-    text: objName
-  }))), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", {
+    text: (0, _tools.htmlDecodeByRegExp)(objName)
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__obj-other-info")
+  }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__obj-principal-user")
   }, objPrincipalUser && /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
     id: objPrincipalUser.userId,
     name: objPrincipalUser.name
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__obj-cycle")
-  }, objCycleName)))));
+  }, objCycleName)))))));
 };
 
 var _default = DynamicRelative;