Correct dialog window
This commit is contained in:
parent
5a0cc476d6
commit
cf2ff32462
|
@ -44,6 +44,9 @@ class AddFilterController extends Component {
|
||||||
const { t } = this.props;
|
const { t } = this.props;
|
||||||
const _t = t('View.Add', {returnObjects: true});
|
const _t = t('View.Add', {returnObjects: true});
|
||||||
|
|
||||||
|
f7.popup.close('.add-popup');
|
||||||
|
f7.popover.close('#add-popover');
|
||||||
|
|
||||||
let typeCheck = type == 'down' ? Asc.c_oAscSortOptions.Ascending : Asc.c_oAscSortOptions.Descending;
|
let typeCheck = type == 'down' ? Asc.c_oAscSortOptions.Ascending : Asc.c_oAscSortOptions.Descending;
|
||||||
if( api.asc_sortCellsRangeExpand()) {
|
if( api.asc_sortCellsRangeExpand()) {
|
||||||
f7.dialog.create({
|
f7.dialog.create({
|
||||||
|
@ -52,23 +55,23 @@ class AddFilterController extends Component {
|
||||||
buttons: [
|
buttons: [
|
||||||
{
|
{
|
||||||
text: _t.txtExpand,
|
text: _t.txtExpand,
|
||||||
|
bold: true,
|
||||||
onClick: () => {
|
onClick: () => {
|
||||||
api.asc_sortColFilter(typeCheck, '', undefined, undefined, true);
|
api.asc_sortColFilter(typeCheck, '', undefined, undefined, true);
|
||||||
f7.popup.close('.add-popup');
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: _t.txtSortSelected,
|
text: _t.txtSortSelected,
|
||||||
|
bold: true,
|
||||||
onClick: () => {
|
onClick: () => {
|
||||||
api.asc_sortColFilter(typeCheck, '', undefined, undefined);
|
api.asc_sortColFilter(typeCheck, '', undefined, undefined);
|
||||||
f7.popup.close('.add-popup');
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: _t.textCancel
|
text: _t.textCancel
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
cssClass: 'type-sort'
|
verticalButtons: true,
|
||||||
}).open();
|
}).open();
|
||||||
} else
|
} else
|
||||||
api.asc_sortColFilter(typeCheck, '', undefined, undefined, api.asc_sortCellsRangeExpand() !== null);
|
api.asc_sortColFilter(typeCheck, '', undefined, undefined, api.asc_sortCellsRangeExpand() !== null);
|
||||||
|
|
|
@ -84,15 +84,3 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.type-sort{
|
|
||||||
|
|
||||||
.dialog-inner{
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
.dialog-buttons{
|
|
||||||
height: 130px;
|
|
||||||
flex-direction: column;
|
|
||||||
justify-content: space-between;
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in a new issue