@topconsultnpm/sdkui-react 6.19.0-dev2.32 → 6.19.0-dev2.33

package/lib/components/editors/TMTextArea.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, useEffect, useRef } from 'react';
 import { StyledEditorContainer, StyledEditorIcon, StyledEditorLabel, StyledTextareaEditor } from './TMEditorStyled';
 import { FontSize, TMColors } from '../../utils/theme';
@@ -8,8 +8,10 @@ import TMLayoutContainer, { TMLayoutItem } from '../base/TMLayout';
 import TMVilViewer from '../base/TMVilViewer';
 import TMTooltip from '../base/TMTooltip';
 import { DeviceType, useDeviceType } from '../base/TMDeviceProvider';
-import { IconClearButton } from '../../helper';
+import { IconClearButton, IconDataList, SDKUI_Localizator } from '../../helper';
 import styled from 'styled-components';
+import { FormulaItemHelper } from './TMTextExpression';
+import TMChooserForm from '../forms/TMChooserForm';
 const StyledTextAreaEditorButton = styled.div `
     color: ${TMColors.button_icon};
     display: flex;
@@ -37,6 +39,8 @@ const TMTextArea = (props) => {
     const [formulaMenuItems, setFormulaMenuItems] = useState([]);
     // Stores the calculated number of rows for the textarea
     const [calculatedRows, setCalculatedRows] = useState(rows ?? 1);
+    //Show chooserForm formulaItems
+    const [showFormulaItemsChooser, setShowFormulaItemsChooser] = useState(false);
     // Manages the state for the custom context menu
     const { clicked, setClicked, points, setPoints } = useContextMenu();
     const deviceType = useDeviceType();
@@ -73,6 +77,30 @@ const TMTextArea = (props) => {
             setFormulaMenuItems(menuItems);
         }
     }, [formulaItems]);
+    function getFormulaDataSorce() {
+        let fiarray = [];
+        if (!formulaItems)
+            return [];
+        let i = 0;
+        for (const f of formulaItems) {
+            let fi = new FormulaItemHelper();
+            fi.id = i;
+            fi.paramName = f;
+            fiarray.push(fi);
+            i++;
+        }
+        return fiarray;
+    }
+    const openFormulaItemsChooser = () => {
+        return (showFormulaItemsChooser ?
+            _jsx(TMChooserForm, { title: SDKUI_Localizator.Parameters, height: '350', width: '300', hasShowId: false, showDefaultColumns: false, allowMultipleSelection: true, columns: [
+                    { dataField: 'paramName', caption: SDKUI_Localizator.Name, dataType: 'string', sortOrder: 'asc', alignment: 'left' }
+                ], dataSource: getFormulaDataSorce(), onClose: () => { setShowFormulaItemsChooser(false); }, onChoose: (IDs) => {
+                    let expr = value?.toString() ?? '';
+                    IDs.map(i => expr += formulaItems[i]);
+                    onValueChanged?.({ target: { value: expr } });
+                } }) : _jsx(_Fragment, {}));
+    };
     // Adjust the rows dynamically
     const updateRows = () => {
         const newRowCount = calculateRows(currentValue);
@@ -136,7 +164,10 @@ const TMTextArea = (props) => {
                         const y = e.clientY - bounds.top;
                         // set the x and y coordinates of our users right click
                         setPoints({ x, y });
-                    }, "$isMobile": deviceType === DeviceType.MOBILE, "$maxHeight": maxHeight, "$disabled": disabled, "$vil": validationItems, "$isModified": isModifiedWhen, "$fontSize": fontSize, "$width": width, "$resize": resize }), _jsxs("div", { style: { display: 'flex', flexDirection: 'row', justifyContent: 'flex-start', alignItems: 'center', position: 'absolute', right: '6px', top: label.length > 0 ? '22px' : '7px', pointerEvents: disabled ? 'none' : 'auto', opacity: disabled ? 0.4 : 1 }, children: [showClearButton && currentValue &&
+                    }, "$isMobile": deviceType === DeviceType.MOBILE, "$maxHeight": maxHeight, "$disabled": disabled, "$vil": validationItems, "$isModified": isModifiedWhen, "$fontSize": fontSize, "$width": width, "$resize": resize }), _jsxs("div", { style: { display: 'flex', flexDirection: 'row', justifyContent: 'flex-start', alignItems: 'center', position: 'absolute', right: '6px', top: label.length > 0 ? '22px' : '7px', pointerEvents: disabled ? 'none' : 'auto', opacity: disabled ? 0.4 : 1 }, children: [formulaItems.length > 0 &&
+                            _jsx(StyledTextAreaEditorButton, { onClick: () => {
+                                    setShowFormulaItemsChooser(true);
+                                }, children: _jsx(IconDataList, {}) }), showClearButton && currentValue &&
                             _jsx(StyledTextAreaEditorButton, { onClick: () => {
                                     onValueChanged?.({ target: { value: undefined } });
                                     setCurrentValue('');
@@ -144,7 +175,7 @@ const TMTextArea = (props) => {
                                     onBlur?.(undefined);
                                 }, children: _jsx(IconClearButton, {}) }), buttons.map((buttonItem, index) => {
                             return (_jsx(StyledTextAreaEditorButton, { onClick: buttonItem.onClick, children: _jsx(TMTooltip, { content: buttonItem.text, children: buttonItem.icon }) }, buttonItem.text));
-                        })] }), formulaItems.length > 0 && clicked && (_jsx(TMContextMenu, { menuData: formulaMenuItems, top: points.y, left: points.x, onMenuItemClick: (formula) => insertText(formula) })), _jsx(TMVilViewer, { vil: validationItems })] });
+                        })] }), openFormulaItemsChooser(), formulaItems.length > 0 && clicked && (_jsx(TMContextMenu, { menuData: formulaMenuItems, top: points.y, left: points.x, onMenuItemClick: (formula) => insertText(formula) })), _jsx(TMVilViewer, { vil: validationItems })] });
     };
     // Layout for the textarea with a left-aligned label
     const renderedLeftLabelTextArea = () => {

package/lib/components/editors/TMTextBox.js

@@ -3,7 +3,7 @@ import { useState, useEffect, useRef } from 'react';
 import styled from 'styled-components';
 import { StyledEditor, StyledEditorContainer, StyledEditorIcon, StyledEditorLabel, editorColorManager } from './TMEditorStyled';
 import { FontSize, TMColors } from '../../utils/theme';
-import { genUniqueId, IconClearButton, IconHide, IconShow, SDKUI_Localizator } from '../../helper';
+import { genUniqueId, IconClearButton, IconDataList, IconHide, IconShow, SDKUI_Localizator } from '../../helper';
 import ShowAlert from '../base/TMAlert';
 import { TMExceptionBoxManager } from '../base/TMPopUp';
 import TMLayoutContainer, { TMLayoutItem } from '../base/TMLayout';
@@ -11,6 +11,8 @@ import TMVilViewer from '../base/TMVilViewer';
 import TMTooltip from '../base/TMTooltip';
 import { ContextMenu } from 'devextreme-react';
 import { DeviceType, useDeviceType } from '../base/TMDeviceProvider';
+import TMChooserForm from '../forms/TMChooserForm';
+import { FormulaItemHelper } from './TMTextExpression';
 const StyledShowPasswordIcon = styled.div `
     color: ${props => !props.$disabled ? (props.$vil.length === 0) ? !props.$isModified ? TMColors.text_normal : TMColors.isModified : editorColorManager(props.$vil) : TMColors.disabled};
     position: absolute;
