Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/controls/fieldCollectionData/ICustomCollectionField.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,6 @@ export enum CustomCollectionFieldType {
peoplepicker,
fabricIcon,
url,
date,
custom
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import { PeoplePicker, PrincipalType } from "../../peoplepicker";
import { Callout, DirectionalHint } from 'office-ui-fabric-react/lib/components/Callout';
import { CollectionIconField } from '../collectionIconField';
import { clone, findIndex, sortBy } from '@microsoft/sp-lodash-subset';
import { CollectionNumberField } from '../collectionNumberField';
import { Guid } from '@microsoft/sp-core-library';
import { FieldValidator } from '../FieldValidator';
import { DatePicker } from 'office-ui-fabric-reac/lib/DatePicker';
import { IPersonaProps } from 'office-ui-fabric-react/lib/Persona';

export class CollectionDataItem extends React.Component<ICollectionDataItemProps, ICollectionDataItemState> {
Expand Down Expand Up @@ -487,9 +487,16 @@ export class CollectionDataItem extends React.Component<ICollectionDataItemProps
onRenderOption={field.onRenderOption}
className="PropertyFieldCollectionData__panel__dropdown-field" />;
case CustomCollectionFieldType.number:
return (
<CollectionNumberField field={field} item={item} disableEdit={disableFieldOnEdit} fOnValueChange={this.onValueChanged} fValidation={this.fieldValidation} />
);
return <TextField placeholder={field.placeholder || field.title}
className={styles.collectionDataField}
value={item[field.id] ? item[field.id] : ""}
required={field.required}
disabled={disableFieldOnEdit}
type='number'
onChange={(e, value) => this.onValueChanged(field.id, value)}
deferredValidationTime={field.deferredValidationTime || field.deferredValidationTime >= 0 ? field.deferredValidationTime : 200}
onGetErrorMessage={async (value: string) => await this.fieldValidation(field, value)}
inputClassName="PropertyFieldCollectionData__panel__number-field" />;
case CustomCollectionFieldType.fabricIcon:
return (
<CollectionIconField field={field} item={item} disableEdit={disableFieldOnEdit} fOnValueChange={this.onValueChanged} fValidation={this.fieldValidation} />
Expand All @@ -504,6 +511,16 @@ export class CollectionDataItem extends React.Component<ICollectionDataItemProps
deferredValidationTime={field.deferredValidationTime || field.deferredValidationTime >= 0 ? field.deferredValidationTime : 200}
onGetErrorMessage={async (value: string) => this.urlFieldValidation(field, value, item)}
inputClassName="PropertyFieldCollectionData__panel__url-field" />;
case CustomCollectionFieldType.date:
return <DatePicker
className={styles.collectionDataField}
placeholder={field.placeholder || field.title}
isRequired={field.required}
disabled={disableFieldOnEdit}
value={item[field.id] ? new Date(item[field.id]) : undefined}
onSelectDate={(date) => { this.onValueChanged(field.id, date) }}
formatDate={(date) => { return date ? date?.toLocaleDateString() : ""; }}
/>;
case CustomCollectionFieldType.custom:
if (field.onCustomRender) {
return field.onCustomRender(field, item[field.id], this.onValueChanged, item, item.uniqueId, this.onCustomFieldValidation);
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

10 changes: 8 additions & 2 deletions src/webparts/controlsTest/components/ControlsTest.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2043,7 +2043,8 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
key={"FieldCollectionData"}
label={"Fields Collection"}
itemsPerPage={3}
manageBtnLabel={"Manage"} onChanged={(value) => { console.log(value); }}
manageBtnLabel={"Manage"}
onChanged={(value) => { console.log(value); }}
panelHeader={"Manage values"}
enableSorting={true}
panelProps={{ type: PanelType.custom, customWidth: "98vw" }}
Expand All @@ -2064,7 +2065,7 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
id: "Field7", title: "Combo Multi", type: CustomCollectionFieldType.combobox,
allowFreeform: true, multiSelect: true, options: [{key: "choice 1", text: "choice 1"}, {key: "choice 2", text: "choice 2"}, {key: "choice 3", text: "choice 3"}]
},

{ id: "Field8", title: "Date field", type: CustomCollectionFieldType.date, placeholder: "Select a date" }
]}
value={this.getRandomCollectionFieldData()}

Expand Down Expand Up @@ -2665,6 +2666,10 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
private getRandomCollectionFieldData = () => {
let result = [];
for (let i = 1; i < 16; i++) {

const sampleDate = new Date();
sampleDate.setDate(sampleDate.getDate() + i);

result.push({
"Field1": `String${i}`,
"Field2": i,
Expand All @@ -2673,6 +2678,7 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
"Field5": null,
"Field6": {key: "choice 1", text: "choice 1"},
"Field7": [{key: "choice 1", text: "choice 1"}, {key: "choice 2", text: "choice 2"}]
"Field8": sampleDate
});
}
return result;
Expand Down