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

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;

package/lib/components/dynamic/dynamic-item/{dynamic-replay → dynamic-reply}/index.css

@@ -3,11 +3,16 @@
 }
 
 .titaui-dynamic-reply-item__content {
-  margin-left: 69px;
+  margin-left: 88px;
+}
+
+.titaui-dynamic-reply-item__content-title {
+  display: flex;
+  overflow: hidden;
 }
 
 .titaui-dynamic-reply-item__detail {
-  margin-top: 16px;
+  margin-top: 12px;
 }
 
 .titaui-dynamic-reply-item__detail-gain {
@@ -18,21 +23,29 @@
   margin-bottom: 16px;
 }
 
+.titaui-dynamic-reply-item__detail-drawback:last-of-type {
+  margin-bottom: 0;
+}
+
+.titaui-dynamic-reply-item__detail-tasks {
+  margin-top: 16px;
+}
+
 .titaui-dynamic-reply-item__detail-tasks-item {
   display: flex;
   align-items: center;
-  margin-left: 8px;
   font-size: 14px;
   color: #6f7886;
   line-height: 22px;
+  margin-top: 8px;
   cursor: pointer;
 }
 
 .titaui-dynamic-reply-item__detail-tasks-item::before {
   content: '';
   display: inline-block;
-  width: 6px;
-  height: 6px;
+  width: 5px;
+  height: 5px;
   background: #2879ff;
   border-radius: 50%;
   margin-right: 6px;
@@ -43,25 +56,15 @@
 }
 
 .titaui-dynamic-reply-item__detail-block-title {
-  font-size: 14px;
+  font-size: 16px;
   font-weight: 600;
   color: #3f4755;
-  line-height: 22px;
+  line-height: 24px;
   display: flex;
   align-items: center;
   margin-bottom: 8px;
 }
 
-.titaui-dynamic-reply-item__detail-block-title::before {
-  content: '';
-  display: inline-block;
-  width: 4px;
-  height: 12px;
-  background: linear-gradient(180deg, #2879ff 0%, #9fbfff 100%);
-  border-radius: 2px;
-  margin-right: 4px;
-}
-
 .titaui-dynamic-reply-item__detail-block-title--sub {
   display: flex;
   align-items: center;
@@ -70,18 +73,9 @@
   font-weight: 600;
   color: #3f4755;
   line-height: 22px;
-  margin-left: 8px;
   white-space: pre-wrap;
-}
-
-.titaui-dynamic-reply-item__detail-block-title--sub::before {
-  content: '';
-  display: inline-block;
-  width: 6px;
-  height: 6px;
-  background: #2879ff;
-  border-radius: 50%;
-  margin-right: 6px;
+  margin-left: 12px;
+  margin-top: 16px;
 }
 
 .titaui-dynamic-reply-item__detail-block-content {
@@ -90,12 +84,15 @@
   color: #6f7886;
   line-height: 22px;
   margin-bottom: 4px;
-  margin-left: 8px;
   white-space: pre-wrap;
 }
 
+.titaui-dynamic-reply-item__detail-block-content:last-of-type {
+  margin-bottom: 0;
+}
+
 .titaui-dynamic-reply-item__detail-block-content--sub {
-  margin-left: 20px;
+  margin-left: 12px;
 }
 
 .titaui-dynamic-reply-item__object-name {
@@ -115,8 +112,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;
 }
 

package/lib/components/dynamic/dynamic-item/{dynamic-replay → dynamic-reply}/index.js

@@ -23,8 +23,6 @@ var _constant = require("../../constant");
 
 var _title = _interopRequireDefault(require("../../components/title"));
 
-var _util = require("../../util");
-
 var _tooltip = _interopRequireDefault(require("../../../tooltip"));
 
 var _getLocale = require("../../../../utils/getLocale");
@@ -57,13 +55,8 @@ var DynamicReply = function DynamicReply(_ref) {
       searchKeyWord = _useContext.searchKeyWord;
 
   var replayObjType = data.replayObjType,
-      feedType = data.feedType,
       publishUser = data.publishUser;
 
-  var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(feedType),
-      feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
-      feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
-
   var handleShowTaskDrawer = function handleShowTaskDrawer(taskId) {
     window.Talent.app.vent.trigger("global-pull-screen", taskId, "task");
   };
@@ -107,14 +100,9 @@ var DynamicReply = function DynamicReply(_ref) {
       })), "\u4E0B\u5173\u952E\u6210\u679C\u7684\u590D\u76D8");
     }
 
