@titaui/pc 1.5.69-beta.20 → 1.5.69-beta.21

package/lib/components/communication/index.js

@@ -231,6 +231,7 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
         sentData.CommentId = 0;
         sentData.ObjId = 0;
         sentData.ObjType = 0;
+        sentData.Content = sentData.Content || ' ';
 
         if (isShowReplyToUser) {
           sentData.CommentId = replyUserCommentId;

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

@@ -59,9 +59,9 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       _ref$showTopping = _ref.showTopping,
       showTopping = _ref$showTopping === void 0 ? false : _ref$showTopping,
       data = _ref.data,
-      desc = _ref.desc;
-  var publishUser = data.publishUser,
-      createDate = data.createDate,
+      desc = _ref.desc,
+      user = _ref.user;
+  var createDate = data.createDate,
       feedId = data.feedId,
       _data$isTop = data.isTop,
       isTop = _data$isTop === void 0 ? false : _data$isTop,
@@ -81,51 +81,20 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
   var _useState5 = (0, _react.useState)(false),
       _useState6 = _slicedToArray(_useState5, 2),
       showDialogConfirm = _useState6[0],
-      setShowDialogConfirm = _useState6[1]; // const url = getUrlForUserPage({
+      setShowDialogConfirm = _useState6[1];
+
+  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,
   // });
 
 
-  var url = '';
+  var url = "";
 
   var onChangeHandler = function onChangeHandler(name, _) {
-    if (name === "top") {
-      if (nowIsTop) {
-        (0, _requestApi.cancelTopDynamic)({
-          feedId: feedId
-        }).then(function (resp) {
-          if (resp.Code === 1) {
-            setNowIsTop(!nowIsTop);
-
-            _popDownNotification.Toast.Success("操作成功", {
-              canClose: false
-            });
-          } else {
-            _popDownNotification.Toast.Error(resp.Message, {
-              canClose: false
-            });
-          }
-        });
-      } else {
-        (0, _requestApi.topDynamic)({
-          feedId: feedId
-        }).then(function (resp) {
-          if (resp.Code === 1) {
-            setNowIsTop(!nowIsTop);
-
-            _popDownNotification.Toast.Success("操作成功", {
-              canClose: false
-            });
-          } else {
-            _popDownNotification.Toast.Error(resp.Message, {
-              canClose: false
-            });
-          }
-        });
-      }
-    }
-
     if (name === "collect") {
       if (nowIsCollect) {
         (0, _requestApi.cancelCollectDynamic)({
@@ -161,12 +130,49 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
         });
       }
     }
+  };
 
-    if (name === "delete") {
-      setShowDialogConfirm(true);
+  var handleTopOperateClick = function handleTopOperateClick() {
+    if (nowIsTop) {
+      (0, _requestApi.cancelTopDynamic)({
+        feedId: feedId
+      }).then(function (resp) {
+        if (resp.Code === 1) {
+          setNowIsTop(!nowIsTop);
+
+          _popDownNotification.Toast.Success("操作成功", {
+            canClose: false
+          });
+        } else {
+          _popDownNotification.Toast.Error(resp.Message, {
+            canClose: false
+          });
+        }
+      });
+    } else {
+      (0, _requestApi.topDynamic)({
+        feedId: feedId
+      }).then(function (resp) {
+        if (resp.Code === 1) {
+          setNowIsTop(!nowIsTop);
+
+          _popDownNotification.Toast.Success("操作成功", {
+            canClose: false
+          });
+        } else {
+          _popDownNotification.Toast.Error(resp.Message, {
+            canClose: false
+          });
+        }
+      });
     }
   };
 
+  var handleDeleteClick = function handleDeleteClick() {
+    setShowDialogConfirm(true);
+    setSelectVisible(false);
+  };
+
   var enSureDeleteDynamic = function enSureDeleteDynamic() {
     (0, _requestApi.deleteDynamic)({
       feedId: feedId
@@ -186,6 +192,10 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
     setShowDialogConfirm(false);
   };
 
+  var handleShowDropSelector = function handleShowDropSelector() {
+    setSelectVisible(true);
+  };
+
   var handleOpenUserPage = function handleOpenUserPage() {
     if (!url) return;
     window.open(url, "_blank");
@@ -213,10 +223,10 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
     className: (0, _classnames["default"])(prefix + "-desc-avatar", _defineProperty({}, prefix + "-desc-avatar--not-link", !url)),
     onClick: handleOpenUserPage
   }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
-    name: publishUser.name,
-    userId: publishUser.id || publishUser.userId,
-    src: publishUser.avatar.medium,
-    color: publishUser.avatar.color,
+    name: user.name,
+    userId: user.id || user.userId,
+    src: user.avatar.medium,
+    color: user.avatar.color,
     size: {
       width: 40,
       textNum: 1,
@@ -232,8 +242,8 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_tooltip.TooltipText, {
     maxWidth: 98,
     text: /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
-      name: publishUser.name,
-      id: publishUser.userId
+      name: user.name,
+      id: user.userId
     })
   })), desc), /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "-desc-time"
