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

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

@@ -64,7 +64,9 @@ var AttachmentsPreview = function AttachmentsPreview(props) {
             });
             previewRef.current.show(i);
           } else {
-            window.open(attachments[index].ClientUrl);
+            var _attachments$index, _attachments$index2;
+
+            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));
           }
 
           break;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EStatusStatus2ClassType = void 0;
+exports.EStatusStatus2ClassType = exports.EObjType = void 0;
 var EStatusStatus2ClassType = {
   2: "tu-icon-finished",
   1: "tu-icon-running",
@@ -13,4 +13,17 @@ var EStatusStatus2ClassType = {
   0: "tu-icon-notstart",
   5: "tu-icon-jiantou-right"
 };
-exports.EStatusStatus2ClassType = EStatusStatus2ClassType;
+exports.EStatusStatus2ClassType = EStatusStatus2ClassType;
+var EObjType;
+exports.EObjType = EObjType;
+
+(function (EObjType) {
+  EObjType[EObjType["Project"] = 4] = "Project";
+  EObjType[EObjType["Task"] = 7] = "Task";
+  EObjType[EObjType["O"] = 62] = "O";
+  EObjType[EObjType["Kr"] = 65] = "Kr";
+  EObjType[EObjType["Assess"] = 23] = "Assess";
+  EObjType[EObjType["MileStone"] = 27] = "MileStone";
+  EObjType[EObjType["KanBan"] = 66] = "KanBan";
+  EObjType[EObjType["Report"] = 8] = "Report";
+})(EObjType || (exports.EObjType = EObjType = {}));

package/lib/components/dynamic/dynamic-item/components/task-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
 });
@@ -11,15 +13,11 @@ var _tooltip = _interopRequireDefault(require("../../../../tooltip"));
 
 var _getLocale = require("../../../../../utils/getLocale");
 
-var _progress = _interopRequireDefault(require("../progress"));
-
-var _schedule = _interopRequireDefault(require("../schedule"));
-
-var _tableRowOProject = _interopRequireDefault(require("../table-row-o-project"));
+var _utils = require("./utils");
 
-var _constant = require("./constant");
+var _renderRow = _interopRequireDefault(require("./render-row"));
 
-var _utils = require("./utils");
+var _classnames = _interopRequireDefault(require("classnames"));
 
 require("./index.css");
 
@@ -29,7 +27,7 @@ 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 _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(); }
 
