@etsoo/appscript 1.4.83 → 1.4.85

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 ETSOO
+Copyright (c) 2004-2024 ETSOO® (亿速思维 ®), https://www.etsoo.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/lib/cjs/app/IApp.d.ts

@@ -1,6 +1,6 @@
 import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent, NotificationReturn } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
-import { DataTypes, DateUtils, ErrorData, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
+import { DataTypes, DateUtils, ErrorData, ErrorType, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
@@ -462,8 +462,9 @@ export interface IApp {
     /**
      * Setup frontend logging
      * @param action Custom action
+     * @param preventDefault Is prevent default action
      */
-    setupLogging(action?: (data: ErrorData) => void | Promise<void>): void;
+    setupLogging(action?: (data: ErrorData) => void | Promise<void>, preventDefault?: ((type: ErrorType) => boolean) | boolean): void;
     /**
      * Signout, with userLogout and toLoginPage
      */

package/lib/cjs/erp/rq/QueryPagingData.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Query paging data
+ * 查询分页数据
+ */
+export type QueryPagingData = {
+    /**
+     * Current page
+     */
+    currentPage?: number;
+    /**
+     * Batch size
+     */
+    batchSize: number;
+    /**
+     * Order by field name
+     */
+    orderBy?: string;
+    /**
+     * Order by ascending
+     */
+    orderByAsc?: boolean;
+};

package/lib/cjs/erp/rq/QueryPagingData.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/erp/rq/QueryRQ.d.ts

@@ -1,4 +1,5 @@
 import { IdType } from '@etsoo/shared';
+import { QueryPagingData } from './QueryPagingData';
 /**
  * Query request data
  * com.etsoo.CoreFramework.Models.QueryRQ
@@ -13,19 +14,7 @@ export type QueryRQ<T extends IdType = number> = {
      */
     sid?: string;
     /**
-     * Current page
+     * Query paging data
      */
-    currentPage?: number;
-    /**
-     * Batch size
-     */
-    batchSize: number;
-    /**
-     * Order by field name
-     */
-    orderBy?: string;
-    /**
-     * Order by ascending
-     */
-    orderByAsc?: boolean;
+    queryPaging?: QueryPagingData;
 };

package/lib/cjs/index.d.ts

@@ -50,6 +50,7 @@ export * from './erp/rq/OrgQueryRQ';
 export * from './erp/rq/ParsePinRQ';
 export * from './erp/rq/PlaceParseRQ';
 export * from './erp/rq/PlaceQueryRQ';
+export * from './erp/rq/QueryPagingData';
 export * from './erp/rq/QueryRQ';
 export * from './erp/rq/RefreshTokenRQ';
 export * from './erp/rq/RegionsRQ';

package/lib/cjs/index.js

@@ -74,6 +74,7 @@ __exportStar(require("./erp/rq/OrgQueryRQ"), exports);
 __exportStar(require("./erp/rq/ParsePinRQ"), exports);
 __exportStar(require("./erp/rq/PlaceParseRQ"), exports);
 __exportStar(require("./erp/rq/PlaceQueryRQ"), exports);
+__exportStar(require("./erp/rq/QueryPagingData"), exports);
 __exportStar(require("./erp/rq/QueryRQ"), exports);
 __exportStar(require("./erp/rq/RefreshTokenRQ"), exports);
 __exportStar(require("./erp/rq/RegionsRQ"), exports);

package/lib/mjs/app/IApp.d.ts

@@ -1,6 +1,6 @@
 import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent, NotificationReturn } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
-import { DataTypes, DateUtils, ErrorData, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
+import { DataTypes, DateUtils, ErrorData, ErrorType, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
@@ -462,8 +462,9 @@ export interface IApp {
     /**
      * Setup frontend logging
      * @param action Custom action
+     * @param preventDefault Is prevent default action
      */
-    setupLogging(action?: (data: ErrorData) => void | Promise<void>): void;
+    setupLogging(action?: (data: ErrorData) => void | Promise<void>, preventDefault?: ((type: ErrorType) => boolean) | boolean): void;
     /**
      * Signout, with userLogout and toLoginPage
      */

package/lib/mjs/erp/rq/QueryPagingData.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Query paging data
+ * 查询分页数据
+ */
+export type QueryPagingData = {
+    /**
+     * Current page
+     */
+    currentPage?: number;
+    /**
+     * Batch size
+     */
+    batchSize: number;
+    /**
+     * Order by field name
+     */
+    orderBy?: string;
+    /**
+     * Order by ascending
+     */
+    orderByAsc?: boolean;
+};

package/lib/mjs/erp/rq/QueryPagingData.js

@@ -0,0 +1 @@
+export {};

package/lib/mjs/erp/rq/QueryRQ.d.ts

@@ -1,4 +1,5 @@
 import { IdType } from '@etsoo/shared';
+import { QueryPagingData } from './QueryPagingData';
 /**
  * Query request data
  * com.etsoo.CoreFramework.Models.QueryRQ
@@ -13,19 +14,7 @@ export type QueryRQ<T extends IdType = number> = {
      */
     sid?: string;
     /**
-     * Current page
+     * Query paging data
      */
-    currentPage?: number;
-    /**
-     * Batch size
-     */
-    batchSize: number;
-    /**
-     * Order by field name
-     */
-    orderBy?: string;
-    /**
-     * Order by ascending
-     */
-    orderByAsc?: boolean;
+    queryPaging?: QueryPagingData;
 };

package/lib/mjs/index.d.ts

@@ -50,6 +50,7 @@ export * from './erp/rq/OrgQueryRQ';
 export * from './erp/rq/ParsePinRQ';
 export * from './erp/rq/PlaceParseRQ';
 export * from './erp/rq/PlaceQueryRQ';
+export * from './erp/rq/QueryPagingData';
 export * from './erp/rq/QueryRQ';
 export * from './erp/rq/RefreshTokenRQ';
 export * from './erp/rq/RegionsRQ';

package/lib/mjs/index.js

@@ -57,6 +57,7 @@ export * from './erp/rq/OrgQueryRQ';
 export * from './erp/rq/ParsePinRQ';
 export * from './erp/rq/PlaceParseRQ';
 export * from './erp/rq/PlaceQueryRQ';
+export * from './erp/rq/QueryPagingData';
 export * from './erp/rq/QueryRQ';
 export * from './erp/rq/RefreshTokenRQ';
 export * from './erp/rq/RegionsRQ';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.4.83",
+    "version": "1.4.85",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,22 +52,22 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.1.41",
-        "@etsoo/restclient": "^1.1.2",
-        "@etsoo/shared": "^1.2.34",
+        "@etsoo/notificationbase": "^1.1.42",
+        "@etsoo/restclient": "^1.1.3",
+        "@etsoo/shared": "^1.2.37",
         "crypto-js": "^4.2.0"
     },
     "devDependencies": {
-        "@babel/cli": "^7.23.9",
-        "@babel/core": "^7.24.0",
-        "@babel/plugin-transform-runtime": "^7.24.0",
-        "@babel/preset-env": "^7.24.0",
-        "@babel/runtime-corejs3": "^7.24.0",
+        "@babel/cli": "^7.24.5",
+        "@babel/core": "^7.24.5",
+        "@babel/plugin-transform-runtime": "^7.24.3",
+        "@babel/preset-env": "^7.24.5",
+        "@babel/runtime-corejs3": "^7.24.5",
         "@types/crypto-js": "^4.2.2",
         "@types/jest": "^29.5.12",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "ts-jest": "^29.1.2",
-        "typescript": "^5.3.3"
+        "typescript": "^5.4.5"
     }
 }

package/src/app/IApp.ts

@@ -10,6 +10,7 @@ import {
     DataTypes,
     DateUtils,
     ErrorData,
+    ErrorType,
     IActionResult,
     IStorage,
     ListType,
@@ -627,8 +628,12 @@ export interface IApp {
     /**
      * Setup frontend logging
      * @param action Custom action
+     * @param preventDefault Is prevent default action
      */
-    setupLogging(action?: (data: ErrorData) => void | Promise<void>): void;
+    setupLogging(
+        action?: (data: ErrorData) => void | Promise<void>,
+        preventDefault?: ((type: ErrorType) => boolean) | boolean
+    ): void;
 
     /**
      * Signout, with userLogout and toLoginPage

package/src/erp/rq/QueryPagingData.ts

@@ -0,0 +1,25 @@
+/**
+ * Query paging data
+ * 查询分页数据
+ */
+export type QueryPagingData = {
+    /**
+     * Current page
+     */
+    currentPage?: number;
+
+    /**
+     * Batch size
+     */
+    batchSize: number;
+
+    /**
+     * Order by field name
+     */
+    orderBy?: string;
+
+    /**
+     * Order by ascending
+     */
+    orderByAsc?: boolean;
+};

package/src/erp/rq/QueryRQ.ts

@@ -1,4 +1,5 @@
 import { IdType } from '@etsoo/shared';
+import { QueryPagingData } from './QueryPagingData';
 
 /**
  * Query request data
@@ -16,22 +17,7 @@ export type QueryRQ<T extends IdType = number> = {
     sid?: string;
 
     /**
-     * Current page
+     * Query paging data
      */
-    currentPage?: number;
-
-    /**
-     * Batch size
-     */
-    batchSize: number;
-
-    /**
-     * Order by field name
-     */
-    orderBy?: string;
-
-    /**
-     * Order by ascending
-     */
-    orderByAsc?: boolean;
+    queryPaging?: QueryPagingData;
 };

package/src/index.ts

@@ -63,6 +63,7 @@ export * from './erp/rq/OrgQueryRQ';
 export * from './erp/rq/ParsePinRQ';
 export * from './erp/rq/PlaceParseRQ';
 export * from './erp/rq/PlaceQueryRQ';
+export * from './erp/rq/QueryPagingData';
 export * from './erp/rq/QueryRQ';
 export * from './erp/rq/RefreshTokenRQ';
 export * from './erp/rq/RegionsRQ';