@titaui/pc 1.15.61 → 1.15.63-beta.2

package/lib/components/dynamic/dynamic-item/dynamic-new-report/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.templateRichPlugins = exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -87,6 +87,19 @@ var getEReportType = function getEReportType(type) {
 var prefix = 'titaui-dynamic-new-report-item';
 var loginUserId = (0, _bsGlobal.getUserInfo)().Id;
 
+var templateRichPlugins = function templateRichPlugins(defaultPrincipleUser, editable, delAble, endDate, newTaskLine) {
+  return ["heading", "strong", "color", "underLine", "deleteLine", "list", "alignment", "blockquote", "link", "table", "image", 'mention', {
+    name: 'task',
+    defaultPrincipleUser: defaultPrincipleUser,
+    editable: editable,
+    delAble: delAble,
+    endDate: endDate,
+    newTaskLine: newTaskLine
+  }];
+};
+
+exports.templateRichPlugins = templateRichPlugins;
+
 var DynamicReply = function DynamicReply(_ref) {
   var _classNames;
 
@@ -152,6 +165,9 @@ var DynamicReply = function DynamicReply(_ref) {
       className: "".concat(prefix, "__operate-desc")
     }, reportTextMap[reportType]);
   }, [reportType]);
+  var edit = true;
+  var delAble = false;
+  var newTaskLine = true;
 
   var renderContent = function renderContent() {
     return /*#__PURE__*/_react["default"].createElement("div", {
@@ -191,7 +207,9 @@ 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"], null, /*#__PURE__*/_react["default"].createElement(_richEditor.EditorComponent, {
+        }, item.title === '工作总结' ? (0, _getLocale.getLocale)('Tasks_Tab_MyS_JobSummary') : (0, _getLocale.getLocale)('Rep_Tab_Mys_NextWorkPlans'), /*#__PURE__*/_react["default"].createElement(_richEditor["default"], {
+          plugins: templateRichPlugins({}, edit, delAble, undefined, newTaskLine)
+        }, /*#__PURE__*/_react["default"].createElement(_richEditor.EditorComponent, {
           editable: false,
           initialState: !!item.richContent ? JSON.parse(item.richContent || '{}') : undefined,
           placeholder: (0, _getLocale.getLocale)('Rep_NewS_Notfilled')

package/lib/components/okr-excel/index.css

@@ -8,6 +8,13 @@
   overflow: hidden;
 }
 
+.tita-okr-excel__html-container {
+  padding-top: 10px;
+  overflow-y: auto;
+  height: 100%;
+  width: 100%;
+}
+
 .tita-okr-excel .tita-okr-type-icon {
   display: inline-block;
   transform: translateY(4px);

package/lib/components/okr-excel/index.js

@@ -132,7 +132,7 @@ var App = function App(_ref2) {
     }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
       field: dicData['KR 最新进展'],
       valueGetter: 'data.Kr.progressDescription',
-      cellRenderer: _renders.tooltipRenderer,
+      cellRenderer: _renders.tooltipHtmlRenderer,
       width: 200
     })];
   }, [showCycle]);

package/lib/components/okr-excel/renders.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.visibilityRenderer = exports.userRenderer = exports.tooltipRenderer = exports.okrTypeRenderer = exports.krWeightRenderer = exports.krUserRenderer = exports.krNameRenderer = exports.getStatus = exports.TaskProgressRenderer = exports.OkrNameRenderer = exports.KrProgressRenderer = exports.EObjType = exports.ConfidenceRenderer = void 0;
+exports.visibilityRenderer = exports.userRenderer = exports.tooltipRenderer = exports.tooltipHtmlRenderer = exports.okrTypeRenderer = exports.krWeightRenderer = exports.krUserRenderer = exports.krNameRenderer = exports.getStatus = exports.TaskProgressRenderer = exports.OkrNameRenderer = exports.KrProgressRenderer = exports.EObjType = exports.ConfidenceRenderer = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -336,4 +336,25 @@ var tooltipRenderer = function tooltipRenderer(params) {
   }, params.value));
 };
 
-exports.tooltipRenderer = tooltipRenderer;
+exports.tooltipRenderer = tooltipRenderer;
+
+var tooltipHtmlRenderer = function tooltipHtmlRenderer(params) {
+  return params.value && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: /*#__PURE__*/_react["default"].createElement("div", {
+      className: "editor-style",
+      dangerouslySetInnerHTML: {
+        __html: params.value
+      }
+    }),
+    placement: "top"
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__html-container editor-style")
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__tooltip"),
+    dangerouslySetInnerHTML: {
+      __html: params.value
+    }
+  })));
+};
+
+exports.tooltipHtmlRenderer = tooltipHtmlRenderer;

package/lib/pages/new-okr-list/header/index.js

@@ -342,7 +342,8 @@ function Header(props, ref) {
       className: "".concat(_precls.precls, "__table-tip")
     }, "\u65B0\u589E OKR \u8868\u683C\u67E5\u770B\u6A21\u5F0F\uFF0C\u67E5\u770B\u66F4\u4FBF\u6377\uFF0C\u5207\u6362\u4F53\u9A8C\u4E00\u4E0B"),
     onClickClose: setTableTip,
-    popupPlacement: "bottom"
+    popupPlacement: "bottom",
+    zIndex: 1000
   }, /*#__PURE__*/_react["default"].createElement(_popupSelect["default"], {
     menuData: viewTypeMenuData,
     popupPlacement: "bottom",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.15.61",
+  "version": "1.15.63-beta.2",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -82,7 +82,7 @@
     "@titaui/rc-trigger": "5.2.5",
     "@titaui/react-flow-renderer": "9.5.4",
     "@titaui/request": "^1.0.1",
-    "@titaui/rich-editor": "0.1.66",
+    "@titaui/rich-editor": "0.1.71-beta.22",
     "@titaui/toast": "1.0.0",
     "@types/color": "3.0.3",
     "@types/prosemirror-commands": "1.0.4",