@@ -244,8 +254,10 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
     checked: ["collect"],
     onChange: onChangeHandler,
     multi: false,
+    visible: selectVisible,
     trigger: /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])(prefix + "-right", "tu-icon-more1")
+      className: (0, _classnames["default"])(prefix + "-right", "tu-icon-more1"),
+      onClick: handleShowDropSelector
     })
   }, /*#__PURE__*/_react["default"].createElement(_dropdownLayer.Item, {
     name: "collect"
@@ -256,7 +268,8 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
   }), nowIsCollect ? "取消收藏" : "收藏")), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: showTopping
   }, /*#__PURE__*/_react["default"].createElement(_dropdownLayer.Item, {
-    name: "top"
+    name: "top",
+    onClick: handleTopOperateClick
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__more-operate-selection"
   }, /*#__PURE__*/_react["default"].createElement("i", {
@@ -264,7 +277,8 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
   }), nowIsTop ? "取消置顶" : "置顶"))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: showDelete
   }, /*#__PURE__*/_react["default"].createElement(_dropdownLayer.Item, {
-    name: "delete"
+    name: "delete",
+    onClick: handleDeleteClick
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__more-operate-selection"
   }, /*#__PURE__*/_react["default"].createElement("i", {

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

@@ -60,7 +60,8 @@ var DynamicAlign = function DynamicAlign(_ref) {
       parentPrincipalUser = data.parentPrincipalUser,
       parentcycleName = data.parentcycleName,
       cycleName = data.cycleName,
-      feedType = data.feedType;
+      feedType = data.feedType,
+      publishUser = data.publishUser;
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
@@ -108,7 +109,8 @@ var DynamicAlign = function DynamicAlign(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
     data: data
   }, restProps, {
-    desc: renderDesc
+    desc: renderDesc,
+    user: publishUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -48,3 +48,7 @@
   color: #ffffff;
   line-height: 18px;
 }
+
+.titaui-dynamic-announcement-item .highlight {
+  color: #f05e5e;
+}

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

@@ -19,12 +19,14 @@ var _fileList = _interopRequireDefault(require("../../../file-list"));
 
 var _context = require("../../context");
 
-var _searchKeyHandle = _interopRequireDefault(require("../../../search-key-handle"));
+var _tools = require("../../../../utils/tools");
 
 var _header = _interopRequireDefault(require("../components/header"));
 
 var _util = require("../../util");
 
+var _dangerousHtml = _interopRequireDefault(require("../../components/dangerous-html"));
+
 require("./index.css");
 
 var _excluded = ["data", "hasDynamicOpereateAuth"];
@@ -52,6 +54,8 @@ var DynamicAnnouncement = function DynamicAnnouncement(_ref) {
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
 
+  var contentRef = (0, _react.useRef)();
+
   var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(data.feedType),
       feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
       feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
@@ -59,28 +63,36 @@ var DynamicAnnouncement = function DynamicAnnouncement(_ref) {
   var renderDesc = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
       className: prefix + "__operate-desc"
-    }, "\u53D1\u5E03\u7684\u5206\u4EAB"), /*#__PURE__*/_react["default"].createElement("span", {
+    }, "\u53D1\u5E03\u7684\u516C\u544A"), /*#__PURE__*/_react["default"].createElement("span", {
       className: prefix + "-desc-operate-type",
       style: {
         background: feedTypeColor
       }
     }, feedTypeText));
   }, []);
+  (0, _react.useEffect)(function () {
+    (0, _tools.highLightWord)({
+      parentDom: contentRef.current,
+      keyWord: searchKeyWord
+    });
+  }, [data, searchKeyWord]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
   }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
     data: data,
     desc: renderDesc,
     showDelete: hasDynamicOpereateAuth,
-    showTopping: hasDynamicOpereateAuth
+    showTopping: hasDynamicOpereateAuth,
+    user: data.publishUser
   }, restProps)), /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__content"
   }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", {
     className: (0, _classnames["default"])(prefix + "__content-quoto", prefix + "__content-quoto--left"),
     src: _dynamicLeftQuoto["default"]
