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

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

@@ -45,6 +45,12 @@ 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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 _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."); }
@@ -96,37 +102,51 @@ var getRemarkTypeList = function getRemarkTypeList() {
 };
 
 var EvaluteCard = function EvaluteCard(props) {
+  var _user$avatar;
+
   var evaluation = props.evaluation,
       feedId = props.feedId,
       publishUser = props.publishUser,
       canEvaluate = props.canEvaluate;
-  var value = evaluation.value,
-      type = evaluation.type,
-      remark = evaluation.remark,
-      user = evaluation.user;
 
-  var _useState = (0, _react.useState)({
-    bgc: "rgba(240, 163, 38, 0.12)"
-  }),
+  var _useState = (0, _react.useState)(evaluation),
       _useState2 = _slicedToArray(_useState, 2),
-      evaluateContentBgc = _useState2[0],
-      setEvaluateContentBgc = _useState2[1];
+      currentEvalute = _useState2[0],
+      setCurrentEvalute = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(false),
+  var value = currentEvalute.value,
+      type = currentEvalute.type,
+      remark = currentEvalute.remark,
+      user = currentEvalute.user;
+
+  var _useState3 = (0, _react.useState)({
+    bgc: "rgba(240, 163, 38, 0.12)"
+  }),
       _useState4 = _slicedToArray(_useState3, 2),
-      evaluateVisible = _useState4[0],
-      setEvaluateVisible = _useState4[1];
+      evaluateContentBgc = _useState4[0],
+      setEvaluateContentBgc = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(false),
+      _useState6 = _slicedToArray(_useState5, 2),
+      evaluateVisible = _useState6[0],
+      setEvaluateVisible = _useState6[1];
 
   var handleClickEvaluate = function handleClickEvaluate() {
     setEvaluateVisible(true);
   };
 
-  var handleCloseEvaluateDialog = function handleCloseEvaluateDialog() {
+  var handleCloseEvaluateDialog = function handleCloseEvaluateDialog(params) {
+    if (params) {
+      setCurrentEvalute(_objectSpread(_objectSpread({}, currentEvalute), params));
+    }
+
     setEvaluateVisible(false);
   };
 
   (0, _react.useEffect)(function () {
     if (evaluation) {
+      setCurrentEvalute(evaluation);
+
       if (type === 1) {
         setEvaluateContentBgc({
           bgc: "rgba(240, 163, 38, 0.12)"
@@ -151,16 +171,15 @@ var EvaluteCard = function EvaluteCard(props) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__head")
   }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
-    name: user.name,
-    userId: user.userId,
-    src: user.avatar.medium,
-    color: user.avatar.color
+    name: (user === null || user === void 0 ? void 0 : user.name) || "",
+    userId: (user === null || user === void 0 ? void 0 : user.userId) || "",
+    src: (user === null || user === void 0 ? void 0 : (_user$avatar = user.avatar) === null || _user$avatar === void 0 ? void 0 : _user$avatar.medium) || "",
+    color: (user === null || user === void 0 ? void 0 : user.avatar.color) || ""
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(preCls, "__head-name")
-  }, user.name), (0, _getLocale.getLocale)("Rep_NewS_EvaluationOF"), type === 1 && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_rate["default"], {
+  }, user === null || user === void 0 ? void 0 : user.name), (0, _getLocale.getLocale)("Rep_NewS_EvaluationOF"), type === 1 && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_rate["default"], {
     defaultValue: Number(value) / 2,
-    disabled: true,
-    allowHalf: true
+    disabled: true
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(preCls, "__head-rate")
   }, "".concat(value).concat((0, _getLocale.getLocale)("Per_Set_Form_Quantifier_Points")))), type === 2 && getRemarkTypeList().map(function (item) {
@@ -184,7 +203,8 @@ var EvaluteCard = function EvaluteCard(props) {
       alt: ""
     });
   }), canEvaluate && /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(preCls, "__evalute")
+    className: "".concat(preCls, "__evalute"),
+    onClick: handleClickEvaluate
   }, type === 1 && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("img", {
     src: _veryGoodWrite["default"],
     className: "".concat(preCls, "__evalute-img"),
@@ -201,8 +221,7 @@ var EvaluteCard = function EvaluteCard(props) {
       className: "".concat(preCls, "__evalute-text"),
       style: {
         color: item.textColor
-      },
-      onClick: handleClickEvaluate
+      }
     }, "\u4FEE\u6539"));
   })), /*#__PURE__*/_react["default"].createElement(_commentsDialog["default"], {
     visible: evaluateVisible,

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

@@ -11,7 +11,7 @@
 }
 
 .titaui-dynamic-new-report-item__content {
-  margin-left: 88px;
+  margin-left: 82px;
   line-height: 24px;
   word-wrap: break-word;
 }

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

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _richEditor = _interopRequireWildcard(require("@titaui/rich-editor"));
+
 var _context = require("../../context");
 
 var _summaryHeader = _interopRequireDefault(require("../components/summary-header"));
@@ -29,17 +31,15 @@ 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");
 
-require("./index.css");
-
 var _util = require("./util");
 
-var _excluded = ["data", "showCollect"];
+require("./index.css");
+
+var _excluded = ["data"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -80,7 +80,6 @@ var prefix = "titaui-dynamic-new-report-item";
 
 var DynamicReply = function DynamicReply(_ref) {
   var data = _ref.data,
-      showCollect = _ref.showCollect,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
   var feedId = data.feedId,
@@ -99,37 +98,17 @@ var DynamicReply = function DynamicReply(_ref) {
       mindImg = _useState2[0],
       setMindImg = _useState2[1];
 
-  var _useState3 = (0, _react.useState)({}),
-      _useState4 = _slicedToArray(_useState3, 2),
-      okrTableData = _useState4[0],
-      setOkrtableData = _useState4[1];
-
-  var _useState5 = (0, _react.useState)({}),
-      _useState6 = _slicedToArray(_useState5, 2),
-      taskTableData = _useState6[0],
-      setTasktableData = _useState6[1];
-
-  var _useState7 = (0, _react.useState)(""),
-      _useState8 = _slicedToArray(_useState7, 2),
-      okrTableTitle = _useState8[0],
-      setOkrtableTitle = _useState8[1];
-
-  var _useState9 = (0, _react.useState)(""),
-      _useState10 = _slicedToArray(_useState9, 2),
-      taskTableTitle = _useState10[0],
-      setTasktableTitle = _useState10[1];
-
-  var _useState11 = (0, _react.useState)(),
-      _useState12 = _slicedToArray(_useState11, 2),
-      richTextData = _useState12[0],
-      setRichTextData = _useState12[1];
-
   var contentRichTextRef = (0, _react.useRef)();
   var workPlanRichTextRef = (0, _react.useRef)();
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
 
+  var _useState3 = (0, _react.useState)(evaluates || []),
+      _useState4 = _slicedToArray(_useState3, 2),
+      currentEvalutes = _useState4[0],
+      setCurrentEvalutes = _useState4[1];
+
   var renderSuffix = (0, _react.useMemo)(function () {
     var _classNames, _classNames2;
 
@@ -149,6 +128,9 @@ var DynamicReply = function DynamicReply(_ref) {
       className: "".concat(prefix, "__operate-desc")
     }, reportTextMap[reportType]);
   }, []);
+  (0, _react.useEffect)(function () {
+    setCurrentEvalutes(evaluates);
+  }, [evaluates]);
   (0, _react.useEffect)(function () {
     (0, _tools.highLightWord)({
       parentDom: contentRichTextRef.current,
@@ -161,26 +143,11 @@ var DynamicReply = function DynamicReply(_ref) {
   }, [data, searchKeyWord]);
   (0, _react.useEffect)(function () {
     if (dailyContent) {
-      var _dailyContent$filter$, _dailyContent$filter$2, _dailyContent$filter$3, _dailyContent$filter$4, _mindData$, _mindData$2;
+      var _mindData$, _mindData$2;
 
       var mindData = dailyContent.filter(function (item) {
         return (item === null || item === void 0 ? void 0 : item.contentType) === 1;
       });
-      setOkrtableData(((_dailyContent$filter$ = dailyContent.filter(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.contentType) === 2;
-      })[0]) === null || _dailyContent$filter$ === void 0 ? void 0 : _dailyContent$filter$.content) || null);
-      setOkrtableTitle((_dailyContent$filter$2 = dailyContent.filter(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.contentType) === 2;
-      })[0]) === null || _dailyContent$filter$2 === void 0 ? void 0 : _dailyContent$filter$2.title);
-      setTasktableData(((_dailyContent$filter$3 = dailyContent.filter(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.contentType) === 3;
-      })[0]) === null || _dailyContent$filter$3 === void 0 ? void 0 : _dailyContent$filter$3.content) || null);
-      setTasktableTitle((_dailyContent$filter$4 = dailyContent.filter(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.contentType) === 3;
-      })[0]) === null || _dailyContent$filter$4 === void 0 ? void 0 : _dailyContent$filter$4.title);
-      setRichTextData(dailyContent.filter(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.contentType) === _constant.dailyContentType.richText;
-      }));
 
       if (typeof ((_mindData$ = mindData[0]) === null || _mindData$ === void 0 ? void 0 : _mindData$.content) === "string" && ((_mindData$2 = mindData[0]) === null || _mindData$2 === void 0 ? void 0 : _mindData$2.content) !== "") {
         setMindImg(_constant.Motion.filter(function (item) {
@@ -198,8 +165,8 @@ var DynamicReply = function DynamicReply(_ref) {
     user: publishUser,
     suffixContent: renderSuffix,
     showDelete: true,
-    showCollect: showCollect,
-    canEvaluate: canEvaluate && evaluates.length === 0
+    canEvaluate: canEvaluate && !currentEvalutes,
+    setEvaluates: setCurrentEvalutes
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -214,30 +181,40 @@ var DynamicReply = function DynamicReply(_ref) {
     src: mindImg,
     className: "".concat(prefix, "__content-mind"),
     alt: ""
-  })), (richTextData === null || richTextData === void 0 ? void 0 : richTextData.length) !== 0 && (richTextData === null || richTextData === void 0 ? void 0 : richTextData.map(function (item) {
-    return item.richContent !== "" && typeof item.richContent === "string" && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "".concat(prefix, "__work")
-    }, item.title, /*#__PURE__*/_react["default"].createElement(_richEditor["default"].Editor, {
-      defaultState: JSON.parse(item.richContent),
-      editable: false
-    }));
-  })), okrTableData && /*#__PURE__*/_react["default"].createElement(_okrProgress["default"], {
-    data: okrTableData,
-    title: okrTableTitle
-  }), taskTableData && /*#__PURE__*/_react["default"].createElement(_taskProgress["default"], {
-    data: taskTableData,
-    title: taskTableTitle
+  })), dailyContent.map(function (item) {
+    if (item.contentType === _constant.dailyContentType.richText) {
+      return item.richContent !== "" && typeof item.richContent === "string" && /*#__PURE__*/_react["default"].createElement("div", {
+        className: "".concat(prefix, "__work")
+      }, item.title, /*#__PURE__*/_react["default"].createElement(_richEditor["default"], null, /*#__PURE__*/_react["default"].createElement(_richEditor.EditorComponent, {
+        editable: false,
+        initialState: JSON.parse(item.richContent)
+      })));
+    }
+
+    if (item.contentType === _constant.dailyContentType.okr) {
+      return item.content && /*#__PURE__*/_react["default"].createElement(_okrProgress["default"], {
+        data: item.content,
+        title: item.title
+      });
+    }
+
+    if (item.contentType === _constant.dailyContentType.task) {
+      return item.content && /*#__PURE__*/_react["default"].createElement(_taskProgress["default"], {
+        data: item.content,
+        title: item.title
+      });
+    }
   }), files.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__upload")
   }, /*#__PURE__*/_react["default"].createElement(_richEditorUpload["default"], {
-    text: "\u9644\u4EF6",
+    text: (0, _getLocale.getLocale)("Per_Ass_New_Err_Attachment"),
     files: files,
     editable: false,
     enableDelete: false
   })), /*#__PURE__*/_react["default"].createElement(_remindUserView["default"], {
     data: atUsers
-  }), evaluates.length !== 0 && /*#__PURE__*/_react["default"].createElement(_evalute["default"], {
-    evaluation: evaluates[0],
+  }), currentEvalutes && currentEvalutes.length !== 0 && /*#__PURE__*/_react["default"].createElement(_evalute["default"], {
+    evaluation: currentEvalutes[0],
     feedId: feedId,
     publishUser: publishUser,
     canEvaluate: canEvaluate

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

@@ -77,6 +77,8 @@ var _dynamicInterviewShare = _interopRequireDefault(require("./dynamic-interview
 
 var _dynamicNewReport = _interopRequireDefault(require("./dynamic-new-report"));
 
+var _excluded = ["data", "onDeleteFeed", "dynamicShareIsShowToping"];
+
 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); }
@@ -89,6 +91,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 _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 _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."); }
@@ -109,7 +113,11 @@ 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';
+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; }
+
+var prefix = "titaui-dynamic-item";
 
 var DynamicItem = function DynamicItem(_ref) {
   var _getBSGlobal, _JSON$parse;
@@ -117,7 +125,8 @@ var DynamicItem = function DynamicItem(_ref) {
   var data = _ref.data,
       onDeleteFeed = _ref.onDeleteFeed,
       dynamicShareIsShowToping = _ref.dynamicShareIsShowToping,
-      showCollect = _ref.showCollect;
+      restProps = _objectWithoutProperties(_ref, _excluded);
+
   var feedId = data.feedId,
       feedComments = data.feedComments,
       praiseType = data.praiseType,
@@ -164,8 +173,8 @@ var DynamicItem = function DynamicItem(_ref) {
       isShowAtAll = _useContext.isShowAtAll;
 
   var hasDynamicOpereateAuth = new _auth.DynamicManagerAuth().hasAuth();
-  var hasRewardBtn = !!((_getBSGlobal = (0, _bsGlobal.getBSGlobal)('WebHead')) !== null && _getBSGlobal !== void 0 && _getBSGlobal.AppHead.find(function (item) {
-    return item.AppId === '950';
+  var hasRewardBtn = !!((_getBSGlobal = (0, _bsGlobal.getBSGlobal)("WebHead")) !== null && _getBSGlobal !== void 0 && _getBSGlobal.AppHead.find(function (item) {
+    return item.AppId === "950";
   }));
   var isBiShare = data.shareType === _constant.EShareType.BiShare && data.biId;
 
@@ -185,10 +194,10 @@ var DynamicItem = function DynamicItem(_ref) {
 
   var handleShowMore = function handleShowMore() {
     if (data.feedType === _constant.EFeedType.Report && window.titaTracker) {
-      window.titaTracker('planAction').record({
-        actionName: '查看日报',
-        actionGroup: '动态-查看更多',
-        productName: '动态',
+      window.titaTracker("planAction").record({
+        actionName: "查看日报",
+        actionGroup: "动态-查看更多",
+        productName: "动态",
         feedId: feedId
       });
     }
@@ -197,18 +206,18 @@ var DynamicItem = function DynamicItem(_ref) {
   };
 
   var onChangeParse = function onChangeParse(type) {
-    var _getBSGlobal2 = (0, _bsGlobal.getBSGlobal)('loginUserInfo'),
+    var _getBSGlobal2 = (0, _bsGlobal.getBSGlobal)("loginUserInfo"),
         Id = _getBSGlobal2.Id;
 
     var data = _toConsumableArray(praiseData).filter(function (item) {
       return Number("".concat(item.userId)) !== Number("".concat(Id));
     });
 
-    var actionName = '';
+    var actionName = "";
 
     if (type) {
-      var avatar = (0, _bsGlobal.getBSGlobal)('loginUserInfo').UserAvatar;
-      var name = (0, _bsGlobal.getBSGlobal)('loginUserInfo').Name;
+      var avatar = (0, _bsGlobal.getBSGlobal)("loginUserInfo").UserAvatar;
+      var name = (0, _bsGlobal.getBSGlobal)("loginUserInfo").Name;
       avatar.color = avatar.Color;
       avatar.medium = avatar.Medium;
       var parseUser = {
@@ -218,17 +227,17 @@ var DynamicItem = function DynamicItem(_ref) {
         praiseType: type
       };
       setPraiseData([parseUser].concat(_toConsumableArray(data)));
-      actionName = '点赞日报';
+      actionName = "点赞日报";
     } else {
       setPraiseData(data);
-      actionName = '取消日报点赞';
+      actionName = "取消日报点赞";
     }
 
     if (feedType === _constant.EFeedType.Report && window.titaTracker) {
-      window.titaTracker('planAction').record({
+      window.titaTracker("planAction").record({
         actionName: actionName,
-        actionGroup: '动态-日报',
-        productName: '动态',
+        actionGroup: "动态-日报",
+        productName: "动态",
         feedId: feedId
       });
     }
@@ -279,21 +288,18 @@ var DynamicItem = function DynamicItem(_ref) {
         });
 
       case _constant.EFeedType.Report:
-        var newSummary = data.newSummary;
-
-        if (newSummary) {
-          return /*#__PURE__*/_react["default"].createElement(_dynamicNewReport["default"], {
-            data: data,
-            onDeleteFeed: onDeleteFeed,
-            showCollect: showCollect
-          });
-        } else {
-          return /*#__PURE__*/_react["default"].createElement(_dynamicReport["default"], {
+        if (data.newSummary) {
+          return /*#__PURE__*/_react["default"].createElement(_dynamicNewReport["default"], _extends({
             data: data,
             onDeleteFeed: onDeleteFeed
-          });
+          }, restProps));
         }
 
+        return /*#__PURE__*/_react["default"].createElement(_dynamicReport["default"], {
+          data: data,
+          onDeleteFeed: onDeleteFeed
+        });
+
       case _constant.EFeedType.Reply:
         return /*#__PURE__*/_react["default"].createElement(_dynamicReply["default"], {
           data: data,
@@ -375,7 +381,7 @@ var DynamicItem = function DynamicItem(_ref) {
 
   var renderUpvoteCount = function renderUpvoteCount(type, count) {
     if (count === 0) {
-      return '';
+      return "";
     }
 
     return count || type;
@@ -393,10 +399,10 @@ var DynamicItem = function DynamicItem(_ref) {
 
     if (window.util) {
       if (feedType === _constant.EFeedType.Report && window.titaTracker) {
-        window.titaTracker('planAction').record({
-          actionName: '打开打赏弹层',
-          actionGroup: '动态-日报',
-          productName: '动态',
+        window.titaTracker("planAction").record({
+          actionName: "打开打赏弹层",
+          actionGroup: "动态-日报",
+          productName: "动态",
           feedId: feedId
         });
       }
@@ -410,13 +416,13 @@ var DynamicItem = function DynamicItem(_ref) {
   var handleReply = function handleReply(_ref2) {
     var submitType = _ref2.submitType;
     if (feedType !== _constant.EFeedType.Report) return;
-    var actionName = submitType === 'delete' ? '删除日报评论' : '评论日报';
+    var actionName = submitType === "delete" ? "删除日报评论" : "评论日报";
 
     if (window.titaTracker) {
-      window.titaTracker('planAction').record({
+      window.titaTracker("planAction").record({
         actionName: actionName,
-        actionGroup: '动态-日报',
-        productName: '动态',
+        actionGroup: "动态-日报",
+        productName: "动态",
         feedId: feedId
       });
     }
@@ -444,15 +450,15 @@ var DynamicItem = function DynamicItem(_ref) {
     className: "".concat(prefix, "__content"),
     ref: dynamicContentRef,
     style: {
-      height: contentIsOverflow && isFold ? '288px' : 'auto'
+      height: contentIsOverflow && isFold ? "288px" : "auto"
     }
   }, renderContent, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: contentIsOverflow && isFold
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content-show-more"),
     onClick: handleShowMore
-  }, (0, _getLocale.getLocale)('Tasks_Tab_MyS_Butt_Seemoral'), /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])('tu-icon-arrow-down', "".concat(prefix, "__icon"))
+  }, (0, _getLocale.getLocale)("Tasks_Tab_MyS_Butt_Seemoral"), /*#__PURE__*/_react["default"].createElement("i", {
+    className: (0, _classnames["default"])("tu-icon-arrow-down", "".concat(prefix, "__icon"))
   })))), feedOperations.total > 0 && /*#__PURE__*/_react["default"].createElement(_feedOperate["default"], {
     feedOperations: feedOperations,
     data: data
@@ -490,12 +496,12 @@ var DynamicItem = function DynamicItem(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__footer-fold"),
     onClick: handleFold
-  }, (0, _getLocale.getLocale)('Mod_Fold'), /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])('tu-icon-arrow-down', "".concat(prefix, "__icon"), "".concat(prefix, "__icon-up"))
+  }, (0, _getLocale.getLocale)("Mod_Fold"), /*#__PURE__*/_react["default"].createElement("i", {
+    className: (0, _classnames["default"])("tu-icon-arrow-down", "".concat(prefix, "__icon"), "".concat(prefix, "__icon-up"))
   }))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: hasRewardBtn
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-    overlay: (0, _getLocale.getLocale)('Feed_Approval'),
+    overlay: (0, _getLocale.getLocale)("Feed_Approval"),
     align: {
       offset: [0, 0]
     },
@@ -505,7 +511,7 @@ var DynamicItem = function DynamicItem(_ref) {
     className: (0, _classnames["default"])("".concat(prefix, "__footer-icon"), "".concat(prefix, "__footer-icon-redenvelopes"))
   }))), /*#__PURE__*/_react["default"].createElement("span", {
     onClick: handleCommentClick,
-    className: (0, _classnames["default"])('tu-icon-pinglun-m', "".concat(prefix, "__footer-icon"))
+    className: (0, _classnames["default"])("tu-icon-pinglun-m", "".concat(prefix, "__footer-icon"))
   }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: feedComments.total > 0
   }, /*#__PURE__*/_react["default"].createElement("span", {

package/lib/components/import-modal/import-okr-modal/index.js

@@ -78,9 +78,10 @@ function ImportOKRModal(props) {
       return;
     }
 
-    onOk && onOk(selected);
     setSelected([]);
+    selectedRef.current = [];
     onCancelHandler();
+    onOk && onOk(selected);
   };
 
   var onCancelHandler = function onCancelHandler() {

package/lib/components/import-modal/import-task-modal/search-form.js

@@ -70,13 +70,15 @@ function SearchForm(props) {
       keyWords = _useState6[0],
       setKeyWords = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(0),
+  var _useState7 = (0, _react.useState)(1),
       _useState8 = _slicedToArray(_useState7, 2),
       relation = _useState8[0],
       setRelation = _useState8[1];
 
   var dilagRef = (0, _react.useRef)(document.createElement('div'));
+  var isInitRef = (0, _react.useRef)(true);
   (0, _react.useEffect)(function () {
+    if (isInitRef.current) return;
     onChange(_objectSpread({
       status: status,
       keyWords: keyWords,
@@ -85,6 +87,7 @@ function SearchForm(props) {
   }, [status, keyWords, cycle, relation]);
   (0, _react.useEffect)(function () {
     if (time) {
+      isInitRef.current = false;
       var cycleDate = (0, _helper.getCycleDate)(time);
       setCycle({
         annualNum: Number(time.split('/')[0]),

package/lib/components/import-modal/request-api.js

@@ -142,7 +142,7 @@ var planTableTask = function planTableTask(params, pageNum, pageSize) {
   }
 
   if (!relation) {
-    relation = '1,2,3';
+    relation = '1,2';
   }
 
   return (0, _request.rpost)('v2')(url, {

package/lib/components/import-modal/search/task-relation.js

@@ -37,14 +37,18 @@ function Relation(props) {
   var onChange = props.onChange,
       initValue = props.initValue;
 
-  var _useState = (0, _react.useState)((0, _getLocale.getLocale)("Pro_page_Plan_FullRange")),
+  var _useState = (0, _react.useState)((0, _getLocale.getLocale)('OKR_Menu_Title03_Owned')),
       _useState2 = _slicedToArray(_useState, 2),
       selectText = _useState2[0],
       setSelectText = _useState2[1];
 
   (0, _react.useEffect)(function () {
     if (initValue === 0) {
-      setSelectText((0, _getLocale.getLocale)("Pro_page_Plan_FullRange"));
+      setSelectText((0, _getLocale.getLocale)('Pro_page_Plan_FullRange'));
+    } else if (initValue === 1) {
+      setSelectText((0, _getLocale.getLocale)('OKR_Menu_Title03_Owned'));
+    } else if (initValue === 2) {
+      setSelectText((0, _getLocale.getLocale)('OKR_Menu_Title_Collaborator'));
     }
   }, [initValue]);
 
@@ -54,13 +58,13 @@ function Relation(props) {
   };
 
   var selectOptions = [{
-    label: (0, _getLocale.getLocale)("Pro_page_Plan_FullRange"),
+    label: (0, _getLocale.getLocale)('Pro_page_Plan_FullRange'),
     value: 0
   }, {
-    label: (0, _getLocale.getLocale)("OKR_Menu_Title03_Owned"),
+    label: (0, _getLocale.getLocale)('OKR_Menu_Title03_Owned'),
     value: 1
   }, {
-    label: (0, _getLocale.getLocale)("OKR_Menu_Title_Collaborator"),
+    label: (0, _getLocale.getLocale)('OKR_Menu_Title_Collaborator'),
     value: 2
   }];
   return /*#__PURE__*/_react["default"].createElement(_selectLayer["default"], {