@titaui/pc 1.12.22-beta.13 → 1.12.22-beta.16

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

@@ -58,6 +58,8 @@ var prefix = "titaui-dynamic-item-header";
 var DynamicItemHeader = function DynamicItemHeader(_ref) {
   var _ref$onDeleteFeed = _ref.onDeleteFeed,
       onDeleteFeed = _ref$onDeleteFeed === void 0 ? function () {} : _ref$onDeleteFeed,
+      _ref$showCollect = _ref.showCollect,
+      showCollect = _ref$showCollect === void 0 ? true : _ref$showCollect,
       _ref$showDelete = _ref.showDelete,
       showDelete = _ref$showDelete === void 0 ? false : _ref$showDelete,
       _ref$showTopping = _ref.showTopping,
@@ -99,45 +101,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
 
   var url = "";
 
-  var onChangeHandler = function onChangeHandler(name) {
-    if (name === "collect") {
-      if (nowIsCollect) {
-        (0, _requestApi.cancelCollectDynamic)({
-          feedId: feedId
-        }).then(function (resp) {
-          if (resp.Code === 1) {
-            setNowIsCollect(!nowIsCollect);
-            setSelectVisible(false);
-
-            _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
-              canClose: false
-            });
-          } else {
-            _toast["default"].Error(resp.Message, {
-              canClose: false
-            });
-          }
-        });
-      } else {
-        (0, _requestApi.collectDynamic)({
-          feedId: feedId
-        }).then(function (resp) {
-          if (resp.Code === 1) {
-            setNowIsCollect(!nowIsCollect);
-            setSelectVisible(false);
-
-            _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
-              canClose: false
-            });
-          } else {
-            _toast["default"].Error(resp.Message, {
-              canClose: false
-            });
-          }
-        });
-      }
-    }
-  };
+  var onChangeHandler = function onChangeHandler(name) {};
 
   var handleTopOperateClick = function handleTopOperateClick() {
     if (nowIsTop) {
@@ -187,6 +151,44 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
     setSelectVisible(false);
   };
 
+  var handleCollectClick = function handleCollectClick() {
+    if (nowIsCollect) {
+      (0, _requestApi.cancelCollectDynamic)({
+        feedId: feedId
+      }).then(function (resp) {
+        if (resp.Code === 1) {
+          setNowIsCollect(!nowIsCollect);
+          setSelectVisible(false);
+
+          _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
+            canClose: false
+          });
+        } else {
+          _toast["default"].Error(resp.Message, {
+            canClose: false
+          });
+        }
+      });
+    } else {
+      (0, _requestApi.collectDynamic)({
+        feedId: feedId
+      }).then(function (resp) {
+        if (resp.Code === 1) {
+          setNowIsCollect(!nowIsCollect);
+          setSelectVisible(false);
+
+          _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
+            canClose: false
+          });
+        } else {
+          _toast["default"].Error(resp.Message, {
+            canClose: false
+          });
+        }
+      });
+    }
+  };
+
   var enSureDeleteDynamic = function enSureDeleteDynamic() {
     (0, _requestApi.deleteDynamic)({
       feedId: feedId
@@ -266,7 +268,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       name: user.name,
       id: user.userId
     })
-  })), desc, suffixContent), !isOldSummary && /*#__PURE__*/_react["default"].createElement("div", {
+  })), desc, suffixContent), (showCollect || showTopping || showDelete) && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__more-operate")
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
     popupPlacement: "bottomRight",
