@titaui/pc 1.12.13-beta.1 → 1.12.13-beta.2

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

@@ -133,6 +133,7 @@
   font-size: 14px;
   margin-left: 4px;
   vertical-align: text-top;
+  color: #89919f;
 }
 
 .titaui-okr-progress__import {
@@ -148,7 +149,7 @@
 
 .titaui-okr-progress__import-icon {
   font-size: 24px;
-  color: #BFC7D5;
+  color: #bfc7d5;
 }
 
 .titaui-okr-progress__import:hover {

package/lib/components/dynamic/dynamic-item/components/schedule/index.css

@@ -1,3 +1,7 @@
+.titaui-dynamic-summary-schedule {
+  padding: 4px 0;
+}
+
 .titaui-dynamic-summary-schedule__content-text {
   font-size: 14px;
   color: #141c28;

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

@@ -9,8 +9,6 @@ exports["default"] = exports.Schedule = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _getLocale = require("../../../../../utils/getLocale");
-
 require("./index.css");
 
 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); }
@@ -47,11 +45,9 @@ var Schedule = function Schedule(_ref) {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content-text")
-  }, content), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__content-date")
-  }, date)), !content && /*#__PURE__*/_react["default"].createElement("div", {
+  }, content)), !content && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__no-progress")
-  }, (0, _getLocale.getLocale)("Rep_NewS_UpProgress")));
+  }, "-"));
 };
 
 exports.Schedule = Schedule;

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

