@etsoo/materialui 1.2.78 → 1.2.79

package/lib/messages/OperationMessageHandler.d.ts

@@ -16,7 +16,7 @@ isSelf: boolean,
 /**
  * Message
  */
-message: OperationMessageDto) => void | boolean;
+message: OperationMessageDto) => void;
 /**
  * Operation message handler type for pages
  * 操作消息处理程序类型（页面）

package/lib/pages/ViewPage.d.ts

@@ -91,7 +91,10 @@ export interface ViewPageProps<T extends DataTypes.StringRecord> extends Omit<Co
     /**
      * Operation message handler
      */
-    operationMessageHandler?: OperationMessageHandlerAll;
+    operationMessageHandler?: OperationMessageHandlerAll | {
+        id: number;
+        types: string[];
+    };
 }
 /**
  * View page

package/lib/pages/ViewPage.js

@@ -106,10 +106,6 @@ export function ViewPage(props) {
     const { actions, children, fields, loadData, paddings = MUGlobal.pagePaddings, spacing = MUGlobal.half(MUGlobal.pagePaddings), supportRefresh = true, fabColumnDirection = true, fabTop = true, supportBack = true, pullToRefresh = true, gridRef, operationMessageHandler, ...rest } = props;
     // Data
     const [data, setData] = React.useState();
-    const refs = React.useRef({
-        seed: 0,
-        mounted: false
-    });
     // Labels
     const labels = Labels.CommonPage;
     // Container
@@ -131,7 +127,13 @@ export function ViewPage(props) {
         };
     }, []);
     return (React.createElement(CommonPage, { paddings: paddings, onRefresh: supportRefresh ? refresh : undefined, onUpdate: supportRefresh ? undefined : refresh, ...rest, scrollContainer: globalThis, fabColumnDirection: fabColumnDirection, fabTop: fabTop, supportBack: supportBack }, data == null ? (React.createElement(LinearProgress, null)) : (React.createElement(React.Fragment, null,
-        operationMessageHandler && (React.createElement(OperationMessageContainer, { handler: operationMessageHandler })),
+        operationMessageHandler && (React.createElement(OperationMessageContainer, { handler: "id" in operationMessageHandler
+                ? [
+                    operationMessageHandler.types,
+                    refresh,
+                    operationMessageHandler.id
+                ]
+                : operationMessageHandler })),
         React.createElement(Grid, { container: true, justifyContent: "left", spacing: spacing, className: "ET-ViewPage", ref: gridRef, sx: {
                 ".MuiTypography-subtitle2": {
                     fontWeight: "bold"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.2.78",
+  "version": "1.2.79",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/messages/OperationMessageHandler.ts

@@ -20,7 +20,7 @@ export type OperationMessageHandler = (
    * Message
    */
   message: OperationMessageDto
-) => void | boolean;
+) => void;
 
 /**
  * Operation message handler type for pages

package/src/pages/ViewPage.tsx

@@ -166,7 +166,9 @@ export interface ViewPageProps<T extends DataTypes.StringRecord>
   /**
    * Operation message handler
    */
-  operationMessageHandler?: OperationMessageHandlerAll;
+  operationMessageHandler?:
+    | OperationMessageHandlerAll
+    | { id: number; types: string[] };
 }
 
 function formatItemData(fieldData: unknown): string | undefined {
@@ -272,10 +274,6 @@ export function ViewPage<T extends DataTypes.StringRecord>(
 
   // Data
   const [data, setData] = React.useState<T>();
-  const refs = React.useRef<{ seed: number; mounted: boolean }>({
-    seed: 0,
-    mounted: false
-  });
 
   // Labels
   const labels = Labels.CommonPage;
@@ -317,7 +315,17 @@ export function ViewPage<T extends DataTypes.StringRecord>(
       ) : (
         <React.Fragment>
           {operationMessageHandler && (
-            <OperationMessageContainer handler={operationMessageHandler} />
+            <OperationMessageContainer
+              handler={
+                "id" in operationMessageHandler
+                  ? [
+                      operationMessageHandler.types,
+                      refresh,
+                      operationMessageHandler.id
+                    ]
+                  : operationMessageHandler
+              }
+            />
           )}
           <Grid
             container