fix related to description field rich text
This commit is contained in:
parent
6ea6c35683
commit
31c5aee90a
|
@ -3,7 +3,7 @@
|
|||
"solution": {
|
||||
"name": "Rhythm of Business Calendar",
|
||||
"id": "37df9a1c-b53e-46ad-9efb-2e4da77a724f",
|
||||
"version": "5.0.1.0",
|
||||
"version": "5.0.2.0",
|
||||
"includeClientSideAssets": true,
|
||||
"skipFeatureDeployment": true,
|
||||
"webApiPermissionRequests": [
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "rhythm-of-business-calendar",
|
||||
"version": "5.0.1",
|
||||
"version": "5.0.2",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "rhythm-of-business-calendar",
|
||||
"version": "5.0.1",
|
||||
"version": "5.0.2",
|
||||
"main": "lib/index.js",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
|
|
|
@ -6,6 +6,7 @@ import { Refiner, humanizeRecurrencePattern } from 'model';
|
|||
import { DefaultButton, PrimaryButton } from 'office-ui-fabric-react';
|
||||
import { Humanize as _strings } from 'ComponentStrings';
|
||||
import { EventOccurrence } from 'model';
|
||||
import { renderSanitizedHTML } from "common/components/LiveUtils";
|
||||
interface IExportToExcelProps {
|
||||
items: any[];
|
||||
_refiners:readonly Refiner[]
|
||||
|
@ -84,7 +85,7 @@ const ExportToExcel: React.FC<any> = forwardRef(( props: IExportToExcelProps, re
|
|||
<td style={{ border: '1px solid black', padding: '8px' }}>{item.title}</td>
|
||||
<td style={{ border: '1px solid black', padding: '8px' }}>{formatDate(item.start)}</td>
|
||||
<td style={{ border: '1px solid black', padding: '8px' }}>{formatDate(item.end)}</td>
|
||||
<td style={{ border: '1px solid black', padding: '8px' }}>{item.description}</td>
|
||||
<td style={{ border: '1px solid black', padding: '8px' }} dangerouslySetInnerHTML={{ __html: renderSanitizedHTML(item.description) }}></td>
|
||||
<td style={{ border: '1px solid black', padding: '8px' }}>{item.isRecurring ? 'Yes' : 'No'}</td>
|
||||
<td style={{ border: '1px solid black', padding: '8px' }}>{item.isAllDay ? 'Yes' : 'No'}</td>
|
||||
{_refiners.map((refiner, index) => (
|
||||
|
|
|
@ -10,6 +10,7 @@ import moment from "moment";
|
|||
import {humanizeRecurrencePattern } from 'model';
|
||||
import { Humanize as _strings } from "ComponentStrings";
|
||||
import ExportToExcel from './ExportToExcel';
|
||||
import { renderSanitizedHTML } from "common/components/LiveUtils";
|
||||
|
||||
const classNames = mergeStyleSets({
|
||||
fileIconHeaderIcon: {
|
||||
|
@ -228,8 +229,14 @@ export class ListView extends React.Component<IViewProps, IDetailsListState> {
|
|||
isResizable: true,
|
||||
data: 'string',
|
||||
onRender: (item: any) => {
|
||||
return <span>{item.description}</span>;
|
||||
},
|
||||
return (
|
||||
<div
|
||||
dangerouslySetInnerHTML={{
|
||||
__html: renderSanitizedHTML(item.description)
|
||||
}}
|
||||
/>
|
||||
);
|
||||
},
|
||||
isPadded: true,
|
||||
});
|
||||
this.setState({ columns: newColumns });
|
||||
|
|
|
@ -30,7 +30,7 @@ export class EventOccurrence implements IEvent {
|
|||
public get isConfidential() { return this.event.isConfidential; }
|
||||
public get refinerValues() { return this.event.refinerValues; }
|
||||
public get contacts() { return this.event.contacts; }
|
||||
public get description() { return this.event.description ? this.parseHTML(this.event.description) : undefined; }
|
||||
public get description() { return this.event.description ? this.event.description : undefined; }
|
||||
public get recurrenceExceptionInstanceDate() { return this.event.recurrenceExceptionInstanceDate; }
|
||||
public get created(){ return this.event.created; }
|
||||
public get createdBy(){ return this.event.creator; }
|
||||
|
|
Loading…
Reference in New Issue