Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2026-03-02 04:09:24 +00:00
Code Issues Projects Releases Wiki Activity

(core) Use individual choices for filtering choice lists

Browse Source 
Test Plan: Wrote unit and browser tests that verify new behavior.

Reviewers: paulfitz, dsagal

Reviewed By: dsagal

Subscribers: alexmojaki

Differential Revision: https://phab.getgrist.com/D2855
This commit is contained in:
George Gevoian
2021-06-11 07:32:05 -07:00
parent 5d3a4b5b5b
commit b94eb107d4
6 changed files with 71 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/client/models/ColumnFilter.ts
View File

@@ -24,7 +24,7 @@ export class ColumnFilter extends Disposable {
private _include: boolean;
private _values: Set<CellValue>;
constructor(private _initialFilterJson: string) {
constructor(private _initialFilterJson: string, private _columnType?: string) {
super();
this.setState(_initialFilterJson);
}
@@ -85,7 +85,7 @@ export class ColumnFilter extends Disposable {
}
private _updateState(): void {
this.filterFunc.set(makeFilterFunc(this._getState()));
this.filterFunc.set(makeFilterFunc(this._getState(), this._columnType));
}
private _getState(): FilterState {

2
app/client/models/SectionFilter.ts
View File

@@ -36,7 +36,7 @@ export class SectionFilter extends Disposable {
const funcs: Array<RowFilterFunc<RowId> | null> = fields.map(f => {
const filterFunc = (openFilter && openFilter.fieldRef === f.getRowId()) ?
use(openFilter.colFilter.filterFunc) :
buildColFilter(use(f.activeFilter));
buildColFilter(use(f.activeFilter), use(f.column).type());
const getter = tableData.getRowPropFunc(use(f.colId));