@titaui/pc 1.10.5 → 1.10.8

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

@@ -23,10 +23,6 @@ var _searchKeyHandle = _interopRequireDefault(require("../../../search-key-handl
 
 var _tooltip = _interopRequireDefault(require("../../../tooltip"));
 
-var _util = require("../../util");
-
-var _dynamicMilestone = _interopRequireDefault(require("./img/dynamic-milestone.png"));
-
 var _getLocale = require("../../../../utils/getLocale");
 
 require("./index.css");
@@ -55,17 +51,12 @@ var DynamicMilestone = function DynamicMilestone(_ref) {
       name = data.name,
       startDate = data.startDate,
       endDate = data.endDate,
-      feedType = data.feedType,
       obj = data.obj,
       principalUser = data.principalUser;
 
   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.mileStoneId, "milestone", new window.Talent.Model(data), {
       option: true,
@@ -81,7 +72,7 @@ var DynamicMilestone = function DynamicMilestone(_ref) {
         objId = obj.objId;
 
     if (objType === _constant2.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)));
     }
   };
 
@@ -95,7 +86,7 @@ var DynamicMilestone = function DynamicMilestone(_ref) {
     }));
   }, [name, 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")
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-desc-wrapper")
@@ -105,12 +96,7 @@ var DynamicMilestone = function DynamicMilestone(_ref) {
     }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
       text: obj.objName,
       isPercent: true
-    })), (0, _getLocale.getLocale)("Mod_smilestone"))), /*#__PURE__*/_react["default"].createElement("span", {
-      className: "".concat(prefix, "-desc-operate-type"),
-      style: {
-        background: feedTypeColor
-      }
-    }, feedTypeText));
+    })), (0, _getLocale.getLocale)("Mod_smilestone")));
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
@@ -121,25 +107,26 @@ var DynamicMilestone = function DynamicMilestone(_ref) {
     user: principalUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
-  }, /*#__PURE__*/_react["default"].createElement("img", {
-    className: "".concat(prefix, "__content-img"),
-    src: _dynamicMilestone["default"]
-  }), /*#__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)("Pro_page_Plan_Milestone")), /*#__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")
   }, _constant.MileStoneStatusClass2StatusTypeText[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, "-", endDate)))));

package/lib/components/dynamic/dynamic-item/dynamic-okrs-communication/index.css

@@ -8,31 +8,18 @@
 }
 
 .titaui-dynamic-okrs-communication-item__content {
-  height: 78px;
+  margin-left: 88px;
+  background: rgba(90, 216, 166, 0.1);
+  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-okrs-communication-item__content-img {
-  display: inline-block;
-  width: 36px;
-  border-radius: 6px;
-}
-
-.titaui-dynamic-okrs-communication-item__content-info {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  margin-left: 16px;
-  overflow: hidden;
 }
 
 .titaui-dynamic-okrs-communication-item__content-title {
+  display: flex;
+  align-items: center;
   flex: 1;
   word-break: keep-all;
   white-space: nowrap;
@@ -43,42 +30,40 @@
   line-height: 24px;
 }
 
+.titaui-dynamic-okrs-communication-item__content-title-type {
+  border-radius: 18px;
+  background: rgba(90, 216, 166, 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-okrs-communication-item__content-title-text {
+  flex: 1;
   cursor: pointer;
+  overflow: hidden;
 }
 
 .titaui-dynamic-okrs-communication-item__content-title-text:hover {
   color: #2879ff;
 }
 
-.titaui-dynamic-okrs-communication-item__content-title-priority {
-  width: 18px;
-  height: 26px;
-  margin-right: 4px;
-}
-
 .titaui-dynamic-okrs-communication-item__operate-desc {
-  font-size: 14px;
+  font-size: 16px;
   font-weight: 400;
   color: #89919f;
-  line-height: 22px;
-  margin: 0 8px 0 4px;
+  line-height: 24px;
+  margin-left: 4px;
   overflow: hidden;
 }
 
 .titaui-dynamic-okrs-communication-item__operate-desc-wrapper {
   display: flex;
 }
-
-.titaui-dynamic-okrs-communication-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-okrs-communication/index.js

@@ -11,15 +11,11 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _header = _interopRequireDefault(require("../components/header"));
 
-var _okrsIcon = _interopRequireDefault(require("./img/okrs-icon.png"));
-
 var _context = require("../../context");
 
 var _searchKeyHandle = _interopRequireDefault(require("../../../search-key-handle"));
 
-var _tooltip = require("../../../tooltip");
-
-var _util = require("../../util");
+var _tooltip = _interopRequireDefault(require("../../../tooltip"));
 
 require("./index.css");
 
@@ -43,20 +39,12 @@ var DynamicTask = function DynamicTask(_ref) {
   var data = _ref.data,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
-  var status = data.status,
-      taskName = data.taskName,
-      startDate = data.startDate,
-      deadline = data.deadline,
-      feedType = data.feedType,
+  var taskName = data.taskName,
       principalUser = data.principalUser;
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
 
-  var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(feedType),
-      feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
-      feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
-
   var handleClickPlanTitle = function handleClickPlanTitle() {
     window.Talent.app.vent.trigger("global-pull-screen", data.taskId, "task");
   };
@@ -71,14 +59,9 @@ var DynamicTask = function DynamicTask(_ref) {
     }));
   }, [taskName, 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")
-    }, "\u7684\u8BA1\u5212\u8868"), /*#__PURE__*/_react["default"].createElement("span", {
-      className: "".concat(prefix, "-desc-operate-type"),
-      style: {
-        background: feedTypeColor
-      }
-    }, feedTypeText));
+    }, "\u7684OKR");
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
@@ -89,17 +72,15 @@ 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: _okrsIcon["default"]
-  }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__content-info")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content-title")
-  }, /*#__PURE__*/_react["default"].createElement(_tooltip.TooltipText, {
-    isPercent: true,
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__content-title-type")
+  }, "OKR"), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__content-title-text")
+  }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     text: renderName,
-    minusWidth: 30
+    isPercent: true
   })))));
 };
 

