@visns-studio/visns-components 2.8.12 → 2.9.0
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.
|
@@ -1301,7 +1301,7 @@ const DataGrid = forwardRef(
|
|
|
1301
1301
|
case 'json':
|
|
1302
1302
|
return {
|
|
1303
1303
|
...commonProps,
|
|
1304
|
-
name: column.id
|
|
1304
|
+
name: `${column.id}.${column.jsonData}`,
|
|
1305
1305
|
render: ({ data }) => {
|
|
1306
1306
|
if (
|
|
1307
1307
|
data &&
|
|
@@ -1855,6 +1855,11 @@ const DataGrid = forwardRef(
|
|
|
1855
1855
|
? column.id + column.nameFrom
|
|
1856
1856
|
: column.id;
|
|
1857
1857
|
}
|
|
1858
|
+
|
|
1859
|
+
if (column.jsonData) {
|
|
1860
|
+
filterName += column.jsonData;
|
|
1861
|
+
}
|
|
1862
|
+
|
|
1858
1863
|
const filterIndex = filterDataSource.findIndex(
|
|
1859
1864
|
(filter) => filter.id === filterName
|
|
1860
1865
|
);
|
|
@@ -1885,9 +1890,15 @@ const DataGrid = forwardRef(
|
|
|
1885
1890
|
let filterName = Array.isArray(column.id)
|
|
1886
1891
|
? column.id.reduce((acc, id) => acc + `${id}.`, '')
|
|
1887
1892
|
: column.id;
|
|
1893
|
+
|
|
1888
1894
|
if (column.nameFrom) {
|
|
1889
1895
|
filterName += column.nameFrom;
|
|
1890
1896
|
}
|
|
1897
|
+
|
|
1898
|
+
if (column.jsonData) {
|
|
1899
|
+
filterName += column.jsonData;
|
|
1900
|
+
}
|
|
1901
|
+
|
|
1891
1902
|
const newFilter = {
|
|
1892
1903
|
id: filterName,
|
|
1893
1904
|
dataset: column.filter.options,
|
|
@@ -25,6 +25,8 @@ import {
|
|
|
25
25
|
PeopleGroup,
|
|
26
26
|
PeopleMultiple,
|
|
27
27
|
Person,
|
|
28
|
+
Question,
|
|
29
|
+
QuestionFill,
|
|
28
30
|
SettingsVertical,
|
|
29
31
|
ShippingBoxV1,
|
|
30
32
|
SignOut,
|
|
@@ -134,6 +136,8 @@ function Navigation({
|
|
|
134
136
|
paper: Paper,
|
|
135
137
|
peopleGroup: PeopleGroup,
|
|
136
138
|
peopleMultiple: PeopleMultiple,
|
|
139
|
+
question: Question,
|
|
140
|
+
questionFill: QuestionFill,
|
|
137
141
|
settingsVertical: SettingsVertical,
|
|
138
142
|
signOut: SignOut,
|
|
139
143
|
shippingboxv1: ShippingBoxV1,
|
|
@@ -43,8 +43,6 @@ function GenericIndex({ layout = 'full', setting, userProfile }) {
|
|
|
43
43
|
rows: rowsSelected,
|
|
44
44
|
});
|
|
45
45
|
|
|
46
|
-
console.info(res);
|
|
47
|
-
|
|
48
46
|
if (res.data.error === '') {
|
|
49
47
|
toast.success(message.success);
|
|
50
48
|
gridRef.current.reload();
|
|
@@ -106,6 +104,10 @@ function GenericIndex({ layout = 'full', setting, userProfile }) {
|
|
|
106
104
|
};
|
|
107
105
|
}, []);
|
|
108
106
|
|
|
107
|
+
useEffect(() => {
|
|
108
|
+
console.info(config);
|
|
109
|
+
}, [config]);
|
|
110
|
+
|
|
109
111
|
return (
|
|
110
112
|
<>
|
|
111
113
|
<div className="grid">
|
package/package.json
CHANGED