Fixed bug where same DataGridQuery for all grids
This commit is contained in:
@@ -161,7 +161,8 @@ class DataGrid(MultipleInstance):
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
for col_id, values in self._state.filtered.items():
|
for col_id, values in self._state.filtered.items():
|
||||||
if col_id == FILTER_INPUT_CID and values is not None:
|
if col_id == FILTER_INPUT_CID:
|
||||||
|
if values is not None:
|
||||||
if self._datagrid_filter.get_query_type() == DG_QUERY_FILTER:
|
if self._datagrid_filter.get_query_type() == DG_QUERY_FILTER:
|
||||||
visible_columns = [c.col_id for c in self._state.columns if c.visible and c.col_id in df.columns]
|
visible_columns = [c.col_id for c in self._state.columns if c.visible and c.col_id in df.columns]
|
||||||
df = df[df[visible_columns].map(lambda x: values.lower() in str(x).lower()).any(axis=1)]
|
df = df[df[visible_columns].map(lambda x: values.lower() in str(x).lower()).any(axis=1)]
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ class Commands(BaseCommands):
|
|||||||
|
|
||||||
class DataGridQuery(MultipleInstance):
|
class DataGridQuery(MultipleInstance):
|
||||||
def __init__(self, parent, _id=None):
|
def __init__(self, parent, _id=None):
|
||||||
super().__init__(parent, _id=_id or "-query")
|
super().__init__(parent, _id=_id)
|
||||||
self.commands = Commands(self)
|
self.commands = Commands(self)
|
||||||
self._state = DataGridFilterState(self)
|
self._state = DataGridFilterState(self)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user