package/lib/components/dynamic/dynamic-item/dynamic-plan-communication/index.css

@@ -8,31 +8,18 @@
 }
 
 .titaui-dynamic-plan-communication-item__content {
-  height: 78px;
+  margin-left: 88px;
+  background: rgba(90, 216, 166, 0.1);
+  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-plan-communication-item__content-img {
-  display: inline-block;
-  width: 36px;
-  border-radius: 6px;
-}
-
-.titaui-dynamic-plan-communication-item__content-info {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  margin-left: 16px;
-  overflow: hidden;
 }
 
 .titaui-dynamic-plan-communication-item__content-title {
+  display: flex;
+  align-items: center;
   flex: 1;
   word-break: keep-all;
   white-space: nowrap;
@@ -43,42 +30,40 @@
   line-height: 24px;
 }
 
+.titaui-dynamic-plan-communication-item__content-title-type {
+  border-radius: 18px;
+  background: rgba(90, 216, 166, 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-plan-communication-item__content-title-text {
+  flex: 1;
   cursor: pointer;
+  overflow: hidden;
 }
 
 .titaui-dynamic-plan-communication-item__content-title-text:hover {
   color: #2879ff;
 }
 
-.titaui-dynamic-plan-communication-item__content-title-priority {
-  width: 18px;
-  height: 26px;
-  margin-right: 4px;
-}
-
 .titaui-dynamic-plan-communication-item__operate-desc {
-  font-size: 14px;
+  font-size: 16px;
   font-weight: 400;
   color: #89919f;
-  line-height: 22px;
-  margin: 0 8px 0 4px;
+  line-height: 24px;
+  margin-left: 4px;
   overflow: hidden;
 }
 
 .titaui-dynamic-plan-communication-item__operate-desc-wrapper {
   display: flex;
 }
-
-.titaui-dynamic-plan-communication-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-plan-communication/index.js

@@ -9,17 +9,15 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _header = _interopRequireDefault(require("../components/header"));
-
-var _planIcon = _interopRequireDefault(require("./img/plan-icon.png"));
+var _searchKeyHandle = _interopRequireDefault(require("../../../search-key-handle"));
 
 var _context = require("../../context");
 
-var _searchKeyHandle = _interopRequireDefault(require("../../../search-key-handle"));
+var _header = _interopRequireDefault(require("../components/header"));
 
-var _tooltip = require("../../../tooltip");
+var _tooltip = _interopRequireDefault(require("../../../tooltip"));
 
-var _util = require("../../util");
+var _getLocale = require("../../../../utils/getLocale");
 
 require("./index.css");
 
@@ -43,20 +41,12 @@ var DynamicTask = function DynamicTask(_ref) {
   var data = _ref.data,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
-  var status = data.status,
-      taskName = data.taskName,
-      startDate = data.startDate,
-      deadline = data.deadline,
-      feedType = data.feedType,
+  var taskName = data.taskName,
       principalUser = data.principalUser;
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
 
-  var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(feedType),
-      feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
-      feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
-
   var handleClickPlanTitle = function handleClickPlanTitle() {
     window.Talent.app.vent.trigger("global-pull-screen", data.taskId, "task");
   };
@@ -71,14 +61,9 @@ var DynamicTask = function DynamicTask(_ref) {
     }));
   }, [taskName, 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")
-    }, "\u7684\u8BA1\u5212\u8868"), /*#__PURE__*/_react["default"].createElement("span", {
-      className: "".concat(prefix, "-desc-operate-type"),
-      style: {
-        background: feedTypeColor
-      }
-    }, feedTypeText));
+    }, "\u7684\u8BA1\u5212\u8868");
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
@@ -89,17 +74,15 @@ 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: _planIcon["default"]
-  }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__content-info")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content-title")
-  }, /*#__PURE__*/_react["default"].createElement(_tooltip.TooltipText, {
-    isPercent: true,
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__content-title-type")
+  }, (0, _getLocale.getLocale)("Menu_Title_Tasks")), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__content-title-text")
+  }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     text: renderName,
-    minusWidth: 30
+    isPercent: true
   })))));
 };
 

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

