honeymoose
/
sp-dev-fx-webparts
mirror of https://github.com/pnp/sp-dev-fx-webparts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bugs

This commit is contained in:
albegut 2021-04-25 13:38:35 +02:00
parent 4cf380fda1
commit ed6fbbde27
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
samples/react-list-search/src/webparts/listSearch/components/ListSearch.tsx
View File

@ -1089,10 +1089,10 @@ export default class IListdSearchWebPart extends React.Component<IListSearchProp
<div className={styles.rowData}>
<div className={styles.colData}>
{this.props.ShowItemCount &&
<Shimmer isDataLoaded={!this.state.isLoading} width={"25%"}><div className={styles.template_resultCount}>{this.props.ItemCountText.replace("{itemCount}", `${this.state.filterItems ? this.state.filterItems.length : 0}`)}</div></Shimmer>}
<Shimmer isDataLoaded={!this.state.isLoading} width={"25%"}><div className={styles.template_resultCount}>{this.props.ItemCountText.replace("{itemCount}", `${this.state.filterItems ? this.state.filterItems.length : 0}`)}</div></Shimmer>
}
<ShimmeredDetailsList
styles={{ root: { backgroundColor: 'red', background: "blue" } }}
enableShimmer={!this.state.isLoading}
enableShimmer={this.state.isLoading}
items={this._getItems()}
columns={this.state.columns}
groups={!this.state.isLoading && this.props.groupByField && this.groups}
@ -1137,5 +1137,4 @@ export default class IListdSearchWebPart extends React.Component<IListSearchProp
</div>
</div >);
}
}

8
samples/react-list-search/src/webparts/listSearch/services/ListService.ts
View File

@ -48,7 +48,7 @@ export default class ListService implements IListService {
try {
let camlQuery: boolean = false;
let items: any = undefined;
let queryConfig: QueryHelperEntity = this.GetViewFieldsWithId(listQueryOptions, !isEmpty(listQueryOptions.camlQuery) || !isEmpty(listQueryOptions.viewName));
let queryConfig: QueryHelperEntity = this.GetViewFieldsWithId(listQueryOptions, !isEmpty(listQueryOptions.camlQuery) || !isEmpty(listQueryOptions.viewName), false);
if (listQueryOptions.camlQuery) {
let query = this.getCamlQueryWithViewFieldsAndRowLimit(listQueryOptions.camlQuery, queryConfig, rowLimit);
items = await this.getListItemsByCamlQuery(listQueryOptions.list.Id, query, queryConfig);
@ -98,7 +98,7 @@ export default class ListService implements IListService {
public async getListItemById(listQueryOptions: IListSearchListQuery, itemId: number): Promise<any> {
try {
let queryConfig: QueryHelperEntity = this.GetViewFieldsWithId(listQueryOptions, false);
let queryConfig: QueryHelperEntity = this.GetViewFieldsWithId(listQueryOptions, false, true);
return this.web.lists.getById(listQueryOptions.list.Id).items.getById(itemId).select(queryConfig.viewFields.join(',')).expand(queryConfig.expandFields.join(',')).usingCaching().get();
} catch (error) {
return Promise.reject(error);
@ -139,7 +139,7 @@ export default class ListService implements IListService {
return results;
}
private GetViewFieldsWithId(listQueryOptions: IListSearchListQuery, isCamlQuery: boolean): QueryHelperEntity {
private GetViewFieldsWithId(listQueryOptions: IListSearchListQuery, isCamlQuery: boolean, isItemId: boolean): QueryHelperEntity {
let result: QueryHelperEntity = { expandFields: [], viewFields: ['ServerUrl', 'FileLeafRef', 'Id', 'UniqueId'] };
let hasToAddFieldsAsText: boolean = false;
listQueryOptions.fields.map(field => {
@ -199,7 +199,7 @@ export default class ListService implements IListService {
result.expandFields.push('FieldValuesAsText');
}
if (listQueryOptions.audienceEnabled) {
if (listQueryOptions.audienceEnabled && !isItemId) {
result.expandFields.push(ListService.SharePointOnlineAudienceOOTBFieldName);
result.viewFields.push(`${ListService.SharePointOnlineAudienceOOTBFieldName}/Name`);
}