@titaui/pc 1.12.7-beta.19 → 1.12.7-beta.21

package/lib/components/color-date-picker/index.css

@@ -17,6 +17,7 @@
 }
 
 .tita-ui-color-date-picker__content-daily {
+  cursor: pointer;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -30,6 +31,7 @@
 }
 
 .tita-ui-color-date-picker__content-weekly {
+  cursor: pointer;
   height: 36px;
   border-radius: 8px;
   box-sizing: border-box;
@@ -53,6 +55,7 @@
 }
 
 .tita-ui-color-date-picker__content-month {
+  cursor: pointer;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -63,3 +66,7 @@
   color: #3f4755;
   line-height: 18px;
 }
+
+.tita-ui-color-date-picker__content--disable {
+  cursor: default;
+}

package/lib/components/color-date-picker/index.js

@@ -9,16 +9,22 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _interface = require("./interface");
 
 var _constant = require("../../utils/constant");
 
 require("./index.css");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -63,7 +69,7 @@ var ColorDatePicker = function ColorDatePicker(_ref) {
       });
       result.push.apply(result, _toConsumableArray(data.map(function (item) {
         return /*#__PURE__*/_react["default"].createElement("div", {
-          className: "".concat(prefix, "__content-daily"),
+          className: (0, _classnames["default"])("".concat(prefix, "__content-daily"), _defineProperty({}, "".concat(prefix, "__content--disable"), !item.selectedBgColor)),
           onClick: function onClick() {
             return handleItemClick(item);
           }
@@ -78,7 +84,7 @@ var ColorDatePicker = function ColorDatePicker(_ref) {
     } else if (type === _interface.EReportType.Weekly) {
       result.push.apply(result, _toConsumableArray(data.map(function (item) {
         return /*#__PURE__*/_react["default"].createElement("div", {
-          className: "".concat(prefix, "__content-weekly"),
+          className: (0, _classnames["default"])("".concat(prefix, "__content-weekly"), _defineProperty({}, "".concat(prefix, "__content--disable"), !item.selectedBgColor)),
           onClick: function onClick() {
             return handleItemClick(item);
           },
@@ -95,7 +101,7 @@ var ColorDatePicker = function ColorDatePicker(_ref) {
     } else if (type === _interface.EReportType.Month) {
       result.push.apply(result, _toConsumableArray(data.map(function (item) {
         return /*#__PURE__*/_react["default"].createElement("div", {
-          className: "".concat(prefix, "__content-month"),
+          className: (0, _classnames["default"])("".concat(prefix, "__content-month"), _defineProperty({}, "".concat(prefix, "__content--disable"), !item.selectedBgColor)),
           onClick: function onClick() {
             return handleItemClick(item);
           },

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

@@ -94,11 +94,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
   var _useState7 = (0, _react.useState)(false),
       _useState8 = _slicedToArray(_useState7, 2),
       selectVisible = _useState8[0],
-      setSelectVisible = _useState8[1]; // const url = getUrlForUserPage({
-  //   userId: publishUser.id || publishUser.userId,
-  //   userType: publishUser.userType || 2,
-  // });
-
+      setSelectVisible = _useState8[1];
 
   var url = "";
 

package/lib/components/dynamic/dynamic-item/components/okr-progress/index.js

@@ -98,10 +98,7 @@ var OkrProgress = function OkrProgress(_ref) {
           type: "o",
           status: _constant.OkrRiskMapping[item.Status],
           value: item.Progress
-        })), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_newConfidence["default"], {
-          value: item.ConfidenceValue,
-          editable: false
-        })), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_schedule["default"], {
+        })), /*#__PURE__*/_react["default"].createElement("td", null), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_schedule["default"], {
           value: item.LastContent,
           date: item.LastContentTime,
           id: item.Id
@@ -136,10 +133,11 @@ var OkrProgress = function OkrProgress(_ref) {
     })));
   }, [rowsData]);
   (0, _react.useEffect)(function () {
-    if (_typeof(data) !== 'object') {
+    if (_typeof(data) !== 'object' && data !== '') {
       setRowsData(JSON.parse(data));
     }
   }, [data]);
+  if (!(rowsData !== null && rowsData !== void 0 && rowsData.Rows.length)) return null;
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
   }, /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/dynamic/dynamic-item/components/summary-header/index.css

@@ -1,4 +1,4 @@
-.titaui-dynamic-item-header {
+.titaui-dynamic-new-summary-header {
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -6,19 +6,19 @@
   padding: 26px 0 0 24px;
 }
 
-.titaui-dynamic-item-header-left {
+.titaui-dynamic-new-summary-header-left {
   display: flex;
   align-items: center;
   flex: 1;
   overflow: hidden;
 }
 
-.titaui-dynamic-item-header-left .titaui-pc-avator-container {
+.titaui-dynamic-new-summary-header-left .titaui-pc-avator-container {
   display: inline-flex;
   align-items: center;
 }
 
-.titaui-dynamic-item-header-right {
+.titaui-dynamic-new-summary-header-right {
   font-size: 24px;
   width: 24px;
   height: 24px;
@@ -30,11 +30,11 @@
   border-radius: 4px;
 }
 
-.titaui-dynamic-item-header-right:hover {
+.titaui-dynamic-new-summary-header-right:hover {
   background: #f0f4fa;
 }
 
-.titaui-dynamic-item-header-desc {
+.titaui-dynamic-new-summary-header-desc {
   flex: 1;
   margin-left: 12px;
   overflow: hidden;
@@ -42,13 +42,13 @@
   flex-direction: column;
 }
 
-.titaui-dynamic-item-header-desc-title {
+.titaui-dynamic-new-summary-header-desc-title {
   display: flex;
   justify-content: space-between;
   align-items: center;
 }
 
-.titaui-dynamic-item-header-desc-title-left {
+.titaui-dynamic-new-summary-header-desc-title-left {
   word-break: keep-all;
   white-space: nowrap;
   overflow: hidden;
@@ -59,38 +59,38 @@
   margin-right: 60px;
 }
 
-.titaui-dynamic-item-header-desc-user {
+.titaui-dynamic-new-summary-header-desc-user {
   font-size: 16px;
   font-weight: 600;
   color: #3f4755;
   line-height: 24px;
 }
 
-.titaui-dynamic-item-header-desc-user--not-link:hover {
+.titaui-dynamic-new-summary-header-desc-user--not-link:hover {
   cursor: default !important;
   color: #3f4755 !important;
 }
 
-.titaui-dynamic-item-header-desc-time {
+.titaui-dynamic-new-summary-header-desc-time {
   font-size: 12px;
   color: #89919f;
   line-height: 18px;
   margin-top: 4px;
 }
 
-.titaui-dynamic-item-header-desc-avatar {
+.titaui-dynamic-new-summary-header-desc-avatar {
   position: relative;
 }
 
-.titaui-dynamic-item-header-desc-avatar:hover {
+.titaui-dynamic-new-summary-header-desc-avatar:hover {
   cursor: pointer;
 }
 
-.titaui-dynamic-item-header-desc-avatar--not-link:hover {
+.titaui-dynamic-new-summary-header-desc-avatar--not-link:hover {
   cursor: default !important;
 }
 
-.titaui-dynamic-item-header-desc-mind {
+.titaui-dynamic-new-summary-header-desc-mind {
   position: absolute;
   right: 0;
   bottom: 0;
@@ -98,23 +98,23 @@
   height: 20px;
 }
 
-.titaui-dynamic-item-header__more-operate {
+.titaui-dynamic-new-summary-header__more-operate {
   font-size: 14px;
   color: #89919f;
   line-height: 22px;
 }
 
-.titaui-dynamic-item-header__more-operate-selection {
+.titaui-dynamic-new-summary-header__more-operate-selection {
   display: flex;
   align-items: center;
   height: 32px;
 }
 
-.titaui-dynamic-item-header__more-operate-selection-icon {
+.titaui-dynamic-new-summary-header__more-operate-selection-icon {
   margin-right: 10px;
 }
 
-.titaui-dynamic-item-header__evalute {
+.titaui-dynamic-new-summary-header__evalute {
   display: inline-flex;
   align-items: center;
   justify-content: center;
@@ -124,13 +124,43 @@
   background: rgba(240, 163, 38, 0.12);
   border-radius: 12px;
   font-size: 14px;
-  color: #BD7500;
+  color: #bd7500;
   line-height: 22px;
   cursor: pointer;
 }
 
-.titaui-dynamic-item-header__evalute-img {
+.titaui-dynamic-new-summary-header__evalute-img {
   width: 20px;
   height: 22px;
   margin-right: 4px;
 }
+
+.titaui-dynamic-new-summary__operate .drawer-content-wrapper {
+  width: 372px !important;
+}
+
+.titaui-dynamic-new-summary__operate__head {
+  height: 56px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16px 32px;
+  box-sizing: border-box;
+  border-bottom: 1px #e9ecf0 solid;
+}
+
+.titaui-dynamic-new-summary__operate__head-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #141c28;
+  line-height: 24px;
+}
+
+.titaui-dynamic-new-summary__operate__head-icon {
+  font-size: 20px;
+  cursor: pointer;
+}
+
+.titaui-dynamic-new-summary__operate__content {
+  padding: 16px 32px;
+}

package/lib/components/dynamic/dynamic-item/components/summary-header/index.js

@@ -35,6 +35,10 @@ var _getLocale = require("../../../../../utils/getLocale");
 
 var _constant2 = require("./constant");
 
+var _operateRecord = _interopRequireDefault(require("./operate-record"));
+
+var _bsGlobal = require("../../../../../utils/bs-global");
+
 var _evalute = _interopRequireDefault(require("./img/evalute.png"));
 
 require("./index.css");
@@ -59,17 +63,17 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var prefix = "titaui-dynamic-item-header";
+var prefix = "titaui-dynamic-new-summary-header";
 
 var DynamicItemHeader = function DynamicItemHeader(_ref) {
   var _ref$onDeleteFeed = _ref.onDeleteFeed,
       onDeleteFeed = _ref$onDeleteFeed === void 0 ? function () {} : _ref$onDeleteFeed,
       _ref$showDelete = _ref.showDelete,
       showDelete = _ref$showDelete === void 0 ? false : _ref$showDelete,
-      _ref$showTopping = _ref.showTopping,
-      showTopping = _ref$showTopping === void 0 ? false : _ref$showTopping,
       _ref$showEdit = _ref.showEdit,
       showEdit = _ref$showEdit === void 0 ? true : _ref$showEdit,
+      _ref$showCollect = _ref.showCollect,
+      showCollect = _ref$showCollect === void 0 ? false : _ref$showCollect,
       _ref$showOperateRecor = _ref.showOperateRecord,
       showOperateRecord = _ref$showOperateRecor === void 0 ? true : _ref$showOperateRecor,
       data = _ref.data,
@@ -80,45 +84,54 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       suffixContent = _ref$suffixContent === void 0 ? "" : _ref$suffixContent;
   var createDate = data.createDate,
       feedId = data.feedId,
-      _data$isTop = data.isTop,
-      isTop = _data$isTop === void 0 ? false : _data$isTop,
       _data$isCollect = data.isCollect,
       isCollect = _data$isCollect === void 0 ? false : _data$isCollect,
       feedType = data.feedType,
-      canevaluate = data.canevaluate,
-      dailyContent = data.dailyContent;
+      canEvaluate = data.canEvaluate,
+      dailyContent = data.dailyContent,
+      dailyDate = data.dailyDate,
+      reportType = data.reportType;
 
-  var _useState = (0, _react.useState)(isTop),
+  var _useState = (0, _react.useState)(isCollect),
       _useState2 = _slicedToArray(_useState, 2),
-      nowIsTop = _useState2[0],
-      setNowIsTop = _useState2[1];
+      nowIsCollect = _useState2[0],
+      setNowIsCollect = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(isCollect),
+  var _useState3 = (0, _react.useState)(false),
       _useState4 = _slicedToArray(_useState3, 2),
-      nowIsCollect = _useState4[0],
-      setNowIsCollect = _useState4[1];
+      showDialogConfirm = _useState4[0],
+      setShowDialogConfirm = _useState4[1];
 
   var _useState5 = (0, _react.useState)(false),
       _useState6 = _slicedToArray(_useState5, 2),
-      showDialogConfirm = _useState6[0],
-      setShowDialogConfirm = _useState6[1];
+      selectVisible = _useState6[0],
+      setSelectVisible = _useState6[1];
 
   var _useState7 = (0, _react.useState)(false),
       _useState8 = _slicedToArray(_useState7, 2),
-      selectVisible = _useState8[0],
-      setSelectVisible = _useState8[1];
+      evaluateVisible = _useState8[0],
+      setEvaluateVisible = _useState8[1];
 
-  var _useState9 = (0, _react.useState)(false),
+  var _useState9 = (0, _react.useState)(""),
       _useState10 = _slicedToArray(_useState9, 2),
-      evaluateVisible = _useState10[0],
-      setEvaluateVisible = _useState10[1];
+      mindImg = _useState10[0],
+      setMindImg = _useState10[1];
 
-  var _useState11 = (0, _react.useState)(""),
+  var _useState11 = (0, _react.useState)(false),
       _useState12 = _slicedToArray(_useState11, 2),
-      mindImg = _useState12[0],
-      setMindImg = _useState12[1];
+      operateVisible = _useState12[0],
+      setOperateVisible = _useState12[1];
 
   var url = "";
+  var loginUserId = (0, _bsGlobal.getUserInfo)().Id;
+
+  var handleCloseOperateDrawer = function handleCloseOperateDrawer() {
+    setOperateVisible(false);
+  };
+
+  var handleOpenOperateRecord = function handleOpenOperateRecord() {
+    setOperateVisible(true);
+  };
 
   var onChangeHandler = function onChangeHandler(name) {
     if (name === "collect") {
@@ -160,49 +173,6 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
     }
   };
 
-  var handleTopOperateClick = function handleTopOperateClick() {
-    if (nowIsTop) {
-      (0, _requestApi.cancelTopDynamic)({
-        feedId: feedId
-      }).then(function (resp) {
-        if (resp.Code === 1) {
-          setNowIsTop(!nowIsTop);
-          setSelectVisible(false);
-
-          _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
-            canClose: false
-          });
-        } else {
-          _toast["default"].Error(resp.Message, {
-            canClose: false
-          });
-        }
-      });
-    } else {
-      (0, _requestApi.topDynamic)({
-        feedId: feedId
-      }).then(function (resp) {
-        if (resp.Code === 1) {
-          setNowIsTop(!nowIsTop);
-          setSelectVisible(false);
-
-          _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
-            canClose: false
-          });
-
-          setTimeout(function () {
-            // @ts-ignore
-            window.reFreshDynamicTopping();
-          }, 1000);
-        } else {
-          _toast["default"].Error(resp.Message, {
-            canClose: false
-          });
-        }
-      });
-    }
-  };
-
   var handleDeleteClick = function handleDeleteClick() {
     setShowDialogConfirm(true);
     setSelectVisible(false);
@@ -243,6 +213,10 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
     setEvaluateVisible(true);
   };
 
+  var handleClickEdit = function handleClickEdit() {
+    window.open("#/summary/template?isCreate=false&hideNavTop=true&reportType=".concat(reportType, "&currentTime=").concat(dailyDate), "_blank");
+  };
+
   var handleCloseEvaluateDialog = function handleCloseEvaluateDialog() {
     setEvaluateVisible(false);
   };
@@ -269,7 +243,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
         return item.title === "心情";
       }); // 暂时用title
 
-      if (typeof mindData[0].content === 'string' && mindData[0].content !== '') {
+      if (typeof mindData[0].content === "string" && mindData[0].content !== "") {
         setMindImg(_constant2.Motion.filter(function (item) {
           return item.id === JSON.parse(mindData[0].content).SelectedValues[0];
         })[0].img);
@@ -295,7 +269,8 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
     }
   }), mindImg && /*#__PURE__*/_react["default"].createElement("img", {
     src: mindImg,
-    className: "".concat(prefix, "-desc-mind")
+    className: "".concat(prefix, "-desc-mind"),
+    alt: "\u5FC3\u60C5"
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "-desc")
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -311,12 +286,13 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       name: user.name,
       id: user.userId
     })
-  })), desc, suffixContent), canevaluate && /*#__PURE__*/_react["default"].createElement("div", {
+  })), desc, suffixContent), canEvaluate && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__evalute"),
     onClick: handleClickEvaluate
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: _evalute["default"],
-    className: "".concat(prefix, "__evalute-img")
+    className: "".concat(prefix, "__evalute-img"),
+    alt: "\u8BC4\u4EF7"
   }), (0, _getLocale.getLocale)("Per_MyRe_button_Toevaluate")), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__more-operate")
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
@@ -329,26 +305,19 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       className: (0, _classnames["default"])("".concat(prefix, "-right"), "tu-icon-more1"),
       onClick: handleShowDropSelector
     })
+  }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: showCollect
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "collect"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__more-operate-selection")
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])("tu-icon-APP-shoucang", "".concat(prefix, "__more-operate-selection-icon"))
-  }), nowIsCollect ? (0, _getLocale.getLocale)("Mod_CancCollection") : (0, _getLocale.getLocale)("Mod_Collection"))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
-    condition: showTopping
-  }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
-    name: "top",
-    onClick: handleTopOperateClick
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__more-operate-selection")
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("tu-icon-zhiding", "".concat(prefix, "__more-operate-selection-icon"))
-  }), nowIsTop ? (0, _getLocale.getLocale)("OKR_MyO_Unpinned") : (0, _getLocale.getLocale)("Feed_Top")))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
-    condition: showEdit
+  }), nowIsCollect ? (0, _getLocale.getLocale)("Mod_CancCollection") : (0, _getLocale.getLocale)("Mod_Collection")))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: showEdit && (user.id || user.userId) === loginUserId
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "edit",
-    onClick: handleDeleteClick
+    onClick: handleClickEdit
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__more-operate-selection")
   }, /*#__PURE__*/_react["default"].createElement("i", {
@@ -357,13 +326,13 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
     condition: showOperateRecord
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "record",
-    onClick: handleDeleteClick
+    onClick: handleOpenOperateRecord
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__more-operate-selection")
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])("tu-icon-jinzhan-s", "".concat(prefix, "__more-operate-selection-icon"))
   }), (0, _getLocale.getLocale)("Per_details_OperationRecord")))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
