@etsoo/react 1.2.6 → 1.2.10

package/lib/app/ReactApp.d.ts

@@ -50,6 +50,14 @@ export declare abstract class ReactApp<S extends IAppSettings, D extends IUser,
      * @param culture New culture definition
      */
     changeCultureEx(dispatch: React.Dispatch<CultureAction>, culture: DataTypes.CultureDefinition): void;
+    /**
+     * Get money format props
+     * @returns Props
+     */
+    getMoneyFormatProps(): {
+        culture: string;
+        currency: string;
+    };
     /**
      * Try login
      * Will update user state with UserActionType.Unauthorized

package/lib/app/ReactApp.js

@@ -50,11 +50,21 @@ export class ReactApp extends CoreApp {
      * @param culture New culture definition
      */
     changeCultureEx(dispatch, culture) {
+        // Same?
+        if (culture.name === this.culture)
+            return;
         // Dispatch action
         dispatch(culture);
         // Super call
         super.changeCulture(culture);
     }
+    /**
+     * Get money format props
+     * @returns Props
+     */
+    getMoneyFormatProps() {
+        return { culture: this.culture, currency: this.currency };
+    }
     /**
      * Try login
      * Will update user state with UserActionType.Unauthorized

package/lib/components/GridColumn.d.ts

@@ -61,6 +61,10 @@ export interface GridCellRendererProps<T, P = any> extends GridCellFormatterProp
      * Data type
      */
     type?: GridDataType;
+    /**
+     * Render props
+     */
+    renderProps?: GridColumnRenderProps;
 }
 /**
  * Grid header cell renderer props
@@ -83,6 +87,27 @@ export interface GridHeaderCellRendererProps<T, P = any> {
      */
     states: GridLoaderStates<T>;
 }
+/**
+ * Grid column render props
+ */
+export interface GridColumnRenderProps {
+    /**
+     * Culture, like zh-CN
+     */
+    readonly culture?: string;
+    /**
+     * Currency, like USD for US dollar
+     */
+    readonly currency?: string;
+    /**
+     * Number format options
+     */
+    readonly numberFormatOptions?: Intl.NumberFormatOptions;
+    /**
+     * Additional data
+     */
+    readonly data?: Readonly<Record<string, any>>;
+}
 /**
  * Grid column
  */
