@topconsultnpm/sdkui-react-beta 6.7.140 → 6.7.141

package/lib/components/query/TMQueryEditor.js

@@ -554,7 +554,7 @@ const TMQueryEditor = ({ formMode, inputData, onQDChanged, runQdImmediately = fa
         return (_jsxs(StyledDivHorizontal, { children: [_jsx("p", { children: title }), _jsx(TMTabItemBadge, { vil: vil })] }));
     };
     const getColorIndex = (tid) => {
-        let index = qdTIDs.findIndex(o => o.tid == tid.tid && o.alias == tid.alias);
+        let index = qdTIDs.findIndex(o => o.tid == tid.tid && (o.alias ?? '') == (tid.alias ?? ''));
         switch (index) {
             case 0: return color1;
             case 1: return color2;
@@ -803,9 +803,17 @@ const TMQueryEditor = ({ formMode, inputData, onQDChanged, runQdImmediately = fa
 export default TMQueryEditor;
 const TMQdEditableItem = ({ value, placeHolder, width, backgroundColor, onValueChanged }) => {
     const [isComponentVisible, setIsComponentVisible] = useState(false);
-    const ref = useOutsideClick(() => { setIsComponentVisible(false); });
+    const [currentValue1, setCurrentValue1] = useState();
+    useEffect(() => { setCurrentValue1(value); }, [value]);
+    const ref = useOutsideClick((escPressed) => {
+        setIsComponentVisible(false);
+        if (escPressed)
+            return;
+        if (currentValue1 != value)
+            onValueChanged?.(currentValue1);
+    });
     return (_jsx("div", { ref: ref, children: isComponentVisible ?
-            _jsx(TMTextBox, { elementStyle: { marginLeft: '5px', marginRight: '5px' }, width: width ?? '50px', autoFocus: true, value: value ?? '', onBlur: (newValue) => onValueChanged(newValue) })
+            _jsx(TMTextBox, { elementStyle: { marginLeft: '5px', marginRight: '5px' }, width: width ?? '50px', autoFocus: true, value: value ?? '', onValueChanged: (e) => setCurrentValue1(e.target.value) })
             :
                 _jsx(StyledItemWrapper, { onClick: () => setIsComponentVisible(true), style: { backgroundColor: backgroundColor, cursor: 'pointer' }, children: value ?? placeHolder }) }));
 };
@@ -866,7 +874,7 @@ const TMQdWhereItemValue = ({ whereItem, index, queryParamsDynDataList, onlyEdit
             setMd(mdOut);
             switch (mdOut?.dataDomain) {
                 case MetadataDataDomains.DataList:
-                    setEditingMode(EditingModes.Chooser);
+                    setEditingMode(whereItem.operator == QueryOperators.Custom ? EditingModes.Editing : EditingModes.Chooser);
                     if (dataList != undefined)
                         return;
                     TMSpinner.show({ description: `${SDKUI_Localizator.Loading} - ${SDK_Localizator.DataList} ...` });
@@ -876,7 +884,7 @@ const TMQdWhereItemValue = ({ whereItem, index, queryParamsDynDataList, onlyEdit
                     });
                     break;
                 case MetadataDataDomains.DynamicDataList:
-                    setEditingMode(EditingModes.Chooser);
+                    setEditingMode(whereItem.operator == QueryOperators.Custom ? EditingModes.Editing : EditingModes.Chooser);
                     if (dynDl != undefined)
                         return;
                     TMSpinner.show({ description: `${SDKUI_Localizator.Loading} - ${"Lista dati dinamica"} ...` });
@@ -890,7 +898,7 @@ const TMQdWhereItemValue = ({ whereItem, index, queryParamsDynDataList, onlyEdit
                     }).catch((err) => { TMExceptionBoxManager.show({ exception: err }); });
                     break;
                 case MetadataDataDomains.UserID:
-                    setEditingMode(EditingModes.Chooser);
+                    setEditingMode(whereItem.operator == QueryOperators.Custom ? EditingModes.Editing : EditingModes.Chooser);
                     if (users !== undefined)
                         return;
                     TMSpinner.show({ description: `${SDKUI_Localizator.Loading} - ${SDK_Localizator.Users} ...` });
@@ -953,7 +961,7 @@ const TMQdWhereItemValue = ({ whereItem, index, queryParamsDynDataList, onlyEdit
     const mdValueEmptyDescr = `<${SDKUI_Localizator.Search_EnterValue}...>`;
     return (_jsxs("div", { ref: ref, id: containerId, style: { width: isEditing && whereItem.operator == QueryOperators.Custom && !onlyEditing ? "100%" : undefined }, children: [(isEditing || onlyEditing) &&
                 _jsxs(StyledRowItem, { children: [showValue1 && _jsx(TMMetadataEditor, { tid: whereItem.tid, mid: whereItem.mid, layoutMode: LayoutModes.None, value: whereItem.value1, queryOperator: whereItem.operator, autoFocus: !onlyEditing, containerElement: containerElement, onValueChange: (value) => setCurrentValue1(value), onValueChanged: (value) => { normalizeValue(value, true); } }), showValue2 && _jsx(TMMetadataEditor, { tid: whereItem.tid, mid: whereItem.mid, layoutMode: LayoutModes.None, value: whereItem.value1, queryOperator: whereItem.operator, autoFocus: !onlyEditing, containerElement: containerElement, onValueChange: (value) => setCurrentValue2(value), onValueChanged: (value) => { normalizeValue(value, false); } })] }), !isEditing && !onlyEditing && (showValue1 || showValue2) &&
-                _jsxs(StyledDivHorizontal, { children: [editingMode == EditingModes.Chooser &&
+                _jsxs(StyledDivHorizontal, { children: [(editingMode == EditingModes.Chooser) &&
                             _jsxs(_Fragment, { children: [showDataListChooseForm &&
                                         _jsx(TMDataListItemChooserForm, { height: '500px', width: '450px', allowMultipleSelection: whereItem.operator == QueryOperators.In || whereItem.operator == QueryOperators.NotIn, dataListId: md?.dataListID, selectedIDs: whereItem.value1?.split(',').map((item) => !item.startsWith("'") ? item : item.slice(1, -1)) ?? [], onClose: () => setShowDataListChooseForm(false), onChoose: (IDs) => { IDs && normalizeValue(IDs.length == 1 ? IDs[0] : IDs.map((item) => `${item}`).join(","), true); } }), showDynDataListChooseForm &&
                                         _jsx(TMDynDataListItemChooserForm, { TID: whereItem.tid, MID: md?.id, height: '500px', width: '450px', dynDL: dynDl, allowMultipleSelection: false, searchResult: dataSource, selectedIDs: [whereItem.value1], onClose: () => setShowDynDataListChooseForm(false), onChoose: (IDs) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react-beta",
-    "version": "6.7.140",
+    "version": "6.7.141",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
@@ -28,7 +28,7 @@
         "lib"
     ],
     "dependencies": {
-        "@topconsultnpm/sdk-ts-beta": "^6.7.39",
+        "@topconsultnpm/sdk-ts-beta": "^6.7.40",
         "buffer": "^6.0.3",
         "devextreme": "24.1.6",
         "devextreme-react": "24.1.6",