@@ -2,8 +2,8 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 16px;
-  padding: 26px 0 0 24px;
+  margin-bottom: 24px;
+  padding: 24px 0 0 20px;
 }
 
 .titaui-dynamic-new-summary-header-left {
@@ -62,7 +62,7 @@
 .titaui-dynamic-new-summary-header-desc-user {
   font-size: 16px;
   font-weight: 600;
-  color: #3f4755;
+  color: #141c28;
   line-height: 24px;
 }
 
@@ -94,8 +94,8 @@
   position: absolute;
   right: 0;
   bottom: 0;
-  width: 20px;
-  height: 20px;
+  width: 24px;
+  height: 24px;
 }
 
 .titaui-dynamic-new-summary-header__more-operate {

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

@@ -29,11 +29,9 @@ var _tooltip = _interopRequireDefault(require("../../../../tooltip"));
 
 var _commentsDialog = _interopRequireDefault(require("../comments-dialog"));
 
-var _constant = require("../../../constant");
-
 var _getLocale = require("../../../../../utils/getLocale");
 
-var _constant2 = require("./constant");
+var _constant = require("./constant");
 
 var _operateRecord = _interopRequireDefault(require("./operate-record"));
 
@@ -131,6 +129,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
 
   var handleOpenOperateRecord = function handleOpenOperateRecord() {
     setOperateVisible(true);
+    setSelectVisible(false);
   };
 
   var onChangeHandler = function onChangeHandler(name) {
@@ -227,9 +226,9 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       type: "warning"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       type: "title"
-    }, feedType === _constant.EFeedType.Share ? (0, _getLocale.getLocale)("OKR_MyO_Err_Delesh") : (0, _getLocale.getLocale)("OKR_MyO_Err_Delepost")), /*#__PURE__*/_react["default"].createElement("span", {
+    }, (0, _getLocale.getLocale)('OKR_MyO_Pleasenote')), /*#__PURE__*/_react["default"].createElement("span", {
       type: "content"
-    }, feedType === _constant.EFeedType.Share ? (0, _getLocale.getLocale)("OKR_MyO_Err_Deleshre") : (0, _getLocale.getLocale)("OKR_MyO_Err_Delepostsu")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.CancelButton, {
+    }, (0, _getLocale.getLocale)('Mod_cannotberecovered')), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.CancelButton, {
       type: "button",
       onClick: cancelDeleteDynamic
     }, (0, _getLocale.getLocale)("Mod_Cancel")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.WarningButton, {
@@ -244,7 +243,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       }); // 暂时用title
 
       if (typeof mindData[0].content === "string" && mindData[0].content !== "") {
-        setMindImg(_constant2.Motion.filter(function (item) {
+        setMindImg(_constant.Motion.filter(function (item) {
           return item.id === JSON.parse(mindData[0].content).SelectedValues[0];
         })[0].img);
       }
@@ -315,7 +314,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
   }, /*#__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: showEdit && (user.id || user.userId) === loginUserId
+    condition: showEdit && !showCollect && (user.id || user.userId) === loginUserId
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "edit",
     onClick: handleClickEdit
@@ -324,7 +323,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])("tu-icon-bianji3", "".concat(prefix, "__more-operate-selection-icon"))
   }), (0, _getLocale.getLocale)("Mod_Editor")))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
-    condition: showOperateRecord
+    condition: showOperateRecord && !showCollect
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "record",
     onClick: handleOpenOperateRecord
@@ -333,7 +332,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])("tu-icon-jinzhan-s", "".concat(prefix, "__more-operate-selection-icon"))
   }), (0, _getLocale.getLocale)("Per_details_OperationRecord")))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
-    condition: showDelete && (user.id || user.userId) === loginUserId
+    condition: showDelete && !showCollect && (user.id || user.userId) === loginUserId
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "delete",
     onClick: handleDeleteClick

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

@@ -1,5 +1,5 @@
 .titaui-dynamic-summary-task-progress {
-  margin-top: 16px;
+  margin-top: 24px;
 }
 
 .titaui-dynamic-summary-task-progress__title {

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

@@ -3,7 +3,7 @@
   width: 100%;
   background: rgba(240, 163, 38, 0.12);
   border-radius: 12px;
-  margin-top: 20px;
+  margin-top: 24px;
   padding: 16px 8px 14px 16px;
   box-sizing: border-box;
 }

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

@@ -1,5 +1,5 @@
 .titaui-dynamic-summary__remind-view {
-  margin-top: 25px;
+  margin-top: 24px;
 }
 
 .titaui-dynamic-summary__remind-view .titaui-pc-avator-container {

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

@@ -2,6 +2,14 @@
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
 }
 
+.titaui-dynamic-new-report-item .titaui-dynamic-title__content-text {
+  cursor: default;
+}
+
+.titaui-dynamic-new-report-item .titaui-dynamic-title__content-text:hover {
+  opacity: 1;
+}
+
 .titaui-dynamic-new-report-item__content {
   margin-left: 88px;
   line-height: 24px;
@@ -76,11 +84,11 @@
 }
 
 .titaui-dynamic-new-report-item__upload {
-  margin-top: 16px;
+  margin-top: 24px;
 }
 
 .titaui-dynamic-new-report-item__summary {
-  margin-bottom: 16px;
+  margin-bottom: 24px;
   margin-top: 12px;
 }
 
@@ -145,13 +153,18 @@
   background-color: rgba(98, 77, 255, 0.16);
 }
 
+.titaui-dynamic-new-report-item__complete-type--unsubmit {
+  color: #f05e5e;
+  background-color: rgba(240, 94, 94, 0.16);
+}
+
 .titaui-dynamic-new-report-item .highlight {
   color: #f05e5e;
 }
 
 .titaui-dynamic-new-report-item__operate-desc {
   font-size: 14px;
-  font-weight: 400;
+  font-weight: 600;
   color: #89919f;
   line-height: 24px;
   margin-left: 4px;
@@ -159,7 +172,7 @@
 }
 
 .titaui-dynamic-new-report-item__work {
-  margin-top: 16px;
+  margin-top: 24px;
   font-size: 18px;
   font-weight: 600;
   color: #141c28;

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

@@ -126,10 +126,10 @@ var DynamicReply = function DynamicReply(_ref) {
     var _classNames, _classNames2;
 
     return /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(prefix, "__complete-type"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "__complete-type--normal"), submitState === 1), _defineProperty(_classNames, "".concat(prefix, "__complete-type--delay"), submitState === 2), _classNames))
+      className: (0, _classnames["default"])("".concat(prefix, "__complete-type"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "__complete-type--normal"), submitState === 1), _defineProperty(_classNames, "".concat(prefix, "__complete-type--delay"), submitState === 2), _defineProperty(_classNames, "".concat(prefix, "__complete-type--unsubmit"), submitState === 3), _classNames))
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])("".concat(prefix, "__complete-type-icon"), (_classNames2 = {}, _defineProperty(_classNames2, "".concat(prefix, "__complete-type-icon--normal"), submitState === 1), _defineProperty(_classNames2, "".concat(prefix, "__complete-type-icon--delay"), submitState === 2), _classNames2))
-    }), submitState === 1 ? (0, _getLocale.getLocale)("Rep_Tab_Mys_Submitontime") : (0, _getLocale.getLocale)("Tasks_Tab_DelaSubmission"));
+    }), submitState === 1 && (0, _getLocale.getLocale)('Rep_Tab_Mys_Submitontime'), submitState === 2 && (0, _getLocale.getLocale)('Tasks_Tab_DelaSubmission'), submitState === 3 && (0, _getLocale.getLocale)('Mod_Unsubmitted'));
   }, []);
   var renderDesc = (0, _react.useMemo)(function () {
     var reportTextMap = {
@@ -201,11 +201,7 @@ var DynamicReply = function DynamicReply(_ref) {
     src: mindImg,
     className: "".concat(prefix, "__content-mind"),
     alt: ""
-  })), /*#__PURE__*/_react["default"].createElement(_okrProgress["default"], {
-    data: okrTableData
-  }), /*#__PURE__*/_react["default"].createElement(_taskProgress["default"], {
-    data: taskTableData
-  }), workSummaryData && /*#__PURE__*/_react["default"].createElement("div", {
+  })), workSummaryData && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__work")
   }, (0, _getLocale.getLocale)("Tasks_Tab_MyS_JobSummary"), /*#__PURE__*/_react["default"].createElement(_richEditor["default"].Editor, {
     defaultState: JSON.parse(workSummaryData).RichText,
@@ -215,7 +211,11 @@ var DynamicReply = function DynamicReply(_ref) {
   }, (0, _getLocale.getLocale)("Rep_Tab_Mys_NextWorkPlans"), /*#__PURE__*/_react["default"].createElement(_richEditor["default"].Editor, {
     defaultState: JSON.parse(nextWorkPlanData).RichText,
     editable: false
-  })), files.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+  })), /*#__PURE__*/_react["default"].createElement(_okrProgress["default"], {
+    data: okrTableData
+  }), /*#__PURE__*/_react["default"].createElement(_taskProgress["default"], {
+    data: taskTableData
+  }), files.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__upload")
   }, /*#__PURE__*/_react["default"].createElement(_richEditorUpload["default"], {
     text: "\u9644\u4EF6",

package/lib/components/import-modal/helper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.formatDateStr = void 0;
 exports.formatPeriodPlanData = formatPeriodPlanData;
-exports.lableTypeMap = exports.isOpenWorkManage = exports.isOpenOkrManage = exports.isOpenLabel = void 0;
+exports.lableTypeMap = exports.isOpenWorkManage = exports.isOpenOkrManage = exports.isOpenLabel = exports.getCycleDate = void 0;
 exports.momentDate = momentDate;
 exports.workStatus = exports.timeFormat = exports.preCls = exports.okrStatus = void 0;
 
@@ -15,15 +15,27 @@ var _getLocale = require("../../utils/getLocale");
 
 var _planDataJson = require("../../utils/planDataJson");
 
-var preCls = "titaui-task-import";
+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 preCls = 'titaui-task-import';
 exports.preCls = preCls;
-var isOpenOkrManage = (0, _bsGlobal.getAppHead)("113"); // 开通OKR
+var isOpenOkrManage = (0, _bsGlobal.getAppHead)('113'); // 开通OKR
 
 exports.isOpenOkrManage = isOpenOkrManage;
-var isOpenWorkManage = (0, _bsGlobal.getAppHead)("112"); // 开通项目
+var isOpenWorkManage = (0, _bsGlobal.getAppHead)('112'); // 开通项目
 
 exports.isOpenWorkManage = isOpenWorkManage;
-var TaskAdvancedSetting = (0, _bsGlobal.getBSGlobal)("TaskAdvancedSetting");
+var TaskAdvancedSetting = (0, _bsGlobal.getBSGlobal)('TaskAdvancedSetting');
 var isOpenLabel = TaskAdvancedSetting.TaskPlanSetting.TaskLabel; // 开启分类
 
 exports.isOpenLabel = isOpenLabel;
@@ -115,8 +127,8 @@ exports.okrStatus = okrStatus;
 
 var workStatus = function workStatus() {
   return {
-    1: (0, _getLocale.getLocale)("Per_MyRe_text_Inprogress"),
-    2: (0, _getLocale.getLocale)("OKR_MyO_E_From_Completed")
+    1: (0, _getLocale.getLocale)('Per_MyRe_text_Inprogress'),
+    2: (0, _getLocale.getLocale)('OKR_MyO_E_From_Completed')
   };
 };
 
@@ -176,4 +188,38 @@ function formatPeriodPlanData(period) {
     planTableType: planData && planData.PlanTableType,
     startDate: planData ? period.cycleType == '0' ? planData.StartDate : momentDate(planData.StartDate || '') : ''
   };
-}
+}
+
+var getCycleDate = function getCycleDate(date) {
+  if (date) {
+    var _date$split = date.split('/'),
+        _date$split2 = _slicedToArray(_date$split, 2),
+        year = _date$split2[0],
+        month = _date$split2[1];
+
+    var startDate = new Date();
+    var endDate = new Date();
+    startDate.setFullYear(Number(year));
+    startDate.setMonth(Number(month) - 1);
+    startDate.setDate(1);
+    endDate.setFullYear(Number(year));
+    endDate.setMonth(Number(month));
+    endDate.setDate(0);
+    return {
+      start: "".concat(startDate.getFullYear(), "/").concat(startDate.getMonth() + 1, "/").concat(startDate.getDate()),
+      end: "".concat(endDate.getFullYear(), "/").concat(endDate.getMonth() + 1, "/").concat(endDate.getDate())
+    };
+  }
+
+  var newStartDate = new Date();
+  var newEndDate = new Date();
+  newStartDate.setDate(1);
+  newEndDate.setMonth(newEndDate.getMonth() + 1);
+  newEndDate.setDate(0);
+  return {
+    start: "".concat(newStartDate.getFullYear(), "/").concat(newStartDate.getMonth() + 1, "/").concat(newStartDate.getDate()),
+    end: "".concat(newEndDate.getFullYear(), "/").concat(newEndDate.getMonth() + 1, "/").concat(newEndDate.getDate())
+  };
+};
+
+exports.getCycleDate = getCycleDate;

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

