@etsoo/materialui 1.2.78 → 1.2.80

package/lib/app/IServiceUser.d.ts

@@ -3,14 +3,23 @@ import { IActionResult, IUser } from "@etsoo/appscript";
  * Service user interface
  */
 export interface IServiceUser extends IUser {
+    /**
+     * Global user id
+     * 全局用户编号
+     */
+    readonly uid?: string;
+    /**
+     * Organization name
+     */
+    readonly organizationName: string;
     /**
      * Service device id
      */
-    serviceDeviceId: string;
+    readonly serviceDeviceId: string;
     /**
      * Service passphrase encrypted
      */
-    servicePassphrase: string;
+    readonly servicePassphrase: string;
 }
 /**
  * Service user login result

package/lib/app/ISmartERPUser.d.ts

@@ -1,10 +1,16 @@
-import { IActionResult, IUser } from '@etsoo/appscript';
+import { IActionResult, IUser } from "@etsoo/appscript";
 /**
  * SmartERP user interface
  */
 export interface ISmartERPUser extends IUser {
+    /**
+     * Global user id
+     * 全局用户编号
+     */
+    readonly uid?: string;
     /**
      * Service refresh token
+     * 服务刷新令牌
      */
     readonly serviceToken?: string;
 }

package/lib/messages/OperationMessageContainer.js

@@ -18,10 +18,11 @@ export function OperationMessageContainer(props) {
     React.useEffect(() => {
         const my = typeof handler === "function"
             ? handler
-            : (_user, _isSelf, message) => {
+            : (_user, isSelf, message) => {
                 const [types, callback, id] = handler;
                 if (id == null || id === message.id) {
-                    if (!types.includes(message.operationType))
+                    // Check types & isSelf
+                    if (!isSelf || !types.includes(message.operationType))
                         return;
                     resetSeed();
                     refs.current.seed = window.setTimeout(callback, timeout);

package/lib/messages/OperationMessageDto.d.ts

@@ -8,6 +8,11 @@ export type OperationMessageDto = {
      * 操作类型
      */
     operationType: string;
+    /**
+     * Device id
+     * 设备编号
+     */
+    deviceId: number;
     /**
      * Target object id
      * 目标对象编号

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/messages/SignalRUser.d.ts

@@ -4,8 +4,8 @@ import { UserRole } from "@etsoo/appscript";
  */
 export type SignalRUser = {
     /**
-     * Id
-     * 编号
+     * Global id, not local system user id
+     * 全局用户编号，不是子系统用户编号
      */
     id: number;
     /**
@@ -22,7 +22,7 @@ export type SignalRUser = {
      * Device id
      * 设备编号
      */
-    deviceId: number | number[];
+    deviceId: number;
     /**
      * Role
      * 角色

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.80",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,13 +50,13 @@
     "@emotion/css": "^11.11.2",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@etsoo/appscript": "^1.4.29",
+    "@etsoo/appscript": "^1.4.30",
     "@etsoo/notificationbase": "^1.1.25",
-    "@etsoo/react": "^1.7.0",
+    "@etsoo/react": "^1.7.1",
     "@etsoo/shared": "^1.2.8",
     "@mui/icons-material": "^5.14.3",
     "@mui/material": "^5.14.4",
-    "@mui/x-data-grid": "^6.11.0",
+    "@mui/x-data-grid": "^6.11.1",
     "@types/pica": "^9.0.1",
     "@types/pulltorefreshjs": "^0.1.5",
     "@types/react": "^18.2.20",

package/src/app/IServiceUser.ts

@@ -4,15 +4,26 @@ import { IActionResult, IUser } from "@etsoo/appscript";
  * Service user interface
  */
 export interface IServiceUser extends IUser {
+  /**
+   * Global user id
+   * 全局用户编号
+   */
+  readonly uid?: string;
+
+  /**
+   * Organization name
+   */
+  readonly organizationName: string;
+
   /**
    * Service device id
    */
-  serviceDeviceId: string;
+  readonly serviceDeviceId: string;
 
   /**
    * Service passphrase encrypted
    */
-  servicePassphrase: string;
+  readonly servicePassphrase: string;
 }
 
 /**

package/src/app/ISmartERPUser.ts

@@ -1,13 +1,20 @@
-import { IActionResult, IUser } from '@etsoo/appscript';
+import { IActionResult, IUser } from "@etsoo/appscript";
 
 /**
  * SmartERP user interface
  */
 export interface ISmartERPUser extends IUser {
-    /**
-     * Service refresh token
-     */
-    readonly serviceToken?: string;
+  /**
+   * Global user id
+   * 全局用户编号
+   */
+  readonly uid?: string;
+
+  /**
+   * Service refresh token
+   * 服务刷新令牌
+   */
+  readonly serviceToken?: string;
 }
 
 /**

package/src/messages/OperationMessageContainer.tsx

@@ -47,10 +47,11 @@ export function OperationMessageContainer(
     const my: OperationMessageHandler =
       typeof handler === "function"
         ? handler
-        : (_user, _isSelf, message) => {
+        : (_user, isSelf, message) => {
             const [types, callback, id] = handler;
             if (id == null || id === message.id) {
-              if (!types.includes(message.operationType)) return;
+              // Check types & isSelf
+              if (!isSelf || !types.includes(message.operationType)) return;
 
               resetSeed();
 

package/src/messages/OperationMessageDto.ts

@@ -9,6 +9,12 @@ export type OperationMessageDto = {
    */
   operationType: string;
 
+  /**
+   * Device id
+   * 设备编号
+   */
+  deviceId: number;
+
   /**
    * Target object id
    * 目标对象编号

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/messages/SignalRUser.ts

@@ -5,8 +5,8 @@ import { UserRole } from "@etsoo/appscript";
  */
 export type SignalRUser = {
   /**
-   * Id
-   * 编号
+   * Global id, not local system user id
+   * 全局用户编号，不是子系统用户编号
    */
   id: number;
 
@@ -26,7 +26,7 @@ export type SignalRUser = {
    * Device id
    * 设备编号
    */
-  deviceId: number | number[];
+  deviceId: number;
 
   /**
    * Role

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