@@ -278,13 +280,16 @@ 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"
+    name: "collect",
+    onClick: handleCollectClick
   }, /*#__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"], {
+  }), 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",

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

@@ -134,6 +134,18 @@
   margin-right: 4px;
 }
 
+.titaui-dynamic-new-summary-header__guide {
+  font-size: 14px;
+  color: #FFFFFF;
+  line-height: 22px;
+}
+
+.titaui-dynamic-new-summary-header__guide-img {
+  width: 18px;
+  height: 18px;
+  margin-right: 2px;
+}
+
 .titaui-dynamic-new-summary__operate .drawer-content-wrapper {
   width: 372px !important;
 }

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

@@ -27,6 +27,8 @@ var _conditionRender = _interopRequireDefault(require("../../../../condition-ren
 
 var _tooltip = _interopRequireDefault(require("../../../../tooltip"));
 
+var _guideTip = _interopRequireDefault(require("../../../../guide-tip"));
+
 var _commentsDialog = _interopRequireDefault(require("../../../components/comments-dialog"));
 
 var _getLocale = require("../../../../../utils/getLocale");
@@ -39,6 +41,8 @@ var _bsGlobal = require("../../../../../utils/bs-global");
 
 var _evalute = _interopRequireDefault(require("./img/evalute.png"));
 
+var _guideImg = _interopRequireDefault(require("./img/guide-img.png"));
+
 require("./index.css");
 
 var _requestApi2 = require("./request-api");
@@ -71,7 +75,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var prefix = "titaui-dynamic-new-summary-header";
+var prefix = 'titaui-dynamic-new-summary-header';
 
 var DynamicItemHeader = function DynamicItemHeader(_ref) {
   var _ref$onDeleteFeed = _ref.onDeleteFeed,
@@ -86,10 +90,10 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       showOperateRecord = _ref$showOperateRecor === void 0 ? false : _ref$showOperateRecor,
       data = _ref.data,
       _ref$desc = _ref.desc,
-      desc = _ref$desc === void 0 ? "" : _ref$desc,
+      desc = _ref$desc === void 0 ? '' : _ref$desc,
       user = _ref.user,
       _ref$suffixContent = _ref.suffixContent,
-      suffixContent = _ref$suffixContent === void 0 ? "" : _ref$suffixContent,
+      suffixContent = _ref$suffixContent === void 0 ? '' : _ref$suffixContent,
       canEvaluate = _ref.canEvaluate,
       _ref$setEvaluates = _ref.setEvaluates,
       setEvaluates = _ref$setEvaluates === void 0 ? function () {} : _ref$setEvaluates;
@@ -121,7 +125,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       evaluateVisible = _useState8[0],
       setEvaluateVisible = _useState8[1];
 
-  var _useState9 = (0, _react.useState)(""),
+  var _useState9 = (0, _react.useState)(''),
       _useState10 = _slicedToArray(_useState9, 2),
       mindImg = _useState10[0],
       setMindImg = _useState10[1];
@@ -131,7 +135,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       operateVisible = _useState12[0],
       setOperateVisible = _useState12[1];
 
-  var url = "";
+  var url = '';
   var loginUserId = (0, _bsGlobal.getUserInfo)().Id;
 
   var handleCloseOperateDrawer = function handleCloseOperateDrawer() {
@@ -154,7 +158,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
           setNowIsCollect(!nowIsCollect);
           setSelectVisible(false);
 
-          _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
+          _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'), {
             canClose: false
           });
         } else {
@@ -171,7 +175,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
           setNowIsCollect(!nowIsCollect);
           setSelectVisible(false);
 
-          _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
+          _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'), {
             canClose: false
           });
         } else {
@@ -210,7 +214,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
 
   var handleOpenUserPage = function handleOpenUserPage() {
     if (!url) return;
-    window.open(url, "_blank");
+    window.open(url, '_blank');
   };
 
   var handleClickEvaluate = function handleClickEvaluate() {
@@ -218,7 +222,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
   };
 
   var handleClickEdit = function handleClickEdit() {
-    window.open("#/summary/template?isCreate=false&hideNavTop=true&reportType=".concat(reportType, "&currentTime=").concat(dailyDate), "_blank");
+    window.open("#/summary/template?isCreate=false&hideNavTop=true&reportType=".concat(reportType, "&currentTime=").concat(dailyDate), '_blank');
   };
 
   var handleCloseEvaluateDialog = /*#__PURE__*/function () {
@@ -265,23 +269,23 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       type: "warning"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       type: "title"
-    }, (0, _getLocale.getLocale)("OKR_MyO_Pleasenote")), /*#__PURE__*/_react["default"].createElement("span", {
+    }, (0, _getLocale.getLocale)('OKR_MyO_Pleasenote')), /*#__PURE__*/_react["default"].createElement("span", {
       type: "content"
-    }, (0, _getLocale.getLocale)("Mod_cannotberecovered")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.CancelButton, {
+    }, (0, _getLocale.getLocale)('Mod_cannotberecovered')), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.CancelButton, {
       type: "button",
       onClick: cancelDeleteDynamic
-    }, (0, _getLocale.getLocale)("Mod_Cancel")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.WarningButton, {
+    }, (0, _getLocale.getLocale)('Mod_Cancel')), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.WarningButton, {
       type: "button",
       onClick: enSureDeleteDynamic
-    }, (0, _getLocale.getLocale)("Mod_Delete")));
+    }, (0, _getLocale.getLocale)('Mod_Delete')));
   }, [showDialogConfirm]);
   (0, _react.useEffect)(function () {
     if (dailyContent) {
       var mindData = dailyContent.filter(function (item) {
-        return item.title === "心情";
+        return item.title === '心情';
       }); // 暂时用title
 
-      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);
@@ -324,23 +328,33 @@ 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(_guideTip["default"], {
+    type: "button",
+    width: 304,
+    content: /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(prefix, "__guide")
+    }, /*#__PURE__*/_react["default"].createElement("img", {
+      src: _guideImg["default"],
+      alt: "",
+      className: "".concat(prefix, "__guide-img")
+    }), (0, _getLocale.getLocale)('Rep_NewS_GrowTogether'))
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__evalute"),
     onClick: handleClickEvaluate
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: _evalute["default"],
     className: "".concat(prefix, "__evalute-img"),
     alt: "\u8BC4\u4EF7"
-  }), (0, _getLocale.getLocale)("Per_MyRe_button_Toevaluate")), /*#__PURE__*/_react["default"].createElement("div", {
+  }), (0, _getLocale.getLocale)('Per_MyRe_button_Toevaluate'))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__more-operate")
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
     popupPlacement: "bottomRight",