@@ -37,6 +39,7 @@ const TMTextBox = ({ autoFocus, maxLength, labelColor, precision, fromModal = fa
     const [currentType, setCurrentType] = useState(type);
     const [currentValue, setCurrentValue] = useState(value);
     const [formulaMenuItems, setFormulaMenuItems] = useState([]);
+    const [showFormulaItemsChooser, setShowFormulaItemsChooser] = useState(false);
     const [isFocused, setIsFocused] = useState(false);
     const inputRef = useRef(null);
     const deviceType = useDeviceType();
@@ -219,6 +222,30 @@ const TMTextBox = ({ autoFocus, maxLength, labelColor, precision, fromModal = fa
         setCurrentValue(inputValue);
         onValueChanged?.({ target: { value: inputValue } }); // Passa il valore filtrato
     };
+    function getFormulaDataSorce() {
+        let fiarray = [];
+        if (!formulaItems)
+            return [];
+        let i = 0;
+        for (const f of formulaItems) {
+            let fi = new FormulaItemHelper();
+            fi.id = i;
+            fi.paramName = f;
+            fiarray.push(fi);
+            i++;
+        }
+        return fiarray;
+    }
+    const openFormulaItemsChooser = () => {
+        return (showFormulaItemsChooser ?
+            _jsx(TMChooserForm, { title: SDKUI_Localizator.Parameters, height: '350', width: '300', hasShowId: false, showDefaultColumns: false, allowMultipleSelection: true, columns: [
+                    { dataField: 'paramName', caption: SDKUI_Localizator.Name, dataType: 'string', sortOrder: 'asc', alignment: 'left' }
+                ], dataSource: getFormulaDataSorce(), onClose: () => { setShowFormulaItemsChooser(false); }, onChoose: (IDs) => {
+                    let expr = value?.toString() ?? '';
+                    IDs.map(i => expr += formulaItems[i]);
+                    onValueChanged?.({ target: { value: expr } });
+                } }) : _jsx(_Fragment, {}));
+    };
     const renderInputField = () => {
         const bulletEntity = '\u2022'; // •
         const displayedValue = initialType === 'secureText'
@@ -233,13 +260,16 @@ const TMTextBox = ({ autoFocus, maxLength, labelColor, precision, fromModal = fa
                                 e.preventDefault();
                         }
                     }, "$isMobile": deviceType === DeviceType.MOBILE, "$disabled": disabled, "$vil": validationItems, "$isModified": isModifiedWhen, "$fontSize": fontSize, "$maxValue": maxValue, "$width": width, "$type": currentType, "$borderRadius": borderRadius }), (initialType === 'password' || initialType === 'secureText') && _jsx(StyledShowPasswordIcon, { onClick: toggleShowPassword, "$disabled": disabled, "$vil": validationItems, "$isModified": isModifiedWhen, children: showPasswordIcon() }), initialType !== 'password' &&
-                    _jsxs("div", { style: { display: 'flex', flexDirection: 'row', justifyContent: 'flex-start', alignItems: 'center', position: 'absolute', right: type === 'number' ? '25px' : '6px', top: label.length > 0 ? '20px' : '7px', pointerEvents: disabled ? 'none' : 'auto', opacity: disabled ? 0.4 : 1 }, children: [showClearButton && currentValue &&
+                    _jsxs("div", { style: { display: 'flex', flexDirection: 'row', justifyContent: 'flex-start', alignItems: 'center', position: 'absolute', right: type === 'number' ? '25px' : '6px', top: label.length > 0 ? '20px' : '7px', pointerEvents: disabled ? 'none' : 'auto', opacity: disabled ? 0.4 : 1 }, children: [formulaItems.length > 0 &&
+                                _jsx(StyledTextBoxEditorButton, { onClick: () => {
+                                        setShowFormulaItemsChooser(true);
+                                    }, children: _jsx(IconDataList, {}) }), showClearButton && currentValue &&
                                 _jsx(StyledTextBoxEditorButton, { onClick: () => {
                                         onValueChanged?.({ target: { value: undefined } });
                                         onBlur?.(undefined);
                                     }, children: _jsx(IconClearButton, {}) }), buttons.map((buttonItem, index) => {
                                 return (_jsx(StyledTextBoxEditorButton, { onClick: buttonItem.onClick, children: _jsx(TMTooltip, { content: buttonItem.text, children: buttonItem.icon }) }, buttonItem.text));
-                            })] }), formulaItems.length > 0 && (_jsx(ContextMenu, { dataSource: formulaMenuItems, target: `#text-${id}`, onItemClick: (e) => { insertText(e.itemData?.text ?? ''); } })), _jsx(TMVilViewer, { vil: validationItems })] }));
+                            })] }), openFormulaItemsChooser(), formulaItems.length > 0 && (_jsx(ContextMenu, { dataSource: formulaMenuItems, target: `#text-${id}`, onItemClick: (e) => { insertText(e.itemData?.text ?? ''); } })), _jsx(TMVilViewer, { vil: validationItems })] }));
     };
     const renderedLeftLabelTextBox = () => {
         return (_jsxs(TMLayoutContainer, { direction: 'horizontal', children: [icon && _jsx(TMLayoutItem, { width: '20px', children: _jsx(StyledEditorIcon, { "$disabled": disabled, "$vil": validationItems, "$isModified": isModifiedWhen, children: icon }) }), _jsx(TMLayoutItem, { children: _jsxs(StyledEditorContainer, { "$width": width, children: [label && _jsx(StyledEditorLabel, { "$color": labelColor, "$isFocused": isFocused, "$labelPosition": labelPosition, "$disabled": disabled, children: label }), renderInputField()] }) })] }));

package/lib/components/editors/TMTextExpression.js

@@ -1,10 +1,9 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState } from 'react';
 import { DcmtTypeListCacheService } from '@topconsultnpm/sdk-ts';
