@gisce/react-ooui 1.1.39 → 1.1.40-rc.1

package/dist/widgets/base/Reference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Reference.d.ts","sourceRoot":"","sources":["Reference.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAEnD,OAAO,EACL,SAAS,IAAI,aAAa,EAG3B,MAAM,aAAa,CAAC;AAKrB,aAAK,KAAK,GAAG;IACX,IAAI,EAAE,aAAa,CAAC;IACpB,iBAAiB,CAAC,EACd,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC,GAC5D,SAAS,CAAC;IACd,aAAa,CAAC,EACV,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC,GAC5D,SAAS,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,KAAK,gBASrC,CAAC;AAEF,UAAU,mBAAmB;IAC3B,IAAI,EAAE,aAAa,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;CAChD;AAED,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAkExD,CAAC"}
+{"version":3,"file":"Reference.d.ts","sourceRoot":"","sources":["Reference.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAEnD,OAAO,EACL,SAAS,IAAI,aAAa,EAG3B,MAAM,aAAa,CAAC;AAKrB,aAAK,KAAK,GAAG;IACX,IAAI,EAAE,aAAa,CAAC;IACpB,iBAAiB,CAAC,EACd,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC,GAC5D,SAAS,CAAC;IACd,aAAa,CAAC,EACV,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC,GAC5D,SAAS,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,KAAK,gBASrC,CAAC;AAEF,UAAU,mBAAmB;IAC3B,IAAI,EAAE,aAAa,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;CAChD;AAED,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CA0ExD,CAAC"}

package/dist/widgets/views/Graph/GraphDefaults.d.ts

@@ -3,10 +3,13 @@ declare const DefaultGraphOptions: {
         padding: string;
         xAxis: {
             tickCount: number;
+            label: {
+                formatter: (value: any) => any;
+            };
         };
         yAxis: {
             label: {
-                formatter: (value: number) => string;
+                formatter: (value: any) => any;
             };
         };
         legend: {
@@ -58,9 +61,14 @@ declare const DefaultGraphOptions: {
                 value: any;
             };
         };
+        xAxis: {
+            label: {
+                formatter: (value: any) => any;
+            };
+        };
         yAxis: {
             label: {
-                formatter: (value: number) => string;
+                formatter: (value: any) => any;
             };
         };
         label: {

package/dist/widgets/views/Graph/GraphDefaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GraphDefaults.d.ts","sourceRoot":"","sources":["GraphDefaults.ts"],"names":[],"mappings":"AAUA,QAAA,MAAM,mBAAmB;;;;;;;;mCAQE,MAAM;;;;;;;;gCAjBf,GAAG;;;;;;;;;;;;mCAsCQ,GAAG;;;;;;;;;;;gCAtCd,GAAG;;;;;;;;;;;;;;;;gCAAH,GAAG;;;;;;;mCAoEM,MAAM;;;;;;;;;;CAsBhC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"GraphDefaults.d.ts","sourceRoot":"","sources":["GraphDefaults.ts"],"names":[],"mappings":"AAiCA,QAAA,MAAM,mBAAmB;;;;;;mCAvBK,GAAG;;;;;mCAAH,GAAG;;;;;;;;gCATf,GAAG;;;;;;;;;;;;mCA4DQ,GAAG;;;;;;;;;;;gCA5Dd,GAAG;;;;;;;;;;;;;;;;gCAAH,GAAG;;;;;;;mCASS,GAAG;;;;;mCAAH,GAAG;;;;;;;;;;CAwGhC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.1.39",
+  "version": "1.1.40-rc.1",
   "files": [
     "dist",
     "src",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
-    "@gisce/ooui": "^0.18.0",
+    "@gisce/ooui": "^0.17.14-rc.1",
     "@gisce/react-formiga-table": "^0.5.0",
     "@monaco-editor/react": "^4.4.5",
     "@tabler/icons-react": "^2.11.0",

package/src/widgets/base/Reference.tsx

@@ -73,8 +73,16 @@ export const ReferenceInput: React.FC<ReferenceInputProps> = (
           }
           onChange={(changedValue: string) => {
             setSelectionValue(changedValue);
-            setMany2oneValue([]);
-            onChange?.(undefined);
+            let m2oValue = many2oneValue[0] || 0;
+            if (changedValue !== selectionValue) {
+              setMany2oneValue([]);
+              m2oValue = 0;
+            }
+            const referenceValue = `${changedValue},${m2oValue}`;
+            if (referenceValue === value) {
+              return;
+            }
+            onChange?.(referenceValue);
           }}
           value={selectionValue}
         />
@@ -92,7 +100,7 @@ export const ReferenceInput: React.FC<ReferenceInputProps> = (
           value={many2oneValue}
           onChange={(changedValue: any[]) => {
             setMany2oneValue(changedValue);
-            const referenceValue = `${selectionValue},${changedValue[0]}`;
+            const referenceValue = `${selectionValue},${changedValue[0] || 0}`;
             if (referenceValue === value) {
               return;
             }

package/src/widgets/views/Graph/GraphDefaults.ts

@@ -8,19 +8,41 @@ const formatter = (graphType: "pie" | "default" | "barGrouped") => {
   };
 };
 
+const axisFormatter = (value: any) => {
+  if (typeof value === "string" && stringIsValidNumeric(value)) {
+    return parseFloat(value).toLocaleString("es-ES", {
+      useGrouping: true,
+    });
+  } else if (isNumber(value)) {
+    return value.toLocaleString("es-ES", {
+      useGrouping: true,
+    });
+  } else {
+    return value;
+  }
+};
+
+const stringIsValidNumeric = (value: string) => {
+  const regex = /^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$/;
+  return regex.test(value);
+};
+
+const isNumber = (value: any) => {
+  return typeof value === "number" && !isNaN(value);
+};
+
 const DefaultGraphOptions = {
   default: {
     padding: "auto",
     xAxis: {
       tickCount: 5,
+      label: {
+        formatter: axisFormatter,
+      },
     },
     yAxis: {
       label: {
-        formatter: (value: number) => {
-          return value.toLocaleString("es-ES", {
-            useGrouping: true,
-          });
-        },
+        formatter: axisFormatter,
       },
     },
     legend: {
@@ -65,13 +87,14 @@ const DefaultGraphOptions = {
     tooltip: {
       formatter: formatter("barGrouped"),
     },
+    xAxis: {
+      label: {
+        formatter: axisFormatter,
+      },
+    },
     yAxis: {
       label: {
-        formatter: (value: number) => {
-          return value.toLocaleString("es-ES", {
-            useGrouping: true,
-          });
-        },
+        formatter: axisFormatter,
       },
     },
     label: {