-    condition: showDelete
+    condition: showDelete && (user.id || user.userId) === loginUserId
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "delete",
     onClick: handleDeleteClick
@@ -376,6 +345,10 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
   }, createDate))), renderDialogConfirm, /*#__PURE__*/_react["default"].createElement(_commentsDialog["default"], {
     visible: evaluateVisible,
     closeDialog: handleCloseEvaluateDialog
+  }), /*#__PURE__*/_react["default"].createElement(_operateRecord["default"], {
+    visible: operateVisible,
+    onClose: handleCloseOperateDrawer,
+    feedId: feedId
   }));
 };
 

package/lib/components/dynamic/dynamic-item/components/summary-header/operate-record.js

@@ -0,0 +1,49 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _drawer = _interopRequireDefault(require("../../../../drawer"));
+
+var _getLocale = require("../../../../../utils/getLocale");
+
+var _operationRecords = _interopRequireDefault(require("../../../../operation-records"));
+
+require("./index.css");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var preCls = 'titaui-dynamic-new-summary__operate';
+
+var OperateRecord = function OperateRecord(props) {
+  var visible = props.visible,
+      onClose = props.onClose,
+      feedId = props.feedId;
+  return /*#__PURE__*/_react["default"].createElement(_drawer["default"], {
+    visible: visible,
+    onClose: onClose,
+    className: preCls,
+    autoClosable: true
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__head")
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(preCls, "__head-title")
+  }, (0, _getLocale.getLocale)('Per_details_OperationRecord')), /*#__PURE__*/_react["default"].createElement("i", {
+    className: (0, _classnames["default"])("".concat(preCls, "__head-icon"), 'tu-icon-close'),
+    onClick: onClose
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__content")
+  }, /*#__PURE__*/_react["default"].createElement(_operationRecords["default"], {
+    feedId: feedId,
+    commentCount: 4
+  })));
+};
+
+var _default = OperateRecord;
+exports["default"] = _default;

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