-  })), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-    str: data.content,
-    keyWord: searchKeyWord
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    ref: contentRef
+  }, /*#__PURE__*/_react["default"].createElement(_dangerousHtml["default"], {
+    htmlText: data.content
   }), /*#__PURE__*/_react["default"].createElement("img", {
     className: (0, _classnames["default"])(prefix + "__content-quoto", prefix + "__content-quoto--right"),
     src: _dynamicRightQuoto["default"]

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

@@ -67,7 +67,8 @@ var DynamicShare = function DynamicShare(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
     data: data
   }, restProps, {
-    desc: renderDesc
+    desc: renderDesc,
+    user: data.principalUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement(_title["default"], {

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

@@ -56,7 +56,8 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
       cycleName = data.cycleName,
       okrTypeName = data.okrTypeName,
       okrTypeId = data.okrTypeId,
-      classify = data.classify;
+      classify = data.classify,
+      principalUser = data.principalUser;
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
@@ -130,7 +131,8 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
     data: data
   }, restProps, {
-    desc: renderDesc
+    desc: renderDesc,
+    user: principalUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__content"
   }, /*#__PURE__*/_react["default"].createElement(_title["default"], {

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

@@ -12,6 +12,7 @@
   font-size: 12px;
   color: #89919f;
   line-height: 18px;
+  margin-top: 8px;
 }
 
 .titaui-dynamic-kr-item__content-time-range-icon {

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

@@ -45,10 +45,11 @@ var DynamicKr = function DynamicKr(_ref) {
   var data = _ref.data,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
-  var deadline = data.deadline,
+  var endDate = data.endDate,
       startDate = data.startDate,
       name = data.name,
-      krId = data.krId;
+      krId = data.krId,
+      principalUser = data.principalUser;
 
   var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(data.feedType),
       feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
@@ -89,7 +90,8 @@ var DynamicKr = function DynamicKr(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
     data: data
   }, restProps, {
-    desc: renderDesc
+    desc: renderDesc,
+    user: principalUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__content"
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -97,11 +99,11 @@ var DynamicKr = function DynamicKr(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_title["default"], {
     content: "KR\uFF1A".concat(name),
     onClickTitle: handleClickKrTitle
-  }), /*#__PURE__*/_react["default"].createElement("div", {
+  })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content-time-range")
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])("tu-icon-deferred", "".concat(prefix, "__content-time-range-icon"))
-  }), /*#__PURE__*/_react["default"].createElement("span", null, startDate, "-", deadline)))));
+  }), /*#__PURE__*/_react["default"].createElement("span", null, startDate, "-", endDate))));
 };
 
 var _default = DynamicKr;

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

