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

[SSE mobile] Fix Bug 53765

Browse source
This commit is contained in:
SergeyEzhin 2021-11-16 19:07:52 +04:00
parent b0ec722fd0
commit 846ffffa38
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx
View file

@ -4,8 +4,9 @@ import { f7,Sheet,Popover } from 'framework7-react';
import { Device } from '../../../../common/mobile/utils/device'; import { Device } from '../../../../common/mobile/utils/device';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
const FilterOptionsController = memo( () => { const FilterOptionsController = memo(props => {
const { t } = useTranslation(); const { t } = useTranslation();
const wsProps = props.wsProps;
const _t = t('View.Edit', {returnObjects: true}); const _t = t('View.Edit', {returnObjects: true});
const configRef = useRef(); const configRef = useRef();
@ -36,6 +37,9 @@ const FilterOptionsController = memo( () => {
setDataFilterCells(config); setDataFilterCells(config);
configRef.current = config; configRef.current = config;
if (wsProps.PivotTables && config.asc_getPivotObj() ||
wsProps.AutoFilter && !config.asc_getPivotObj()) return;
setCheckSort((config.asc_getSortState() === Asc.c_oAscSortOptions.Ascending ? 'down' : '') || setCheckSort((config.asc_getSortState() === Asc.c_oAscSortOptions.Ascending ? 'down' : '') ||
(config.asc_getSortState() === Asc.c_oAscSortOptions.Descending ? 'up' : '')); (config.asc_getSortState() === Asc.c_oAscSortOptions.Descending ? 'up' : ''));

2
apps/spreadsheeteditor/mobile/src/page/main.jsx
View file

@ -135,7 +135,7 @@ class MainPage extends Component {
{appOptions.isDocReady && {appOptions.isDocReady &&
<Fragment key='filter-context'> <Fragment key='filter-context'>
<FilterOptionsController /> <FilterOptionsController wsProps={wsProps} />
<ContextMenu openOptions={this.handleClickToOpenOptions.bind(this)} /> <ContextMenu openOptions={this.handleClickToOpenOptions.bind(this)} />
</Fragment> </Fragment>
} }