IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files

Browse Source
This commit is contained in:
Artem Tarasov 2020-09-15 15:06:00 +03:00
commit fcf878dd6b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/ASC.Web.Common/package.json
View File

@ -1,6 +1,6 @@
{
"name": "asc-web-common",
"version": "1.0.223",
"version": "1.0.224",
"description": "Ascensio System SIA common components and solutions library",
"license": "AGPL-3.0",
"files": [

5
web/ASC.Web.Common/src/components/FilterInput/FilterInput.js
View File

@ -91,12 +91,15 @@ class FilterInput extends React.Component {
return filterItems;
}
let filterValues = props.selectedFilterData ? getDefaultFilterData() : [];
filterValues = [...filterValues, ...this.convertSelectorToInternalData(props.getFilterData(), cloneObjectsArray(props.selectedFilterData.filterValues))];
this.state = {
sortDirection: props.selectedFilterData.sortDirection === "desc" ? true : false,
sortId: props.getSortData().findIndex(x => x.key === props.selectedFilterData.sortId) != -1 ? props.selectedFilterData.sortId : props.getSortData().length > 0 ? props.getSortData()[0].key : "",
searchText: props.selectedFilterData.inputValue || props.value,
filterValues: props.selectedFilterData ? getDefaultFilterData() : [],
filterValues,
openFilterItems: [],
hideFilterItems: []
};