-import { IconClear, IconColumns, IconDataList, SDKUI_Localizator, stringIsNullOrEmpty } from '../../helper';
+import { IconClear, IconColumns, SDKUI_Localizator, stringIsNullOrEmpty } from '../../helper';
 import { TMExceptionBoxManager } from '../base/TMPopUp';
 import { TMMetadataChooserForm } from '../choosers/TMMetadataChooser';
-import TMChooserForm from '../forms/TMChooserForm';
 import TMTextBox from './TMTextBox';
 import TMTextArea from './TMTextArea';
 const TMTextExpression = (props) => {
@@ -96,8 +95,7 @@ const TMTextExpression = (props) => {
         let buttons = [];
         if (props.qd || props.tid)
             buttons.push({ icon: _jsx(IconColumns, {}), text: SDKUI_Localizator.MetadataReferenceInsert, onClick: () => { setShowMetadataChooser(true); } });
-        if (props.formulaItems && props.formulaItems.length > 0)
-            buttons.push({ icon: _jsx(IconDataList, {}), text: SDKUI_Localizator.Parameters, onClick: () => setShowFormulaChooser(true) });
+        // if (props.formulaItems && props.formulaItems.length > 0) buttons.push({ icon: <IconDataList />, text: SDKUI_Localizator.Parameters, onClick: () => setShowFormulaChooser(true) })
         buttons.push({ icon: _jsx(IconClear, {}), text: SDKUI_Localizator.Clear, onClick: () => props.onValueChanged?.('') });
         return buttons;
     };
@@ -120,20 +118,18 @@ const TMTextExpression = (props) => {
         }
         return output;
     }