@@ -58,7 +58,8 @@ var DynamicMilestone = function DynamicMilestone(_ref) {
       startDate = data.startDate,
       deadline = data.deadline,
       feedType = data.feedType,
-      obj = data.obj;
+      obj = data.obj,
+      principalUser = data.principalUser;
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
@@ -124,7 +125,8 @@ var DynamicMilestone = function DynamicMilestone(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
     data: data
   }, restProps, {
-    desc: renderDesc
+    desc: renderDesc,
+    user: principalUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {

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

@@ -64,7 +64,8 @@ var DynamicProgress = function DynamicProgress(_ref) {
       obj = data.obj,
       classify = data.classify,
       relationParentName = data.relationParentName,
-      relationParentId = data.relationParentId;
+      relationParentId = data.relationParentId,
+      publishUser = data.publishUser;
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
@@ -178,7 +179,8 @@ var DynamicProgress = function DynamicProgress(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
     data: data
   }, restProps, {
-    desc: renderDesc
+    desc: renderDesc,
+    user: publishUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__content"
   }, /*#__PURE__*/_react["default"].createElement("div", {

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

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

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

@@ -67,7 +67,8 @@ var DynamicRelative = function DynamicRelative(_ref) {
       status = data.status,
       objPrincipalUser = data.objPrincipalUser,
       rObjprincipalUser = data.rObjprincipalUser,
-      rObjCycleName = data.rObjCycleName;
+      rObjCycleName = data.rObjCycleName,
+      publishUser = data.publishUser;
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
@@ -123,7 +124,8 @@ var DynamicRelative = function DynamicRelative(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
     data: data
   }, restProps, {
-    desc: renderDesc
+    desc: renderDesc,
+    user: publishUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -53,7 +53,8 @@ var DynamicReply = function DynamicReply(_ref) {
       searchKeyWord = _useContext.searchKeyWord;
 
   var replayObjType = data.replayObjType,
-      feedType = data.feedType;
+      feedType = data.feedType,
+      publishUser = data.publishUser;
 
   var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(feedType),
       feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
@@ -116,7 +117,8 @@ var DynamicReply = function DynamicReply(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
     data: data
   }, restProps, {
-    desc: renderDesc
+    desc: renderDesc,
+    user: publishUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__content"
   }, /*#__PURE__*/_react["default"].createElement(_title["default"], {

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

@@ -52,16 +52,16 @@ var DynamicReply = function DynamicReply(_ref) {
   var data = _ref.data,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
+  var submitState = data.submitState,
+      feedId = data.feedId,
+      feedType = data.feedType,
+      publishUser = data.publishUser;
   var contentRichTextRef = (0, _react.useRef)();
   var workPlanRichTextRef = (0, _react.useRef)();
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
 
-  var submitState = data.submitState,
-      feedId = data.feedId,
-      feedType = data.feedType;
-
   var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(feedType),
       feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
       feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
@@ -105,7 +105,8 @@ var DynamicReply = function DynamicReply(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
     data: data
   }, restProps, {
-    desc: renderDesc
+    desc: renderDesc,
+    user: publishUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__content"
   }, /*#__PURE__*/_react["default"].createElement(_title["default"], {

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

@@ -62,7 +62,8 @@ var DynamicReward = function DynamicReward(_ref) {
       obj = data.obj,
       classify = data.classify,
       feedType = data.feedType,
-      rewardUser = data.rewardUser;
+      rewardUser = data.rewardUser,
+      publishUser = data.publishUser;
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
@@ -139,7 +140,7 @@ var DynamicReward = function DynamicReward(_ref) {
     });
   }, [classify]);
   var renderDesc = (0, _react.useMemo)(function () {
-    var url = ''; // const url = getUrlForUserPage({
+    var url = ""; // const url = getUrlForUserPage({
     //   userId: rewardUser.name,
     //   userType: rewardUser.userType,
     // });
@@ -169,10 +170,10 @@ var DynamicReward = function DynamicReward(_ref) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
   }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
-    data: data
-  }, restProps, {
-    desc: renderDesc
-  })), /*#__PURE__*/_react["default"].createElement("div", {
+    data: data,
+    desc: renderDesc,
+    user: publishUser
+  }, restProps)), /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__content"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__title"

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

@@ -48,3 +48,7 @@
   color: #ffffff;
   line-height: 18px;
 }
+
+.titaui-dynamic-share-item .highlight {
+  color: #f05e5e;
+}

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

@@ -19,14 +19,16 @@ var _fileList = _interopRequireDefault(require("../../../file-list"));
 
 var _context = require("../../context");
 
-var _searchKeyHandle = _interopRequireDefault(require("../../../search-key-handle"));
-
 var _header = _interopRequireDefault(require("../components/header"));
 
-require("./index.css");
+var _dangerousHtml = _interopRequireDefault(require("../../components/dangerous-html"));
 
 var _util = require("../../util");
 
+var _tools = require("../../../../utils/tools");
+
+require("./index.css");
+
 var _excluded = ["data", "hasDynamicOpereateAuth"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -52,6 +54,8 @@ var DynamicShare = function DynamicShare(_ref) {
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
 
+  var contentRef = (0, _react.useRef)();
+
   var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(data.feedType),
       feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
       feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
@@ -66,22 +70,29 @@ var DynamicShare = function DynamicShare(_ref) {
       }
     }, feedTypeText));
   }, []);
+  (0, _react.useEffect)(function () {
+    (0, _tools.highLightWord)({
+      parentDom: contentRef.current,
+      keyWord: searchKeyWord
+    });
+  }, [data, searchKeyWord]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
   }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
-    data: data
-  }, restProps, {
+    data: data,
     desc: renderDesc,
     showDelete: hasDynamicOpereateAuth,
-    showTopping: hasDynamicOpereateAuth
-  })), /*#__PURE__*/_react["default"].createElement("div", {
+    showTopping: hasDynamicOpereateAuth,
+    user: data.publishUser
+  }, restProps)), /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix + "__content"
   }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", {
     className: (0, _classnames["default"])(prefix + "__content-quoto", prefix + "__content-quoto--left"),
     src: _dynamicLeftQuoto["default"]