-    checked: ["collect"],
+    checked: ['collect'],
     onChange: onChangeHandler,
     multi: false,
     visible: selectVisible,
     trigger: /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(prefix, "-right"), "tu-icon-more1"),
+      className: (0, _classnames["default"])("".concat(prefix, "-right"), 'tu-icon-more1'),
       onClick: handleShowDropSelector
     })
   }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
@@ -351,8 +365,8 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
   }, /*#__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"], {
+    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: showEdit && data.isEdit
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "edit",
@@ -360,8 +374,8 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__more-operate-selection")
   }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("tu-icon-bianji3", "".concat(prefix, "__more-operate-selection-icon"))
-  }), (0, _getLocale.getLocale)("Mod_Editor")))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    className: (0, _classnames["default"])('tu-icon-bianji3', "".concat(prefix, "__more-operate-selection-icon"))
+  }), (0, _getLocale.getLocale)('Mod_Editor')))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: showOperateRecord
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "record",
@@ -369,8 +383,8 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
   }, /*#__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"], {
+    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 && data.isEdit
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "delete",
@@ -378,8 +392,8 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__more-operate-selection")
   }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("tu-icon-del", "".concat(prefix, "__more-operate-selection-icon"))
-  }), (0, _getLocale.getLocale)("Mod_Delete"))))))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])('tu-icon-del', "".concat(prefix, "__more-operate-selection-icon"))
+  }), (0, _getLocale.getLocale)('Mod_Delete'))))))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "-desc-time")
   }, createDate))), renderDialogConfirm, /*#__PURE__*/_react["default"].createElement(_commentsDialog["default"], {
     visible: evaluateVisible,

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

@@ -36,6 +36,55 @@
   margin-top: 12px;
 }
 
+.titaui-dynamic-summary-task-progress__table-row-title {
+  font-size: 14px;
+  color: #141c28;
+  padding: 8px 0;
+}
+
+.titaui-dynamic-summary-task-progress__table-row-title-remain {
+  background: rgba(240, 94, 94, 0.16);
+  border-radius: 12px;
+  padding: 0 8px;
+  height: 20px;
+  display: inline-flex;
+  align-items: center;
+  font-size: 12px;
+  color: #3f4755;
+  line-height: 18px;
+  margin-left: 4px;
+}
+
+.titaui-dynamic-summary-task-progress__table-row-title-worktime {
+  margin-left: 4px;
+  display: flex;
+  align-items: center;
+  height: 20px;
+  padding: 0 8px;
+  border-radius: 12px;
+  background: rgba(240, 163, 38, 0.16);
+  font-size: 12px;
+  color: #3f4755;
+  line-height: 18px;
+}
+
+.titaui-dynamic-summary-task-progress__table-row-title-icon {
+  margin-right: 4px;
+  vertical-align: middle;
+}
+
+.titaui-dynamic-summary-task-progress__table-row-title-text {
+  font-size: 14px;
+  font-weight: 600;
+  color: #141c28;
+  line-height: 22px;
+}
+
+.titaui-dynamic-summary-task-progress__table-row-title-text:hover {
+  cursor: pointer;
+  color: #2879ff;
+}
+
 .titaui-dynamic-summary-task-progress__table table {
   width: 100%;
 }

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

@@ -31,15 +31,19 @@ var formatTaskData = function formatTaskData(data) {
     2: [],
     3: []
   };
-  data.forEach(function (item) {
-    if (item.Status === 2) {
-      result[1].push(item);
-    } else if (item.Status === 1) {
-      result[2].push(item);
-    } else if (item.Status === 3) {
-      result[3].push(item);
-    }
-  });
+
+  if (data && data.length !== 0) {
+    data.forEach(function (item) {
+      if (item.Status === 2) {
+        result[1].push(item);
+      } else if (item.Status === 1) {
+        result[2].push(item);
+      } else if (item.Status === 3) {
+        result[3].push(item);
+      }
+    });
+  }
+
   return result;
 };
 
