@titaui/pc 1.12.22-beta.14 → 1.12.22-beta.15

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/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/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/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,7 +118,7 @@ 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),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.22-beta.14",
+  "version": "1.12.22-beta.15",
   "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",