@@ -43,125 +41,129 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var prefix = 'titaui-dynamic-summary-task-progress';
-var isImport = true;
+var prefix = "titaui-dynamic-summary-task-progress";
 
 var TaskProgress = function TaskProgress(_ref) {
   var data = _ref.data,
-      _ref$type = _ref.type,
-      type = _ref$type === void 0 ? 'day' : _ref$type,
       title = _ref.title;
 
-  var _useState = (0, _react.useState)(),
+  var _useState = (0, _react.useState)({
+    1: [],
+    2: [],
+    3: []
+  }),
       _useState2 = _slicedToArray(_useState, 2),
-      rowsData = _useState2[0],
-      setRowsData = _useState2[1];
+      tableData = _useState2[0],
+      setTableData = _useState2[1];
 
   var _useState3 = (0, _react.useState)((0, _utils.getStatusStatistic)([])),
       _useState4 = _slicedToArray(_useState3, 2),
       statusStatistic = _useState4[0],
       setStatusStatistic = _useState4[1];
 
-  var handleShowTaskDetail = function handleShowTaskDetail(item) {
-    // @ts-ignore
-    window.Talent.app.vent.trigger("global-pull-screen", item.id, "task");
+  var _useState5 = (0, _react.useState)(false),
+      _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 renderTitle = (0, _react.useMemo)(function () {
-    if (type === 'day') {
-      return (0, _getLocale.getLocale)('Rep_NewS_Toworkasks');
-    } else if (type === 'week') {
-      return (0, _getLocale.getLocale)('Rep_NewS_Thisetasks');
-    } else if (type === 'month') {
-      return (0, _getLocale.getLocale)('Rep_NewS_Taskormonth');
-    }
+  var handleMouseLeave = function handleMouseLeave() {
+    setIsMouseEnter(false);
+  };
+
+  var handleFilterDone = function handleFilterDone() {
+    setActiveId(1);
+  };
+
+  var handleFilterDoing = function handleFilterDoing() {
+    setActiveId(2);
+  };
+
+  var handleFilterOverdue = function handleFilterOverdue() {
+    setActiveId(3);
+  };
 
-    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")
     }, /*#__PURE__*/_react["default"].createElement("td", {
       className: "".concat(prefix, "__table-title-okrs")
-    }, (0, _getLocale.getLocale)('OKR_MyO_Title_Taskname')), /*#__PURE__*/_react["default"].createElement("td", {
+    }, (0, _getLocale.getLocale)("OKR_MyO_Title_Taskname")), /*#__PURE__*/_react["default"].createElement("td", {
       className: "".concat(prefix, "__table-title-progress")
-    }, (0, _getLocale.getLocale)('OKR_MyO_Pop_Upd_Progresss1')), /*#__PURE__*/_react["default"].createElement("td", {
+    }, (0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Progresss1")), /*#__PURE__*/_react["default"].createElement("td", {
       className: "".concat(prefix, "__table-title-progress-desc")
-    }, (0, _getLocale.getLocale)('Feed_Tab_Title_Progress'), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-      overlay: (0, _getLocale.getLocale)('Rep_Tab_Mys_FillOKRsync'),
+    }, (0, _getLocale.getLocale)("Feed_Tab_Title_Progress"), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+      overlay: (0, _getLocale.getLocale)("Rep_NewS_PrgreTask"),
       placement: "top",
       align: {
         offset: [0, 5]
       }
     }, /*#__PURE__*/_react["default"].createElement("i", {
       className: "tu-icon-wiki ".concat(prefix, "__table-title-progress-desc-icon")
-    }))))), /*#__PURE__*/_react["default"].createElement("tbody", null, rowsData && rowsData.Rows.map(function (item) {
-      if (isImport) {
-        var _item$LastContent;
-
-        return /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement("div", {
-          className: "".concat(prefix, "__table-row-title"),
-          onClick: function onClick() {
-            return handleShowTaskDetail(item);
-          }
-        }, /*#__PURE__*/_react["default"].createElement("i", {
-          className: "".concat(prefix, "__table-row-title-icon ").concat(_constant.EStatusStatus2ClassType[item.Status])
-        }), /*#__PURE__*/_react["default"].createElement("span", {
-          className: "".concat(prefix, "__table-row-title-text")
-        }, item.Name))), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_progress["default"], {
-          id: "".concat(item.Id),
-          type: "task",
-          status: item.Status === 1 ? "normal" : "risk",
-          value: item.Progress,
-          editable: false,
-          riskLevel: item.Status
-        })), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_schedule["default"], {
-          value: (item === null || item === void 0 ? void 0 : (_item$LastContent = item.LastContent) === null || _item$LastContent === void 0 ? void 0 : _item$LastContent.trim()) || '',
-          date: item.LastContentTime,
-          editable: false,
-          id: item.Id
-        })));
-      } else {
-        return /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", {
-          colSpan: 4
-        }, /*#__PURE__*/_react["default"].createElement(_tableRowOProject["default"], {
-          id: item.Id // isO={item.Type === EObjType.O}
-          ,
-          extraClass: "".concat(prefix, "__table-obj"),
-          text: item.Name
-        })));
-      }
+    }))))), /*#__PURE__*/_react["default"].createElement("tbody", null, tableData[activeId].map(function (item) {
+      return /*#__PURE__*/_react["default"].createElement(_renderRow["default"], {
+        item: item
+      });
     })));