-  })), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-    str: data.content,
-    keyWord: searchKeyWord
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    ref: contentRef
+  }, /*#__PURE__*/_react["default"].createElement(_dangerousHtml["default"], {
+    htmlText: data.content
   }), /*#__PURE__*/_react["default"].createElement("img", {
     className: (0, _classnames["default"])(prefix + "__content-quoto", prefix + "__content-quoto--right"),
     src: _dynamicRightQuoto["default"]

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

@@ -56,7 +56,8 @@ var DynamicTask = function DynamicTask(_ref) {
       startDate = data.startDate,
       deadline = data.deadline,
       feedType = data.feedType,
-      obj = data.obj;
+      obj = data.obj,
+      principalUser = data.principalUser;
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
@@ -130,7 +131,8 @@ var DynamicTask = function DynamicTask(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
     data: data
   }, restProps, {
-    desc: renderDesc
+    desc: renderDesc,
+    user: principalUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {

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

@@ -344,7 +344,7 @@ var DynamicItem = function DynamicItem(_ref) {
     commentCount: 3,
     ref: communicationRef,
     highLightKeyWord: searchKeyWord,
-    autoFocus: showComment && feedComments.total === 0
+    autoFocus: feedComments.total === 0
   }))));
 };
 

package/lib/components/mblog/index.js

@@ -175,7 +175,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
 
       _this.setState({
         textareaValue: textareaValue,
-        isAllowSubmit: textareaValue.trim().length > 0 && textareaValue.trim().length <= (_this.props.maxLength || 2000),
+        isAllowSubmit: textareaValue.trim().length > 0 && textareaValue.trim().length <= (_this.props.maxLength || 2000) || successFilesPath.length > 0,
         uploadSuccessFilesPath: successFilesPath,
         dragFilesList: []
       });
