@titaui/pc 1.12.22-beta.5 → 1.12.22-beta.8

package/lib/components/attachments-preview/index.js

@@ -49,7 +49,9 @@ var AttachmentsPreview = function AttachmentsPreview(props) {
       case 'delete':
         {
           onChange(attachments.filter(function (f) {
-            return f.Id != attachments[index].Id;
+            var _attachments$index;
+
+            return f.Id !== attachments[index].Id || (f === null || f === void 0 ? void 0 : f.DocumentId) !== ((_attachments$index = attachments[index]) === null || _attachments$index === void 0 ? void 0 : _attachments$index.DocumentId);
           }));
           break;
         }
@@ -64,9 +66,9 @@ var AttachmentsPreview = function AttachmentsPreview(props) {
             });
             previewRef.current.show(i);
           } else {
-            var _attachments$index, _attachments$index2;
+            var _attachments$index2, _attachments$index3;
 
-            window.open(((_attachments$index = attachments[index]) === null || _attachments$index === void 0 ? void 0 : _attachments$index.ClientUrl) || ((_attachments$index2 = attachments[index]) === null || _attachments$index2 === void 0 ? void 0 : _attachments$index2.PreviewUrl));
+            window.open(((_attachments$index2 = attachments[index]) === null || _attachments$index2 === void 0 ? void 0 : _attachments$index2.ClientUrl) || ((_attachments$index3 = attachments[index]) === null || _attachments$index3 === void 0 ? void 0 : _attachments$index3.PreviewUrl));
           }
 
           break;

package/lib/components/dynamic/components/comments-dialog/index.js