-  }, [rowsData]);
+  }, [tableData, activeId]);
   (0, _react.useEffect)(function () {
-    if (_typeof(data) !== 'object' && data !== '') {
-      setRowsData(JSON.parse(data));
+    if (data && typeof data === 'string') {
+      var statisticData = (0, _utils.getStatusStatistic)(JSON.parse(data).Rows);
+      setStatusStatistic(statisticData);
+      setTableData((0, _utils.formatTaskData)(JSON.parse(data).Rows));
 
-      if (JSON.parse(data).Rows.length !== 0) {
-        setStatusStatistic((0, _utils.getStatusStatistic)(JSON.parse(data).Rows));
+      if (activeId === 1 && statisticData.done > 0 || activeId === 2 && statisticData.doing > 0 || activeId === 3 && statisticData.overDue > 0) {
+        return;
+      }
+
+      if (statisticData.done > 0) {
+        setActiveId(1);
+      } else if (statisticData.doing > 0) {
+        setActiveId(2);
+      } else if (statisticData.overDue > 0) {
+        setActiveId(3);
       }
     }
   }, [data]);
-  if (!(rowsData !== null && rowsData !== void 0 && rowsData.Rows.length)) return null;
+
+  if (data && typeof data === 'string') {
+    if (!JSON.parse(data).Rows || !JSON.parse(data).Rows.length) {
+      return null;
+    }
+  }
+
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: prefix
+    className: prefix,
+    onMouseEnter: handleMouseEnter,
+    onMouseLeave: handleMouseLeave
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__title")
-  }, title), /*#__PURE__*/_react["default"].createElement("div", {
+  }, title), statusStatistic.done + statusStatistic.doing + statusStatistic.overDue > 0 && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__statistic")
-  }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "".concat(prefix, "__statistic-item ").concat(prefix, "__statistic-item--finished")
-  }, (0, _getLocale.getLocale)('OKR_MyO_E_From_Completed'), ' ', /*#__PURE__*/_react["default"].createElement("span", {
+  }, statusStatistic.done > 0 && /*#__PURE__*/_react["default"].createElement("span", {
+    onClick: handleFilterDone,
+    className: (0, _classnames["default"])("".concat(prefix, "__statistic-item ").concat(prefix, "__statistic-item--finished"), _defineProperty({}, "".concat(prefix, "__statistic-item--finished-active"), activeId === 1))
+  }, (0, _getLocale.getLocale)("OKR_MyO_E_From_Completed"), " ", /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__statistic-item--finished-text")
-  }, statusStatistic.doing)), /*#__PURE__*/_react["default"].createElement("span", {
-    className: "".concat(prefix, "__statistic-item ").concat(prefix, "__statistic-item--processing")
-  }, (0, _getLocale.getLocale)('OKR_MyO_Butt_Inprogress'), ' ', /*#__PURE__*/_react["default"].createElement("span", {
+  }, statusStatistic.done)), statusStatistic.doing > 0 && /*#__PURE__*/_react["default"].createElement("span", {
+    onClick: handleFilterDoing,
+    className: (0, _classnames["default"])("".concat(prefix, "__statistic-item ").concat(prefix, "__statistic-item--processing"), _defineProperty({}, "".concat(prefix, "__statistic-item--processing-active"), activeId === 2))
+  }, (0, _getLocale.getLocale)("OKR_MyO_Butt_Inprogress"), " ", /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__statistic-item--processing-text")
-  }, statusStatistic.doing)), /*#__PURE__*/_react["default"].createElement("span", {
-    className: "".concat(prefix, "__statistic-item ").concat(prefix, "__statistic-item--overdue")
-  }, (0, _getLocale.getLocale)('OKR_MyO_E_Overdue'), ' ', /*#__PURE__*/_react["default"].createElement("span", {
+  }, statusStatistic.doing)), statusStatistic.overDue > 0 && /*#__PURE__*/_react["default"].createElement("span", {
+    onClick: handleFilterOverdue,
+    className: (0, _classnames["default"])("".concat(prefix, "__statistic-item ").concat(prefix, "__statistic-item--overdue"), _defineProperty({}, "".concat(prefix, "__statistic-item--overdue-active"), activeId === 3))
+  }, (0, _getLocale.getLocale)("OKR_MyO_E_Overdue"), " ", /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__statistic-item--overdue-text")
-  }, statusStatistic.overDue))), /*#__PURE__*/_react["default"].createElement("div", {
+  }, statusStatistic.overDue))), (tableData[1].length > 0 || tableData[2].length > 0 || tableData[3].length > 0) && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__table")
   }, renderTable));
 };

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