@@ -27,7 +27,7 @@ var _getLocale = require("../../../utils/getLocale");
 
 require("./index.css");
 
-var _excluded = ["isVisible", "multiple", "onOk", "onCancel", "isRelationOther", "onRelateSuccess", "lastSelected"];
+var _excluded = ["isVisible", "multiple", "onOk", "onCancel", "isRelationOther", "onRelateSuccess", "lastSelected", "time"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -77,6 +77,7 @@ function ImportTaskModal(props) {
       onRelateSuccess = props.onRelateSuccess,
       _props$lastSelected = props.lastSelected,
       lastSelected = _props$lastSelected === void 0 ? [] : _props$lastSelected,
+      time = props.time,
       restProps = _objectWithoutProperties(props, _excluded);
 
   var _useState = (0, _react.useState)(isVisible),
@@ -212,7 +213,8 @@ function ImportTaskModal(props) {
       e.nativeEvent.stopImmediatePropagation();
     }
   }, /*#__PURE__*/_react["default"].createElement(_searchForm["default"], {
-    onChange: onQueryChangeHandler
+    onChange: onQueryChangeHandler,
+    time: time
   }), isloading ? /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__content-empty")
   }, /*#__PURE__*/_react["default"].createElement("img", {

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

@@ -23,8 +23,6 @@ var _taskRelation = _interopRequireDefault(require("../search/task-relation"));
 
 var _helper = require("../helper");
 
-var _formatTime = require("../../../utils/format-time");
-
 var _getLocale = require("../../../utils/getLocale");
 
 require("./index.css");
@@ -54,16 +52,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function SearchForm(props) {
-  var onChange = props.onChange;
-
-  var _useState = (0, _react.useState)({
-    annualNum: new Date().getFullYear(),
-    // 默认当前年份全部周期
-    yqmNum: 0,
-    cycleType: '1',
-    startDate: (0, _formatTime.getFirstDayOfYear)(),
-    endDate: (0, _formatTime.getNextDayOfYear)()
-  }),
+  var onChange = props.onChange,
+      time = props.time;
+
+  var _useState = (0, _react.useState)(null),
       _useState2 = _slicedToArray(_useState, 2),
       cycle = _useState2[0],
       setCycle = _useState2[1];
@@ -85,6 +77,7 @@ function SearchForm(props) {
 
   var dilagRef = (0, _react.useRef)(document.createElement('div'));
   (0, _react.useEffect)(function () {
+    if (!cycle) return;
     var planCycle = (0, _helper.formatPeriodPlanData)(cycle);
     onChange(_objectSpread({
       status: status,
@@ -92,6 +85,19 @@ function SearchForm(props) {
       relation: relation
     }, planCycle));
   }, [status, keyWords, cycle, relation]);
+  (0, _react.useEffect)(function () {
+    if (time) {
+      var cycleDate = (0, _helper.getCycleDate)(time);
+      setCycle({
+        annualNum: Number(time.split('/')[0]),
+        // 默认当前年份全部周期
+        yqmNum: Number(time.split('/')[1]),
+        cycleType: '3',
+        startDate: cycleDate.start,
+        endDate: cycleDate.end
+      });
+    }
+  }, [time]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     ref: dilagRef
   }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -62,9 +62,6 @@ function Relation(props) {
   }, {
     label: (0, _getLocale.getLocale)("OKR_Menu_Title_Collaborator"),
     value: 2
-  }, {
-    label: (0, _getLocale.getLocale)("Data_Idistributed"),
-    value: 3
   }];
   return /*#__PURE__*/_react["default"].createElement(_selectLayer["default"], {
     onChangeSelect: onChangeHandler,

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

@@ -240,7 +240,7 @@ var OkrTree = function OkrTree(_ref) {
     className: "".concat(precls, "__header")
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__header-obj")
-  }, (0, _getLocale.getLocale)('Pro_detail_AssociatedObject')), /*#__PURE__*/_react["default"].createElement("span", {
+  }, "OKRs"), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__header-principle")
   }, (0, _getLocale.getLocale)('Mod_Owner')), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__header-time")

package/lib/components/import-modal/tree/task-work-tree/index.css

@@ -19,6 +19,7 @@
 .okr-import-task-work-tree__header-name {
   width: 332px;
   margin-left: 12px;
+  overflow: hidden;
 }
 
 .okr-import-task-work-tree__header-status {

package/lib/components/import-modal/tree/task-work-tree/index.js

@@ -164,9 +164,12 @@ var TaskWorkTree = function TaskWorkTree(_ref) {
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(preCls, "__content-item-name"),
       onClick: function onClick() {
-        return handleName(item.id);
+        return handleName(item.taskId);
       }
-    }, (0, _tools.htmlDecodeByRegExp)(item.name)), /*#__PURE__*/_react["default"].createElement("div", {
+    }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
+      text: (0, _tools.htmlDecodeByRegExp)(item.name),
+      maxWidth: 332
+    })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(preCls, "__content-item-status")
     }, item.status), /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(preCls, "__content-item-principer")