@@ -115,7 +115,11 @@ var RemindDialog = function RemindDialog(props) {
     };
     (0, _api.setSummaryEvaluate)(params).then(function (res) {
       if (res.Code === 1) {
-        closeDialog();
+        closeDialog({
+          remark: remark,
+          type: Number(evaluateType),
+          value: value
+        });
 
         _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
       }
@@ -123,7 +127,7 @@ var RemindDialog = function RemindDialog(props) {
   };
 
   (0, _react.useEffect)(function () {
-    if (!isUpdated) {
+    if (!isUpdated && visible) {
       var params = {
         objectId: feedId,
         objectType: "8",
@@ -145,21 +149,23 @@ var RemindDialog = function RemindDialog(props) {
         }
       });
     }
+  }, [visible]);
+  var onCloseHandler = (0, _react.useCallback)(function () {
+    closeDialog();
   }, []);
   return /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
-    visible: visible // visible={true}
-    ,
+    visible: visible,
     style: {
       width: 538
     },
-    onCancel: closeDialog,
+    onCancel: onCloseHandler,
     onOk: handleSubmit,
     noFooterLine: true,
     noHeadLine: true,
     title: /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("p", null, (0, _getLocale.getLocale)("Rep_NewS_Evaluation")), /*#__PURE__*/_react["default"].createElement("span", {
       className: "titleDesc"
     }, (0, _getLocale.getLocale)("Rep_NewS_ComhenRatin"))),
-    onClose: closeDialog
+    onClose: onCloseHandler
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(precls, "-content")
   }, /*#__PURE__*/_react["default"].createElement(_form["default"], null, /*#__PURE__*/_react["default"].createElement(_regulationSettingItem["default"], {

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

@@ -13,8 +13,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _avatar = _interopRequireDefault(require("../../../../avatar"));
 
-var _dropSelector = _interopRequireWildcard(require("../../../../drop-selector"));
-
 var _requestApi = require("../../../request-api");
 
 var _dialogConfirm = _interopRequireWildcard(require("../../../../dialog-confirm"));
@@ -23,8 +21,6 @@ var _toast = _interopRequireDefault(require("../../../../toast"));
 
 var _openData = require("../../../../../utils/open-data");
 
-var _conditionRender = _interopRequireDefault(require("../../../../condition-render"));
-
 var _tooltip = _interopRequireDefault(require("../../../../tooltip"));
 
 var _constant = require("../../../constant");
@@ -265,43 +261,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       name: user.name,
       id: user.userId
     })
-  })), desc, suffixContent), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__more-operate")
-  }, /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
-    popupPlacement: "bottomRight",
-    checked: ["collect"],
-    onChange: onChangeHandler,
-    multi: false,
-    visible: selectVisible,
-    trigger: /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(prefix, "-right"), "tu-icon-more1"),
-      onClick: handleShowDropSelector
-    })
-  }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
-    name: "collect"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__more-operate-selection")
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("tu-icon-APP-shoucang", "".concat(prefix, "__more-operate-selection-icon"))
-  }), nowIsCollect ? (0, _getLocale.getLocale)("Mod_CancCollection") : (0, _getLocale.getLocale)("Mod_Collection"))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
-    condition: showTopping
-  }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
-    name: "top",
-    onClick: handleTopOperateClick
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__more-operate-selection")
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("tu-icon-zhiding", "".concat(prefix, "__more-operate-selection-icon"))
-  }), nowIsTop ? (0, _getLocale.getLocale)("OKR_MyO_Unpinned") : (0, _getLocale.getLocale)("Feed_Top")))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
-    condition: showDelete
-  }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
-    name: "delete",
-    onClick: handleDeleteClick
-  }, /*#__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", {
+  })), desc, suffixContent)), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "-desc-time")
   }, createDate))), renderDialogConfirm);
 };

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

@@ -1,5 +1,7 @@
 "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
 });
@@ -31,8 +33,6 @@ 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 _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); }
-
 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."); }
@@ -59,17 +59,6 @@ var OkrProgress = function OkrProgress(_ref) {
       rowsData = _useState2[0],
       setRowsData = _useState2[1];
 
-  var renderTitle = (0, _react.useMemo)(function () {
-    if (type === 'day') {
-      return (0, _getLocale.getLocale)('Rep_NewS_ToOKRpro');
-    } else if (type === 'week') {
-      return (0, _getLocale.getLocale)('Rep_NewS_ThisOKRprogr');
-    } else if (type === 'month') {
-      return (0, _getLocale.getLocale)('Rep_NewS_TmonOKRpro');
-    }
-
-    return '';
-  }, [type]);
   var renderTable = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react["default"].createElement("table", null, /*#__PURE__*/_react["default"].createElement("thead", null, /*#__PURE__*/_react["default"].createElement("tr", {
       className: "".concat(prefix, "__table-title")
@@ -134,7 +123,7 @@ var OkrProgress = function OkrProgress(_ref) {
     })));
   }, [rowsData]);
   (0, _react.useEffect)(function () {
-    if (_typeof(data) !== 'object' && data !== '') {
+    if (typeof data === 'string' && data !== '') {
       setRowsData(JSON.parse(data));
     }
   }, [data]);

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

@@ -41,14 +41,24 @@ var _evalute = _interopRequireDefault(require("./img/evalute.png"));
 
 require("./index.css");
 
+var _requestApi2 = require("./request-api");
+
 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 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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 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."); }
@@ -69,18 +79,20 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       _ref$showDelete = _ref.showDelete,
       showDelete = _ref$showDelete === void 0 ? false : _ref$showDelete,
       _ref$showEdit = _ref.showEdit,
-      showEdit = _ref$showEdit === void 0 ? true : _ref$showEdit,
+      showEdit = _ref$showEdit === void 0 ? false : _ref$showEdit,
       _ref$showCollect = _ref.showCollect,
-      showCollect = _ref$showCollect === void 0 ? false : _ref$showCollect,
+      showCollect = _ref$showCollect === void 0 ? true : _ref$showCollect,
       _ref$showOperateRecor = _ref.showOperateRecord,
-      showOperateRecord = _ref$showOperateRecor === void 0 ? true : _ref$showOperateRecor,
+      showOperateRecord = _ref$showOperateRecor === void 0 ? false : _ref$showOperateRecor,
       data = _ref.data,
       _ref$desc = _ref.desc,
       desc = _ref$desc === void 0 ? "" : _ref$desc,
       user = _ref.user,
       _ref$suffixContent = _ref.suffixContent,
       suffixContent = _ref$suffixContent === void 0 ? "" : _ref$suffixContent,
-      canEvaluate = _ref.canEvaluate;
+      canEvaluate = _ref.canEvaluate,
+      _ref$setEvaluates = _ref.setEvaluates,
+      setEvaluates = _ref$setEvaluates === void 0 ? function () {} : _ref$setEvaluates;
   var createDate = data.createDate,
       feedId = data.feedId,
       _data$isCollect = data.isCollect,
@@ -209,9 +221,43 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
     window.open("#/summary/template?isCreate=false&hideNavTop=true&reportType=".concat(reportType, "&currentTime=").concat(dailyDate), "_blank");
   };
 
