@etsoo/materialui 1.2.75 → 1.2.77

package/lib/messages/MessageUtils.d.ts

@@ -17,7 +17,7 @@ export declare namespace MessageUtils {
      * 发出操作信息
      * @param seed Refresh seed
      */
-    function emitOperationMessage(): void;
+    function emitOperationMessage(user: SignalRUser | undefined, isSelf: boolean, message: OperationMessageDto): void;
     /**
      * Emit refresh
      * 发出刷新
@@ -25,7 +25,7 @@ export declare namespace MessageUtils {
      * @param isSelf Is current user self
      * @param message Message
      */
-    function emitRefresh(user: SignalRUser | undefined, isSelf: boolean, message: OperationMessageDto): void;
+    function emitRefresh(): void;
     /**
      * Add operation event listener
      * 添加操作事件监控器

package/lib/messages/MessageUtils.js

@@ -16,8 +16,8 @@ export var MessageUtils;
      * 发出操作信息
      * @param seed Refresh seed
      */
-    function emitOperationMessage() {
-        MessageUtils.eventEmitter.emit(OperationMessageName);
+    function emitOperationMessage(user, isSelf, message) {
+        MessageUtils.eventEmitter.emit(OperationMessageName, user, isSelf, message);
     }
     MessageUtils.emitOperationMessage = emitOperationMessage;
     /**
@@ -27,8 +27,8 @@ export var MessageUtils;
      * @param isSelf Is current user self
      * @param message Message
      */
-    function emitRefresh(user, isSelf, message) {
-        MessageUtils.eventEmitter.emit(RefreshName, user, isSelf, message);
+    function emitRefresh() {
+        MessageUtils.eventEmitter.emit(RefreshName);
     }
     MessageUtils.emitRefresh = emitRefresh;
     /**

package/lib/pages/ViewPage.d.ts

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

package/lib/pages/ViewPage.js

@@ -120,15 +120,18 @@ export function ViewPage(props) {
         const handler = (user, isSelf, message) => {
             if (operationMessageHandler == null)
                 return;
-            if (Array.isArray(operationMessageHandler)) {
-                if (!operationMessageHandler.includes(message.operationType))
-                    return;
-            }
-            else {
-                if (operationMessageHandler(user, isSelf, message) === false)
-                    return;
+            const [id, handler] = operationMessageHandler;
+            if ((id == null && message.id == null) || id === message.id) {
+                if (Array.isArray(handler)) {
+                    if (!handler.includes(message.operationType))
+                        return;
+                }
+                else {
+                    if (handler(user, isSelf, message) === false)
+                        return;
+                }
+                refresh();
             }
-            refresh();
         };
         MessageUtils.onOperationMessage(handler);
         const refreshHandler = async () => {

package/package.json

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

package/src/messages/MessageUtils.ts

@@ -21,8 +21,12 @@ export namespace MessageUtils {
    * 发出操作信息
    * @param seed Refresh seed
    */
-  export function emitOperationMessage() {
-    eventEmitter.emit(OperationMessageName);
+  export function emitOperationMessage(
+    user: SignalRUser | undefined,
+    isSelf: boolean,
+    message: OperationMessageDto
+  ) {
+    eventEmitter.emit(OperationMessageName, user, isSelf, message);
   }
 
   /**
@@ -32,12 +36,8 @@ export namespace MessageUtils {
    * @param isSelf Is current user self
    * @param message Message
    */
-  export function emitRefresh(
-    user: SignalRUser | undefined,
-    isSelf: boolean,
-    message: OperationMessageDto
-  ) {
-    eventEmitter.emit(RefreshName, user, isSelf, message);
+  export function emitRefresh() {
+    eventEmitter.emit(RefreshName);
   }
 
   /**

package/src/pages/ViewPage.tsx

@@ -165,7 +165,10 @@ export interface ViewPageProps<T extends DataTypes.StringRecord>
   /**
    * Operation message handler
    */
-  operationMessageHandler?: OperationMessageHandler | string[];
+  operationMessageHandler?: [
+    id: number | undefined,
+    handler: OperationMessageHandler | string[]
+  ];
 }
 
 function formatItemData(fieldData: unknown): string | undefined {
@@ -288,12 +291,16 @@ export function ViewPage<T extends DataTypes.StringRecord>(
   React.useEffect(() => {
     const handler: OperationMessageHandler = (user, isSelf, message) => {
       if (operationMessageHandler == null) return;
-      if (Array.isArray(operationMessageHandler)) {
-        if (!operationMessageHandler.includes(message.operationType)) return;
-      } else {
-        if (operationMessageHandler(user, isSelf, message) === false) return;
+
+      const [id, handler] = operationMessageHandler;
+      if ((id == null && message.id == null) || id === message.id) {
+        if (Array.isArray(handler)) {
+          if (!handler.includes(message.operationType)) return;
+        } else {
+          if (handler(user, isSelf, message) === false) return;
+        }
+        refresh();
       }
-      refresh();
     };
     MessageUtils.onOperationMessage(handler);