package/lib/components/import-modal/tree-node/kr-node/index.css

@@ -23,6 +23,13 @@
   cursor: pointer;
   overflow: hidden;
   text-overflow: ellipsis;
+  display: flex;
+}
+
+.import-kr-node__name-text {
+  position: relative;
+  flex: 1;
+  overflow: hidden;
 }
 
 .import-kr-node__name-index {

package/lib/components/import-modal/tree-node/kr-node/index.js

@@ -86,8 +86,12 @@ function KrNode(props) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__name-index")
   }, "KR", krIndex), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(precls, "__name-text"),
     onClick: openKrDrawer
-  }, (0, _tools.htmlDecodeByHtmlRegExp)(data.mileStoneName))), /*#__PURE__*/_react["default"].createElement("span", {
+  }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
+    text: (0, _tools.htmlDecodeByHtmlRegExp)(data.mileStoneName),
+    maxWidth: 374
+  }))), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__principle")
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     text: /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {

package/lib/components/import-modal/tree-node/o-node/index.css

@@ -22,6 +22,13 @@
   margin-right: 40px;
   overflow: hidden;
   text-overflow: ellipsis;
+  display: flex;
+}
+
+.import-okr-node__name-text {
+  position: relative;
+  flex: 1;
+  overflow: hidden;
 }
 
 .import-okr-node__principle {

package/lib/components/import-modal/tree-node/o-node/index.js

@@ -116,8 +116,12 @@ function ONode(props) {
   }, OkrTypeSetting && /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])(okrTypeIcon[data.okrType], "".concat(precls, "__okr-type-icon"))
   }), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(precls, "__name-text"),
     onClick: openOkrDrawer