@@ -51,16 +55,20 @@ var getStatusStatistic = function getStatusStatistic(data) {
     doing: 0,
     overDue: 0
   };
-  data.forEach(function (items) {
-    // 1 进行中 2 已完成 3已延期
-    if (items.Status === 3) {
-      result.overDue = result.overDue + 1;
-    } else if (items.Status === 1) {
-      result.doing = result.doing + 1;
-    } else if (items.Status === 2) {
-      result.done = result.done + 1;
-    }
-  });
+
+  if (data && data.length !== 0) {
+    data.forEach(function (items) {
+      // 1 进行中 2 已完成 3已延期
+      if (items.Status === 3) {
+        result.overDue = result.overDue + 1;
+      } else if (items.Status === 1) {
+        result.doing = result.doing + 1;
+      } else if (items.Status === 2) {
+        result.done = result.done + 1;
+      }
+    });
+  }
+
   return result;
 };
 

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

@@ -66,7 +66,8 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
       _data$okrStatus = data.okrStatus,
       okrStatus = _data$okrStatus === void 0 ? 1 : _data$okrStatus,
       _data$okrProgress = data.okrProgress,
-      okrProgress = _data$okrProgress === void 0 ? 0 : _data$okrProgress;
+      okrProgress = _data$okrProgress === void 0 ? 0 : _data$okrProgress,
+      publishUser = data.publishUser;
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
@@ -128,7 +129,7 @@ var DynamicCreateO = function DynamicCreateO(_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-milestone/index.js

@@ -54,7 +54,8 @@ var DynamicMilestone = function DynamicMilestone(_ref) {
       startDate = data.startDate,
       endDate = data.endDate,
       obj = data.obj,
-      principalUser = data.principalUser;
+      principalUser = data.principalUser,
+      publishUser = data.publishUser;
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
@@ -106,7 +107,7 @@ var DynamicMilestone = function DynamicMilestone(_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-task/index.js

@@ -59,7 +59,8 @@ var DynamicTask = function DynamicTask(_ref) {
       deadline = data.deadline,
       obj = data.obj,
       principalUser = data.principalUser,
-      workId = data.workId;
+      workId = data.workId,
+      publishUser = data.publishUser;
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
@@ -135,7 +136,7 @@ var DynamicTask = function DynamicTask(_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

@@ -295,10 +295,10 @@ var DynamicItem = function DynamicItem(_ref) {
           }, restProps));
         }
 
-        return /*#__PURE__*/_react["default"].createElement(_dynamicReport["default"], {
+        return /*#__PURE__*/_react["default"].createElement(_dynamicReport["default"], _extends({
           data: data,
           onDeleteFeed: onDeleteFeed
-        });
+        }, restProps));
 
       case _constant.EFeedType.Reply:
         return /*#__PURE__*/_react["default"].createElement(_dynamicReply["default"], {

package/lib/components/guide-tip/index.css

@@ -0,0 +1,21 @@
+.titaui-pc__guide-tip__popup {
+  display: flex;
+  align-items: flex-start;
+  background: #5C8EFF;
+  box-shadow: 0px -4px 12px 0px rgba(127, 145, 180, 0.2);
+  border: 1px solid #FFFFFF;
+  padding: 16px;
+  box-sizing: border-box;
+  border-radius: 24px;
+}
+
+.titaui-pc__guide-tip__popup--button {
+  flex-direction: column;
+}
+
+.titaui-pc__guide-tip__popup-close {
+  font-size: 16px;
+  color: #fff;
+  margin-left: 10px;
+  cursor: pointer;
+}

package/lib/components/guide-tip/index.js

@@ -0,0 +1,103 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _popup = _interopRequireDefault(require("../popup"));
+
+var _button = _interopRequireDefault(require("../button"));
+
+require("./index.css");
+
+var _excluded = ["type", "width", "time", "children", "placement", "classnames", "content", "onClickClose", "buttonTitle"];
+
+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 _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 _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 _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; }
+
+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; }
+
+var preCls = 'titaui-pc__guide-tip';
+
+var GuideTip = function GuideTip(props) {
+  var _useState = (0, _react.useState)(true),
+      _useState2 = _slicedToArray(_useState, 2),
+      popupVisible = _useState2[0],
+      setPopupVisible = _useState2[1];
+
+  var _props$type = props.type,
+      type = _props$type === void 0 ? 'default' : _props$type,
+      _props$width = props.width,
+      width = _props$width === void 0 ? 304 : _props$width,
+      _props$time = props.time,
+      time = _props$time === void 0 ? 3000 : _props$time,
+      children = props.children,
+      _props$placement = props.placement,
+      placement = _props$placement === void 0 ? 'top' : _props$placement,
+      _props$classnames = props.classnames,
+      classnames = _props$classnames === void 0 ? "".concat(preCls, "__popup") : _props$classnames,
+      content = props.content,
+      onClickClose = props.onClickClose,
+      _props$buttonTitle = props.buttonTitle,
+      buttonTitle = _props$buttonTitle === void 0 ? '好哒' : _props$buttonTitle,
+      restProps = _objectWithoutProperties(props, _excluded);
+
+  var renderPopupContent = function renderPopupContent() {
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: (0, _classnames["default"])("".concat(preCls, "__popup"), _defineProperty({}, classnames, classnames), _defineProperty({}, "".concat(preCls, "__popup--button"), type === 'button')),
+      style: {
+        width: "".concat(width, "px")
+      }
+    }, content, type === 'default' && /*#__PURE__*/_react["default"].createElement("i", {
+      className: (0, _classnames["default"])('tu-icon-close', "".concat(preCls, "__popup-close")),
+      onClick: onClickClose
+    }), type === 'button' && /*#__PURE__*/_react["default"].createElement(_button["default"].Rect, {
+      text: buttonTitle,
+      size: "small"
+    }));
+  };
+
+  (0, _react.useEffect)(function () {
+    if (type === 'time') {
+      setTimeout(function () {
+        setPopupVisible(false);
+      }, time);
+    }
+  }, []);
+  return /*#__PURE__*/_react["default"].createElement(_popup["default"], _extends({
+    placement: placement,
+    popup: renderPopupContent(),
+    popupVisible: popupVisible
+  }, restProps), children);
+};
+
+var _default = GuideTip;
+exports["default"] = _default;