-    function getFormulaDataSorce() {
-        let fiarray = [];
-        if (!props.formulaItems)
-            return [];
-        let i = 0;
-        for (const f of props.formulaItems) {
-            let fi = new FormulaItemHelper();
-            fi.id = i;
-            fi.paramName = f;
-            fiarray.push(fi);
-            i++;
-        }
-        return fiarray;
-    }
+    // function getFormulaDataSorce() {
+    //     let fiarray: FormulaItemHelper[] = []
+    //     if (!props.formulaItems) return []
+    //     let i: number = 0;
+    //     for (const f of props.formulaItems!) {
+    //         let fi = new FormulaItemHelper();
+    //         fi.id = i; fi.paramName = f;
+    //         fiarray.push(fi);
+    //         i++;
+    //     }
+    //     return fiarray;
+    // }
     const openMetadataChooseForm = () => {
         return (showMetadataChooser ?
             _jsx(TMMetadataChooserForm, { allowMultipleSelection: true, qd: props.qd, tids: props.tid ? [props.tid] : undefined, qdShowOnlySelectItems: true, allowSysMetadata: true, onClose: () => setShowMetadataChooser(false), onChoose: (tid_mid) => {
@@ -146,18 +142,30 @@ const TMTextExpression = (props) => {
             { dataField: 'paramName', caption: props.captionColumnChooser ?? SDKUI_Localizator.Name, dataType: 'string', sortOrder: 'asc', alignment: 'left' }
         ];
     }, []);
-    const openFormulaChooseForm = () => {
-        return (showFormulaChooser ?
-            _jsx(TMChooserForm, { title: props.titleChooser ?? SDKUI_Localizator.Parameters, height: props.higthChooser ?? '350', width: props.widthChooser ?? '300', hasShowId: false, showDefaultColumns: false, allowMultipleSelection: props.disableMultipleSelection !== true, columns: dataColumns, dataSource: getFormulaDataSorce(), onClose: () => { setShowFormulaChooser(false); }, onChoose: (IDs) => {
-                    let expr = props.value ?? '';
-                    IDs.map(i => expr += props.formulaItems[i]);
-                    props.onValueChanged?.(expr);
-                } }) : _jsx(_Fragment, {}));
-    };
+    // const openFormulaChooseForm = () => {
+    //     return (showFormulaChooser ?
+    //         <TMChooserForm
+    //             title={props.titleChooser ?? SDKUI_Localizator.Parameters}
+    //             height={props.higthChooser ?? '350'}
+    //             width={props.widthChooser ?? '300'}
+    //             hasShowId={false}
+    //             showDefaultColumns={false}
+    //             allowMultipleSelection={props.disableMultipleSelection !== true}
+    //             columns={dataColumns}
+    //             dataSource={getFormulaDataSorce()}
+    //             onClose={() => { setShowFormulaChooser(false); }}
+    //             onChoose={(IDs: number[]) => {
+    //                 let expr: string = props.value ?? '';
+    //                 IDs.map(i => expr += props.formulaItems![i]);
+    //                 props.onValueChanged?.(expr)
+    //             }}
+    //         /> : <></>
+    //     )
+    // }
     return (_jsxs(_Fragment, { children: [props.rows === undefined ?
-                _jsx(TMTextBox, { buttons: renderButtons(), isModifiedWhen: props.value != props.valueOrig, label: props.label, value: Expression_IDs2Names(props.value) ?? '', validationItems: props.validationItems, onValueChanged: (e) => { props.onValueChanged?.(Expression_Names2IDs(e.target.value)); } })
+                _jsx(TMTextBox, { buttons: renderButtons(), formulaItems: props.formulaItems, isModifiedWhen: props.value != props.valueOrig, label: props.label, value: Expression_IDs2Names(props.value) ?? '', validationItems: props.validationItems, onValueChanged: (e) => { props.onValueChanged?.(Expression_Names2IDs(e.target.value)); } })
                 :
-                    _jsx(TMTextArea, { buttons: renderButtons(), isModifiedWhen: props.value != props.valueOrig, label: props.label, rows: props.rows, resize: false, placeHolder: props.placeHolder, value: Expression_IDs2Names(props.value) ?? '', validationItems: props.validationItems, onValueChanged: (e) => { props.onValueChanged?.(Expression_Names2IDs(e.target.value)); } }), openMetadataChooseForm(), " ", openFormulaChooseForm()] }));
+                    _jsx(TMTextArea, { buttons: renderButtons(), formulaItems: props.formulaItems, isModifiedWhen: props.value != props.valueOrig, label: props.label, rows: props.rows, resize: false, placeHolder: props.placeHolder, value: Expression_IDs2Names(props.value) ?? '', validationItems: props.validationItems, onValueChanged: (e) => { props.onValueChanged?.(Expression_Names2IDs(e.target.value)); } }), openMetadataChooseForm(), " "] }));
 };
 class MetatadaHelper {
     constructor(mid, metadataName) {

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

@@ -987,7 +987,7 @@ const TMSearchResultGrid = ({ openInOffice, inputFocusedItem, showSearch, allowM
                 width: 50,
                 cellRender: (cellData) => renderDcmtIcon(cellData, onDownloadDcmtsAsync, openInOffice),
                 allowResizing: false,
-                filterOperations: ['=']
+                filterOperations: ['=', "anyof"]
             },
             ...columns.filter(col => col.dataField !== 'FILEEXT')
         ];

package/lib/helper/dcmtsHelper.d.ts

@@ -4,5 +4,5 @@ export declare const hasDetailRelations: (mTID: number | undefined) => Promise<b
 /** Check if dcmtType (mTID) has configured Master or Many-to-Many relations */
 export declare const hasMasterRelations: (mTID: number | undefined) => Promise<boolean>;
 export declare const isXMLFileExt: (fileExt: string | undefined) => boolean;
-export declare const processButtonAttributes: (args: string | undefined, formData: MetadataValueDescriptorEx[] | undefined) => Record<string, string> | undefined;
+export declare const processButtonAttributes: (args: string | undefined, formData: MetadataValueDescriptorEx[] | undefined) => string[] | undefined;
 export declare const processSelectedItems: (selectedItems: Array<any> | undefined) => any[] | undefined;

package/lib/helper/dcmtsHelper.js

@@ -36,14 +36,18 @@ export const processSelectedItems = (selectedItems) => selectedItems?.map(item =
         return acc;
     }, {});
 });
-const formDataMap = (data, args) => data.reduce((acc, md) => {
-    const matches = Array.from(args.matchAll(/@\w+/g));
-    const keys = matches.map(([match]) => match.slice(1));
-    if (!keys.includes(md.md?.name || ''))
-        return acc;
-    //const key = md.md?.name;
-    const key = md?.mid; // inserisco il mid come chiave
-    if (key && md.value)
-        acc[key] = md.value;
-    return acc;
-}, {});
+const formDataMap = (data, args) => {
+    const tokens = args.match(/\{@?[^}]+\}/g) || [];
+    return tokens.map(token => {
+        if (token.startsWith('{@')) {
+            // Campo dinamico: {@campo} -> cerca in formData
+            const fieldName = token.slice(2, -1); // Rimuove {@...}
+            const md = data.find(md => md.md?.name === fieldName);
+            return md?.value;
+        }
+        else {
+            // Campo statico: {valore} -> ritorna il valore direttamente
+            return token.slice(1, -1); // Rimuove {...}
+        }
+    }).filter((value) => value !== undefined && value !== null);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react",
-    "version": "6.19.0-dev2.32",
+    "version": "6.19.0-dev2.33",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",