-    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
@@ -125,10 +113,16 @@ var DynamicReply = function DynamicReply(_ref) {
     user: publishUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__content-title")
   }, /*#__PURE__*/_react["default"].createElement(_title["default"], {
-    content: "".concat(data.replayObjType === 65 ? "KR：" : "O：").concat(data.replayObjName),
-    onClickTitle: handleClickTitle
-  }), /*#__PURE__*/_react["default"].createElement("div", {
+    content: data.replayObjName,
+    onClickTitle: handleClickTitle,
+    type: "".concat(data.replayObjType === 65 ? "KR" : (0, _getLocale.getLocale)("Mod_Objective")),
+    typeBgColor: "".concat(data.replayObjType === 65 ? "rgba(90, 216, 166, 0.5)" : "rgba(40, 121, 255, 0.5)"),
+    titleBgColor: "".concat(data.replayObjType === 65 ? "rgba(90, 216, 166, 0.1)" : "rgba(40, 121, 255, 0.1)"),
+    contentColor: "".concat(data.replayObjType === 65 ? "#5AD8A6" : "#2879FF")
+  })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__detail")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__detail-gain")
@@ -169,7 +163,7 @@ var DynamicReply = function DynamicReply(_ref) {
     className: "".concat(prefix, "__detail-tasks")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__detail-block-title")
-  }, "\u884C\u52A8\u8BA1\u5212"), data.tasks && data.tasks.map(function (task) {
+  }, "\u6539\u8FDB\u8BA1\u5212"), data.tasks && data.tasks.map(function (task) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       key: task.taskId,
       className: "".concat(prefix, "__detail-tasks-item"),

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

@@ -3,11 +3,16 @@
 }
 
 .titaui-dynamic-report-item__content {
-  margin-left: 69px;
+  margin-left: 88px;
   line-height: 24px;
   word-wrap: break-word;
 }
 