@@ -3,7 +3,7 @@
 }
 
 .titaui-dynamic-progress-item__content {
-  margin-left: 69px;
+  margin-left: 88px;
 }
 
 .titaui-dynamic-progress-item__title {
@@ -14,57 +14,24 @@
 
 .titaui-dynamic-progress-item__description {
   font-size: 14px;
-  color: #3F4755;
-  line-height: 22px;
-  display: flex;
-  margin-top: 12px;
-}
-
-.titaui-dynamic-progress-item__description-quoto {
-  width: 12px;
-  height: 12px;
-}
-
-.titaui-dynamic-progress-item__description-quoto--left {
-  margin-right: 8px;
-  margin-top: -6px;
-}
-
-.titaui-dynamic-progress-item__description-quoto--right {
-  margin-left: 8px;
+  color: #3f4755;
+  line-height: 24px;
   margin-top: 4px;
+  display: flex;
 }
 
 .titaui-dynamic-progress-item__description-text {
   white-space: pre-wrap;
 }
 
-.titaui-dynamic-progress-item__status-left {
-  margin-left: 12px;
-}
-
-.titaui-dynamic-progress-item__percent-left {
-  margin-left: 8px;
-}
-
-.titaui-dynamic-progress-item__classify {
-  display: flex;
-  width: 18px;
-  margin-left: 8px;
-}
-
-.titaui-dynamic-progress-item__classify--desire {
-  background: url("../../img/dynamic-desire.svg") no-repeat;
-}
-
-.titaui-dynamic-progress-item__classify--promise {
-  background: url("../../img/dynamic-promise.svg") no-repeat;
+.titaui-dynamic-progress-item__status {
+  margin-top: 12px;
 }
 
 .titaui-dynamic-progress-item__object-name {
-  font-size: 14px;
+  font-size: 16px;
   color: #2879ff;
-  line-height: 22px;
+  line-height: 24px;
   margin: 0 4px;
   overflow: hidden;
 }
@@ -74,24 +41,15 @@
   color: #5c8eff;
 }
 
+.titaui-dynamic-progress-item__obj-wrapper {
+  display: flex;
+}
+
 .titaui-dynamic-progress-item__operate-desc {
-  font-size: 14px;
+  font-size: 16px;
   font-weight: 400;
   color: #89919f;
-  line-height: 22px;
-  margin: 0 8px 0 4px;
+  line-height: 24px;
+  margin-left: 4px;
   overflow: hidden;
 }
-
-.titaui-dynamic-progress-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;
-}