@@ -190,7 +190,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
     };
 
     _this.allowSubmit = function (content) {
-      return content.trim().length > 0 && content.trim().length <= _this.props.maxLength;
+      return content.trim().length > 0 && content.trim().length <= _this.props.maxLength || _this.state.uploadSuccessFilesPath.length > 0;
     };
 
     _this.onActionSubmit = function (submitType) {

package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.js

@@ -70,20 +70,27 @@ var _default = function _default(props) {
 
   var openCreate = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(name) {
+      var params;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               if (name == "addTask") {
+                params = {
+                  'objId': data.workId,
+                  'objType': 4,
+                  'AppId': 1,
+                  'AppType': 1,
+                  'TaskType': 0,
+                  'WorkMileStoneId': data.mileStoneId
+                };
+
+                if (data.mileStoneId > 0) {
+                  params.WorkMileStoneName = data.mileStoneName;
+                }
+
                 window.openCreateTaskPop(btnRef.current, {
-                  "createParams": {
-                    "objId": data.workId,
-                    "objType": 4,
-                    "AppId": 1,
-                    "AppType": 1,
-                    "TaskType": 0,
-                    "WorkMileStoneId": data.mileStoneId
-                  },
+                  "createParams": params,
                   "createTaskOption": {
                     "allowObjectOptions": false
                   }

package/lib/components/table/index.css

@@ -67,7 +67,6 @@
   font-weight: 400;
   padding-right: 20px;
   white-space: nowrap;
-  text-overflow: ellipsis;
   color: #3f4755;
   font-size: 14px;
   border-bottom: 1px solid #e9edf0;

package/lib/pages/like-ranking/column.js

@@ -51,7 +51,7 @@ var columns = function columns() {
   return [{
     title: "排名",
     dataIndex: "rankNum",
-    width: 50,
+    width: 100,
     key: "rankNum",
     className: "".concat(preCls, "__td ").concat(preCls, "__td-raking"),
     render: function render(text, data) {
@@ -88,7 +88,7 @@ var columns = function columns() {
           id: user.userId,
           name: user.name
         }),
-        maxWidth: 360
+        isPercent: true
       })));
     }
   }, {
@@ -104,7 +104,7 @@ var columns = function columns() {
           id: user.departmentId,
           name: user.departmentName
         }),
-        maxWidth: 360
+        isPercent: true
       });
     }
   }, {
@@ -119,7 +119,7 @@ var columns = function columns() {
           id: data.oneLevelDepName,
           name: data.oneLevelDepName
         }),
-        maxWidth: 360
+        isPercent: true
       });
     }
   }, {

package/lib/pages/like-ranking/filter-buttons/department.js

@@ -21,60 +21,21 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _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 DepartMent = function DepartMent(_ref) {
   var setParma = _ref.setParma;
 
-  var _useState = (0, _react.useState)({}),
-      _useState2 = _slicedToArray(_useState, 2),
-      selected = _useState2[0],
-      setSelected = _useState2[1];
-
   var onDepartSelect = function onDepartSelect(keys, data) {
-    setSelected(keys);
-    var departments = keys.departments,
-        groups = keys.groups;
-    var depIds = "";
-    departments.forEach(function (item, key) {
-      depIds = depIds + item.id;
-
-      if (key != departments.length - 1) {
-        depIds = depIds + ",";
-      }
-    });
-    var groupIds = "";
-    groups.forEach(function (item, key) {
-      groupIds = groupIds + item.id;
-
-      if (key != groups.length - 1) {
-        groupIds = groupIds + ",";
-      }
-    });
-    setParma("departmets", {
-      depIds: depIds,
-      groupIds: groupIds
-    });
+    setParma("depIds", keys[0]["id"]);
   };
 
   var departRef = (0, _react.useRef)();
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_userSelector.FieldPersonSelector, {
-    multiple: true,
-    departOnly: true,
     ref: departRef,
     auth: true,
-    selectNodes: selected,
-    onOk: onDepartSelect,
+    departOnly: true,
+    isGetRoot: true // selectNodes={selected}
+    ,
+    onSelect: onDepartSelect,
     position: "bottomLeft"
   }, /*#__PURE__*/_react["default"].createElement(_searchDropdown["default"], null, "\u90E8\u95E8")));
 };

