@topconsultnpm/sdkui-react 6.21.0-dev1.20 → 6.21.0-dev1.22

package/lib/components/editors/TMFormulaEditor.js

@@ -705,19 +705,19 @@ export class FormulaHelper {
     static jsonItems_LoadFunctions_Link() {
         let items = [{
                 id: '3_4_1',
-                text: `TM_GetViewLink (${SDKUI_Localizator.FormulaEditor_Function_TM_GetViewLink_WithLogin})`,
+                text: `[dbo].[TM_GetViewLink](NULL, NULL, NULL, 0, {@TID}, {@DID}, 1, NULL, 0)`,
                 icon: FormulaIconTypes.Function,
                 expanded: false,
                 hasItems: false,
             }, {
                 id: '3_4_2',
-                text: `TM_GetViewLink (${SDKUI_Localizator.FormulaEditor_Function_TM_GetViewLink_WithoutLogin})`,
+                text: `[dbo].[TM_GetViewLink](NULL, 'ASKLOGIN', NULL, 0, {@TID}, {@DID}, 1, NULL, 0)`,
                 icon: FormulaIconTypes.Function,
                 expanded: false,
                 hasItems: false,
             }, {
                 id: '3_4_3',
-                text: `TM_GetViewLink (${SDKUI_Localizator.FormulaEditor_Function_TM_GetViewLink_WithDate})`,
+                text: `[dbo].[TM_GetViewLink](NULL, NULL, NULL, 0, {@TID}, {@DID}, 1, CONVERT(VARCHAR, {@CreationTime}+30, 126), 0)`,
                 icon: FormulaIconTypes.Function,
                 expanded: false,
                 hasItems: false,

package/lib/hooks/useForm.js

@@ -94,21 +94,27 @@ export function useSaveForm(formMode, id, sfo, validator, onSaved, onStatusChang
     const saveDataAsync = async (...args) => {
         if (!formData)
             return;
-        let newId = -1;
-        if (saveCustomAsync)
-            newId = await saveCustomAsync();
-        else
-            newId = await setDataAsync?.(formMode, formData, ...args);
-        let newData;
-        if (sfo.loadDataAfterSave)
-            newData = await loadDataAsync(newId, FormModes.Update);
-        else {
-            newData = formData;
-            newData.id = newId;
-            setFormData(newData);
-            setFormDataOrig(newData);
+        try {
+            TMSpinner.show({ description: `${SDKUI_Localizator.SavingInProgress}...`, backgroundColor: 'transparent' });
+            let newId = -1;
+            if (saveCustomAsync)
+                newId = await saveCustomAsync();
+            else
+                newId = await setDataAsync?.(formMode, formData, ...args);
+            let newData;
+            if (sfo.loadDataAfterSave)
+                newData = await loadDataAsync(newId, FormModes.Update);
+            else {
+                newData = formData;
+                newData.id = newId;
+                setFormData(newData);
+                setFormDataOrig(newData);
+            }
+            onSaved?.(newData);
+        }
+        finally {
+            TMSpinner.hide();
         }
-        onSaved?.(newData);
     };
     useEffect(() => { id && loadDataAsync(id, formMode); }, [id, formMode]);
     useEffect(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topconsultnpm/sdkui-react",
-    "version": "6.21.0-dev1.20",
+    "version": "6.21.0-dev1.22",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",