Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE mobile] Fix Bug 60059

Browse source
This commit is contained in:
SergeyEzhin 2022-12-15 17:09:05 +04:00
parent 8f06fbf167
commit e61c7dba20
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/spreadsheeteditor/mobile/src/controller/Main.jsx
View file

@ -516,9 +516,6 @@ class MainController extends Component {
storeSpreadsheetInfo.changeTitle(meta.title); storeSpreadsheetInfo.changeTitle(meta.title);
} }
}); });
const storeAppOptions = this.props.storeAppOptions;
this.api.asc_setFilteringMode && this.api.asc_setFilteringMode(storeAppOptions.canModifyFilter);
} }
onEntriesListMenu(validation, textArr, addArr) { onEntriesListMenu(validation, textArr, addArr) {

8
apps/spreadsheeteditor/mobile/src/controller/add/AddFilter.jsx
View file

@ -24,6 +24,9 @@ class AddFilterController extends Component {
componentDidMount () { componentDidMount () {
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
const appOptions = this.props.storeAppOptions;
api.asc_setFilteringMode && api.asc_setFilteringMode(appOptions.canModifyFilter);
api.asc_registerCallback('asc_onError', this.uncheckedFilter); api.asc_registerCallback('asc_onError', this.uncheckedFilter);
} }
@ -108,7 +111,8 @@ class AddFilterController extends Component {
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
const formatTableInfo = api.asc_getCellInfo().asc_getFormatTableInfo(); const formatTableInfo = api.asc_getCellInfo().asc_getFormatTableInfo();
const tablename = (formatTableInfo) ? formatTableInfo.asc_getTableName() : undefined; const tablename = (formatTableInfo) ? formatTableInfo.asc_getTableName() : undefined;
if (checked) {
if (checked || tablename) {
api.asc_addAutoFilter(); api.asc_addAutoFilter();
} else { } else {
api.asc_changeAutoFilter(tablename, Asc.c_oAscChangeFilterOptions.filter, checked); api.asc_changeAutoFilter(tablename, Asc.c_oAscChangeFilterOptions.filter, checked);
@ -127,4 +131,4 @@ class AddFilterController extends Component {
} }
} }
export default inject("storeWorksheets")(observer(withTranslation()(AddFilterController))); export default inject("storeWorksheets", "storeAppOptions")(observer(withTranslation()(AddFilterController)));

8
apps/spreadsheeteditor/mobile/src/view/add/AddFilter.jsx
View file

@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
const AddSortAndFilter = props => { const AddSortAndFilter = props => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t('View.Add', {returnObjects: true}); const _t = t('View.Add', {returnObjects: true});
const isFilter = props.isFilter; const [isFilter, setIsFilter] = useState(props.isFilter);
const wsLock = props.wsLock; const wsLock = props.wsLock;
return ( return (
@ -27,7 +27,11 @@ const AddSortAndFilter = props => {
<List> <List>
<ListItem title={_t.textFilter}> <ListItem title={_t.textFilter}>
<Toggle checked={isFilter} <Toggle checked={isFilter}
onToggleChange={() => props.onInsertFilter(!isFilter)}/> onToggleChange={() => {
setIsFilter(!isFilter);
props.onInsertFilter(!isFilter)}
}
/>
</ListItem> </ListItem>
</List> </List>
} }