+.titaui-dynamic-report-item__content-title {
+  display: flex;
+  overflow: hidden;
+}
+
 .titaui-dynamic-report-item__content ul {
   list-style-type: disc;
   padding-left: 20px;
@@ -81,11 +86,11 @@
 }
 
 .titaui-dynamic-report-item__block-title::before {
-  content: "";
+  content: '';
   display: inline-block;
   width: 4px;
   height: 12px;
-  background: linear-gradient(180deg, #2879ff 0%, #9fbfff 100%);
+  background: #2879ff;
   border-radius: 2px;
   margin-right: 4px;
 }
@@ -97,32 +102,38 @@
 .titaui-dynamic-report-item__complete-type {
   display: flex;
   align-items: center;
-  font-size: 14px;
-  line-height: 22px;
+  font-size: 12px;
+  line-height: 18px;
   margin-left: 8px;
+  border-radius: 12px;
+  padding: 2px 8px;
 }
 
 .titaui-dynamic-report-item__complete-type-icon {
   margin-right: 4px;
   display: inline-block;
-  width: 16px;
-  height: 16px;
+  width: 14px;
+  height: 14px;
 }
 
 .titaui-dynamic-report-item__complete-type-icon--normal {
   background: url("../../img/dynamic-submit-normal.svg") no-repeat;
+  background-size: 14px;
 }
 
 .titaui-dynamic-report-item__complete-type-icon--delay {
   background: url("../../img/dynamic-submit-delay.svg") no-repeat;
+  background-size: 14px;
 }
 
 .titaui-dynamic-report-item__complete-type--normal {
   color: #5ad8a6;
+  background-color: rgba(90, 216, 166, 0.16);
 }
 
 .titaui-dynamic-report-item__complete-type--delay {
   color: #624dff;
+  background-color: rgba(98, 77, 255, 0.16);
 }
 
 .titaui-dynamic-report-item .highlight {
@@ -133,20 +144,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-report-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-report/index.js

@@ -15,18 +15,16 @@ var _context = require("../../context");
 
 var _header = _interopRequireDefault(require("../components/header"));
 
-var _dangerousHtml = _interopRequireDefault(require("../../components/dangerous-html"));
+var _dangerousHtml = _interopRequireDefault(require("../../../dangerous-html"));
 
 var _tools = require("../../../../utils/tools");
 
 var _title = _interopRequireDefault(require("../../components/title"));
 
-var _util = require("../../util");
+var _getLocale = require("../../../../utils/getLocale");
 
 require("./index.css");
 
-var _getLocale = require("../../../../utils/getLocale");
-
 var _excluded = ["data"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -43,11 +41,15 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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; }
 
-var EReportType = {
-  8: "日报：",
-  26: "周报：",
-  27: "月报："
+var getEReportType = function getEReportType(type) {
+  var reportTextMap = {
+    8: (0, _getLocale.getLocale)("Rep_Tab_Dailynewspaper"),
+    26: (0, _getLocale.getLocale)("Rep_Tab_Weeklynewspaper"),
+    27: (0, _getLocale.getLocale)("Rep_Tab_MonthlyReport")
+  };
+  return reportTextMap[type];
 };
+
 var prefix = "titaui-dynamic-report-item";
 
 var DynamicReply = function DynamicReply(_ref) {
@@ -56,21 +58,26 @@ var DynamicReply = function DynamicReply(_ref) {
 
   var submitState = data.submitState,
       feedId = data.feedId,
-      feedType = data.feedType,
-      publishUser = data.publishUser;
+      publishUser = data.publishUser,
+      reportType = data.reportType;
   var contentRichTextRef = (0, _react.useRef)();
   var workPlanRichTextRef = (0, _react.useRef)();
 
   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() {
-    // @ts-ignore
-    Talent.app.vent.trigger("global-daily-detail-pull-screen", feedId);
+    if (window.titaTracker) {
+      window.titaTracker("planAction").record({
+        actionName: "查看日报",
+        actionGroup: "动态-推屏",
+        productName: "动态",
+        feedId: data.dailyId
+      });
+    } // @ts-ignore
+
+
+    window.Talent.app.vent.trigger("global-daily-detail-pull-screen", feedId);
   };
 
   var renderSuffix = (0, _react.useMemo)(function () {
@@ -80,17 +87,17 @@ var DynamicReply = function DynamicReply(_ref) {
       className: (0, _classnames["default"])("".concat(prefix, "__complete-type"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "__complete-type--normal"), submitState === 1), _defineProperty(_classNames, "".concat(prefix, "__complete-type--delay"), submitState === 2), _classNames))
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])("".concat(prefix, "__complete-type-icon"), (_classNames2 = {}, _defineProperty(_classNames2, "".concat(prefix, "__complete-type-icon--normal"), submitState === 1), _defineProperty(_classNames2, "".concat(prefix, "__complete-type-icon--delay"), submitState === 2), _classNames2))
-    }), submitState === 1 ? (0, _getLocale.getLocale)("Rep_Tab_Mys_Submitontime") : (0, _getLocale.getLocale)("\"Tasks_Tab_DelaSubmission\""));
+    }), submitState === 1 ? (0, _getLocale.getLocale)("Rep_Tab_Mys_Submitontime") : (0, _getLocale.getLocale)("Tasks_Tab_DelaSubmission"));
   }, []);
   var renderDesc = (0, _react.useMemo)(function () {
-    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
+    var reportTextMap = {
+      8: (0, _getLocale.getLocale)("Rep_Tab_Mys_Dailynewsp"),
+      26: (0, _getLocale.getLocale)("Rep_Tab_Mys_sweeklyReport"),
+      27: (0, _getLocale.getLocale)("Rep_Tab_Sub_monthlyeport")
+    };
+    return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-desc")
-    }, (0, _getLocale.getLocale)("Mod_skeyprogress")), /*#__PURE__*/_react["default"].createElement("span", {
-      className: "".concat(prefix, "-desc-operate-type"),
-      style: {
-        background: feedTypeColor
-      }
-    }, feedTypeText));
+    }, reportTextMap[reportType]);
   }, []);
   (0, _react.useEffect)(function () {
     (0, _tools.highLightWord)({
@@ -108,14 +115,20 @@ var DynamicReply = function DynamicReply(_ref) {
     data: data
   }, restProps, {
     desc: renderDesc,
-    user: publishUser
+    user: publishUser,
+    suffixContent: renderSuffix
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__content-title")
   }, /*#__PURE__*/_react["default"].createElement(_title["default"], {
-    content: EReportType[data.reportType] + data.name,
+    content: (0, _tools.htmlDecodeByRegExp)(data.name),
     onClickTitle: handleClickTitle,
-    suffixContent: renderSuffix
-  }), data.contentRichText && /*#__PURE__*/_react["default"].createElement("div", {
+    type: getEReportType(reportType),
+    typeBgColor: "rgba(92, 142, 255, 0.5)",
+    titleBgColor: "rgba(92, 142, 255, 0.1)",
+    contentColor: "#5C8EFF"
+  })), data.contentRichText && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__summary")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__block-title")
@@ -128,7 +141,7 @@ var DynamicReply = function DynamicReply(_ref) {
     className: "".concat(prefix, "__work-plan")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__block-title")
-  }, "\u4E0B\u4E00\u6B65\u5DE5\u4F5C\u8BA1\u5212"), /*#__PURE__*/_react["default"].createElement("div", {
+  }, (0, _getLocale.getLocale)("Rep_Tab_Mys_NextWorkPlans")), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content-text"),
     ref: workPlanRichTextRef
   }, /*#__PURE__*/_react["default"].createElement(_dangerousHtml["default"], {