@titaui/pc 1.15.69-beta.6 → 1.15.69-beta.7

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),
@@ -180,7 +181,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.js

@@ -30,7 +30,18 @@ var Schedule = function Schedule(_ref) {
   }, (value === null || value === void 0 ? void 0 : value.length) !== 0 && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
   }, value === null || value === void 0 ? void 0 : value.map(function (val) {
-    if (!val.EntityId) return null;
+    if (!val.EntityId) return (
+      /*#__PURE__*/
+      // <div className={`${prefix}__content-text`}>
+      _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
+        }
+      })) // </div>
+
+    );
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__content-text")
     }, /*#__PURE__*/_react["default"].createElement("div", {

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/dynamic-new-report/index.js

@@ -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/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

@@ -141,13 +141,6 @@ var summaryMenus = /*#__PURE__*/function () {
       type: _index.GROUP_NAME_NODE,
       href: "",
       isShow: isShowManage
-    }, {
-      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: 'yibiao',
       label: _i18n.locale.menu_summary_dashboard,
@@ -155,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/promise-confirm/index.js

@@ -68,8 +68,6 @@ var PromiseConfirm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   };
 
   var handleConfirmBtnClick = function handleConfirmBtnClick(e) {
-    e.stopPropagation();
-
     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,

package/package.json

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