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

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

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/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/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.7",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",