@@ -45,25 +45,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var prefix = 'titaui-dynamic-summary-task-progress';
 var isImport = true;
-var rows1 = {
-  "Rows": [{
-    "Id": 0,
-    "ParentId": 0,
-    "ParentObjType": 0,
-    "ParentObjName": "",
-    "Name": "1231313",
-    "Progress": 50,
-    "Status": 1,
-    "LastContent": " ",
-    "LastContentTime": "2022-05-25T20:57:09.4231912+08:00",
-    "IsQuantifyTask": 0,
-    "Deadline": "2022-06-17T18:00:00",
-    "StartDate": "2022-04-13T08:00:00",
-    "ImportTime": "2022-05-25T18:56:30.8395384+08:00",
-    "ImportType": 1,
-    "IsImport": 1
-  }]
-};
 
 var TaskProgress = function TaskProgress(_ref) {
   var data = _ref.data,
@@ -80,6 +61,11 @@ var TaskProgress = function TaskProgress(_ref) {
       statusStatistic = _useState4[0],
       setStatusStatistic = _useState4[1];
 
+  var handleShowTaskDetail = function handleShowTaskDetail(item) {
+    // @ts-ignore
+    window.Talent.app.vent.trigger("global-pull-screen", item.id, "task");
+  };
+
   var renderTitle = (0, _react.useMemo)(function () {
     if (type === 'day') {
       return (0, _getLocale.getLocale)('Rep_NewS_Toworkasks');
@@ -108,13 +94,15 @@ var TaskProgress = function TaskProgress(_ref) {
       }
     }, /*#__PURE__*/_react["default"].createElement("i", {
       className: "tu-icon-wiki ".concat(prefix, "__table-title-progress-desc-icon")
-    }))))), /*#__PURE__*/_react["default"].createElement("tbody", null, rowsData && rows1.Rows.map(function (item) {
+    }))))), /*#__PURE__*/_react["default"].createElement("tbody", null, rowsData && rowsData.Rows.map(function (item) {
       if (isImport) {
         var _item$LastContent;
 
         return /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement("div", {
-          className: "".concat(prefix, "__table-row-title") // onClick={() => handleShowTaskDetail(item)}
-
+          className: "".concat(prefix, "__table-row-title"),
+          onClick: function onClick() {
+            return handleShowTaskDetail(item);
+          }
         }, /*#__PURE__*/_react["default"].createElement("i", {
           className: "".concat(prefix, "__table-row-title-icon ").concat(_constant.EStatusStatus2ClassType[item.Status])
         }), /*#__PURE__*/_react["default"].createElement("span", {
@@ -122,7 +110,7 @@ var TaskProgress = function TaskProgress(_ref) {
         }, item.Name))), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_progress["default"], {
           id: "".concat(item.Id),
           type: "task",
-          status: "normal",
+          status: item.Status === 1 ? "normal" : "risk",
           value: item.Progress,
           editable: false,
           riskLevel: item.Status
@@ -145,11 +133,12 @@ var TaskProgress = function TaskProgress(_ref) {
     })));
   }, [rowsData]);
   (0, _react.useEffect)(function () {
-    if (_typeof(data) !== 'object') {
+    if (_typeof(data) !== 'object' && data !== '') {
       setRowsData(JSON.parse(data));
       setStatusStatistic((0, _utils.getStatusStatistic)(JSON.parse(data).Rows));
     }
   }, [data]);
+  if (!(rowsData !== null && rowsData !== void 0 && rowsData.Rows.length)) return null;
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
   }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -52,7 +52,8 @@ var DynamicKr = function DynamicKr(_ref) {
 
   var name = data.name,
       krId = data.krId,
-      principalUser = data.principalUser;
+      principalUser = data.principalUser,
+      publishUser = data.publishUser;
 
   var handleClickKrTitle = function handleClickKrTitle() {
     _drawerManager["default"].open('krDetail', {
@@ -85,7 +86,7 @@ var DynamicKr = function DynamicKr(_ref) {
     data: data
   }, restProps, {
     desc: renderDesc,
-    user: principalUser
+    user: principalUser || publishUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -1,6 +1,6 @@
 .titaui-dynamic-summary__evalute-card {
+  position: relative;
   width: 100%;
-  height: 102px;
   background: rgba(240, 163, 38, 0.12);
   border-radius: 12px;
   margin-top: 20px;
@@ -30,3 +30,39 @@
   margin-left: 4px;
   color: #F0A326;
 }
+
+.titaui-dynamic-summary__evalute-card__head-medal {
+  position: relative;
+  height: 18px;
+  padding: 0 8px 0 16px;
+  background: rgba(246, 189, 22, 0.16);
+  border-radius: 0px 14px 14px 0px;
+  font-size: 12px;
+  font-family: OPPOSans-R, OPPOSans;
+  font-weight: normal;
+  color: #BD7500;
+  line-height: 18px;
+  margin-left: 20px;
+}
+
+.titaui-dynamic-summary__evalute-card__head-medal-img {
+  position: absolute;
+  left: -12px;
+  top: -6px;
+  width: 24px;
+  height: 24px;
+}
+
+.titaui-dynamic-summary__evalute-card__bgc-img {
+  position: absolute;
+  width: 82px;
+  height: 86px;
+  right: 8px;
+  top: 0;
+}
+
+.titaui-dynamic-summary__evalute-card__remark {
+  font-size: 14px;
+  color: #3F4755;
+  line-height: 22px;
+}

package/lib/components/dynamic/dynamic-item/dynamic-new-report/components/evalute/index.js

@@ -7,19 +7,23 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _rate = _interopRequireDefault(require("../../../../../rate"));
-
 var _getLocale = require("../../../../../../utils/getLocale");
 
 var _fighting = _interopRequireDefault(require("../../img/fighting.png"));
 
+var _veryGoodBig = _interopRequireDefault(require("./img/very-good-big.png"));
+
+var _veryGoodSmall = _interopRequireDefault(require("./img/very-good-small.png"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var preCls = 'titaui-dynamic-summary__evalute-card';
 
-var EvaluteCard = function EvaluteCard() {
+var EvaluteCard = function EvaluteCard(props) {
+  // const { evaluation } = props
+  // const { value, type, remark } = evaluation
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -29,14 +33,17 @@ var EvaluteCard = function EvaluteCard() {
     className: "".concat(preCls, "__head-img")
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(preCls, "__head-name")
-  }, "cnjsk"), (0, _getLocale.getLocale)('Rep_NewS_EvaluationOF'), /*#__PURE__*/_react["default"].createElement(_rate["default"], {
-    defaultValue: 2.5,
-    disabled: true // style={{ fontSize: 50, marginTop: 24 }}
-    ,
-    allowHalf: true
-  }), /*#__PURE__*/_react["default"].createElement("span", {
-    className: "".concat(preCls, "__head-rate")
-  }, "5\u5206")));
+  }, "cnjsk"), (0, _getLocale.getLocale)('Rep_NewS_EvaluationOF'), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__head-medal")
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    src: _veryGoodSmall["default"],
+    className: "".concat(preCls, "__head-medal-img")
+  }), "\u592A\u68D2\u4E86")), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__remark")
+  }, "mjncj"), /*#__PURE__*/_react["default"].createElement("img", {
+    src: _veryGoodBig["default"],
+    className: "".concat(preCls, "__bgc-img")
+  }));
 };
 
 var _default = EvaluteCard;