package/lib/pages/like-ranking/filter-buttons/group.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _userSelector = require("../../../components/user-selector");
+
+var _searchDropdown = _interopRequireDefault(require("./search-dropdown"));
+
+require("./index.css");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var DepartMent = function DepartMent(_ref) {
+  var setParma = _ref.setParma;
+
+  var onSelect = function onSelect(keys) {
+    setParma("groupIds", keys[0]["id"]);
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_userSelector.GroupSelector, {
+    auth: true,
+    isGetRoot: true,
+    onSelect: onSelect,
+    position: "bottomLeft"
+  }, /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_searchDropdown["default"], null, "\u7FA4\u7EC4"))));
+};
+
+var _default = DepartMent;
+exports["default"] = _default;

package/lib/pages/like-ranking/filter-buttons/index.js

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _department = _interopRequireDefault(require("./department"));
 
+var _group = _interopRequireDefault(require("./group"));
+
 var _timer = _interopRequireDefault(require("./timer"));
 
 var _modular = _interopRequireDefault(require("./modular"));
@@ -21,14 +23,18 @@ var preCls = "filter-buttons";
 
 var FilterButton = function FilterButton(_ref) {
   var parmas = _ref.parmas,
-      setParma = _ref.setParma;
+      setParma = _ref.setParma,
+      setType = _ref.setType;
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls)
   }, /*#__PURE__*/_react["default"].createElement(_department["default"], {
     setParma: setParma
+  }), /*#__PURE__*/_react["default"].createElement(_group["default"], {
+    setParma: setParma
   }), /*#__PURE__*/_react["default"].createElement(_timer["default"], {
     setParma: setParma,
-    parmas: parmas
+    parmas: parmas,
+    setType: setType
   }), /*#__PURE__*/_react["default"].createElement(_modular["default"], {
     setParma: setParma
   }));

package/lib/pages/like-ranking/filter-buttons/timer.js