@@ -2,4 +2,21 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
+});
+exports.EReportType = exports.EImportType = void 0;
+var EReportType;
+exports.EReportType = EReportType;
+
+(function (EReportType) {
+  EReportType[EReportType["Daily"] = 8] = "Daily";
+  EReportType[EReportType["Weekly"] = 26] = "Weekly";
+  EReportType[EReportType["Month"] = 27] = "Month";
+})(EReportType || (exports.EReportType = EReportType = {}));
+
+var EImportType;
+exports.EImportType = EImportType;
+
+(function (EImportType) {
+  EImportType[EImportType["Imported"] = 1] = "Imported";
+  EImportType[EImportType["NotImported"] = 0] = "NotImported";
+})(EImportType || (exports.EImportType = EImportType = {}));

package/lib/components/dynamic/dynamic-item/components/task-progress/render-row.js

@@ -0,0 +1,80 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _progress = _interopRequireDefault(require("../progress"));
+
+var _tableRowOProject = _interopRequireDefault(require("../table-row-o-project"));
+
+var _constant = require("./constant");
+
+var _schedule = _interopRequireDefault(require("../schedule"));
+
+var _getLocale = require("../../../../../utils/getLocale");
+
+require("./index.css");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var prefix = "titaui-dynamic-summary-task-progress";
+
+var RenderRow = function RenderRow(_ref) {
+  var item = _ref.item;
+
+  var handleShowTaskDetail = function handleShowTaskDetail(item) {
+    // @ts-ignore
+    window.Talent.app.vent.trigger("global-pull-screen", item.TaskId, "task");
+  };
+
+  var render = function render() {
+    if (item.IsImport) {
+      var _item$LastContent;
+
+      return /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "".concat(prefix, "__table-row-title"),
+        onClick: function onClick() {
+          return handleShowTaskDetail(item);
+        }
+      }, /*#__PURE__*/_react["default"].createElement("i", {
+        className: "".concat(prefix, "__table-row-title-icon ").concat(_constant.EStatusStatus2ClassType[item.Status])
+      }), /*#__PURE__*/_react["default"].createElement("span", {
+        className: "".concat(prefix, "__table-row-title-text")
+      }, item.Name), item.RemainDay > 0 && /*#__PURE__*/_react["default"].createElement("span", {
+        className: "".concat(prefix, "__table-row-title-remain")
+      }, (0, _getLocale.getLocale)("Rep_NewS_PrgreDelay").replace("XX", item.RemainDay)), item.WorkTimes > 0 && /*#__PURE__*/_react["default"].createElement("span", {
+        className: "".concat(prefix, "__table-row-title-worktime")
+      }, item.WorkTimes, "h"))), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_progress["default"], {
+        id: "".concat(item.Id),
+        type: "task",
+        status: item.Status === 1 || item.Status === 2 && item.RiskLevel === 4 ? "normal" : "risk",
+        value: item.Progress,
+        editable: false
+      })), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_schedule["default"], {
+        value: (item === null || item === void 0 ? void 0 : (_item$LastContent = item.LastContent) === null || _item$LastContent === void 0 ? void 0 : _item$LastContent.trim()) || "",
+        editable: false,
+        id: item.Id
+      })));
+    } else {
+      return /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", {
+        colSpan: 3
+      }, /*#__PURE__*/_react["default"].createElement(_tableRowOProject["default"], {
+        id: item.Id // 6: okr 4: 项目
+        ,
+        isO: item.ParentObjType === 6,
+        extraClass: "".concat(prefix, "__table-obj"),
+        text: item.Name,
+        notIcon: item.ParentObjType !== 4 && item.ParentObjType !== 6
+      })));
+    }
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, render());
+};
+
+var _default = RenderRow;
+exports["default"] = _default;

