@visns-studio/visns-components 5.4.11 → 5.4.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
"react-dom": "^17.0.0 || ^18.0.0"
|
|
82
82
|
},
|
|
83
83
|
"name": "@visns-studio/visns-components",
|
|
84
|
-
"version": "5.4.
|
|
84
|
+
"version": "5.4.12",
|
|
85
85
|
"description": "Various packages to assist in the development of our Custom Applications.",
|
|
86
86
|
"main": "src/index.js",
|
|
87
87
|
"files": [
|
|
@@ -102,6 +102,7 @@ const loadData = async (
|
|
|
102
102
|
...(fv.whereHas?.relation && {
|
|
103
103
|
whereHas: fv.whereHas.relation,
|
|
104
104
|
}),
|
|
105
|
+
orKey: fv.orKey || null,
|
|
105
106
|
};
|
|
106
107
|
|
|
107
108
|
if (existingIndex !== -1) {
|
|
@@ -2737,6 +2738,9 @@ const DataGrid = forwardRef(
|
|
|
2737
2738
|
key: column.filter.key
|
|
2738
2739
|
? column.filter.key
|
|
2739
2740
|
: null,
|
|
2741
|
+
orKey: column.filter.orKey
|
|
2742
|
+
? column.filter.orKey
|
|
2743
|
+
: null,
|
|
2740
2744
|
name: filterName,
|
|
2741
2745
|
operator: column.filter.operator,
|
|
2742
2746
|
type: column.filter.type,
|