package/lib/components/upvote/selector.js

@@ -9,7 +9,7 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rcTrigger = _interopRequireDefault(require("rc-trigger"));
+var _popup = _interopRequireDefault(require("../popup"));
 
 var _rcQueueAnim = _interopRequireDefault(require("rc-queue-anim"));
 
@@ -118,11 +118,10 @@ var VoteSelector = function VoteSelector(_ref) {
     }
   }, [arrowPosition]);
   if (!children || !_react["default"].Children.only(children)) throw "only support single child";
-  return /*#__PURE__*/_react["default"].createElement(_rcTrigger["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_popup["default"], {
     zIndex: 1500,
     popupVisible: popVisible,
     popupAlign: getAlignPostion(align, offset),
-    getPopupContainer: getPopupContainer,
     onPopupAlign: handlePopAlign,
     popup: /*#__PURE__*/_react["default"].createElement("div", {
       className: "pull-screen-ignore document-mouse-event-ignore"

package/lib/index.js

@@ -207,6 +207,12 @@ Object.defineProperty(exports, "GroupManagementPage", {
     return _groupManagement["default"];
   }
 });
+Object.defineProperty(exports, "GuideTip", {
+  enumerable: true,
+  get: function get() {
+    return _guideTip["default"];
+  }
+});
 Object.defineProperty(exports, "HelpCard", {
   enumerable: true,
   get: function get() {
@@ -746,6 +752,8 @@ var _gridLayout = _interopRequireDefault(require("./components/grid-layout"));
 
 var _groupManagement = _interopRequireDefault(require("./pages/group-management"));
 
+var _guideTip = _interopRequireDefault(require("./components/guide-tip"));
+
 var _home = _interopRequireDefault(require("./pages/home"));
 
 var _homePageDataList = _interopRequireDefault(require("./pages/home-page-data-list"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.22-beta.13",
+  "version": "1.12.22-beta.16",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -78,7 +78,7 @@
     "@titaui/rc-trigger": "5.2.5",
     "@titaui/react-flow-renderer": "9.5.4",
     "@titaui/request": "^1.0.1",
-    "@titaui/rich-editor": "^0.1.50",
+    "@titaui/rich-editor": "^0.1.50-beta.14",
     "@titaui/toast": "1.0.0",
     "@types/color": "3.0.3",
     "@types/prosemirror-commands": "1.0.4",