-  var handleCloseEvaluateDialog = function handleCloseEvaluateDialog() {
-    setEvaluateVisible(false);
-  };
+  var handleCloseEvaluateDialog = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(params) {
+      var _user;
+
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!params) {
+                _context.next = 5;
+                break;
+              }
+
+              _context.next = 3;
+              return (0, _requestApi2.getUserById)(loginUserId);
+
+            case 3:
+              _user = _context.sent;
+              setEvaluates([_objectSpread(_objectSpread({}, params), {}, {
+                user: _user
+              })]);
+
+            case 5:
+              setEvaluateVisible(false);
+
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function handleCloseEvaluateDialog(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
 
   var renderDialogConfirm = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {

package/lib/components/dynamic/dynamic-item/components/summary-header/request-api.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getUserById = void 0;
+
+var _request = require("../../../../../utils/request");
+
+// @ts-ignore
+var getUserById = function getUserById(userId) {
+  return (0, _request.rget)("v2")("user/GetById?touserid=".concat(userId)).then(function (res) {
+    return res.Data;
+  });
+};
+
+exports.getUserById = getUserById;

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

@@ -131,6 +131,7 @@
   line-height: 22px;
   position: relative;
   overflow: hidden;
+  cursor: pointer;
 }
 
 .titaui-dynamic-summary-task-progress__statistic-item:last-child {
@@ -141,8 +142,17 @@
   background: rgba(0, 214, 133, 0.1);
 }
 
-.titaui-dynamic-summary-task-progress__statistic-item--finished::before {
-  content: '';
+.titaui-dynamic-summary-task-progress__statistic-item--finished-text {
+  color: #00d685;
+  font-size: 16px;
+}
+
+.titaui-dynamic-summary-task-progress__statistic-item--finished-active {
+  background: rgba(0, 214, 133, 0.3);
+}
+
+.titaui-dynamic-summary-task-progress__statistic-item--finished-active::before {
+  content: "";
   position: absolute;
   top: 0;
   left: 0;
@@ -152,50 +162,50 @@
   border-radius: 12px 0 0 12px;
 }
 
-.titaui-dynamic-summary-task-progress__statistic-item--finished-text {
-  color: #00D685;
-  font-size: 16px;
-}
-
 .titaui-dynamic-summary-task-progress__statistic-item--processing {
   background: rgba(40, 121, 255, 0.1);
 }
 
 .titaui-dynamic-summary-task-progress__statistic-item--processing-text {
-  color: #2879FF;
+  color: #2879ff;
   font-size: 16px;
 }
 
-.titaui-dynamic-summary-task-progress__statistic-item--overdue {
-  background: rgba(240, 94, 94, 0.1);
+.titaui-dynamic-summary-task-progress__statistic-item--processing-active {
+  background: rgba(40, 121, 255, 0.3);
 }
 
-.titaui-dynamic-summary-task-progress__statistic-item--overdue-text {
-  color: #F05E5E;
-  font-size: 16px;
+.titaui-dynamic-summary-task-progress__statistic-item--processing-active::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 4px;
+  height: 48px;
+  background: rgba(40, 121, 255, 0.3);
+  border-radius: 12px 0 0 12px;
 }
 
-.titaui-dynamic-summary-task-progress__import {
-  margin-top: 10px;
-  width: 60px;
-  height: 60px;
-  border-radius: 8px;
-  border: 1px solid #e9ecf0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
+.titaui-dynamic-summary-task-progress__statistic-item--overdue {
+  background: rgba(240, 94, 94, 0.1);
 }
 
-.titaui-dynamic-summary-task-progress__import-icon {
-  font-size: 24px;
-  color: #BFC7D5;
+.titaui-dynamic-summary-task-progress__statistic-item--overdue-text {
+  color: #f05e5e;
+  font-size: 16px;
 }
 
-.titaui-dynamic-summary-task-progress__import:hover {
-  cursor: pointer;
-  border: 1px solid #2879ff;
+.titaui-dynamic-summary-task-progress__statistic-item--overdue-active {
+  background: rgba(240, 94, 94, 0.3);
 }
 
-.titaui-dynamic-summary-task-progress__import:hover .tu-icon-add1 {
-  color: #2879ff;
+.titaui-dynamic-summary-task-progress__statistic-item--overdue-active::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 4px;
+  height: 48px;
+  background: rgba(240, 94, 94, 0.3);
+  border-radius: 12px 0 0 12px;
 }

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

@@ -61,23 +61,10 @@ var TaskProgress = function TaskProgress(_ref) {
       statusStatistic = _useState4[0],
       setStatusStatistic = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(false),
+  var _useState5 = (0, _react.useState)(1),
       _useState6 = _slicedToArray(_useState5, 2),
-      isMouseEnter = _useState6[0],
-      setIsMouseEnter = _useState6[1];
-
-  var _useState7 = (0, _react.useState)(1),
-      _useState8 = _slicedToArray(_useState7, 2),
-      activeId = _useState8[0],
-      setActiveId = _useState8[1];
-
-  var handleMouseEnter = function handleMouseEnter() {
-    setIsMouseEnter(true);
-  };
-
-  var handleMouseLeave = function handleMouseLeave() {
-    setIsMouseEnter(false);
-  };
+      activeId = _useState6[0],
+      setActiveId = _useState6[1];
 
   var handleFilterDone = function handleFilterDone() {
     setActiveId(1);
@@ -141,9 +128,7 @@ var TaskProgress = function TaskProgress(_ref) {
   }
 
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: prefix,
-    onMouseEnter: handleMouseEnter,
-    onMouseLeave: handleMouseLeave
+    className: prefix
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__title")
   }, title), statusStatistic.done + statusStatistic.doing + statusStatistic.overDue > 0 && /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -33,11 +33,11 @@ var formatTaskData = function formatTaskData(data) {
   };
   data.forEach(function (item) {
     if (item.Status === 2) {
-      result[1] = [item];
+      result[1].push(item);
     } else if (item.Status === 1) {
-      result[2] = [item];
+      result[2].push(item);
     } else if (item.Status === 3) {
-      result[3] = [item];
+      result[3].push(item);
     }
   });
   return result;

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,56 @@ 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)"
+    value: "",
+    type: 1,
+    remark: "",
+    user: null
   }),
       _useState2 = _slicedToArray(_useState, 2),
-      evaluateContentBgc = _useState2[0],
-      setEvaluateContentBgc = _useState2[1];
+      currentEvalute = _useState2[0],
+      setCurrentEvalute = _useState2[1];
+
+  var value = currentEvalute.value,
+      type = currentEvalute.type,
+      remark = currentEvalute.remark,
+      user = currentEvalute.user;
 
-  var _useState3 = (0, _react.useState)(false),
+  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,13 +176,13 @@ 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
@@ -184,7 +209,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 +227,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.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,16 +31,14 @@ 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");
 
+require("./index.css");
+
 var _excluded = ["data", "showCollect"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -99,37 +99,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 +129,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 +144,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) {
@@ -199,7 +167,8 @@ var DynamicReply = function DynamicReply(_ref) {
     suffixContent: renderSuffix,
     showDelete: true,
     showCollect: showCollect,
-    canEvaluate: canEvaluate && !evaluates
+    canEvaluate: canEvaluate && !currentEvalutes,
+    setEvaluates: setCurrentEvalutes
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -214,19 +183,29 @@ 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"], {
@@ -236,8 +215,8 @@ var DynamicReply = function DynamicReply(_ref) {
     enableDelete: false
   })), /*#__PURE__*/_react["default"].createElement(_remindUserView["default"], {
     data: atUsers
-  }), evaluates && 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/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/menus/export-modules/summary-menus/depart-menus/index.js

@@ -104,7 +104,6 @@ var _default = function _default() {
       var allDepartmentText = window.getLocale && window.getLocale(_i18n.locale.menu_alldeparment) || _i18n.locale.menu_alldeparment;
 
       (0, _requestApis.getDepsAndUsers)(-1, false).then(function (rawTreeData) {
-        var transNodes = (0, _helper.translateDepartsToTreeNode)(rawTreeData);
         var rootNode = {
           async: true,
           data: {
@@ -118,8 +117,8 @@ var _default = function _default() {
           nodeType: _index.DEPART_NODE,
           title: allDepartmentText
         };
-        setRawTreeData([rootNode].concat(_toConsumableArray(transNodes)));
-        setTreeData((0, _utils.toTree)([rootNode].concat(_toConsumableArray(transNodes))));
+        setRawTreeData([rootNode].concat(_toConsumableArray(rawTreeData)));
+        setTreeData((0, _utils.toTree)([rootNode].concat(_toConsumableArray(rawTreeData))));
         setLoading(false);
       });
     } else {

package/lib/components/upvote/index.js

@@ -88,7 +88,8 @@ function UpvoteButton(_ref) {
       _ref$buttonType = _ref.buttonType,
       buttonType = _ref$buttonType === void 0 ? "" : _ref$buttonType,
       _ref$customUpvoteBtnC = _ref.customUpvoteBtnCls,
-      customUpvoteBtnCls = _ref$customUpvoteBtnC === void 0 ? "" : _ref$customUpvoteBtnC;
+      customUpvoteBtnCls = _ref$customUpvoteBtnC === void 0 ? "" : _ref$customUpvoteBtnC,
+      getPopupContainer = _ref.getPopupContainer;
 
   var _useState = (0, _react.useState)({
     type: type,
@@ -127,8 +128,11 @@ function UpvoteButton(_ref) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "feed-upvote pull-screen-click-through pull-screen-ignore",
     style: style
-  }, /*#__PURE__*/_react["default"].createElement(_selector["default"] // visible={selectorVisible}
-  , {
+  }, /*#__PURE__*/_react["default"].createElement(_selector["default"], {
+    getPopupContainer: function getPopupContainer() {
+      return btnref.current;
+    } // visible={selectorVisible}
+    ,
     align: popAlign,
     onSelect: /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(type) {

package/lib/components/write-summary-modal/index.css

@@ -39,6 +39,7 @@
   justify-content: center;
   color: #ffffff;
   font-size: 14px;
+  font-weight: 600;
 }
 
 .tita-ui-write-summary-modal__content-item-title-name {

package/lib/components/write-summary-modal/index.js

@@ -17,7 +17,7 @@ var _requestApi = require("./request-api");
 
 require("./index.css");
 
-var _constants = require("./constants");
+var _utils = require("./utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -121,7 +121,8 @@ var WriteSummaryModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
     maskClosable: false
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix)
-  }, modalList.map(function (item, index) {
+  }, modalList.map(function (item) {
+    var randomColor = (0, _utils.getRandomColor)();
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__content-item"),
       onClick: function onClick() {
@@ -132,7 +133,7 @@ var WriteSummaryModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__content-item-title-avatar"),
       style: {
-        background: _constants.color[index].bg
+        background: randomColor.bg
       }
     }, item.name[0]), /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__content-item-title-name")
@@ -143,21 +144,21 @@ var WriteSummaryModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
     }, (0, _getLocale.getLocale)("Rep_Tab_Mys_Workprogre")), /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__content-item-desc-block"),
       style: {
-        background: _constants.color[index].contentBg
+        background: randomColor.contentBg
       }
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__content-item-desc-text")
     }, (0, _getLocale.getLocale)("Tasks_Tab_MyS_JobSummary")), /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__content-item-desc-block"),
       style: {
-        background: _constants.color[index].contentBg
+        background: randomColor.contentBg
       }
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__content-item-desc-text")
     }, (0, _getLocale.getLocale)("Rep_Tab_Mys_NextWorkPlans")), /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__content-item-desc-block"),
       style: {
-        background: _constants.color[index].contentBg
+        background: randomColor.contentBg
       }
     })));
   })));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.22-beta.5",
+  "version": "1.12.22-beta.8",
   "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.48",
+    "@titaui/rich-editor": "^0.1.50",
     "@titaui/toast": "1.0.0",
     "@types/color": "3.0.3",
     "@types/prosemirror-commands": "1.0.4",