package/lib/components/dynamic/dynamic-item/components/task-progress/request-api.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getTasks = void 0;
+
+var _request = require("@titaui/request");
+
+var getTasks = function getTasks(_ref) {
+  var feedId = _ref.feedId,
+      moduleId = _ref.moduleId;
+  return (0, _request.rpost)("v1")("summary/task/search/".concat(feedId, "/").concat(moduleId));
+};
+
+exports.getTasks = getTasks;

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

@@ -3,7 +3,47 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getStatusStatistic = void 0;
+exports.getStatusStatistic = exports.getMapText = exports.formatTime = exports.formatTaskData = void 0;
+
+var _constant = require("./constant");
+
+var _getLocale = require("../../../../../utils/getLocale");
+
+var _helpers = require("../../../../../utils/helpers");
+
+var _interface = require("./interface");
+
+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 formatTaskData = function formatTaskData(data) {
+  var result = {
+    1: [],
+    2: [],
+    3: []
+  };
+  data.forEach(function (item) {
+    if (item.Status === 2) {
+      result[1] = [item];
+    } else if (item.Status === 1) {
+      result[2] = [item];
+    } else if (item.Status === 3) {
+      result[3] = [item];
+    }
+  });
+  return result;
+};
+
+exports.formatTaskData = formatTaskData;
 
 var getStatusStatistic = function getStatusStatistic(data) {
   var result = {
@@ -11,17 +51,61 @@ var getStatusStatistic = function getStatusStatistic(data) {
     doing: 0,
     overDue: 0
   };
-  data.forEach(function (item) {
-    // 1 进行中 2 已完成 3 已延期
-    if (item.Status === 1) {
+  data.forEach(function (items) {
+    // 1 进行中 2 已完成 3已延期
+    if (items.Status === 3) {
+      result.overDue = result.overDue + 1;
+    } else if (items.Status === 1) {
       result.doing = result.doing + 1;
-    } else if (item.Status === 2) {
+    } else if (items.Status === 2) {
       result.done = result.done + 1;
-    } else if (item.Status === 3) {
-      result.overDue = result.overDue + 1;
     }
   });
   return result;
 };
 
-exports.getStatusStatistic = getStatusStatistic;
+exports.getStatusStatistic = getStatusStatistic;
+
+var formatTime = function formatTime(type, date) {
+  if (type === _interface.EReportType.Daily) {
+    return date.replace(/-/g, '/');
+  } else if (type === _interface.EReportType.Weekly) {
+    var _date$split = date.split('-'),
+        _date$split2 = _slicedToArray(_date$split, 3),
+        year = _date$split2[0],
+        month = _date$split2[1],
+        week = _date$split2[2];
+
+    var weeks = (0, _helpers.getPointYearMonthWeeksRange)(year, month);
+    var startDate = weeks[Number(week) - 1].startTime;
+    var endTime = weeks[Number(week) - 1].endTime;
+
+    var _startDate$replace$sp = startDate.replace('/', '-').split('-'),
+        _startDate$replace$sp2 = _slicedToArray(_startDate$replace$sp, 1),
+        startMonth = _startDate$replace$sp2[0];
+
+    var _endTime$replace$spli = endTime.replace('/', '-').split('-'),
+        _endTime$replace$spli2 = _slicedToArray(_endTime$replace$spli, 1),
+        endMonth = _endTime$replace$spli2[0];
+
+    return "".concat(Number(startMonth) > Number(endMonth) ? Number(year) + 1 : year, "/") + weeks[Number(week) - 1].endTime;
+  } else if (type === _interface.EReportType.Month) {
+    return date.replace(/-/g, '/');
+  }
+};
+
+exports.formatTime = formatTime;
+
+var getMapText = function getMapText(types, type) {
+  if (types.includes(_constant.EObjType.Task)) {
+    if (type === 1) {
+      return (0, _getLocale.getLocale)('Rep_NewS_TargBeenMdif');
+    } else if (type === 2) {
+      return (0, _getLocale.getLocale)('Rep_NewS_ModifOKR');
+    }
+  }
+
+  return '';
+};
+
+exports.getMapText = getMapText;

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/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"], {

package/lib/components/menus/components/search-colleague/index.js

@@ -86,6 +86,7 @@ function _default(props) {
     var _ref2 = _slicedToArray(_ref, 1),
         user = _ref2[0];
 
+    setSearchVal(user.title);
     onSelect(user);
   };
 
@@ -109,7 +110,8 @@ function _default(props) {
     placeholder: placeholder,
     onChange: handleInputChange,
     onFocus: onInputFocusHandler,
-    onBlur: onInputBlurHandler
+    onBlur: onInputBlurHandler,
+    value: searchVal
   })), /*#__PURE__*/_react["default"].createElement(_userSelector["default"], {
     ref: selectorRef,
     multiple: false,

package/lib/utils/helpers.js

@@ -6,13 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.cssSupport = cssSupport;
 exports.escapeHtml = escapeHtml;
 exports.getApiUrl = getApiUrl;
-exports.getPreAndNextMonthDate = exports.getLoginUserInfo = void 0;
+exports.getPreAndNextMonthDate = exports.getPointYearMonthWeeksRange = exports.getLoginUserInfo = void 0;
 exports.getTenantInfo = getTenantInfo;
 exports.getUploadMaxSize = getUploadMaxSize;
-exports.isTencentHr = exports.isLocal = exports.isFeishu = exports.isDingDing = void 0;
+exports.toTree = exports.isTencentHr = exports.isLocal = exports.isFeishu = exports.isDingDing = void 0;
 
 var _bsGlobal = require("./bs-global");
 
+var _cloneDeep = _interopRequireDefault(require("clone-deep"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
 function cssSupport(attr, value) {
   var element = document.createElement('div');
 
@@ -121,6 +125,57 @@ var getPreAndNextMonthDate = function getPreAndNextMonthDate() {
     preDate: preDate,
     nextDate: nextDate
   };
+}; //根据年月，计算这个月周的范围
+
+
+exports.getPreAndNextMonthDate = getPreAndNextMonthDate;
+
+var getPointYearMonthWeeksRange = function getPointYearMonthWeeksRange(year, month) {
+  var startDate = new Date("".concat(year, "/").concat(month, "/1"));
+  var calDays = new Date(startDate.valueOf());
+  calDays.setMonth(calDays.getMonth() + 1);
+  calDays.setDate(0);
+  var days = calDays.getDate();
+  var dayNum = 1 * 24 * 60 * 60 * 1000;
+  var result = [];
+
+  for (var i = 0; i < days; i++) {
+    var date = new Date(startDate.valueOf() + i * dayNum);
+
+    if (date.getDay() === 1) {
+      var endDate = new Date(date.valueOf() + 6 * dayNum);
+      result.push({
+        startTime: "".concat(date.getMonth() + 1 >= 10 ? date.getMonth() + 1 : "0" + (date.getMonth() + 1), "/").concat(date.getDate() >= 10 ? date.getDate() : "0" + date.getDate()),
+        endTime: "".concat(endDate.getMonth() + 1 >= 10 ? endDate.getMonth() + 1 : "0" + (endDate.getMonth() + 1), "/").concat(endDate.getDate() >= 10 ? endDate.getDate() : "0" + endDate.getDate())
+      });
+      i += 6;
+    }
+  }
+
+  return result;
+}; // 扁平数据转换为树
+
+
+exports.getPointYearMonthWeeksRange = getPointYearMonthWeeksRange;
+
+var toTree = function toTree(data) {
+  var cloneData = (0, _cloneDeep["default"])(data);
+  var map = {};
+  var res = [];
+  cloneData.forEach(function (item) {
+    return map[item.id] = item;
+  });
+  cloneData.forEach(function (item) {
+    var parent = map[item.parentId];
+
+    if (parent) {
+      if (!parent.children) parent.children = [];
+      parent.children.push(item);
+    } else {
+      res.push(item);
+    }
+  });
+  return res;
 };
 
-exports.getPreAndNextMonthDate = getPreAndNextMonthDate;
+exports.toTree = toTree;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.22-beta.4",
+  "version": "1.12.22-beta.5",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",