@@ -128,6 +153,10 @@ export interface GridColumn<T> {
      * Cell renderer
      */
     cellRenderer?: (props: GridCellRendererProps<T>) => React.ReactNode;
+    /**
+     * Render props
+     */
+    renderProps?: GridColumnRenderProps;
     /**
      * Header cell renderer
      */

package/lib/mu/DataGridEx.js

@@ -224,7 +224,7 @@ export function DataGridEx(props) {
      */
     const itemRenderer = ({ columnIndex, rowIndex, style, data, selectedItems }) => {
         // Column
-        const { align, cellRenderer = DataGridRenderers.defaultCellRenderer, field, type, valueFormatter } = columns[columnIndex];
+        const { align, cellRenderer = DataGridRenderers.defaultCellRenderer, field, type, valueFormatter, renderProps } = columns[columnIndex];
         // Props
         const formatProps = {
             data,
@@ -260,7 +260,8 @@ export function DataGridEx(props) {
             type,
             rowIndex,
             columnIndex,
-            cellProps
+            cellProps,
+            renderProps
         });
         return (React.createElement("div", { className: rowClass, style: style, "data-row": rowIndex, "data-column": columnIndex, onClick: selectable && !checkable ? handleClick : undefined, onMouseOver: selectable ? handleMouseOver : undefined, onMouseOut: selectable ? handleMouseOut : undefined },
             React.createElement(Box, { ...cellProps, onMouseEnter: handleMouseEnter }, child)));

package/lib/mu/DataGridRenderers.d.ts

@@ -10,7 +10,7 @@ export declare namespace DataGridRenderers {
      * @param param Props
      * @returns Component
      */
-    function defaultCellRenderer<T extends Record<string, any>>({ cellProps, data, field, formattedValue, columnIndex, type }: GridCellRendererProps<T>): React.ReactNode;
+    function defaultCellRenderer<T extends Record<string, any>>({ cellProps, data, field, formattedValue, columnIndex, type, renderProps }: GridCellRendererProps<T>): React.ReactNode;
     /**
      * Default footer item renderer
      * @param param Props

package/lib/mu/DataGridRenderers.js

@@ -14,7 +14,7 @@ export var DataGridRenderers;
      * @param param Props
      * @returns Component
      */
-    function defaultCellRenderer({ cellProps, data, field, formattedValue, columnIndex, type }) {
+    function defaultCellRenderer({ cellProps, data, field, formattedValue, columnIndex, type, renderProps }) {
         // Is loading
         if (data == null) {
             // First column, show loading indicator
@@ -37,9 +37,9 @@ export var DataGridRenderers;
         // For numbers
         if (typeof value === 'number') {
             if (type === GridDataType.Money || type === GridDataType.IntMoney)
-                return NumberUtils.formatMoney(value, undefined, undefined, type === GridDataType.IntMoney);
+                return NumberUtils.formatMoney(value, renderProps === null || renderProps === void 0 ? void 0 : renderProps.currency, renderProps === null || renderProps === void 0 ? void 0 : renderProps.culture, type === GridDataType.IntMoney, renderProps === null || renderProps === void 0 ? void 0 : renderProps.numberFormatOptions);
             else
-                return NumberUtils.format(value);
+                return NumberUtils.format(value, renderProps === null || renderProps === void 0 ? void 0 : renderProps.culture, renderProps === null || renderProps === void 0 ? void 0 : renderProps.numberFormatOptions);
         }
         // For boolean
         if (typeof value === 'boolean') {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.2.6",
+    "version": "1.2.10",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -44,7 +44,7 @@
         "@emotion/react": "^11.4.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.3.0",
-        "@etsoo/appscript": "^1.0.96",
+        "@etsoo/appscript": "^1.0.99",
         "@etsoo/notificationbase": "^1.0.78",
         "@etsoo/shared": "^1.0.44",
         "@mui/icons-material": "^5.0.1",

package/src/app/ReactApp.ts

@@ -106,6 +106,9 @@ export abstract class ReactApp<
         dispatch: React.Dispatch<CultureAction>,
         culture: DataTypes.CultureDefinition
     ): void {
+        // Same?
+        if (culture.name === this.culture) return;
+
         // Dispatch action
         dispatch(culture);
 
@@ -113,6 +116,14 @@ export abstract class ReactApp<
         super.changeCulture(culture);
     }
 
+    /**
+     * Get money format props
+     * @returns Props
+     */
+    getMoneyFormatProps() {
+        return { culture: this.culture, currency: this.currency };
+    }
+
     /**
      * Try login
      * Will update user state with UserActionType.Unauthorized

package/src/components/GridColumn.ts

@@ -86,6 +86,11 @@ export interface GridCellRendererProps<T, P = any>
      * Data type
      */
     type?: GridDataType;
+
+    /**
+     * Render props
+     */
+    renderProps?: GridColumnRenderProps;
 }
 
 /**
@@ -113,6 +118,31 @@ export interface GridHeaderCellRendererProps<T, P = any> {
     states: GridLoaderStates<T>;
 }
 
+/**
+ * Grid column render props
+ */
+export interface GridColumnRenderProps {
+    /**
+     * Culture, like zh-CN
+     */
+    readonly culture?: string;
+
+    /**
+     * Currency, like USD for US dollar
+     */
+    readonly currency?: string;
+
+    /**
+     * Number format options
+     */
+    readonly numberFormatOptions?: Intl.NumberFormatOptions;
+
+    /**
+     * Additional data
+     */
+    readonly data?: Readonly<Record<string, any>>;
+}
+
 /**
  * Grid column
  */
@@ -168,6 +198,11 @@ export interface GridColumn<T> {
      */
     cellRenderer?: (props: GridCellRendererProps<T>) => React.ReactNode;
 
+    /**
+     * Render props
+     */
+    renderProps?: GridColumnRenderProps;
+
     /**
      * Header cell renderer
      */

package/src/mu/DataGridEx.tsx

@@ -505,7 +505,8 @@ export function DataGridEx<T extends Record<string, any>>(
             cellRenderer = DataGridRenderers.defaultCellRenderer,
             field,
             type,
-            valueFormatter
+            valueFormatter,
+            renderProps
         } = columns[columnIndex];
 
         // Props
@@ -554,7 +555,8 @@ export function DataGridEx<T extends Record<string, any>>(
             type,
             rowIndex,
             columnIndex,
-            cellProps
+            cellProps,
+            renderProps
         });
 
         return (

package/src/mu/DataGridRenderers.tsx

@@ -21,7 +21,8 @@ export namespace DataGridRenderers {
         field,
         formattedValue,
         columnIndex,
-        type
+        type,
+        renderProps
     }: GridCellRendererProps<T>): React.ReactNode {
         // Is loading
         if (data == null) {
@@ -53,11 +54,17 @@ export namespace DataGridRenderers {
             if (type === GridDataType.Money || type === GridDataType.IntMoney)
                 return NumberUtils.formatMoney(
                     value,
-                    undefined,
-                    undefined,
-                    type === GridDataType.IntMoney
+                    renderProps?.currency,
+                    renderProps?.culture,
+                    type === GridDataType.IntMoney,
+                    renderProps?.numberFormatOptions
+                );
+            else
+                return NumberUtils.format(
+                    value,
+                    renderProps?.culture,
+                    renderProps?.numberFormatOptions
                 );
-            else return NumberUtils.format(value);
         }
 
         // For boolean