package/lib/components/dynamic/dynamic-item/dynamic-new-report/components/remind-user-view/index.css

@@ -2,10 +2,14 @@
   margin-top: 25px;
 }
 
+.titaui-dynamic-summary__remind-view .titaui-pc-avator-container {
+  display: inline-flex;
+}
+
 .titaui-dynamic-summary__remind-view__title {
   font-size: 18px;
   font-weight: 600;
-  color: #141C28;
+  color: #141c28;
   line-height: 26px;
 }
 
@@ -21,12 +25,12 @@
   display: inline-flex;
   align-items: center;
   height: 32px;
-  background: #F0F4FA;
+  background: #f0f4fa;
   border-radius: 16px;
   padding: 5px 8px 5px 4px;
   box-sizing: border-box;
   font-size: 14px;
-  color: #3F4755;
+  color: #3f4755;
   line-height: 22px;
 }
 

package/lib/components/dynamic/dynamic-item/dynamic-new-report/components/remind-user-view/index.js

@@ -62,7 +62,7 @@ var userInfo = [{
 
 var RemindUserView = function RemindUserView(props) {
   var data = props.data;
-  if (!data) return null;
+  if (!data || !data.length) return null;
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls
   }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -75,6 +75,10 @@
   line-height: 1.5;
 }
 
+.titaui-dynamic-new-report-item__upload {
+  margin-top: 16px;
+}
+
 .titaui-dynamic-new-report-item__summary {
   margin-bottom: 16px;
   margin-top: 12px;
@@ -153,3 +157,15 @@
   margin-left: 4px;
   overflow: hidden;
 }
+
+.titaui-dynamic-new-report-item__work {
+  margin-top: 16px;
+  font-size: 18px;
+  font-weight: 600;
+  color: #141c28;
+  line-height: 26px;
+}
+
+.titaui-dynamic-new-report-item__work .tita-rich-editor {
+  min-height: auto;
+}

package/lib/components/dynamic/dynamic-item/dynamic-new-report/index.js

@@ -29,6 +29,8 @@ var _evalute = _interopRequireDefault(require("./components/evalute"));
 
 var _richEditorUpload = _interopRequireDefault(require("../../../rich-editor-upload"));
 
+var _richEditor = _interopRequireDefault(require("../../../rich-editor"));
+
 var _getLocale = require("../../../../utils/getLocale");
 
 var _constant = require("./constant");
@@ -37,7 +39,7 @@ require("./index.css");
 
 var _util = require("./util");
 
-var _excluded = ["data"];
+var _excluded = ["data", "showCollect"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -78,10 +80,10 @@ var prefix = "titaui-dynamic-new-report-item";
 
 var DynamicReply = function DynamicReply(_ref) {
   var data = _ref.data,
+      showCollect = _ref.showCollect,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
   var submitState = data.submitState,
-      feedId = data.feedId,
       publishUser = data.publishUser,
       reportType = data.reportType,
       dailyContent = data.dailyContent,
@@ -104,12 +106,12 @@ var DynamicReply = function DynamicReply(_ref) {
       taskTableData = _useState6[0],
       setTasktableData = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(''),
+  var _useState7 = (0, _react.useState)(""),
       _useState8 = _slicedToArray(_useState7, 2),
       workSummaryData = _useState8[0],
       setWorkSummaryData = _useState8[1];
 
-  var _useState9 = (0, _react.useState)(''),
+  var _useState9 = (0, _react.useState)(""),
       _useState10 = _slicedToArray(_useState9, 2),
       nextWorkPlanData = _useState10[0],
       setNextWorkPlanData = _useState10[1];
@@ -168,7 +170,7 @@ var DynamicReply = function DynamicReply(_ref) {
         return item.title === "下一步工作计划";
       })[0].content);
 
-      if (typeof mindData[0].content === 'string' && mindData[0].content !== '') {
+      if (typeof mindData[0].content === "string" && mindData[0].content !== "") {
         setMindImg(_constant.Motion.filter(function (item) {
           return item.id === JSON.parse(mindData[0].content).SelectedValues[0];
         })[0].img);
@@ -182,7 +184,9 @@ var DynamicReply = function DynamicReply(_ref) {
   }, restProps, {
     desc: renderDesc,
     user: publishUser,
-    suffixContent: renderSuffix
+    suffixContent: renderSuffix,
+    showDelete: true,
+    showCollect: showCollect
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -195,16 +199,30 @@ var DynamicReply = function DynamicReply(_ref) {
     contentColor: "#5C8EFF"
   }), mindImg && /*#__PURE__*/_react["default"].createElement("img", {
     src: mindImg,
-    className: "".concat(prefix, "__content-mind")
+    className: "".concat(prefix, "__content-mind"),
+    alt: ""
   })), /*#__PURE__*/_react["default"].createElement(_okrProgress["default"], {
     data: okrTableData
   }), /*#__PURE__*/_react["default"].createElement(_taskProgress["default"], {
     data: taskTableData
-  }), /*#__PURE__*/_react["default"].createElement(_richEditorUpload["default"], {
+  }), workSummaryData && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__work")
+  }, (0, _getLocale.getLocale)("Tasks_Tab_MyS_JobSummary"), /*#__PURE__*/_react["default"].createElement(_richEditor["default"].Editor, {
+    defaultState: JSON.parse(workSummaryData).RichText,
+    editable: false
+  })), nextWorkPlanData && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__work")
+  }, (0, _getLocale.getLocale)("Rep_Tab_Mys_NextWorkPlans"), /*#__PURE__*/_react["default"].createElement(_richEditor["default"].Editor, {
+    defaultState: JSON.parse(nextWorkPlanData).RichText,
+    editable: false
+  })), files.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__upload")
+  }, /*#__PURE__*/_react["default"].createElement(_richEditorUpload["default"], {
     text: "\u9644\u4EF6",
     files: files,
-    editable: false
-  }), /*#__PURE__*/_react["default"].createElement(_remindUserView["default"], {
+    editable: false,
+    enableDelete: false
+  })), /*#__PURE__*/_react["default"].createElement(_remindUserView["default"], {
     data: atUsers
   }), /*#__PURE__*/_react["default"].createElement(_evalute["default"], null)));
 };

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