@@ -25,12 +25,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var Timer = function Timer(_ref) {
   var setParma = _ref.setParma,
-      parmas = _ref.parmas;
+      parmas = _ref.parmas,
+      setType = _ref.setType;
   var _parmas$date = parmas.date,
       createDate = _parmas$date.createDate,
       endDate = _parmas$date.endDate;
 
   var onStartDateConfirmHandler = function onStartDateConfirmHandler(data) {
+    setType("");
     var date = {
       createDate: data.startDate,
       endDate: data.endDate

package/lib/pages/like-ranking/index.css

@@ -138,8 +138,8 @@
 
 .like-ranking-table__td {
   font-size: 14px;
-  padding: 10px 4px;
   overflow: hidden;
+  margin-right: 4px;
 }
 
 .like-ranking-table__td-raking {

package/lib/pages/like-ranking/index.js

@@ -56,17 +56,10 @@ var hasAuth = new _auth.DynamicManagerAuth();
 
 var LikeRanking = function LikeRanking() {
   var _useState = (0, _react.useState)(function () {
-    var department = {
-      depIds: "",
-      groupIds: ""
-    };
+    var depIds = "";
 
     if (hasAuth.isOnlyLeader()) {
-      var depId = (0, _bsGlobal.getUserInfo)().DepartmentId;
-      department = {
-        depIds: "" + depId,
-        groupIds: ""
-      };
+      depIds = "" + (0, _bsGlobal.getUserInfo)().DepartmentId;
     }
 
     return {
@@ -74,7 +67,7 @@ var LikeRanking = function LikeRanking() {
         createDate: "",
         endDate: ""
       },
-      departmets: department
+      depIds: depIds
     };
   }),
       _useState2 = _slicedToArray(_useState, 2),
@@ -115,14 +108,26 @@ var LikeRanking = function LikeRanking() {
     var obj = _objectSpread({}, parmas);
 
     obj[key] = value;
+
+    switch (key) {
+      case "depIds":
+        obj["groupIds"] = "";
+        break;
+
+      case "groupIds":
+        obj["depIds"] = "";
+        break;
+    }
+
+    setPageNum(1);
     setParmas(obj);
   };
 
   (0, _react.useEffect)(function () {
     setIsloading(true);
     (0, _requestApi.getRanking)({
-      ToDepIds: parmas["departmets"]["depIds"] || "",
-      ToGroupIds: parmas["departmets"]["groupIds"] || "",
+      ToDepIds: parmas["depIds"] || "",
+      ToGroupIds: parmas["groupIds"] || "",
       CreateDate: parmas["date"] ? parmas["date"]["createDate"] || "" : "",
       EndDate: parmas["date"] ? parmas["date"]["endDate"] || "" : "",
       ObjectType: parmas["ObjectType"] || "",
@@ -227,10 +232,12 @@ var LikeRanking = function LikeRanking() {
     className: "".concat(preCls, "__btns-left")
   }, /*#__PURE__*/_react["default"].createElement(_filterButtons["default"], {
     setParma: setParma,
-    parmas: parmas
+    parmas: parmas,
+    setType: setType
   }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__content")
   }, TabBar(), renderEmpty(), isLoadingPage(), !isLoading && /*#__PURE__*/_react["default"].createElement(_table["default"], {
+    tableLayout: "fixed",
     columns: (0, _column.columns)(),
     tableData: pariseInfos,
     total: total,

package/lib/utils/format-time.js

@@ -90,9 +90,10 @@ var getNextDayOfYear = function getNextDayOfYear() {
 exports.getNextDayOfYear = getNextDayOfYear;
 
 var showWeekFirstDay = function showWeekFirstDay() {
-  var Nowdate = new Date(); // @ts-ignore
+  var Nowdate = new Date();
+  var weekDay = Nowdate.getDay() || 7; // @ts-ignore
 
-  var WeekFirstDay = new Date(Nowdate - (Nowdate.getDay() - 1) * 86400000);
+  var WeekFirstDay = new Date(Nowdate - (weekDay - 1) * 86400000);
   var M = Number(WeekFirstDay.getMonth()) + 1;
   return WeekFirstDay.getFullYear() + "-" + M + "-" + WeekFirstDay.getDate();
 }; // 本周最后一天
@@ -101,9 +102,10 @@ var showWeekFirstDay = function showWeekFirstDay() {
 exports.showWeekFirstDay = showWeekFirstDay;
 
 var showWeekLastDay = function showWeekLastDay() {
-  var Nowdate = new Date(); // @ts-ignore
+  var Nowdate = new Date();
+  var weekDay = Nowdate.getDay() || 7; // @ts-ignore
 
-  var WeekFirstDay = new Date(Nowdate - (Nowdate.getDay() - 1) * 86400000); // @ts-ignore
+  var WeekFirstDay = new Date(Nowdate - (weekDay - 1) * 86400000); // @ts-ignore
 
   var WeekLastDay = new Date((WeekFirstDay / 1000 + 6 * 86400) * 1000);
   var M = Number(WeekLastDay.getMonth()) + 1;
@@ -114,9 +116,10 @@ var showWeekLastDay = function showWeekLastDay() {
 exports.showWeekLastDay = showWeekLastDay;
 
 var showNextWeekFirstDay = function showNextWeekFirstDay() {
-  var Nowdate = new Date(); // @ts-ignore
+  var Nowdate = new Date();
+  var weekDay = Nowdate.getDay() || 7; // @ts-ignore
 
-  var WeekFirstDay = new Date(Nowdate - (Nowdate.getDay() - 1) * 86400000); // @ts-ignore
+  var WeekFirstDay = new Date(Nowdate - (weekDay - 1) * 86400000); // @ts-ignore
 
   var WeekLastDay = new Date((WeekFirstDay / 1000 + 7 * 86400) * 1000);
   var M = Number(WeekLastDay.getMonth()) + 1;

package/package.json

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