-  }, (0, _tools.htmlDecodeByHtmlRegExp)(data.workName))), /*#__PURE__*/_react["default"].createElement("span", {
+  }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
+    text: (0, _tools.htmlDecodeByHtmlRegExp)(data.workName),
+    maxWidth: 390
+  }))), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__principle")
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     text: /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {

package/lib/components/menus/export-modules/summary-menus/depart-menus/index.js

@@ -137,9 +137,9 @@ function _default() {
             hasChild: rawTreeData[0].hasChild
           },
           pid: -1,
-          id: '0',
+          id: rawTreeData[0].id,
           key: '0',
-          isLeaf: true,
+          // isLeaf: !rawTreeData[0].hasChild,
           nodeType: _index.DEPART_NODE,
           title: rawTreeData[0].name
         };

package/lib/components/menus/export-modules/summary-menus/index.js

@@ -21,6 +21,8 @@ var _searchColleague = _interopRequireDefault(require("../../components/search-c
 
 var _summaryFrontMenus = _interopRequireDefault(require("./summary-front-menus"));
 
+var _subordinateMenus = _interopRequireDefault(require("./subordinate-menus"));
+
 var _context = require("../../context");
 
 var _precls = _interopRequireDefault(require("../../precls"));
@@ -125,7 +127,7 @@ function SummaryMenus(props) {
     history: history
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "-summary-menus-back"), "tita-bootstrap__scrollbar")
-  }, flipBackType == "depart" && /*#__PURE__*/_react["default"].createElement(_departMenus["default"], null)))));
+  }, flipBackType == "depart" && /*#__PURE__*/_react["default"].createElement(_departMenus["default"], null), flipBackType == "subordinate" && /*#__PURE__*/_react["default"].createElement(_subordinateMenus["default"], flipOptions)))));
 } // @ts-ignore
 
 

