namirasoft-site-react 1.4.515 → 1.4.517

package/dist/formatter/BaseColumnFormatter.d.ts

@@ -4,5 +4,5 @@ export declare abstract class BaseColumnFormatter {
     width: string;
     onclick_overrided: boolean;
     abstract format(value: any, column: TableColumnInfo, row: TableRowInfo<any>, printable: boolean): any;
-    static getColumn(column: BaseMetaColumn, formatter: BaseColumnFormatter): TableColumnInfo;
+    static getColumn(column: BaseMetaColumn, formatter: BaseColumnFormatter, group?: string): TableColumnInfo;
 }

package/dist/formatter/BaseColumnFormatter.js

@@ -3,8 +3,9 @@ export class BaseColumnFormatter {
         this.width = "100px";
         this.onclick_overrided = false;
     }
-    static getColumn(column, formatter) {
-        return Object.assign(Object.assign({ index: 0 }, column), { formatter });
+    static getColumn(column, formatter, group) {
+        return Object.assign(Object.assign({ index: 0 }, column), { formatter,
+            group });
     }
 }
 //# sourceMappingURL=BaseColumnFormatter.js.map

package/dist/formatter/BaseColumnFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseColumnFormatter.js","sourceRoot":"","sources":["../../src/formatter/BaseColumnFormatter.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,mBAAmB;IAAzC;QAEW,UAAK,GAAW,OAAO,CAAC;QACxB,sBAAiB,GAAY,KAAK,CAAC;IAU9C,CAAC;IARG,MAAM,CAAC,SAAS,CAAC,MAAsB,EAAE,SAA8B;QAEnE,qCACI,KAAK,EAAE,CAAC,IACL,MAAM,KACT,SAAS,IACX;IACN,CAAC;CACJ"}
+{"version":3,"file":"BaseColumnFormatter.js","sourceRoot":"","sources":["../../src/formatter/BaseColumnFormatter.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,mBAAmB;IAAzC;QAEW,UAAK,GAAW,OAAO,CAAC;QACxB,sBAAiB,GAAY,KAAK,CAAC;IAW9C,CAAC;IATG,MAAM,CAAC,SAAS,CAAC,MAAsB,EAAE,SAA8B,EAAE,KAAc;QAEnF,qCACI,KAAK,EAAE,CAAC,IACL,MAAM,KACT,SAAS;YACT,KAAK,IACP;IACN,CAAC;CACJ"}

package/dist/formatter/JsonFormatter.d.ts

@@ -2,5 +2,6 @@ import { BaseColumnFormatter } from "./BaseColumnFormatter";
 import { TableColumnInfo, TableRowInfo } from "../main";
 export declare class JsonFormatter extends BaseColumnFormatter {
     constructor(width?: string);
+    private isJsonSerializable;
     format(value: any, _: TableColumnInfo, __: TableRowInfo<any>, printable: boolean): any;
 }

package/dist/formatter/JsonFormatter.js

@@ -7,14 +7,34 @@ export class JsonFormatter extends BaseColumnFormatter {
         if (width)
             this.width = width;
     }
-    format(value, _, __, printable) {
+    isJsonSerializable(v) {
         try {
-            let parsed = JSON.parse(String(value).trim());
-            if (!printable)
-                return _jsx(JsonView, { value: parsed });
+            JSON.stringify(v);
+            return true;
+        }
+        catch (_a) {
+            return false;
+        }
+    }
+    format(value, _, __, printable) {
+        let parsed = value;
+        if (typeof value === "string")
+            try {
+                parsed = JSON.parse(value.trim());
+            }
+            catch (_a) {
+                return value;
+            }
+        if (printable)
+            return parsed;
+        if (parsed === null || typeof parsed !== "object")
             return parsed;
+        if (!this.isJsonSerializable(parsed))
+            return value;
+        try {
+            return _jsx(JsonView, { value: parsed });
         }
-        catch (error) {
+        catch (_b) {
             return value;
         }
     }

package/dist/formatter/JsonFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonFormatter.js","sourceRoot":"","sources":["../../src/formatter/JsonFormatter.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAE5C,MAAM,OAAO,aAAc,SAAQ,mBAAmB;IAElD,YAAY,QAAgB,OAAO;QAE/B,KAAK,EAAE,CAAC;QACR,IAAI,KAAK;YACL,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IAC3B,CAAC;IAEQ,MAAM,CAAC,KAAU,EAAE,CAAkB,EAAE,EAAqB,EAAE,SAAkB;QAErF,IACA,CAAC;YACG,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YAE9C,IAAI,CAAC,SAAS;gBACV,OAAO,KAAC,QAAQ,IAAC,KAAK,EAAE,MAAM,GAAI,CAAC;YAEvC,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,OAAO,KAAK,EACZ,CAAC;YACG,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;CACJ"}
+{"version":3,"file":"JsonFormatter.js","sourceRoot":"","sources":["../../src/formatter/JsonFormatter.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAE5C,MAAM,OAAO,aAAc,SAAQ,mBAAmB;IAElD,YAAY,QAAgB,OAAO;QAE/B,KAAK,EAAE,CAAC;QACR,IAAI,KAAK;YACL,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IAC3B,CAAC;IAEO,kBAAkB,CAAC,CAAU;QAEjC,IACA,CAAC;YACG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAClB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,WACA,CAAC;YACG,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;IAEQ,MAAM,CAAC,KAAU,EAAE,CAAkB,EAAE,EAAqB,EAAE,SAAkB;QAErF,IAAI,MAAM,GAAG,KAAK,CAAC;QAEnB,IAAI,OAAO,KAAK,KAAK,QAAQ;YACzB,IACA,CAAC;gBACG,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YACtC,CAAC;YACD,WACA,CAAC;gBACG,OAAO,KAAK,CAAC;YACjB,CAAC;QAEL,IAAI,SAAS;YACT,OAAO,MAAM,CAAC;QAElB,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,KAAK,QAAQ;YAC7C,OAAO,MAAM,CAAC;QAElB,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;YAChC,OAAO,KAAK,CAAC;QAEjB,IACA,CAAC;YACG,OAAO,KAAC,QAAQ,IAAC,KAAK,EAAE,MAAM,GAAI,CAAC;QACvC,CAAC;QACD,WACA,CAAC;YACG,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;CACJ"}

package/package.json

@@ -8,7 +8,7 @@
 	"framework": "npm",
 	"application": "package",
 	"private": false,
-	"version": "1.4.515",
+	"version": "1.4.517",
 	"author": "Amir Abolhasani",
 	"license": "MIT",
 	"main": "./dist/main.js",
@@ -36,7 +36,7 @@
 		"copyfiles": "^2.4.1",
 		"link-react": "^3.0.0",
 		"namirasoft-api-link": "^1.4.20",
-		"namirasoft-api-product": "^1.4.48",
+		"namirasoft-api-product": "^1.4.50",
 		"namirasoft-core": "^1.4.111",
 		"namirasoft-schema": "^1.4.27",
 		"namirasoft-site": "^1.4.44",

package/src/formatter/BaseColumnFormatter.ts

@@ -6,12 +6,13 @@ export abstract class BaseColumnFormatter
     public width: string = "100px";
     public onclick_overrided: boolean = false;
     abstract format(value: any, column: TableColumnInfo, row: TableRowInfo<any>, printable: boolean): any;
-    static getColumn(column: BaseMetaColumn, formatter: BaseColumnFormatter): TableColumnInfo
+    static getColumn(column: BaseMetaColumn, formatter: BaseColumnFormatter, group?: string): TableColumnInfo
     {
         return {
             index: 0,
             ...column,
-            formatter
+            formatter,
+            group
         };
     }
 }

package/src/formatter/JsonFormatter.tsx

@@ -11,18 +11,47 @@ export class JsonFormatter extends BaseColumnFormatter
             this.width = width;
     }
 
-    override format(value: any, _: TableColumnInfo, __: TableRowInfo<any>, printable: boolean): any
+    private isJsonSerializable(v: unknown): boolean
     {
         try
         {
-            let parsed = JSON.parse(String(value).trim());
+            JSON.stringify(v);
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
+    override format(value: any, _: TableColumnInfo, __: TableRowInfo<any>, printable: boolean): any
+    {
+        let parsed = value;
 
-            if (!printable)
-                return <JsonView value={parsed} />;
+        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} />;
         }
-        catch (error)
+        catch
         {
             return value;
         }