namirasoft-site-react 1.5.45 → 1.5.47

package/src/formatter/FloatFormatter.ts

@@ -1,28 +1,28 @@
-import { BaseColumnFormatter } from "./BaseColumnFormatter";
-
-export class FloatFormatter extends BaseColumnFormatter
-{
-    constructor(width: string = "125px", private maximumFractionDigits?: number)
-    {
-        super();
-        this.width = width;
-    }
-    override format(value: any): any
-    {
-        try
-        {
-            if (value != null)
-                return Number(value).toLocaleString(undefined, {
-                    minimumFractionDigits: 0,
-                    maximumFractionDigits: this.maximumFractionDigits ?? 10
-                });
-        } catch (e)
-        {
-        }
-        return value;
-    }
-    override compare(a: any, b: any): number
-    {
-        return BaseColumnFormatter.numberCompare(a, b);
-    }
+import { BaseColumnFormatter } from "./BaseColumnFormatter";
+
+export class FloatFormatter extends BaseColumnFormatter
+{
+    constructor(width: string = "125px", private maximumFractionDigits?: number)
+    {
+        super();
+        this.width = width;
+    }
+    override format(value: any): any
+    {
+        try
+        {
+            if (value != null)
+                return Number(value).toLocaleString(undefined, {
+                    minimumFractionDigits: 0,
+                    maximumFractionDigits: this.maximumFractionDigits ?? 10
+                });
+        } catch (e)
+        {
+        }
+        return value;
+    }
+    override compare(a: any, b: any): number
+    {
+        return BaseColumnFormatter.numberCompare(a, b);
+    }
 }

package/src/formatter/ForeColorFormatter.tsx

@@ -1,25 +1,25 @@
-import { TableColumnInfo, TableRowInfo } from "../components/NSTable";
-import { BaseColumnFormatter } from "./BaseColumnFormatter";
-
-export class ForeColorFormatter extends BaseColumnFormatter
-{
-    private formatter: BaseColumnFormatter;
-    private colors: { [value: string]: string }
-    constructor(formatter: BaseColumnFormatter, colors: { [value: string]: string }, width?: string)
-    {
-        super();
-        this.formatter = formatter;
-        this.colors = colors;
-        let w = width ?? formatter.width;
-        if (w)
-            this.width = w;
-    }
-    override format(value: any, column: TableColumnInfo, row: TableRowInfo<any>, printable: boolean): any
-    {
-        let formatted = this.formatter.format(value, column, row, printable);
-        if (!printable)
-            if (this.colors[value])
-                return <span style={{ color: this.colors[value], fontWeight: "bold" }}> {formatted} </span>;
-        return formatted;
-    }
+import { TableColumnInfo, TableRowInfo } from "../components/NSTable";
+import { BaseColumnFormatter } from "./BaseColumnFormatter";
+
+export class ForeColorFormatter extends BaseColumnFormatter
+{
+    private formatter: BaseColumnFormatter;
+    private colors: { [value: string]: string }
+    constructor(formatter: BaseColumnFormatter, colors: { [value: string]: string }, width?: string)
+    {
+        super();
+        this.formatter = formatter;
+        this.colors = colors;
+        let w = width ?? formatter.width;
+        if (w)
+            this.width = w;
+    }
+    override format(value: any, column: TableColumnInfo, row: TableRowInfo<any>, printable: boolean): any
+    {
+        let formatted = this.formatter.format(value, column, row, printable);
+        if (!printable)
+            if (this.colors[value])
+                return <span style={{ color: this.colors[value], fontWeight: "bold" }}> {formatted} </span>;
+        return formatted;
+    }
 }

package/src/formatter/IDFormatter.tsx

@@ -1,59 +1,59 @@
-import { IStorage } from "namirasoft-core";
-import { NamirasoftMap } from "namirasoft-site-map";
-import { NSID } from "../components/NSID";
-import { TableColumnInfo, TableRowInfo } from "../components/NSTable";
-import { BaseColumnFormatter } from "./BaseColumnFormatter";
-
-export class IDFormatter extends BaseColumnFormatter
-{
-    private namirasoft: NamirasoftMap | null;
-    private storage: IStorage | null;
-
-    constructor(globe: NamirasoftMap | null, storage: IStorage | null, width: string = "224px") 
-    {
-        super();
-        this.namirasoft = globe;
-        this.storage = storage;
-        this.onclick_overrided = true;
-        this.width = width;
-    }
-    override format(value: any, _: TableColumnInfo, __: TableRowInfo<any>, printable: boolean): any
-    {
-        try
-        {
-            if (!printable)
-            {
-                let ids: string[] = [];
-
-                if (Array.isArray(value))
-                    ids = value;
-                else
-                {
-                    let strValue = String(value);
-                    try
-                    {
-                        ids = JSON.parse(strValue);
-                    } catch (error)
-                    {
-                        ids = strValue.split(",").map(id => id.trim());
-                    }
-                }
-                return ids.map((id, i) => (
-                    <NSID
-                        key={`${id}-${i}`}
-                        id={id}
-                        map={this.namirasoft}
-                        storage={this.storage}
-                    />
-                ));
-            }
-        }
-        catch (error) { }
-
-        return value;
-    }
-    override compare(a: any, b: any): number
-    {
-        return BaseColumnFormatter.smartCompare(a, b);
-    }
+import { IStorage } from "namirasoft-core";
+import { NamirasoftMap } from "namirasoft-site-map";
+import { NSID } from "../components/NSID";
+import { TableColumnInfo, TableRowInfo } from "../components/NSTable";
+import { BaseColumnFormatter } from "./BaseColumnFormatter";
+
+export class IDFormatter extends BaseColumnFormatter
+{
+    private namirasoft: NamirasoftMap | null;
+    private storage: IStorage | null;
+
+    constructor(globe: NamirasoftMap | null, storage: IStorage | null, width: string = "224px") 
+    {
+        super();
+        this.namirasoft = globe;
+        this.storage = storage;
+        this.onclick_overrided = true;
+        this.width = width;
+    }
+    override format(value: any, _: TableColumnInfo, __: TableRowInfo<any>, printable: boolean): any
+    {
+        try
+        {
+            if (!printable)
+            {
+                let ids: string[] = [];
+
+                if (Array.isArray(value))
+                    ids = value;
+                else
+                {
+                    let strValue = String(value);
+                    try
+                    {
+                        ids = JSON.parse(strValue);
+                    } catch (error)
+                    {
+                        ids = strValue.split(",").map(id => id.trim());
+                    }
+                }
+                return ids.map((id, i) => (
+                    <NSID
+                        key={`${id}-${i}`}
+                        id={id}
+                        map={this.namirasoft}
+                        storage={this.storage}
+                    />
+                ));
+            }
+        }
+        catch (error) { }
+
+        return value;
+    }
+    override compare(a: any, b: any): number
+    {
+        return BaseColumnFormatter.smartCompare(a, b);
+    }
 }

package/src/formatter/IPFormatter.ts

@@ -1,40 +1,40 @@
-import { BaseColumnFormatter } from "./BaseColumnFormatter";
-
-export class IPFormatter extends BaseColumnFormatter
-{
-    constructor(width: string = "150px")
-    {
-        super();
-        this.width = width;
-    }
-    override format(value: any): any
-    {
-        return value;
-    }
-    override compare(a: any, b: any): number
-    {
-        const e = BaseColumnFormatter.compareEmpty(a, b);
-        if (e !== null)
-            return e;
-        const parse = (v: any): number[] | null =>
-        {
-            const parts = String(v).split(".");
-            if (parts.length !== 4)
-                return null;
-            const nums = parts.map(p => Number(p));
-            if (nums.some(n => isNaN(n)))
-                return null;
-            return nums;
-        };
-        const na = parse(a);
-        const nb = parse(b);
-        if (na && nb)
-        {
-            for (let i = 0; i < 4; i++)
-                if (na[i] !== nb[i])
-                    return na[i] - nb[i];
-            return 0;
-        }
-        return BaseColumnFormatter.stringCompare(a, b);
-    }
+import { BaseColumnFormatter } from "./BaseColumnFormatter";
+
+export class IPFormatter extends BaseColumnFormatter
+{
+    constructor(width: string = "150px")
+    {
+        super();
+        this.width = width;
+    }
+    override format(value: any): any
+    {
+        return value;
+    }
+    override compare(a: any, b: any): number
+    {
+        const e = BaseColumnFormatter.compareEmpty(a, b);
+        if (e !== null)
+            return e;
+        const parse = (v: any): number[] | null =>
+        {
+            const parts = String(v).split(".");
+            if (parts.length !== 4)
+                return null;
+            const nums = parts.map(p => Number(p));
+            if (nums.some(n => isNaN(n)))
+                return null;
+            return nums;
+        };
+        const na = parse(a);
+        const nb = parse(b);
+        if (na && nb)
+        {
+            for (let i = 0; i < 4; i++)
+                if (na[i] !== nb[i])
+                    return na[i] - nb[i];
+            return 0;
+        }
+        return BaseColumnFormatter.stringCompare(a, b);
+    }
 }

package/src/formatter/IntegerFormatter.ts

@@ -1,28 +1,28 @@
-import { BaseColumnFormatter } from "./BaseColumnFormatter";
-
-export class IntegerFormatter extends BaseColumnFormatter
-{
-    constructor(width: string = "125px")
-    {
-        super();
-        this.width = width;
-    }
-    override format(value: any): any
-    {
-        try
-        {
-            if (value != null)
-                return (value as number).toLocaleString(undefined, {
-                    minimumFractionDigits: 0,
-                    maximumFractionDigits: 0
-                });
-        } catch (e)
-        {
-        }
-        return value;
-    }
-    override compare(a: any, b: any): number
-    {
-        return BaseColumnFormatter.numberCompare(a, b);
-    }
+import { BaseColumnFormatter } from "./BaseColumnFormatter";
+
+export class IntegerFormatter extends BaseColumnFormatter
+{
+    constructor(width: string = "125px")
+    {
+        super();
+        this.width = width;
+    }
+    override format(value: any): any
+    {
+        try
+        {
+            if (value != null)
+                return (value as number).toLocaleString(undefined, {
+                    minimumFractionDigits: 0,
+                    maximumFractionDigits: 0
+                });
+        } catch (e)
+        {
+        }
+        return value;
+    }
+    override compare(a: any, b: any): number
+    {
+        return BaseColumnFormatter.numberCompare(a, b);
+    }
 }

package/src/formatter/JsonFormatter.tsx

@@ -1,76 +1,76 @@
-import { BaseColumnFormatter } from "./BaseColumnFormatter";
-import { TableColumnInfo, TableRowInfo } from "../components/NSTable";
-import JsonView from "@uiw/react-json-view";
-
-export class JsonFormatter extends BaseColumnFormatter
-{
-    constructor(width: string = "320px", private collapsed: boolean = true)
-    {
-        super();
-        this.width = width;
-        this.collapsed = collapsed;
-    }
-
-    private isJsonSerializable(v: unknown): boolean
-    {
-        try
-        {
-            JSON.stringify(v);
-            return true;
-        }
-        catch
-        {
-            return false;
-        }
-    }
-
-    override format(value: any, _: TableColumnInfo, __: TableRowInfo<any>, printable: boolean): any
-    {
-        let parsed = value;
-
-        if (typeof value === "string")
-            try
-            {
-                parsed = JSON.parse(value.trim());
-            }
-            catch
-            {
-                return value;
-            }
-
-        if (printable)
-            return parsed;
-
-        if (parsed === null || typeof parsed !== "object")
-            return parsed;
-
-        if (!this.isJsonSerializable(parsed))
-            return value;
-
-        try
-        {
-            return <JsonView value={parsed} collapsed={this.collapsed} />;
-        }
-        catch
-        {
-            return value;
-        }
-    }
-    override compare(a: any, b: any): number
-    {
-        const toText = (v: any) => typeof v === "string" ?
-            v :
-            (() =>
-            {
-                try
-                {
-                    return JSON.stringify(v);
-                }
-                catch
-                {
-                    return String(v);
-                }
-            })();
-        return BaseColumnFormatter.stringCompare(toText(a), toText(b));
-    }
+import { BaseColumnFormatter } from "./BaseColumnFormatter";
+import { TableColumnInfo, TableRowInfo } from "../components/NSTable";
+import JsonView from "@uiw/react-json-view";
+
+export class JsonFormatter extends BaseColumnFormatter
+{
+    constructor(width: string = "320px", private collapsed: boolean = true)
+    {
+        super();
+        this.width = width;
+        this.collapsed = collapsed;
+    }
+
+    private isJsonSerializable(v: unknown): boolean
+    {
+        try
+        {
+            JSON.stringify(v);
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
+    override format(value: any, _: TableColumnInfo, __: TableRowInfo<any>, printable: boolean): any
+    {
+        let parsed = value;
+
+        if (typeof value === "string")
+            try
+            {
+                parsed = JSON.parse(value.trim());
+            }
+            catch
+            {
+                return value;
+            }
+
+        if (printable)
+            return parsed;
+
+        if (parsed === null || typeof parsed !== "object")
+            return parsed;
+
+        if (!this.isJsonSerializable(parsed))
+            return value;
+
+        try
+        {
+            return <JsonView value={parsed} collapsed={this.collapsed} />;
+        }
+        catch
+        {
+            return value;
+        }
+    }
+    override compare(a: any, b: any): number
+    {
+        const toText = (v: any) => typeof v === "string" ?
+            v :
+            (() =>
+            {
+                try
+                {
+                    return JSON.stringify(v);
+                }
+                catch
+                {
+                    return String(v);
+                }
+            })();
+        return BaseColumnFormatter.stringCompare(toText(a), toText(b));
+    }
 }

package/src/formatter/MoneyFormatter.ts

@@ -1,40 +1,53 @@
-import { PriceOperation } from "namirasoft-core";
-import { BaseColumnFormatter } from "./BaseColumnFormatter";
-
-export class MoneyFormatter extends BaseColumnFormatter
-{
-    private currency: string;
-    private minimumFractionDigits: number;
-    private maximumFractionDigits: number;
-    constructor(width: string = "160px", currency: string = "$", minimumFractionDigits: number = 0, maximumFractionDigits: number = 2)
-    {
-        super();
-        this.width = width;
-        this.currency = currency;
-        this.minimumFractionDigits = minimumFractionDigits;
-        this.maximumFractionDigits = maximumFractionDigits;
-    }
-    override format(value: any): any
-    {
-        try
-        {
-            if (value != null)
-            {
-                return [
-                    this.currency?.trim() ?? "",
-                    PriceOperation.millicent_to_fiat(value as number, this.maximumFractionDigits).toLocaleString(undefined, {
-                        minimumFractionDigits: this.minimumFractionDigits,
-                        maximumFractionDigits: this.maximumFractionDigits
-                    })
-                ].join(" ");
-            }
-        } catch (e)
-        {
-        }
-        return value;
-    }
-    override compare(a: any, b: any): number
-    {
-        return BaseColumnFormatter.numberCompare(a, b);
-    }
+import { PriceOperation } from "namirasoft-core";
+import { BaseColumnFormatter } from "./BaseColumnFormatter";
+
+export class MoneyFormatter extends BaseColumnFormatter
+{
+    private currency: string;
+    private minimumFractionDigits: number;
+    private maximumFractionDigits: number;
+    constructor(width: string = "160px", currency: string = "$", minimumFractionDigits: number = 0, maximumFractionDigits: number = 2)
+    {
+        super();
+        this.width = width;
+        this.currency = currency;
+        this.minimumFractionDigits = minimumFractionDigits;
+        this.maximumFractionDigits = maximumFractionDigits;
+    }
+    override format(value: any): any
+    {
+        try
+        {
+            if (value != null)
+            {
+                const precise = PriceOperation.millicent_to_fiat(value as number, 5);
+                let maxDigits = this.maximumFractionDigits;
+                let minDigits = this.minimumFractionDigits;
+                const absPrecise = Math.abs(precise);
+                if (absPrecise > 0)
+                {
+                    const requiredDigits = Math.ceil(-Math.log10(absPrecise));
+                    if (requiredDigits > maxDigits)
+                    {
+                        maxDigits = Math.min(requiredDigits, 5);
+                        minDigits = Math.min(minDigits, maxDigits);
+                    }
+                }
+                return [
+                    this.currency?.trim() ?? "",
+                    precise.toLocaleString(undefined, {
+                        minimumFractionDigits: minDigits,
+                        maximumFractionDigits: maxDigits
+                    })
+                ].join(" ");
+            }
+        } catch (e)
+        {
+        }
+        return value;
+    }
+    override compare(a: any, b: any): number
+    {
+        return BaseColumnFormatter.numberCompare(a, b);
+    }
 }