ui-soxo-bootstrap-core 2.4.25-dev.25 → 2.4.25-dev.26
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.
|
@@ -163,6 +163,10 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
|
|
|
163
163
|
const onMenuClick = (menu, index) => {
|
|
164
164
|
const key = menu.path || `menu-${menu.id || index}`;
|
|
165
165
|
|
|
166
|
+
if (menu.isRoot) {
|
|
167
|
+
setOpenKeys([]);
|
|
168
|
+
}
|
|
169
|
+
|
|
166
170
|
setSelectedKeys([key]);
|
|
167
171
|
|
|
168
172
|
if (menu.path) {
|
|
@@ -447,7 +451,7 @@ export default function SideMenu({ loading, modules = [], callback, appSettings,
|
|
|
447
451
|
// }}
|
|
448
452
|
|
|
449
453
|
onClick={() => {
|
|
450
|
-
onMenuClick({ ...menu, parentKey: menu.path || menu.caption }, index);
|
|
454
|
+
onMenuClick({ ...menu, parentKey: menu.path || menu.caption, isRoot: true }, index);
|
|
451
455
|
}}
|
|
452
456
|
// key={`${menu.id}-${randomIndex}`}
|
|
453
457
|
key={menu.path || menu.caption}
|
|
@@ -220,7 +220,7 @@ export default function ReportingDashboard({
|
|
|
220
220
|
if (['reference-select', 'reference-search', 'select'].indexOf(record.type) !== -1) {
|
|
221
221
|
// let model = "";
|
|
222
222
|
let model = CustomModels[record.modelName];
|
|
223
|
-
|
|
223
|
+
|
|
224
224
|
return {
|
|
225
225
|
...record,
|
|
226
226
|
model,
|
|
@@ -800,8 +800,7 @@ function GuestList({
|
|
|
800
800
|
field: entry.field,
|
|
801
801
|
title: entry.title,
|
|
802
802
|
key: entry.field,
|
|
803
|
-
width: entry.width
|
|
804
|
-
ellipsis: true,
|
|
803
|
+
width: entry.width ? parseInt(entry.width) : undefined,
|
|
805
804
|
fixed: entry.isFixedColumn ? entry.isFixedColumn : null, // Conditionally setting the 'fixed' key to 'left' if 'isColumnStatic' is true; otherwise, setting it to null.
|
|
806
805
|
// Check if filtering is enabled and patients is an array
|
|
807
806
|
filters:
|