@titaui/pc 1.15.90 → 1.15.93

package/lib/components/dialog-confirm/index.js

@@ -61,7 +61,9 @@ function WarningButton(props) {
       children = props.children,
       disabled = props.disabled;
 
-  var onClickHandler = function onClickHandler() {
+  var onClickHandler = function onClickHandler(e) {
+    e.stopPropagation();
+
     if (!disabled) {
       onClick();
     }

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

@@ -9,6 +9,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _tooltip = _interopRequireDefault(require("../../../../tooltip"));
 
 var _newConfidence = _interopRequireDefault(require("../../../../new-confidence"));
@@ -29,8 +31,6 @@ var _interface = require("../task-progress/interface");
 
 require("./index.css");
 
-var _classnames = _interopRequireDefault(require("classnames"));
-
 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); }
@@ -58,7 +58,8 @@ var OkrProgress = function OkrProgress(_ref) {
   var _rowsData$Rows, _rowsData$Rows2;
 
   var data = _ref.data,
-      reportType = _ref.reportType;
+      reportType = _ref.reportType,
+      title = _ref.title;
 
   var _useState = (0, _react.useState)(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -120,7 +121,9 @@ var OkrProgress = function OkrProgress(_ref) {
         })), /*#__PURE__*/_react["default"].createElement("td", null), /*#__PURE__*/_react["default"].createElement("td", {
           className: "padding-td"
         }, /*#__PURE__*/_react["default"].createElement(_schedule["default"], {
-          value: item.LastContent,
+          oldValue: item.LastRichContent || item.LastContent || '' // oldValue={item.LastRichContent || ""}
+          ,
+          value: item.LastContents,
           date: item.LastContentTime,
           id: item.Id
         })));
@@ -142,7 +145,9 @@ var OkrProgress = function OkrProgress(_ref) {
         })), /*#__PURE__*/_react["default"].createElement("td", {
           className: "padding-td"
         }, /*#__PURE__*/_react["default"].createElement(_schedule["default"], {
-          value: item.LastRichContent || item.LastContent,
+          oldValue: item.LastRichContent || item.LastContent || '' // oldValue={item.LastRichContent || ''}
+          ,
+          value: item === null || item === void 0 ? void 0 : item.LastContents,
           date: item.LastContentTime,
           id: item.Id
         })));
@@ -178,7 +183,7 @@ var OkrProgress = function OkrProgress(_ref) {
     className: (0, _classnames["default"])("".concat(prefix, "__title-arrow"), _defineProperty({}, "".concat(prefix, "__title-arrow--show"), !tableVisible))
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])('tu-icon-caret-down', "".concat(prefix, "__title-arrow-icon"), _defineProperty({}, "".concat(prefix, "__title-arrow-icon--rotate"), !tableVisible))
-  }))), renderTitle, /*#__PURE__*/_react["default"].createElement("div", {
+  }))), title, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__title-total")
   }, rowsData === null || rowsData === void 0 ? void 0 : (_rowsData$Rows2 = rowsData.Rows) === null || _rowsData$Rows2 === void 0 ? void 0 : _rowsData$Rows2.length)), tableVisible && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__table")

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

@@ -9,6 +9,14 @@
   white-space: pre-wrap;
 }
 
