@etsoo/materialui 1.4.87 → 1.4.88
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -37,6 +37,11 @@ var DataGridRenderers;
|
|
|
37
37
|
const value = formattedValue ?? data[field];
|
|
38
38
|
if (value == null)
|
|
39
39
|
return undefined;
|
|
40
|
+
// For unknow and string type, keep the simple format
|
|
41
|
+
if (type === react_1.GridDataType.Unkwown)
|
|
42
|
+
return value;
|
|
43
|
+
else if (type === react_1.GridDataType.String)
|
|
44
|
+
return new String(value);
|
|
40
45
|
// For date time
|
|
41
46
|
// Conversion if necessary
|
|
42
47
|
if (type === react_1.GridDataType.Date || type === react_1.GridDataType.DateTime) {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IUser } from "@etsoo/appscript";
|
|
1
|
+
import { IUser, LoginInputAuthResult } from "@etsoo/appscript";
|
|
2
2
|
import { IActionResult } from "@etsoo/shared";
|
|
3
3
|
/**
|
|
4
4
|
* SmartERP user interface
|
|
@@ -18,4 +18,4 @@ export interface ISmartERPUser extends IUser {
|
|
|
18
18
|
/**
|
|
19
19
|
* SmartERP user login result
|
|
20
20
|
*/
|
|
21
|
-
export type SmartERPLoginResult = IActionResult<ISmartERPUser>;
|
|
21
|
+
export type SmartERPLoginResult = IActionResult<ISmartERPUser | LoginInputAuthResult>;
|
|
@@ -31,6 +31,11 @@ export var DataGridRenderers;
|
|
|
31
31
|
const value = formattedValue ?? data[field];
|
|
32
32
|
if (value == null)
|
|
33
33
|
return undefined;
|
|
34
|
+
// For unknow and string type, keep the simple format
|
|
35
|
+
if (type === GridDataType.Unkwown)
|
|
36
|
+
return value;
|
|
37
|
+
else if (type === GridDataType.String)
|
|
38
|
+
return new String(value);
|
|
34
39
|
// For date time
|
|
35
40
|
// Conversion if necessary
|
|
36
41
|
if (type === GridDataType.Date || type === GridDataType.DateTime) {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IUser } from "@etsoo/appscript";
|
|
1
|
+
import { IUser, LoginInputAuthResult } from "@etsoo/appscript";
|
|
2
2
|
import { IActionResult } from "@etsoo/shared";
|
|
3
3
|
/**
|
|
4
4
|
* SmartERP user interface
|
|
@@ -18,4 +18,4 @@ export interface ISmartERPUser extends IUser {
|
|
|
18
18
|
/**
|
|
19
19
|
* SmartERP user login result
|
|
20
20
|
*/
|
|
21
|
-
export type SmartERPLoginResult = IActionResult<ISmartERPUser>;
|
|
21
|
+
export type SmartERPLoginResult = IActionResult<ISmartERPUser | LoginInputAuthResult>;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@etsoo/materialui",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.88",
|
|
4
4
|
"description": "TypeScript Material-UI Implementation",
|
|
5
5
|
"main": "lib/cjs/index.js",
|
|
6
6
|
"module": "lib/mjs/index.js",
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"@dnd-kit/sortable": "^10.0.0",
|
|
41
41
|
"@emotion/react": "^11.14.0",
|
|
42
42
|
"@emotion/styled": "^11.14.0",
|
|
43
|
-
"@etsoo/appscript": "^1.6.
|
|
43
|
+
"@etsoo/appscript": "^1.6.12",
|
|
44
44
|
"@etsoo/notificationbase": "^1.1.58",
|
|
45
45
|
"@etsoo/react": "^1.8.31",
|
|
46
46
|
"@etsoo/shared": "^1.2.61",
|
|
@@ -41,6 +41,10 @@ export namespace DataGridRenderers {
|
|
|
41
41
|
const value = formattedValue ?? data[field!];
|
|
42
42
|
if (value == null) return undefined;
|
|
43
43
|
|
|
44
|
+
// For unknow and string type, keep the simple format
|
|
45
|
+
if (type === GridDataType.Unkwown) return value;
|
|
46
|
+
else if (type === GridDataType.String) return new String(value);
|
|
47
|
+
|
|
44
48
|
// For date time
|
|
45
49
|
// Conversion if necessary
|
|
46
50
|
if (type === GridDataType.Date || type === GridDataType.DateTime) {
|
package/src/app/ISmartERPUser.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IUser } from "@etsoo/appscript";
|
|
1
|
+
import { IUser, LoginInputAuthResult } from "@etsoo/appscript";
|
|
2
2
|
import { IActionResult } from "@etsoo/shared";
|
|
3
3
|
|
|
4
4
|
/**
|
|
@@ -21,4 +21,6 @@ export interface ISmartERPUser extends IUser {
|
|
|
21
21
|
/**
|
|
22
22
|
* SmartERP user login result
|
|
23
23
|
*/
|
|
24
|
-
export type SmartERPLoginResult = IActionResult<
|
|
24
|
+
export type SmartERPLoginResult = IActionResult<
|
|
25
|
+
ISmartERPUser | LoginInputAuthResult
|
|
26
|
+
>;
|