package/lib/components/menus/export-modules/summary-menus/menus.js

@@ -47,7 +47,6 @@ var summaryMenus = /*#__PURE__*/function () {
     this.COMPANYALL = _index.COMPANY_ALL_NODE;
     this.SHARE = _index.SHARE_NODE;
     this.SUBORDINATES = 'subordinates';
-    console.log('props', props);
     this.menus = [{
       icon: 'all-zongjie',
       label: _i18n.locale.menu_all_summary,

package/lib/components/menus/export-modules/summary-menus/subordinate-menus/helper.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.transToTreeNode = void 0;
+
+var _index = require("../../../components/menu-tree/tree-node/index");
+
+var transToTreeNode = function transToTreeNode(data) {
+  var res = [];
+  data.forEach(function (user) {
+    var node = {
+      id: user.userId,
+      title: user.name,
+      key: "".concat(user.userId),
+      nodeType: _index.USER_NODE,
+      data: user,
+      isLeaf: !user.hasSubordinates,
+      isFlip: false,
+      pid: user.managerId
+    };
+    res.push(node);
+  });
+  return res;
+};
+
+exports.transToTreeNode = transToTreeNode;

package/lib/components/menus/export-modules/summary-menus/subordinate-menus/index.css

@@ -0,0 +1,14 @@
+.titaui-menus__subordinate-menus--loading {
+  align-items: center;
+  justify-content: center;
+  cursor: default;
+  margin-top: 25px;
+}
+
+.titaui-menus__subordinate-menus--loading > span {
+  display: inline-block;
+  width: 96px;
+  height: 20px;
+  background: url(../../../images/loading.gif) transparent no-repeat 50% 50%;
+  background-size: contain;
+}

package/lib/components/menus/export-modules/summary-menus/subordinate-menus/index.js

@@ -0,0 +1,201 @@
+"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
+});
+exports["default"] = _default;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
+
+var _menuTree = _interopRequireDefault(require("../../../components/menu-tree"));
+
+var _requestApis = require("../../../request-apis");
+
+var _utils = require("../../../utils");
+
+var _scrollbar = _interopRequireDefault(require("../../../../scrollbar"));
+
+var _helper = require("./helper");
+
+var _precls = _interopRequireDefault(require("../../../precls"));
+
+require("../../../index.css");
+
+require("./index.css");
+
+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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+
+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; }
+
+function _default(props) {
+  var toUserId = props.toUserId;
+  var loadedNode = (0, _react.useRef)([]);
+
+  var _useState = (0, _react.useState)(true),
+      _useState2 = _slicedToArray(_useState, 2),
+      loading = _useState2[0],
+      setLoading = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(["".concat(toUserId)]),
+      _useState4 = _slicedToArray(_useState3, 1),
+      expandedKeys = _useState4[0];
+
+  var _useState5 = (0, _react.useState)([]),
+      _useState6 = _slicedToArray(_useState5, 2),
+      treeData = _useState6[0],
+      setTreeData = _useState6[1];
+
+  var _useState7 = (0, _react.useState)([]),
+      _useState8 = _slicedToArray(_useState7, 2),
+      rawTreeData = _useState8[0],
+      setRawTreeData = _useState8[1];
+
+  var _useState9 = (0, _react.useState)([]),
+      _useState10 = _slicedToArray(_useState9, 2),
+      selectedMenuKeys = _useState10[0],
+      setSelectedMenuKeys = _useState10[1];
+
+  var _useState11 = (0, _react.useState)(window.BSGlobal && window.BSGlobal.loginUserInfo.Id || 0),
+      _useState12 = _slicedToArray(_useState11, 1),
+      loginUserId = _useState12[0];
+
+  var _useState13 = (0, _react.useState)(function () {
+    return document.body.offsetHeight - 200;
+  }),
+      _useState14 = _slicedToArray(_useState13, 2),
+      maxHeight = _useState14[0],
+      setMaxHeight = _useState14[1];
+
+  (0, _react.useEffect)(function () {
+    setLoading(true); // 获取登陆者的直接/虚线下级
+
+    (0, _requestApis.getSubordinates)({
+      toUserId: loginUserId,
+      relationIds: "1,2"
+    }, {
+      disabledDottedSubordinatesDig: true
+    }).then(function (users) {
+      var rawTreeData = (0, _helper.transToTreeNode)(users); // 要过滤掉那些既是登录者的虚线下级，又是登录者下属的下级，让他默认展开的时候重新获取
+
+      var newRawTreeData = rawTreeData.filter(function (item) {
+        return item.pid === loginUserId;
+      });
+      setRawTreeData(newRawTreeData);
+      setTreeData((0, _utils.toTree)(newRawTreeData));
+      setLoading(false);
+    });
+  }, []);
+
+  var loadNodes = function loadNodes(nodeId) {
+    // 钻去隔级的直接下级
+    return (0, _requestApis.getSubordinates)({
+      toUserId: nodeId,
+      relationIds: "1"
+    });
+  };
+
+  var filterData = function filterData(newNode, oldNode) {
+    var mark = {};
+    newNode.forEach(function (item) {
+      mark[item.userId] = true;
+    });
+    var newArry = oldNode.filter(function (item) {
+      return !mark[item.id];
+    });
+    return newArry;
+  };
+
+  var onLoadTreeNodeDataHandler = function onLoadTreeNodeDataHandler(treeNode) {
+    if (loadedNode.current.includes(treeNode.id)) return null;
+    return new Promise(function (resolve) {
+      var promise = loadNodes(treeNode.id);
+      if (!promise) return resolve(true);
+      promise.then(function (nodes) {
+        var _treeNode$children;
+
+        if (!nodes.length) return null;
+        var oldRawTreeData = rawTreeData;
+
+        if (treeNode !== null && treeNode !== void 0 && (_treeNode$children = treeNode.children) !== null && _treeNode$children !== void 0 && _treeNode$children.length) {
+          oldRawTreeData = filterData(nodes, oldRawTreeData);
+        }
+
+        (0, _helper.transToTreeNode)(nodes).forEach(function (it) {
+          return oldRawTreeData.push(it);
+        });
+        setRawTreeData(oldRawTreeData);
+        setTreeData((0, _utils.toTree)(oldRawTreeData));
+        return true;
+      });
+      resolve(true);
+    });
+  };
+
+  var onSelectHandler = function onSelectHandler(selectedKyes, _ref) {
+    var node = _ref.node;
+    // 处理菜单选中
+    if (!selectedKyes.length) return;
+    location.href = "#/summary/manage?toUserId=".concat(node.id);
+    setSelectedMenuKeys(selectedKyes);
+  };
+
+  (0, _react.useEffect)(function () {
+    var obs = new _resizeObserverPolyfill["default"](function (entries) {
+      var _iterator = _createForOfIteratorHelper(entries),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var entry = _step.value;
+          var cr = entry.contentRect;
+          setMaxHeight(cr.height - 200);
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    });
+    obs.observe(document.body);
+    return function () {
+      obs.unobserve(document.body);
+    };
+  }, []);
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__subordinate-menus"))
+  }, loading ? /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__subordinate-menus--loading"))
+  }, /*#__PURE__*/_react["default"].createElement("span", null)) : /*#__PURE__*/_react["default"].createElement(_scrollbar["default"], {
+    style: {
+      maxHeight: maxHeight
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_menuTree["default"], {
+    data: treeData,
+    defaultExpandedKeys: expandedKeys,
+    selectedKeys: selectedMenuKeys,
+    onSelect: onSelectHandler,
+    loadData: onLoadTreeNodeDataHandler
+  })));
+}

package/lib/components/rich-editor-at/components/index.js

@@ -85,7 +85,8 @@ var RichEditorAtAvatar = function RichEditorAtAvatar(props) {
   var renderImgAvatar = function renderImgAvatar() {
     return /*#__PURE__*/_react["default"].createElement("img", {
       style: {
-        verticalAlign: 'top'
+        verticalAlign: 'top',
+        width: '60px'
       },
       src: src
     });

package/package.json

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