+.titaui-dynamic-summary-schedule__content-richContent {
+  font-size: 14px;
+  color: #141c28;
+  line-height: 22px;
+  white-space: pre-wrap;
+  margin-bottom: 30px;
+}
+
 .titaui-dynamic-summary-schedule__content-date {
   font-size: 12px;
   color: #89919f;

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

@@ -7,8 +7,12 @@ exports["default"] = exports.Schedule = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _moment = _interopRequireDefault(require("moment"));
+
 var _scrollbar = _interopRequireDefault(require("../../../../scrollbar"));
 
+var _openData = require("../../../../../utils/open-data");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -16,24 +20,47 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 var prefix = "titaui-dynamic-summary-schedule";
 
 var Schedule = function Schedule(_ref) {
-  var value = _ref.value;
+  var value = _ref.value,
+      oldValue = _ref.oldValue;
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
   }, /*#__PURE__*/_react["default"].createElement(_scrollbar["default"], {
     style: {
       maxHeight: 164
     }
-  }, value && /*#__PURE__*/_react["default"].createElement("div", {
+  }, (value === null || value === void 0 ? void 0 : value.length) !== 0 && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__content-text")
+  }, value === null || value === void 0 ? void 0 : value.map(function (val) {
+    if (!val.EntityId) return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(prefix, "__content-richContent")
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      dangerouslySetInnerHTML: {
+        __html: val === null || val === void 0 ? void 0 : val.RichContent
+      }
+    }));
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(prefix, "__content-text")
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(prefix, "__content-title")
+    }, (0, _moment["default"])((val === null || val === void 0 ? void 0 : val.startDate) || '').format('YYYY/MM/DD') === (0, _moment["default"])((val === null || val === void 0 ? void 0 : val.endDate) || '').format('YYYY/MM/DD') && /*#__PURE__*/_react["default"].createElement("span", null, (0, _moment["default"])(val === null || val === void 0 ? void 0 : val.startDate).format('YYYY/MM/DD')), (0, _moment["default"])(val === null || val === void 0 ? void 0 : val.startDate).format('YYYY/MM/DD') !== (0, _moment["default"])(val === null || val === void 0 ? void 0 : val.endDate).format('YYYY/MM/DD') && /*#__PURE__*/_react["default"].createElement("span", null, (0, _moment["default"])((val === null || val === void 0 ? void 0 : val.startDate) || '').format('YYYY/MM/DD'), " - ", (0, _moment["default"])((val === null || val === void 0 ? void 0 : val.endDate) || '').format('YYYY/MM/DD')), "\xA0", /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+      id: val.UserId,
+      name: val === null || val === void 0 ? void 0 : val.UserName
+    }))), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(prefix, "__content-richContent")
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      dangerouslySetInnerHTML: {
+        __html: val === null || val === void 0 ? void 0 : val.RichContent
+      }
+    })));
+  })), (!value || (value === null || value === void 0 ? void 0 : value.length) === 0) && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, oldValue ? /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__content-richContent")
   }, /*#__PURE__*/_react["default"].createElement("span", {
     dangerouslySetInnerHTML: {
-      __html: value
+      __html: oldValue
     }
-  }))), !value && /*#__PURE__*/_react["default"].createElement("div", {
+  })) : /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__no-progress")
-  }, "-")));
+  }, "-"))));
 };
 
 exports.Schedule = Schedule;

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

@@ -158,7 +158,6 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       departmentName = _ref3.departmentName,
       departmentId = _ref3.departmentId;
 
