@topconsultnpm/sdkui-react-beta 6.11.109 → 6.11.110

package/lib/components/choosers/TMDistinctValues.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { LayoutModes, MetadataDataDomains, AccessLevels, MetadataDataTypes, SDK_Globals, DcmtTypeListCacheService, DataColumnTypes } from '@topconsultnpm/sdk-ts-beta';
 import styled from 'styled-components';
-import { IconDataList, SDKUI_Localizator } from '../../helper';
+import { IconDataList, SDKUI_Localizator, stringIsNullOrEmpty } from '../../helper';
 import TMButton from '../base/TMButton';
 import TMDataGrid from '../base/TMDataGrid';
 import { TMExceptionBoxManager } from '../base/TMPopUp';
@@ -19,6 +19,14 @@ const TMDistinctValues = ({ tid, mid, layoutMode = LayoutModes.None, allowAppend
     const [hasLoadedBefore, setHasLoadedBefore] = useState(false);
     const [showPrompt, setShowPrompt] = useState(false);
     const [currentValue, setCurrentValue] = useState('');
+    useEffect(() => {
+        if (!hasLoadedBefore) {
+            getDistictValuesAsync().then(() => setHasLoadedBefore(true));
+        }
+        else {
+            getDcmtTypeAsync().then(() => setShowPrompt(true));
+        }
+    }, [mid]);
     useEffect(() => {
         setIsAppendMode(false);
         setFocusedItem(undefined);
@@ -44,20 +52,12 @@ const TMDistinctValues = ({ tid, mid, layoutMode = LayoutModes.None, allowAppend
             return;
         }
         let value = md.dataType === MetadataDataTypes.Number ? parseFloat(focusedItem.value.replace(',', '.')).toString() : focusedItem.value;
-        let newValue = isAppendMode ? currentValue + separator + value : value;
+        let newValue = stringIsNullOrEmpty(currentValue)
+            ? value
+            : isAppendMode ? currentValue + separator + value : value;
         setCurrentValue(newValue);
         onSelectionChanged?.({ tid: tid, mid: mid, newValue: newValue, isAppendMode: isAppendMode });
     }, [focusedItem]);
-    useEffect(() => {
-        if (!hasLoadedBefore) {
-            getDistictValuesAsync();
-            setHasLoadedBefore(true);
-        }
-        else {
-            getDcmtTypeAsync();
-            setShowPrompt(true);
-        }
-    }, [mid, hasLoadedBefore]);
     const getDistictValuesAsync = async () => {
         if (!tid)
             return;
@@ -141,9 +141,8 @@ const TMDistinctValues = ({ tid, mid, layoutMode = LayoutModes.None, allowAppend
             return false;
         return md.dataDomain === undefined || md.dataDomain === MetadataDataDomains.None;
     };
-    if (showPrompt) {
-        return (_jsxs(StyledPanelContainer, { children: [_jsx(IconDataList, { fontSize: 96 }), _jsxs("p", { children: ["Caricare i valori distinti di ", _jsx("strong", { children: `"${md?.nameLoc}" ` }), "? "] }), _jsx(TMButton, { caption: SDKUI_Localizator.Yes, onClick: handleLoadData, showTooltip: false })] }));
-    }
-    return (_jsx(TMToolbarCard, { title: SDKUI_Localizator.DistinctValues + (md?.nameLoc ? ` (${md?.nameLoc})` : ''), showHeader: showHeader, onClose: onClosePanelCallback, children: _jsxs(StyledDistinctValues, { children: [isVisibleAppend() && _jsx(TMCheckBox, { elementStyle: { position: 'absolute', right: '15px', top: '15px', zIndex: 10000 }, label: 'Accoda', value: isAppendMode, onValueChanged: () => { setIsAppendMode(!isAppendMode); } }), _jsx(TMDataGrid, { focusedRowKey: focusedItem ? focusedItem.rowIndex : undefined, selection: { showCheckBoxesMode: 'none' }, searchPanel: { highlightCaseSensitive: true, visible: true }, dataColumns: customColumns, dataSource: dataSource, keyExpr: 'rowIndex', height: 'calc(100%)', onFocusedRowChanged: onFocusedRowChanged, paging: { pageSize: 30 }, summary: customSummary })] }) }));
+    return (_jsx(TMToolbarCard, { title: SDKUI_Localizator.DistinctValues + (md?.nameLoc ? ` (${md?.nameLoc})` : ''), showHeader: showHeader, onClose: onClosePanelCallback, children: showPrompt
+            ? _jsxs(StyledPanelContainer, { children: [_jsx(IconDataList, { fontSize: 96 }), _jsxs("p", { children: ["Caricare i valori distinti di ", _jsx("strong", { children: `"${md?.nameLoc}" ` }), "? "] }), _jsx(TMButton, { caption: SDKUI_Localizator.Yes, onClick: handleLoadData, showTooltip: false })] })
+            : _jsxs(StyledDistinctValues, { children: [isVisibleAppend() && _jsx(TMCheckBox, { elementStyle: { position: 'absolute', right: '15px', top: '15px', zIndex: 10000 }, label: 'Accoda', value: isAppendMode, onValueChanged: () => { setIsAppendMode(!isAppendMode); } }), _jsx(TMDataGrid, { focusedRowKey: focusedItem ? focusedItem.rowIndex : undefined, selection: { showCheckBoxesMode: 'none' }, searchPanel: { highlightCaseSensitive: true, visible: true }, dataColumns: customColumns, dataSource: dataSource, keyExpr: 'rowIndex', height: 'calc(100%)', onFocusedRowChanged: onFocusedRowChanged, paging: { pageSize: 30 }, summary: customSummary })] }) }));
 };
 export default TMDistinctValues;

package/package.json

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