@@ -53,7 +53,8 @@ var DynamicProject = function DynamicProject(_ref) {
       workName = data.workName,
       startDate = data.startDate,
       deadline = data.deadline,
-      principalUser = data.principalUser;
+      principalUser = data.principalUser,
+      publishUser = data.publishUser;
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
@@ -82,7 +83,7 @@ var DynamicProject = function DynamicProject(_ref) {
     data: data
   }, restProps, {
     desc: renderDesc,
-    user: principalUser
+    user: principalUser || publishUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -116,7 +116,8 @@ var DynamicItem = function DynamicItem(_ref) {
 
   var data = _ref.data,
       onDeleteFeed = _ref.onDeleteFeed,
-      dynamicShareIsShowToping = _ref.dynamicShareIsShowToping;
+      dynamicShareIsShowToping = _ref.dynamicShareIsShowToping,
+      showCollect = _ref.showCollect;
   var feedId = data.feedId,
       feedComments = data.feedComments,
       praiseType = data.praiseType,
@@ -279,7 +280,8 @@ var DynamicItem = function DynamicItem(_ref) {
         if (newSummary) {
           return /*#__PURE__*/_react["default"].createElement(_dynamicNewReport["default"], {
             data: data,
-            onDeleteFeed: onDeleteFeed
+            onDeleteFeed: onDeleteFeed,
+            showCollect: showCollect
           });
         } else {
           return /*#__PURE__*/_react["default"].createElement(_dynamicReport["default"], {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.7-beta.19",
+  "version": "1.12.7-beta.21",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",