|
@@ -101,7 +101,7 @@ const getActionsByType = (colType?: string) =>
|
|
const getFilterDesc = (columns: Record<string, ColumnDesc>, colId?: string, act?: string, val?: string) => {
|
|
const getFilterDesc = (columns: Record<string, ColumnDesc>, colId?: string, act?: string, val?: string) => {
|
|
if (colId && act && val !== undefined) {
|
|
if (colId && act && val !== undefined) {
|
|
const colType = getTypeFromDf(columns[colId].type);
|
|
const colType = getTypeFromDf(columns[colId].type);
|
|
- if (!val && (colType === "date" || colType === "number" || colType === "boolean")) {
|
|
|
|
|
|
+ if (val === "" && (colType === "date" || colType === "number" || colType === "boolean")) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
try {
|
|
try {
|
|
@@ -109,12 +109,14 @@ const getFilterDesc = (columns: Record<string, ColumnDesc>, colId?: string, act?
|
|
col: columns[colId].dfid,
|
|
col: columns[colId].dfid,
|
|
action: act,
|
|
action: act,
|
|
value:
|
|
value:
|
|
- colType === "number"
|
|
|
|
- ? parseFloat(val)
|
|
|
|
- : colType === "boolean"
|
|
|
|
- ? val === "1"
|
|
|
|
- : colType === "date"
|
|
|
|
- ? getDateTime(val)
|
|
|
|
|
|
+ typeof val === "string"
|
|
|
|
+ ? colType === "number"
|
|
|
|
+ ? parseFloat(val)
|
|
|
|
+ : colType === "boolean"
|
|
|
|
+ ? val === "1"
|
|
|
|
+ : colType === "date"
|
|
|
|
+ ? getDateTime(val)
|
|
|
|
+ : val
|
|
: val,
|
|
: val,
|
|
} as FilterDesc;
|
|
} as FilterDesc;
|
|
} catch (e) {
|
|
} catch (e) {
|
|
@@ -268,6 +270,7 @@ const FilterRow = (props: FilterRowProps) => {
|
|
) : colLov ? (
|
|
) : colLov ? (
|
|
<Autocomplete
|
|
<Autocomplete
|
|
freeSolo
|
|
freeSolo
|
|
|
|
+ autoSelect
|
|
disableClearable
|
|
disableClearable
|
|
options={colLov}
|
|
options={colLov}
|
|
value={val || ""}
|
|
value={val || ""}
|