-  console.log('visibilityScope', visibilityScope);
   var departmentsRender = (0, _react.useMemo)(function () {
     return (departments === null || departments === void 0 ? void 0 : departments.length) !== 0 && departments.map(function (item, index) {
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {

package/lib/components/dynamic/dynamic-item/components/table-row-okr/utils.js

@@ -69,6 +69,8 @@ var formatPeriod = function formatPeriod(selected) {
         cycleDate = "".concat((0, _getLocale.getLocale)('Mod_Customization'));
       }
 
+      break;
+
     default:
       cycleDate = '';
   }

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

@@ -47,7 +47,8 @@ var prefix = 'titaui-dynamic-task-progress';
 
 var TaskProgress = function TaskProgress(_ref) {
   var data = _ref.data,
-      reportType = _ref.reportType;
+      reportType = _ref.reportType,
+      title = _ref.title;
 
   var _useState = (0, _react.useState)({
     1: [],
@@ -173,7 +174,7 @@ var TaskProgress = function TaskProgress(_ref) {
     className: (0, _classnames["default"])("".concat(prefix, "__title-arrow"), _defineProperty({}, "".concat(prefix, "__title-arrow--show"), !tableVisible))
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])('tu-icon-caret-down', "".concat(prefix, "__title-arrow-icon"), _defineProperty({}, "".concat(prefix, "__title-arrow-icon--rotate"), !tableVisible))
-  }))), renderTitle), statusStatistic.done + statusStatistic.doing + statusStatistic.overDue > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+  }))), title), statusStatistic.done + statusStatistic.doing + statusStatistic.overDue > 0 && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(prefix, "__statistic"), _defineProperty({}, "".concat(prefix, "__statistic--hide"), !tableVisible))
   }, statusStatistic.done > 0 && /*#__PURE__*/_react["default"].createElement("span", {
     onClick: handleFilterDone,

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

@@ -35,8 +35,12 @@ var RenderRow = function RenderRow(_ref) {
   };
 
   var render = function render() {
+    var _item$LastRichContent;
+
+    console.log('LastRichContent', item === null || item === void 0 ? void 0 : (_item$LastRichContent = item.LastRichContent) === null || _item$LastRichContent === void 0 ? void 0 : _item$LastRichContent.trim());
+
     if (item.IsImport) {
-      var _item$LastRichContent;
+      var _item$LastRichContent2;
 
       return /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement("div", {
         className: "".concat(prefix, "__table-row-title"),
@@ -58,7 +62,9 @@ var RenderRow = function RenderRow(_ref) {
         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$LastRichContent = item.LastRichContent) === null || _item$LastRichContent === void 0 ? void 0 : _item$LastRichContent.trim()) || (item === null || item === void 0 ? void 0 : item.LastContent) || "",
+        oldValue: (item === null || item === void 0 ? void 0 : (_item$LastRichContent2 = item.LastRichContent) === null || _item$LastRichContent2 === void 0 ? void 0 : _item$LastRichContent2.trim()) || (item === null || item === void 0 ? void 0 : item.LastContent) || "" // oldValue={item?.LastRichContent?.trim() ||  ""}
+        ,
+        value: item.LastContents,
         editable: false,
         id: item.Id
       })));

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

@@ -207,7 +207,7 @@ var DynamicReply = function DynamicReply(_ref) {
         return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, ((item === null || item === void 0 ? void 0 : item.richContent) || !(0, _util.isEmptyImage)(item === null || item === void 0 ? void 0 : item.richContent)) && /*#__PURE__*/_react["default"].createElement("div", {
           className: "".concat(prefix, "__work"),
           key: item.richContent || Math.random()
-        }, item.title === '工作总结' ? (0, _getLocale.getLocale)('Tasks_Tab_MyS_JobSummary') : (0, _getLocale.getLocale)('Rep_Tab_Mys_NextWorkPlans'), /*#__PURE__*/_react["default"].createElement(_richEditor["default"], {
+        }, item.title, /*#__PURE__*/_react["default"].createElement(_richEditor["default"], {
           plugins: templateRichPlugins({}, edit, delAble, undefined, newTaskLine)
         }, /*#__PURE__*/_react["default"].createElement(_richEditor.EditorComponent, {
           editable: false,
@@ -219,6 +219,7 @@ var DynamicReply = function DynamicReply(_ref) {
       if (item.contentType === _constant.dailyContentType.okr) {
         return item.content && /*#__PURE__*/_react["default"].createElement(_okrProgress["default"], {
           data: item.content,
+          title: item.title,
           reportType: data.reportType
         });
       }
@@ -226,6 +227,7 @@ var DynamicReply = function DynamicReply(_ref) {
       if (item.contentType === _constant.dailyContentType.task) {
         return item.content && /*#__PURE__*/_react["default"].createElement(_taskProgress["default"], {
           data: item.content,
+          title: item.title,
           reportType: data.reportType
         });
       }

package/lib/components/form/form-fields/input/index.css

@@ -49,6 +49,10 @@
   color: #3f475594;
 }
 
+.form-field-input__border:hover {
+  border: 1px solid #2879ff !important;
+}
+
 .form-field-input__border--error {
   box-shadow: inset 0px 0px 4px 0px rgba(240, 94, 94, 0.3);
   border: 1px solid #f05e5e;

package/lib/components/form/form-fields/input/index.js

@@ -112,6 +112,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     if (errors.length) {
       setHasError(true);
       setTip(errors[0].tip);
+      setHasActive(false);
       inputRef.current.focus();
     } else {
       setHasError(false);
@@ -156,6 +157,10 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
     var errors = _verifing();
 
+    if (onBlur) {
+      onBlur();
+    }
+
     if (errors.length) {
       setHasError(true);
       setTip(errors[0].tip);
@@ -184,15 +189,13 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
     var errors = _verifing();
 
-    setHasActive(false);
-
     if (errors.length) {
-      setHasError(true);
-      setTip(errors[0].tip);
+      // setHasError(true);
+      // setTip(errors[0].tip);
       onCheckSuccess && onCheckSuccess(false);
     } else {
-      setHasError(false);
-      setTip('');
+      // setHasError(false);
+      // setTip('');
       onCheckSuccess && onCheckSuccess(true);
     }
   };

package/lib/components/guide-tip/index.js

@@ -19,7 +19,7 @@ var _getLocale = require("../../utils/getLocale");
 
 require("./index.css");
 
-var _excluded = ["type", "width", "time", "children", "popupPlacement", "classnames", "content", "onClickClose", "buttonTitle", "visible"];
+var _excluded = ["type", "width", "time", "children", "popupPlacement", "classnames", "content", "onClickClose", "buttonTitle", "visible", "isShowPopup"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -55,6 +55,8 @@ var GuideTip = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       buttonTitle = _props$buttonTitle === void 0 ? (0, _getLocale.getLocale)('TopMenu_button_InvitColleagues') : _props$buttonTitle,
       _props$visible = props.visible,
       visible = _props$visible === void 0 ? false : _props$visible,
+      _props$isShowPopup = props.isShowPopup,
+      isShowPopup = _props$isShowPopup === void 0 ? true : _props$isShowPopup,
       restProps = _objectWithoutProperties(props, _excluded);
 
   var popupRef = (0, _react.useRef)({
@@ -104,6 +106,7 @@ var GuideTip = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       }, time);
     }
   }, []);
+  if (!isShowPopup) return children;
   return /*#__PURE__*/_react["default"].createElement(_popup["default"], _extends({
     ref: popupRef,
     action: ['focus'],

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

@@ -38,6 +38,8 @@ var _default = /*#__PURE__*/function () {
         cb(_menus.PAGE_SUMMARY_SUBORDINATE);
       } else if (this.isSummaryDashboard()) {
         cb(_menus.PAGE_SUMMARY_DASHBOARD);
+      } else if (this.isSummaryTemplate()) {
+        cb(_menus.PAGE_SUMMARY_TEMPLATE);
       }
 
       return null;
@@ -84,6 +86,12 @@ var _default = /*#__PURE__*/function () {
       var pathname = this.history.location.pathname;
       return pathname.match(/summary\/dashboard/);
     }
+  }, {
+    key: "isSummaryTemplate",
+    value: function isSummaryTemplate() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/summary\/template\/page/);
+    }
   }]);
 
   return _default;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultRefObject = exports["default"] = exports.PAGE_SUMMARY_TONGJI = exports.PAGE_SUMMARY_SUBORDINATE = exports.PAGE_SUMMARY_SHARE = exports.PAGE_SUMMARY_ROLE = exports.PAGE_SUMMARY_MY = exports.PAGE_SUMMARY_DEPART = exports.PAGE_SUMMARY_DASHBOARD = exports.PAGE_SUMMARY_CHART = exports.PAGE_SUMMARY_ALl = void 0;
+exports.defaultRefObject = exports["default"] = exports.PAGE_SUMMARY_TONGJI = exports.PAGE_SUMMARY_TEMPLATE = exports.PAGE_SUMMARY_SUBORDINATE = exports.PAGE_SUMMARY_SHARE = exports.PAGE_SUMMARY_ROLE = exports.PAGE_SUMMARY_MY = exports.PAGE_SUMMARY_DEPART = exports.PAGE_SUMMARY_DASHBOARD = exports.PAGE_SUMMARY_CHART = exports.PAGE_SUMMARY_ALl = void 0;
 
 var _i18n = require("../../i18n");
 
@@ -57,6 +57,8 @@ var PAGE_SUMMARY_DASHBOARD = 'dashboard';
 exports.PAGE_SUMMARY_DASHBOARD = PAGE_SUMMARY_DASHBOARD;
 var PAGE_SUMMARY_TONGJI = 'tongji';
 exports.PAGE_SUMMARY_TONGJI = PAGE_SUMMARY_TONGJI;
+var PAGE_SUMMARY_TEMPLATE = 'template';
+exports.PAGE_SUMMARY_TEMPLATE = PAGE_SUMMARY_TEMPLATE;
 
 var _getUserInfo = (0, _bsGlobal.getUserInfo)(),
     IsLeader = _getUserInfo.IsLeader,
@@ -146,6 +148,13 @@ var summaryMenus = /*#__PURE__*/function () {
       type: _index.MENU_ITEM_NOE,
       href: '#/summary/dashboard',
       isShow: props.isShowDashboard
+    }, {
+      icon: 'template',
+      label: _i18n.locale.menu_summary_template,
+      key: PAGE_SUMMARY_TEMPLATE,
+      type: _index.MENU_ITEM_NOE,
+      href: '#/summary/template/page',
+      isShow: props.isShowTemplate
     }, {
       icon: "my-setup",
       label: _i18n.locale.menu_summary_role,

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getShareStatus = void 0;
+exports.getTemplateUserRole = exports.getShareStatus = void 0;
 
 var _request = require("@titaui/request");
 
@@ -14,4 +14,10 @@ var getShareStatus = function getShareStatus() {
   return (0, _request.rget)('v1')("summary/getShareUsers?toUserId=".concat(loginUser.Id));
 };
 
-exports.getShareStatus = getShareStatus;
+exports.getShareStatus = getShareStatus;
+
+var getTemplateUserRole = function getTemplateUserRole() {
+  return (0, _request.rget)('v1')('summaryTemplate/userRole');
+};
+
+exports.getTemplateUserRole = getTemplateUserRole;

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

@@ -86,6 +86,11 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       isShowTongji = _useState10[0],
       setIsShowTongji = _useState10[1];
 
+  var _useState11 = (0, _react.useState)(false),
+      _useState12 = _slicedToArray(_useState11, 2),
+      isShowTemplate = _useState12[0],
+      setIsShowTemplate = _useState12[1];
+
   var isShowDepartment = baseAuth.isBoss() || baseAuth.isAssistant() || baseAuth.isPlanDailyManager() || baseAuth.isDepartmentLeader() || baseAuth.isHrbp();
   var isShowDashboard = baseAuth.isBoss() || baseAuth.isAssistant() || baseAuth.isPlanDailyManager() || baseAuth.isHrbp();
   var flipRef = (0, _react.useRef)({
@@ -94,17 +99,18 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   });
   var summaryMenusData = (0, _react.useRef)(_menus.defaultRefObject);
 
-  var _useState11 = (0, _react.useState)(function () {
+  var _useState13 = (0, _react.useState)(function () {
     summaryMenusData.current = new _menus["default"]({
       isShowShare: false,
       isShowTongji: false,
-      isShowDept: true
+      isShowDept: true,
+      isShowTemplate: false
     });
     return summaryMenusData.current.getMenus();
   }),
-      _useState12 = _slicedToArray(_useState11, 2),
-      menus = _useState12[0],
-      setMenus = _useState12[1]; // 判断路由高亮菜单
+      _useState14 = _slicedToArray(_useState13, 2),
+      menus = _useState14[0],
+      setMenus = _useState14[1]; // 判断路由高亮菜单
 
 
   (0, _react.useEffect)(function () {
@@ -281,11 +287,12 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       isShowShare: isShowShare,
       isShowTongji: isShowTongji,
       isShowDept: isShowDepartment,
-      isShowDashboard: isShowDashboard
+      isShowDashboard: isShowDashboard,
+      isShowTemplate: isShowTemplate
     });
     summaryMenusData.current = newMenu;
     setMenus(newMenu.getMenus());
-  }, [isShowShare, isShowDepartment, isShowDashboard, isShowTongji]);
+  }, [isShowShare, isShowDepartment, isShowDashboard, isShowTongji, isShowTemplate]);
   (0, _react.useEffect)(function () {
     (0, _requestApi.getShareStatus)().then(function (resp) {
       if (resp.Code === 1) {
@@ -299,6 +306,18 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         setIsShowTongji(true);
       }
     });
+    (0, _requestApi.getTemplateUserRole)().then(function (res) {
+      //0普通人不可以查看，1超管老板助理，2总结管理员，3模板管理员
+      console.log(res);
+
+      if (res.Code === 1) {
+        if (res.Data.userTempRoles[0] === 0) {
+          setIsShowTemplate(false);
+        } else {
+          setIsShowTemplate(true);
+        }
+      }
+    });
     var obs = new _resizeObserverPolyfill["default"](function (entries) {
       var _iterator = _createForOfIteratorHelper(entries),
           _step;

package/lib/components/menus/i18n.js

@@ -60,6 +60,7 @@ var I18N = /*#__PURE__*/_createClass(function I18N() {
   this.menu_summary = 'Rep_NewS_Management';
   this.menu_summary_dashboard = 'Rep_Das_Dashboard';
   this.menu_summary_tongji = 'HP_MyPeer';
+  this.menu_summary_template = 'Rep_Tab_SummTemplates';
 });
 
 var locale = new I18N();

package/lib/components/nav-top/utils.js

@@ -14,14 +14,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 var getMenus = function getMenus() {
   // @ts-ignore
   var navs = window.BSGlobal.newNavigation;
-  var hnavs = navs.filter(function (item) {
-    return item.href !== '#summary/my';
-  }); //新加
-
-  hnavs.sort(function (pre, next) {
+  navs.sort(function (pre, next) {
     return pre.orderId - next.orderId;
   });
-  return hnavs; // const newNavigation = [
+  return navs; // const newNavigation = [
   //   {
   //     id: 21817,
   //     tenantId: 0,

package/lib/components/operation-records/index.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.getOperation = exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -21,6 +21,8 @@ var _style = require("./style");
 
 var _getLocale = require("../../utils/getLocale");
 
+var _request = require("@titaui/request");
+
 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); }
@@ -47,6 +49,12 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
+var getOperation = function getOperation(data) {
+  return (0, _request.rpost)("v1")("summaryTemplate/operations", data);
+};
+
+exports.getOperation = getOperation;
+
 var OperationRecord = /*#__PURE__*/function (_PureComponent) {
   _inherits(OperationRecord, _PureComponent);
 
@@ -86,6 +94,26 @@ var OperationRecord = /*#__PURE__*/function (_PureComponent) {
       });
     };
 
+    _this.getOperationInfo = function (feedId, commentCount) {
+      var params = {
+        TemplateFeedId: feedId,
+        commentCount: commentCount
+      };
+      getOperation(params).then(function (res) {
+        if (res.Code === 1) {
+          var data = res.Data;
+          console.log('data', data);
+
+          var newOperationTrackList = _this.formatCommentsDate(data.comments ? data.comments : []);
+
+          _this.setState({
+            operationTrackList: newOperationTrackList,
+            operationTrackTotal: data.total
+          });
+        }
+      });
+    };
+
     _this.formatCommentsDate = function (comments) {
       var thisYear = (0, _moment["default"])().year(); // 获取当前年份
 
@@ -132,13 +160,20 @@ var OperationRecord = /*#__PURE__*/function (_PureComponent) {
     _this.handlerSwitchShowRecord = function () {
       var _this$props = _this.props,
           feedId = _this$props.feedId,
-          commentCount = _this$props.commentCount; // 默认展示条数
+          commentCount = _this$props.commentCount,
+          isSummaryTemplate = _this$props.isSummaryTemplate; // 默认展示条数
 
       var operationTrackTotal = _this.state.operationTrackTotal; // 记录总数
 
       var isShowAllOperationRecord = _this.state.isShowAllOperationRecord;
-      isShowAllOperationRecord = !isShowAllOperationRecord;
-      isShowAllOperationRecord ? _this.getFeedInfo(feedId, operationTrackTotal) : _this.getFeedInfo(feedId, commentCount);
+      isShowAllOperationRecord = !isShowAllOperationRecord; // isShowAllOperationRecord ? this.getFeedInfo(feedId, operationTrackTotal) : this.getFeedInfo(feedId, commentCount);
+      // isShowAllOperationRecord ? this.getOperationInfo(feedId, operationTrackTotal) : this.getOperationInfo(feedId, commentCount);
+
+      if (isSummaryTemplate) {
+        isShowAllOperationRecord ? _this.getOperationInfo(feedId, operationTrackTotal) : _this.getOperationInfo(feedId, commentCount);
+      } else {
+        isShowAllOperationRecord ? _this.getFeedInfo(feedId, operationTrackTotal) : _this.getFeedInfo(feedId, commentCount);
+      }
 
       _this.setState({
         isShowAllOperationRecord: isShowAllOperationRecord
@@ -158,10 +193,17 @@ var OperationRecord = /*#__PURE__*/function (_PureComponent) {
     value: function componentDidMount() {
       var _this$props2 = this.props,
           feedId = _this$props2.feedId,
-          commentCount = _this$props2.commentCount;
+          commentCount = _this$props2.commentCount,
+          isSummaryTemplate = _this$props2.isSummaryTemplate;
 
       if (feedId) {
-        this.getFeedInfo(feedId, commentCount);
+        // this.getFeedInfo(feedId, commentCount);
+        // this.getOperationInfo(feedId, commentCount);
+        if (isSummaryTemplate) {
+          this.getOperationInfo(feedId, commentCount);
+        } else {
+          this.getFeedInfo(feedId, commentCount);
+        }
       }
     }
   }, {
@@ -170,8 +212,14 @@ var OperationRecord = /*#__PURE__*/function (_PureComponent) {
       if (prevProps.feedId != this.props.feedId) {
         var _this$props3 = this.props,
             feedId = _this$props3.feedId,
-            commentCount = _this$props3.commentCount;
-        this.getFeedInfo(feedId, commentCount);
+            commentCount = _this$props3.commentCount,
+            isSummaryTemplate = _this$props3.isSummaryTemplate;
+
+        if (isSummaryTemplate) {
+          this.getOperationInfo(feedId, commentCount);
+        } else {
+          this.getFeedInfo(feedId, commentCount);
+        }
       }
     }
     /**

package/lib/components/promise-confirm/index.js

@@ -60,13 +60,14 @@ var PromiseConfirm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     reject: function reject() {}
   });
 
-  var handleCancelBtnClick = function handleCancelBtnClick() {
+  var handleCancelBtnClick = function handleCancelBtnClick(e) {
+    e.stopPropagation();
     onCancel();
     dialogPromise.current.reject();
     setVisible(false);
   };
 
-  var handleConfirmBtnClick = function handleConfirmBtnClick() {
+  var handleConfirmBtnClick = function handleConfirmBtnClick(e) {
     if (onConfirm) {
       onConfirm();
     }

package/lib/components/select-tags/index.js

@@ -19,7 +19,7 @@ var _getLocale = require("../../utils/getLocale");
 
 require("./index.css");
 
-var _excluded = ["selected", "controlValue", "data", "onChange", "style", "mode", "className", "placeholder", "name", "noBorder"];
+var _excluded = ["selected", "controlValue", "data", "onChange", "style", "mode", "className", "placeholder", "name", "noBorder", "dropdownClassName"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -67,6 +67,7 @@ var SelectTags = function SelectTags(_ref) {
       placeholder = _ref$placeholder === void 0 ? "".concat((0, _getLocale.getLocale)("Mod_Pleaseselect")) : _ref$placeholder,
       name = _ref.name,
       noBorder = _ref.noBorder,
+      dropdownClassName = _ref.dropdownClassName,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
   var _useState = (0, _react.useState)(selected),
@@ -88,7 +89,7 @@ var SelectTags = function SelectTags(_ref) {
     className: preCls
   }, /*#__PURE__*/_react["default"].createElement(_rcSelect["default"], _extends({
     className: (0, _classnames["default"])(className, _defineProperty({}, "".concat(preCls, "-noborder"), noBorder)),
-    dropdownClassName: (0, _classnames["default"])("titaui-dropDown", _defineProperty({}, "".concat(preCls, "-hasSelectItem"), mode === "multiple")),
+    dropdownClassName: (0, _classnames["default"])(dropdownClassName, "titaui-dropDown", _defineProperty({}, "".concat(preCls, "-hasSelectItem"), mode === "multiple")),
     value: value,
     style: style,
     mode: mode,
@@ -109,7 +110,8 @@ var SelectTags = function SelectTags(_ref) {
   }, restProps), data.map(function (item, key) {
     return /*#__PURE__*/_react["default"].createElement(_rcSelect.Option, {
       key: key,
-      value: item.value
+      value: item.value,
+      disabled: item === null || item === void 0 ? void 0 : item.disabled
     }, item.label);
   })));
 };

package/lib/pages/aha2021/index.js

@@ -117,11 +117,7 @@ function PageLayout(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])(preCls)
-  }, isShowUpdateTip && /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(preCls, "__update-tip")
-  }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "tu-icon-tishi update-tip-icon"
-  }), "\u4EB2\u7231\u7684\u7528\u6237\u60A8\u597D\uFF0C\u300C\u603B\u7ED3\u300D\u5C06\u4E8E\u4ECA\u665A\u8FDB\u884C\u5347\u7EA7\uFF0C22:30 - 23:00 \u5C06\u6682\u65F6\u5173\u95ED\u603B\u7ED3\u6A21\u5757\uFF0C\u8BF7\u4E8E 8.25 22:00 - \u6B21\u65E5 7:00 \u6682\u505C\u603B\u7ED3\u7684\u7F16\u8F91\u4E0E\u63D0\u4EA4\u64CD\u4F5C\uFF0C\u611F\u8C22\u60A8\u7684\u7406\u89E3\u4E0E\u914D\u5408~"), hideNavTop !== 'true' && /*#__PURE__*/_react["default"].createElement("div", {
+  }, hideNavTop !== 'true' && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__header"))
   }, (0, _helpers.getTenantInfo)().Source === 964 ? /*#__PURE__*/_react["default"].createElement(_hrHeader["default"], null) : /*#__PURE__*/_react["default"].createElement(_navTop["default"], null)), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__message"))

package/package.json

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