@topconsultnpm/sdkui-react-beta 6.17.6 → 6.17.8

package/lib/components/base/TMDataGrid.js

@@ -184,13 +184,37 @@ const TMDataGrid = React.forwardRef((props, ref) => {
         }
     }, [onContentReady]);
     const onOptionChangedCallback = useCallback((e) => {
-        if (showFilterPanel && e.fullName === 'filterValue' || e.fullName?.startsWith('columns') && e.fullName.endsWith('filterValues')) {
-            const newHasFilters = Array.isArray(e.value) ? e.value.length > 0 : !!e.value;
+        // Assicurati che component esista
+        const grid = e.component;
+        if (!grid)
+            return;
+        // Controlla se il cambiamento riguarda i filtri
+        const isFilterChange = e.fullName === 'filterValue' || (e.fullName?.startsWith('columns') && e.fullName.endsWith('filterValues'));
+        if (isFilterChange) {
+            let newHasFilters = false;
+            // Filtro globale
+            const filterValue = grid.option('filterValue');
+            if (Array.isArray(filterValue)) {
+                newHasFilters = filterValue.length > 0;
+            }
+            else if (filterValue) {
+                newHasFilters = true;
+            }
+            // Filtro per colonne
+            const columns = grid.option('columns') || [];
+            const columnFilters = columns.some((col) => {
+                if (Array.isArray(col.filterValues))
+                    return col.filterValues.length > 0;
+                return !!col.filterValue;
+            });
+            if (columnFilters)
+                newHasFilters = true;
             setHasFilters(newHasFilters);
             onHasFiltersChange?.(newHasFilters);
         }
+        // Propaga l'evento originale
         onOptionChanged?.(e);
-    }, [onOptionChanged]);
+    }, [onOptionChanged, onHasFiltersChange]);
     return _jsxs("div", { style: { width: "100%", height: "100%" }, children: [_jsx("div", { style: { width: "100%", height: counterConfig.show ? "calc(100% - 25px)" : "100%" }, children: _jsxs(DataGrid, { ref: internalRef, id: id, className: `tm-datagrid ${hasFilters ? 'has-filters' : ''}`, 
                     // main properties
                     keyExpr: keyExpr, dataSource: dataSource, selectedRowKeys: selectedRowKeys, focusedRowEnabled: focusedRowEnabled, hoverStateEnabled: hoverStateEnabled, 

package/lib/components/base/TMDropDownMenu.d.ts

@@ -9,6 +9,7 @@ export interface ITMDropDownMenu {
     disabled?: boolean;
     borderRadius?: string;
     items?: ITMDropDownMenuItem[];
+    onMenuShown?: () => void;
 }
 export interface ITMDropDownMenuItem {
     icon?: any;

package/lib/components/base/TMDropDownMenu.js

@@ -30,7 +30,7 @@ const StyledMenuItem = styled.div `
     width: 100%;
     font-size: ${FontSize.defaultFontSize};
 `;
-const TMDropDownMenu = forwardRef(({ content, items, disabled = false, color = TMColors.text_normal, backgroundColor = TMColors.default_background, borderRadius }, ref) => {
+const TMDropDownMenu = forwardRef(({ content, items, disabled = false, color = TMColors.text_normal, backgroundColor = TMColors.default_background, borderRadius, onMenuShown }, ref) => {
     const [id, setID] = useState('');
     const dropDownMenuElementRef = useRef(null); // Ref all'elemento DOM div principale
     useEffect(() => { setID(genUniqueId()); }, [content]);
@@ -40,6 +40,6 @@ const TMDropDownMenu = forwardRef(({ content, items, disabled = false, color = T
         },
     }));
     const renderItemTemplate = (itemData) => (_jsxs(StyledMenuItem, { children: [itemData.icon && _jsx("div", { style: { display: 'flex', alignItems: 'center' }, children: itemData.icon }), _jsx("span", { style: { flexGrow: 1 }, children: itemData.text }), itemData.items && _jsx("span", { className: "dx-icon-spinright dx-icon", style: { marginLeft: '10px' } })] }));
-    return (_jsxs(_Fragment, { children: [_jsx(StyledContent, { id: `idContainer${id}`, ref: dropDownMenuElementRef, tabIndex: disabled ? -1 : 0, "$disabled": disabled, "$color": color, "$backgroundColor": backgroundColor, "$borderRadius": borderRadius, children: content }), _jsx(ContextMenu, { target: `#idContainer${id}`, dataSource: items, showEvent: 'click', itemRender: renderItemTemplate, onHidden: (e) => dropDownMenuElementRef.current?.focus() })] }));
+    return (_jsxs(_Fragment, { children: [_jsx(StyledContent, { id: `idContainer${id}`, ref: dropDownMenuElementRef, tabIndex: disabled ? -1 : 0, "$disabled": disabled, "$color": color, "$backgroundColor": backgroundColor, "$borderRadius": borderRadius, children: content }), _jsx(ContextMenu, { target: `#idContainer${id}`, dataSource: items, showEvent: 'click', itemRender: renderItemTemplate, onShown: (e) => onMenuShown?.(), onHidden: (e) => dropDownMenuElementRef.current?.focus() })] }));
 });
 export default TMDropDownMenu;

package/lib/components/features/search/TMSearchQueryPanel.js

@@ -273,7 +273,7 @@ const TMSearchQueryPanel = ({ fromDTD, showBackToResultButton, isExpertMode = SD
         setQd({ ...qd, orderBy: newOrderBy });
     }, [qd, fromDTD?.metadata, SQD?.masterTID]);
     return (_jsxs(_Fragment, { children: [_jsxs(TMPanel, { title: fromDTD?.nameLoc ?? SDKUI_Localizator.Search_Metadata, allowMaximize: allowMaximize, onMaximize: onMaximizePanel, onHeaderDoubleClick: onMaximizePanel, onBack: onBack, onActiveChanged: handlePanelActiveChanged, toolbar: _jsx(_Fragment, { children: (SQD && !showSqdForm) ?
-                        _jsx(TMDropDownMenu, { backgroundColor: 'white', borderRadius: '3px', content: _jsx(TMButton, { btnStyle: 'icon', caption: 'Altro', icon: _jsx(IconMenuVertical, { color: 'white' }), showTooltip: false }), items: [
+                        _jsx(TMDropDownMenu, { backgroundColor: 'white', borderRadius: '3px', content: _jsx(TMButton, { btnStyle: 'icon', caption: 'Altro', icon: _jsx(IconMenuVertical, { color: 'white' }), showTooltip: false, onClick: () => setIsQueryPanelActive(true) }), items: [
                                 ...(showBackToResultButton ? [{ icon: _jsx(IconArrowRight, {}), text: "Vai a risultato", onClick: () => { onBackToResult?.(); } }] : []),
                                 { icon: _jsx(IconAddCircleOutline, {}), beginGroup: true, text: SDKUI_Localizator.SavedQueryNew, onClick: () => { openSqdForm(FormModes.Create); } },
                                 { icon: _jsx(IconEdit, {}), text: SDKUI_Localizator.SavedQueryUpdate, disabled: (SQD && SQD.id == 1), onClick: () => { openSqdForm(FormModes.Update); } },
@@ -282,7 +282,7 @@ const TMSearchQueryPanel = ({ fromDTD, showBackToResultButton, isExpertMode = SD
                                 { icon: _jsx(IconEdit, {}), text: `${SDKUI_Localizator.Configure} - ${SDK_Localizator.QuerySelect}`, onClick: () => { setShowOutputConfig(true); } },
                                 { icon: _jsx(IconEdit, {}), text: `${SDKUI_Localizator.Configure} - ${SDK_Localizator.QueryOrderBy}`, onClick: () => { setShowOrderByConfig(true); } },
                                 { icon: _jsx(IconMenuCAArchive, { fontSize: 24 }), beginGroup: true, text: SDKUI_Localizator.PassToArchive, onClick: handlePassToArchive }
-                            ] })
+                            ], onMenuShown: () => setIsQueryPanelActive(true) })
                         : _jsx(_Fragment, {}) }), children: [_jsx(ConfirmQueryParamsDialog, {}), SQD
                         ? _jsxs("div", { style: { height: '100%', width: '100%', position: 'relative', display: 'flex', flexDirection: 'column', gap: 5 }, children: [showAdvancedSearch
                                     ? _jsx(TMQueryEditor, { formMode: FormModes.Update, showToolbar: false, inputData: qd, validateSelect: true, showApply: false, onQDChanged: handleQdChanged })

package/lib/components/features/search/TMSearchResult.js

@@ -687,7 +687,16 @@ const TMSearchResultGrid = ({ openInOffice, inputFocusedItem, showSearch, allowM
     }, [onDblClick]);
     const dataColumns = useMemo(() => {
         return [
-            { dataType: "object", dataField: 'FILEEXT', caption: '', visible: true, width: 50, cellRender: (cellData) => renderDcmtIcon(cellData, onDownloadDcmtsAsync, openInOffice), allowResizing: false, },
+            {
+                dataType: "object",
+                dataField: 'FILEEXT',
+                caption: '',
+                visible: true,
+                width: 50,
+                cellRender: (cellData) => renderDcmtIcon(cellData, onDownloadDcmtsAsync, openInOffice),
+                allowResizing: false,
+                filterOperations: ['=']
+            },
             ...columns.filter(col => col.dataField !== 'FILEEXT')
         ];
     }, [columns, onDownloadDcmtsAsync, openInOffice]);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react-beta",
-    "version": "6.17.6",
+    "version": "6.17.8",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",