@etsoo/appscript 1.4.70 → 1.4.71

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

@@ -1,10 +1,9 @@
 import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent, NotificationReturn } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
-import { DataTypes, DateUtils, IStorage, ListType, ListType1 } from '@etsoo/shared';
+import { DataTypes, DateUtils, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { EntityStatus } from '../business/EntityStatus';
 import { InitCallDto } from '../erp/dto/InitCallDto';
-import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';

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

@@ -1,8 +1,7 @@
 import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent, NotificationReturn } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
-import { DataTypes, DateUtils, IStorage, ListType, ListType1 } from '@etsoo/shared';
+import { DataTypes, DateUtils, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
-import { IActionResult } from '../result/IActionResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';

package/lib/cjs/business/BusinessUtils.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes, ListType, ListType1 } from '@etsoo/shared';
+import { IdType, ListType, ListType1 } from '@etsoo/shared';
 import { CultureGridItem } from './CultureItem';
 /**
  * Business utils
@@ -35,5 +35,5 @@ export declare namespace BusinessUtils {
     function setIdValue<T extends {
         id?: number;
         sid?: string;
-    }>(item: T, id?: DataTypes.IdType): void;
+    }>(item: T, id?: IdType): void;
 }

package/lib/cjs/business/ShoppingCart.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes, IStorage } from '@etsoo/shared';
+import { DataTypes, IStorage, IdType } from '@etsoo/shared';
 import { Currency } from './Currency';
 /**
  * Shopping cart owner
@@ -51,7 +51,7 @@ export type ShoppingCartItemBase = {
      * Product id
      * 产品编号
      */
-    id: DataTypes.IdType;
+    id: IdType;
     /**
      * Product title, default is name
      * 产品标题，默认为name

package/lib/cjs/erp/AuthApi.d.ts

@@ -1,10 +1,10 @@
 import { IApiPayload } from '@etsoo/restclient';
-import { IActionResult } from '../result/IActionResult';
 import { IUser } from '../state/User';
 import { BaseApi } from './BaseApi';
 import { ResultPayload } from './dto/ResultPayload';
 import { LoginRQ } from './rq/LoginRQ';
 import { ResetPasswordRQ } from './rq/ResetPasswordRQ';
+import { IActionResult } from '@etsoo/shared';
 /**
  * Authentication API
  */

package/lib/cjs/erp/EntityApi.d.ts

@@ -1,7 +1,6 @@
 import { IApi, IApiPayload } from '@etsoo/restclient';
-import { DataTypes } from '@etsoo/shared';
+import { IActionResult, IdType } from '@etsoo/shared';
 import { IApp } from '../app/IApp';
-import { IActionResult } from '../result/IActionResult';
 import { BaseApi } from './BaseApi';
 import { AuditLinePayload } from './dto/AuditLineDto';
 import { ResultPayload } from './dto/ResultPayload';
@@ -33,22 +32,22 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param id Id or ids
      * @param payload Payload
      */
-    protected deleteBase<R extends IActionResult>(id: DataTypes.IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
-    protected deleteBase<R extends IActionResult>(ids: DataTypes.IdType[], payload?: IApiPayload<R>): Promise<R | undefined>;
+    protected deleteBase<R extends IActionResult>(id: IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
+    protected deleteBase<R extends IActionResult>(ids: IdType[], payload?: IApiPayload<R>): Promise<R | undefined>;
     /**
      * List
      * @param rq Request data
      * @param payload Payload
      * @returns Result
      */
-    protected listBase<T extends DataTypes.IdType, RQ extends TiplistRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
+    protected listBase<T extends IdType, RQ extends TiplistRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
     /**
      * Merge
      * @param rq Request data
      * @param payload Payload
      * @returns Result
      */
-    protected mergeBase<T extends DataTypes.IdType = number>(rq: MergeRQ<T>, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    protected mergeBase<T extends IdType = number>(rq: MergeRQ<T>, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
     /**
      * Query
      * @param rq Request data
@@ -56,14 +55,14 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param queryKey Additional query key
      * @returns Result
      */
-    protected queryBase<T extends DataTypes.IdType, RQ extends QueryRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>, queryKey?: string): Promise<R[] | undefined>;
+    protected queryBase<T extends IdType, RQ extends QueryRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>, queryKey?: string): Promise<R[] | undefined>;
     /**
      * Query audit history
      * @param rq Request data
      * @param payload Payload
      * @returns Result
      */
-    protected queryAuditBase<T extends DataTypes.IdType, R extends QueryRQ<T>>(rq: R, payload?: AuditLinePayload): Promise<import("./dto/AuditLineDto").AuditLineDto[] | undefined>;
+    protected queryAuditBase<T extends IdType, R extends QueryRQ<T>>(rq: R, payload?: AuditLinePayload): Promise<import("./dto/AuditLineDto").AuditLineDto[] | undefined>;
     /**
      * Query favored country ids
      * @returns Result
@@ -75,7 +74,7 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      * @returns Result
      */
-    protected readBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
+    protected readBase<R extends object>(id: IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
     /**
      * Sort
      * @param items Items to sort
@@ -83,7 +82,7 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @returns Result
      */
     protected sortBase<RQ extends {
-        id: DataTypes.IdType;
+        id: IdType;
     }>(items: RQ[], payload?: IApiPayload<number>): Promise<number | undefined>;
     /**
      * Sort with category
@@ -94,7 +93,7 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @returns Result
      */
     protected sortWith<RQ extends {
-        id: DataTypes.IdType;
+        id: IdType;
     }>(category: number, items: RQ[], method?: string, payload?: IApiPayload<number>): Promise<number | undefined>;
     /**
      * Update
@@ -109,7 +108,7 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      * @returns Result
      */
-    protected updateReadBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
+    protected updateReadBase<R extends object>(id: IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
     /**
      * Update status
      * @param rq Request data

package/lib/cjs/erp/OrgApi.d.ts

@@ -25,7 +25,7 @@ export declare class OrgApi extends EntityApi {
      * @param payload Payload
      * @returns Result
      */
-    checkApiService(api: ApiService, payload?: StringIdResultPayload): Promise<import("..").IdActionResult<string> | undefined>;
+    checkApiService(api: ApiService, payload?: StringIdResultPayload): Promise<import("@etsoo/shared").IdActionResult<string> | undefined>;
     /**
      * Get organization list
      * @param items Max items or request data
@@ -70,7 +70,7 @@ export declare class OrgApi extends EntityApi {
      * @param payload Payload
      * @returns Result
      */
-    update(data: DataTypes.AddOrEditType<OrgDto, true>, payload?: IdResultPayload): Promise<import("..").IdActionResult | undefined>;
+    update(data: DataTypes.AddOrEditType<OrgDto, true>, payload?: IdResultPayload): Promise<import("@etsoo/shared").IdActionResult | undefined>;
     /**
      * Read for update
      * @param id Id

package/lib/cjs/erp/dto/IdLabelPrimaryDto.d.ts

@@ -1,8 +1,8 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdType } from '@etsoo/shared';
 /**
  * Dto with id, label and primary field
  */
-export type IdLabelPrimaryDto<T extends DataTypes.IdType = number> = DataTypes.IdLabelItem<T> & {
+export type IdLabelPrimaryDto<T extends IdType = number> = DataTypes.IdLabelItem<T> & {
     /**
      * Is primary
      */

package/lib/cjs/erp/dto/PublicProductDto.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 import { EntityStatus } from '../../business/EntityStatus';
 /**
  * Public product data
@@ -23,7 +23,7 @@ export type PublicProductDto = {
     /**
      * Query id for service Id / service Uid
      */
-    queryId?: DataTypes.IdType;
+    queryId?: IdType;
 };
 /**
  * Public product with organization data

package/lib/cjs/erp/dto/ResultPayload.d.ts

@@ -1,5 +1,5 @@
 import { IApiPayload } from '@etsoo/restclient';
-import { IActionResult, IdActionResult } from '../../result/IActionResult';
+import { IActionResult, IdActionResult } from '@etsoo/shared';
 /**
  * Action result payload
  */

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

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 import { LoginIdRQ } from './LoginIdRQ';
 /**
  * Login request data
@@ -19,5 +19,5 @@ export type LoginRQ = LoginIdRQ & {
     /**
      * Service id or uid
      */
-    serviceId?: DataTypes.IdType;
+    serviceId?: IdType;
 };

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

@@ -1,8 +1,8 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 /**
  * Merge request data
  */
-export type MergeRQ<T extends DataTypes.IdType = number> = {
+export type MergeRQ<T extends IdType = number> = {
     /**
      * Source id
      */

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

@@ -1,9 +1,9 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 /**
  * Query request data
  * com.etsoo.CoreFramework.Models.QueryRQ
  */
-export type QueryRQ<T extends DataTypes.IdType = number> = {
+export type QueryRQ<T extends IdType = number> = {
     /**
      * Number id
      */

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

@@ -1,9 +1,9 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 /**
  * Tiplist request data
  * com.etsoo.CoreFramework.Models.TiplistRQ
  */
-export type TiplistRQ<T extends DataTypes.IdType = number> = {
+export type TiplistRQ<T extends IdType = number> = {
     /**
      * number id
      */

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

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 import { EntityStatus } from '../../business/EntityStatus';
 /**
  * Update status request data
@@ -7,7 +7,7 @@ export type UpdateStatusRQ = {
     /**
      * Id
      */
-    id: DataTypes.IdType;
+    id: IdType;
     /**
      * New status
      */

package/lib/cjs/index.d.ts

@@ -71,7 +71,6 @@ export { ApiAuthorizationScheme, ApiMethod, ApiResponseType, createClient, creat
 export type { IApi, IApiPayload } from '@etsoo/restclient';
 export * from './result/ActionResult';
 export * from './result/ActionResultError';
-export * from './result/IActionResult';
 export * from './result/InitCallResult';
 export * from './state/Culture';
 export * from './state/State';

package/lib/cjs/index.js

@@ -103,7 +103,6 @@ Object.defineProperty(exports, "createClientAsync", { enumerable: true, get: fun
 // result
 __exportStar(require("./result/ActionResult"), exports);
 __exportStar(require("./result/ActionResultError"), exports);
-__exportStar(require("./result/IActionResult"), exports);
 __exportStar(require("./result/InitCallResult"), exports);
 // state
 __exportStar(require("./state/Culture"), exports);

package/lib/cjs/result/ActionResult.d.ts

@@ -1,4 +1,4 @@
-import { IActionResult } from './IActionResult';
+import { IActionResult } from '@etsoo/shared';
 /**
  * Action result
  */

package/lib/cjs/result/ActionResultError.d.ts

@@ -1,4 +1,4 @@
-import { IActionResult } from './IActionResult';
+import { IActionResult } from '@etsoo/shared';
 /**
  * Action result error
  */

package/lib/cjs/result/InitCallResult.d.ts

@@ -1,4 +1,4 @@
-import { IActionResult } from './IActionResult';
+import { IActionResult } from '@etsoo/shared';
 /**
  * Init call result data
  */

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

@@ -1,10 +1,9 @@
 import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent, NotificationReturn } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
-import { DataTypes, DateUtils, IStorage, ListType, ListType1 } from '@etsoo/shared';
+import { DataTypes, DateUtils, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { EntityStatus } from '../business/EntityStatus';
 import { InitCallDto } from '../erp/dto/InitCallDto';
-import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';

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

@@ -1,8 +1,7 @@
 import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent, NotificationReturn } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
-import { DataTypes, DateUtils, IStorage, ListType, ListType1 } from '@etsoo/shared';
+import { DataTypes, DateUtils, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
-import { IActionResult } from '../result/IActionResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';

package/lib/mjs/business/BusinessUtils.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes, ListType, ListType1 } from '@etsoo/shared';
+import { IdType, ListType, ListType1 } from '@etsoo/shared';
 import { CultureGridItem } from './CultureItem';
 /**
  * Business utils
@@ -35,5 +35,5 @@ export declare namespace BusinessUtils {
     function setIdValue<T extends {
         id?: number;
         sid?: string;
-    }>(item: T, id?: DataTypes.IdType): void;
+    }>(item: T, id?: IdType): void;
 }

package/lib/mjs/business/ShoppingCart.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes, IStorage } from '@etsoo/shared';
+import { DataTypes, IStorage, IdType } from '@etsoo/shared';
 import { Currency } from './Currency';
 /**
  * Shopping cart owner
@@ -51,7 +51,7 @@ export type ShoppingCartItemBase = {
      * Product id
      * 产品编号
      */
-    id: DataTypes.IdType;
+    id: IdType;
     /**
      * Product title, default is name
      * 产品标题，默认为name

package/lib/mjs/erp/AuthApi.d.ts

@@ -1,10 +1,10 @@
 import { IApiPayload } from '@etsoo/restclient';
-import { IActionResult } from '../result/IActionResult';
 import { IUser } from '../state/User';
 import { BaseApi } from './BaseApi';
 import { ResultPayload } from './dto/ResultPayload';
 import { LoginRQ } from './rq/LoginRQ';
 import { ResetPasswordRQ } from './rq/ResetPasswordRQ';
+import { IActionResult } from '@etsoo/shared';
 /**
  * Authentication API
  */

package/lib/mjs/erp/EntityApi.d.ts

@@ -1,7 +1,6 @@
 import { IApi, IApiPayload } from '@etsoo/restclient';
-import { DataTypes } from '@etsoo/shared';
+import { IActionResult, IdType } from '@etsoo/shared';
 import { IApp } from '../app/IApp';
-import { IActionResult } from '../result/IActionResult';
 import { BaseApi } from './BaseApi';
 import { AuditLinePayload } from './dto/AuditLineDto';
 import { ResultPayload } from './dto/ResultPayload';
@@ -33,22 +32,22 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param id Id or ids
      * @param payload Payload
      */
-    protected deleteBase<R extends IActionResult>(id: DataTypes.IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
-    protected deleteBase<R extends IActionResult>(ids: DataTypes.IdType[], payload?: IApiPayload<R>): Promise<R | undefined>;
+    protected deleteBase<R extends IActionResult>(id: IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
+    protected deleteBase<R extends IActionResult>(ids: IdType[], payload?: IApiPayload<R>): Promise<R | undefined>;
     /**
      * List
      * @param rq Request data
      * @param payload Payload
      * @returns Result
      */
-    protected listBase<T extends DataTypes.IdType, RQ extends TiplistRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
+    protected listBase<T extends IdType, RQ extends TiplistRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
     /**
      * Merge
      * @param rq Request data
      * @param payload Payload
      * @returns Result
      */
-    protected mergeBase<T extends DataTypes.IdType = number>(rq: MergeRQ<T>, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    protected mergeBase<T extends IdType = number>(rq: MergeRQ<T>, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
     /**
      * Query
      * @param rq Request data
@@ -56,14 +55,14 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param queryKey Additional query key
      * @returns Result
      */
-    protected queryBase<T extends DataTypes.IdType, RQ extends QueryRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>, queryKey?: string): Promise<R[] | undefined>;
+    protected queryBase<T extends IdType, RQ extends QueryRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>, queryKey?: string): Promise<R[] | undefined>;
     /**
      * Query audit history
      * @param rq Request data
      * @param payload Payload
      * @returns Result
      */
-    protected queryAuditBase<T extends DataTypes.IdType, R extends QueryRQ<T>>(rq: R, payload?: AuditLinePayload): Promise<import("./dto/AuditLineDto").AuditLineDto[] | undefined>;
+    protected queryAuditBase<T extends IdType, R extends QueryRQ<T>>(rq: R, payload?: AuditLinePayload): Promise<import("./dto/AuditLineDto").AuditLineDto[] | undefined>;
     /**
      * Query favored country ids
      * @returns Result
@@ -75,7 +74,7 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      * @returns Result
      */
-    protected readBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
+    protected readBase<R extends object>(id: IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
     /**
      * Sort
      * @param items Items to sort
@@ -83,7 +82,7 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @returns Result
      */
     protected sortBase<RQ extends {
-        id: DataTypes.IdType;
+        id: IdType;
     }>(items: RQ[], payload?: IApiPayload<number>): Promise<number | undefined>;
     /**
      * Sort with category
@@ -94,7 +93,7 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @returns Result
      */
     protected sortWith<RQ extends {
-        id: DataTypes.IdType;
+        id: IdType;
     }>(category: number, items: RQ[], method?: string, payload?: IApiPayload<number>): Promise<number | undefined>;
     /**
      * Update
@@ -109,7 +108,7 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      * @returns Result
      */
-    protected updateReadBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
+    protected updateReadBase<R extends object>(id: IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
     /**
      * Update status
      * @param rq Request data

package/lib/mjs/erp/OrgApi.d.ts

@@ -25,7 +25,7 @@ export declare class OrgApi extends EntityApi {
      * @param payload Payload
      * @returns Result
      */
-    checkApiService(api: ApiService, payload?: StringIdResultPayload): Promise<import("..").IdActionResult<string> | undefined>;
+    checkApiService(api: ApiService, payload?: StringIdResultPayload): Promise<import("@etsoo/shared").IdActionResult<string> | undefined>;
     /**
      * Get organization list
      * @param items Max items or request data
@@ -70,7 +70,7 @@ export declare class OrgApi extends EntityApi {
      * @param payload Payload
      * @returns Result
      */
-    update(data: DataTypes.AddOrEditType<OrgDto, true>, payload?: IdResultPayload): Promise<import("..").IdActionResult | undefined>;
+    update(data: DataTypes.AddOrEditType<OrgDto, true>, payload?: IdResultPayload): Promise<import("@etsoo/shared").IdActionResult | undefined>;
     /**
      * Read for update
      * @param id Id

package/lib/mjs/erp/dto/IdLabelPrimaryDto.d.ts

@@ -1,8 +1,8 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdType } from '@etsoo/shared';
 /**
  * Dto with id, label and primary field
  */
-export type IdLabelPrimaryDto<T extends DataTypes.IdType = number> = DataTypes.IdLabelItem<T> & {
+export type IdLabelPrimaryDto<T extends IdType = number> = DataTypes.IdLabelItem<T> & {
     /**
      * Is primary
      */

package/lib/mjs/erp/dto/PublicProductDto.d.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 import { EntityStatus } from '../../business/EntityStatus';
 /**
  * Public product data
@@ -23,7 +23,7 @@ export type PublicProductDto = {
     /**
      * Query id for service Id / service Uid
      */
-    queryId?: DataTypes.IdType;
+    queryId?: IdType;
 };
 /**
  * Public product with organization data

package/lib/mjs/erp/dto/ResultPayload.d.ts

@@ -1,5 +1,5 @@
 import { IApiPayload } from '@etsoo/restclient';
-import { IActionResult, IdActionResult } from '../../result/IActionResult';
+import { IActionResult, IdActionResult } from '@etsoo/shared';
 /**
  * Action result payload
  */

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

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 import { LoginIdRQ } from './LoginIdRQ';
 /**
  * Login request data
@@ -19,5 +19,5 @@ export type LoginRQ = LoginIdRQ & {
     /**
      * Service id or uid
      */
-    serviceId?: DataTypes.IdType;
+    serviceId?: IdType;
 };

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

@@ -1,8 +1,8 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 /**
  * Merge request data
  */
-export type MergeRQ<T extends DataTypes.IdType = number> = {
+export type MergeRQ<T extends IdType = number> = {
     /**
      * Source id
      */

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

@@ -1,9 +1,9 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 /**
  * Query request data
  * com.etsoo.CoreFramework.Models.QueryRQ
  */
-export type QueryRQ<T extends DataTypes.IdType = number> = {
+export type QueryRQ<T extends IdType = number> = {
     /**
      * Number id
      */

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

@@ -1,9 +1,9 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 /**
  * Tiplist request data
  * com.etsoo.CoreFramework.Models.TiplistRQ
  */
-export type TiplistRQ<T extends DataTypes.IdType = number> = {
+export type TiplistRQ<T extends IdType = number> = {
     /**
      * number id
      */

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

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 import { EntityStatus } from '../../business/EntityStatus';
 /**
  * Update status request data
@@ -7,7 +7,7 @@ export type UpdateStatusRQ = {
     /**
      * Id
      */
-    id: DataTypes.IdType;
+    id: IdType;
     /**
      * New status
      */

package/lib/mjs/index.d.ts

@@ -71,7 +71,6 @@ export { ApiAuthorizationScheme, ApiMethod, ApiResponseType, createClient, creat
 export type { IApi, IApiPayload } from '@etsoo/restclient';
 export * from './result/ActionResult';
 export * from './result/ActionResultError';
-export * from './result/IActionResult';
 export * from './result/InitCallResult';
 export * from './state/Culture';
 export * from './state/State';

package/lib/mjs/index.js

@@ -81,7 +81,6 @@ export { ApiAuthorizationScheme, ApiMethod, ApiResponseType, createClient, creat
 // result
 export * from './result/ActionResult';
 export * from './result/ActionResultError';
-export * from './result/IActionResult';
 export * from './result/InitCallResult';
 // state
 export * from './state/Culture';

package/lib/mjs/result/ActionResult.d.ts

@@ -1,4 +1,4 @@
-import { IActionResult } from './IActionResult';
+import { IActionResult } from '@etsoo/shared';
 /**
  * Action result
  */

package/lib/mjs/result/ActionResultError.d.ts

@@ -1,4 +1,4 @@
-import { IActionResult } from './IActionResult';
+import { IActionResult } from '@etsoo/shared';
 /**
  * Action result error
  */

package/lib/mjs/result/InitCallResult.d.ts

@@ -1,4 +1,4 @@
-import { IActionResult } from './IActionResult';
+import { IActionResult } from '@etsoo/shared';
 /**
  * Init call result data
  */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.4.70",
+    "version": "1.4.71",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,9 +52,9 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.1.30",
-        "@etsoo/restclient": "^1.0.93",
-        "@etsoo/shared": "^1.2.20",
+        "@etsoo/notificationbase": "^1.1.31",
+        "@etsoo/restclient": "^1.0.94",
+        "@etsoo/shared": "^1.2.21",
         "crypto-js": "^4.2.0"
     },
     "devDependencies": {

package/src/app/CoreApp.ts

@@ -12,6 +12,7 @@ import {
     DataTypes,
     DateUtils,
     DomUtils,
+    IActionResult,
     IStorage,
     ListType,
     ListType1,
@@ -24,7 +25,6 @@ import { DataPrivacy } from '../business/DataPrivacy';
 import { EntityStatus } from '../business/EntityStatus';
 import { InitCallDto } from '../erp/dto/InitCallDto';
 import { ActionResultError } from '../result/ActionResultError';
-import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';

package/src/app/IApp.ts

@@ -9,12 +9,12 @@ import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import {
     DataTypes,
     DateUtils,
+    IActionResult,
     IStorage,
     ListType,
     ListType1
 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
-import { IActionResult } from '../result/IActionResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';

package/src/business/BusinessUtils.ts

@@ -1,4 +1,4 @@
-import { DataTypes, ListType, ListType1 } from '@etsoo/shared';
+import { IdType, ListType, ListType1 } from '@etsoo/shared';
 import { CultureGridItem } from './CultureItem';
 
 /**
@@ -102,7 +102,7 @@ export namespace BusinessUtils {
      */
     export function setIdValue<T extends { id?: number; sid?: string }>(
         item: T,
-        id?: DataTypes.IdType
+        id?: IdType
     ) {
         if (id == null) return;
         if (typeof id === 'number') item.id = id;

package/src/business/ShoppingCart.ts

@@ -1,4 +1,10 @@
-import { DataTypes, IStorage, NumberUtils, WindowStorage } from '@etsoo/shared';
+import {
+    DataTypes,
+    IStorage,
+    IdType,
+    NumberUtils,
+    WindowStorage
+} from '@etsoo/shared';
 import { Currency } from './Currency';
 
 /**
@@ -57,7 +63,7 @@ export type ShoppingCartItemBase = {
      * Product id
      * 产品编号
      */
-    id: DataTypes.IdType;
+    id: IdType;
 
     /**
      * Product title, default is name

package/src/erp/AuthApi.ts

@@ -1,11 +1,11 @@
 import { IApiPayload } from '@etsoo/restclient';
-import { IActionResult } from '../result/IActionResult';
 import { IUser } from '../state/User';
 import { BaseApi } from './BaseApi';
 import { ResultPayload } from './dto/ResultPayload';
 import { LoginIdRQ } from './rq/LoginIdRQ';
 import { LoginRQ } from './rq/LoginRQ';
 import { ResetPasswordRQ } from './rq/ResetPasswordRQ';
+import { IActionResult } from '@etsoo/shared';
 
 /**
  * Authentication API

package/src/erp/EntityApi.ts

@@ -1,7 +1,6 @@
 import { IApi, IApiPayload } from '@etsoo/restclient';
-import { DataTypes } from '@etsoo/shared';
+import { IActionResult, IdType } from '@etsoo/shared';
 import { IApp } from '../app/IApp';
-import { IActionResult } from '../result/IActionResult';
 import { BaseApi } from './BaseApi';
 import { AuditLinePayload } from './dto/AuditLineDto';
 import { ResultPayload } from './dto/ResultPayload';
@@ -43,15 +42,15 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      */
     protected deleteBase<R extends IActionResult>(
-        id: DataTypes.IdType,
+        id: IdType,
         payload?: IApiPayload<R>
     ): Promise<R | undefined>;
     protected deleteBase<R extends IActionResult>(
-        ids: DataTypes.IdType[],
+        ids: IdType[],
         payload?: IApiPayload<R>
     ): Promise<R | undefined>;
     protected deleteBase<R extends IActionResult>(
-        id: DataTypes.IdType | DataTypes.IdType[],
+        id: IdType | IdType[],
         payload?: IApiPayload<R>
     ) {
         const query = Array.isArray(id)
@@ -71,7 +70,7 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @returns Result
      */
     protected listBase<
-        T extends DataTypes.IdType,
+        T extends IdType,
         RQ extends TiplistRQ<T>,
         R extends object
     >(rq: RQ, payload?: IApiPayload<R[]>) {
@@ -84,7 +83,7 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      * @returns Result
      */
-    protected mergeBase<T extends DataTypes.IdType = number>(
+    protected mergeBase<T extends IdType = number>(
         rq: MergeRQ<T>,
         payload?: ResultPayload
     ) {
@@ -99,7 +98,7 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @returns Result
      */
     protected queryBase<
-        T extends DataTypes.IdType,
+        T extends IdType,
         RQ extends QueryRQ<T>,
         R extends object
     >(rq: RQ, payload?: IApiPayload<R[]>, queryKey: string = '') {
@@ -112,7 +111,7 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      * @returns Result
      */
-    protected queryAuditBase<T extends DataTypes.IdType, R extends QueryRQ<T>>(
+    protected queryAuditBase<T extends IdType, R extends QueryRQ<T>>(
         rq: R,
         payload?: AuditLinePayload
     ) {
@@ -138,10 +137,7 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      * @returns Result
      */
-    protected readBase<R extends object>(
-        id: DataTypes.IdType,
-        payload?: IApiPayload<R>
-    ) {
+    protected readBase<R extends object>(id: IdType, payload?: IApiPayload<R>) {
         return this.api.get(`${this.flag}/Read/${id}`, undefined, payload);
     }
 
@@ -151,11 +147,11 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      * @returns Result
      */
-    protected sortBase<RQ extends { id: DataTypes.IdType }>(
+    protected sortBase<RQ extends { id: IdType }>(
         items: RQ[],
         payload?: IApiPayload<number>
     ) {
-        const rq: Record<DataTypes.IdType, number> = {};
+        const rq: Record<IdType, number> = {};
         items.forEach((item, index) => (rq[item.id] = index));
         return this.api.put(`${this.flag}/Sort`, rq, payload);
     }
@@ -168,13 +164,13 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      * @returns Result
      */
-    protected sortWith<RQ extends { id: DataTypes.IdType }>(
+    protected sortWith<RQ extends { id: IdType }>(
         category: number,
         items: RQ[],
         method: string = 'Sort',
         payload?: IApiPayload<number>
     ) {
-        const data: Record<DataTypes.IdType, number> = {};
+        const data: Record<IdType, number> = {};
         items.forEach((item, index) => (data[item.id] = index));
         return this.api.put(
             `${this.flag}/${method}`,
@@ -203,7 +199,7 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @returns Result
      */
     protected updateReadBase<R extends object>(
-        id: DataTypes.IdType,
+        id: IdType,
         payload?: IApiPayload<R>
     ) {
         return this.api.get(

package/src/erp/dto/IdLabelPrimaryDto.ts

@@ -1,9 +1,9 @@
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, IdType } from '@etsoo/shared';
 
 /**
  * Dto with id, label and primary field
  */
-export type IdLabelPrimaryDto<T extends DataTypes.IdType = number> =
+export type IdLabelPrimaryDto<T extends IdType = number> =
     DataTypes.IdLabelItem<T> & {
         /**
          * Is primary

package/src/erp/dto/PublicProductDto.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 import { EntityStatus } from '../../business/EntityStatus';
 
 /**
@@ -28,7 +28,7 @@ export type PublicProductDto = {
     /**
      * Query id for service Id / service Uid
      */
-    queryId?: DataTypes.IdType;
+    queryId?: IdType;
 };
 
 /**

package/src/erp/dto/ResultPayload.ts

@@ -1,5 +1,5 @@
 import { IApiPayload } from '@etsoo/restclient';
-import { IActionResult, IdActionResult } from '../../result/IActionResult';
+import { IActionResult, IdActionResult } from '@etsoo/shared';
 
 /**
  * Action result payload

package/src/erp/rq/LoginRQ.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 import { LoginIdRQ } from './LoginIdRQ';
 
 /**
@@ -23,5 +23,5 @@ export type LoginRQ = LoginIdRQ & {
     /**
      * Service id or uid
      */
-    serviceId?: DataTypes.IdType;
+    serviceId?: IdType;
 };

package/src/erp/rq/MergeRQ.ts

@@ -1,9 +1,9 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 
 /**
  * Merge request data
  */
-export type MergeRQ<T extends DataTypes.IdType = number> = {
+export type MergeRQ<T extends IdType = number> = {
     /**
      * Source id
      */

package/src/erp/rq/QueryRQ.ts

@@ -1,10 +1,10 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 
 /**
  * Query request data
  * com.etsoo.CoreFramework.Models.QueryRQ
  */
-export type QueryRQ<T extends DataTypes.IdType = number> = {
+export type QueryRQ<T extends IdType = number> = {
     /**
      * Number id
      */

package/src/erp/rq/TiplistRQ.ts

@@ -1,10 +1,10 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 
 /**
  * Tiplist request data
  * com.etsoo.CoreFramework.Models.TiplistRQ
  */
-export type TiplistRQ<T extends DataTypes.IdType = number> = {
+export type TiplistRQ<T extends IdType = number> = {
     /**
      * number id
      */

package/src/erp/rq/UpdateStatusRQ.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from '@etsoo/shared';
+import { IdType } from '@etsoo/shared';
 import { EntityStatus } from '../../business/EntityStatus';
 
 /**
@@ -8,7 +8,7 @@ export type UpdateStatusRQ = {
     /**
      * Id
      */
-    id: DataTypes.IdType;
+    id: IdType;
 
     /**
      * New status

package/src/index.ts

@@ -98,7 +98,6 @@ export type { IApi, IApiPayload } from '@etsoo/restclient';
 // result
 export * from './result/ActionResult';
 export * from './result/ActionResultError';
-export * from './result/IActionResult';
 export * from './result/InitCallResult';
 
 // state

package/src/result/ActionResult.ts

@@ -1,5 +1,5 @@
 import { ApiError } from '@etsoo/restclient';
-import { IActionResult } from './IActionResult';
+import { IActionResult } from '@etsoo/shared';
 
 /**
  * Action result

package/src/result/ActionResultError.ts

@@ -1,4 +1,4 @@
-import { IActionResult } from './IActionResult';
+import { IActionResult } from '@etsoo/shared';
 
 /**
  * Action result error

package/src/result/InitCallResult.ts

@@ -1,4 +1,4 @@
-import { IActionResult } from './IActionResult';
+import { IActionResult } from '@etsoo/shared';
 
 /**
  * Init call result data

package/lib/cjs/result/IActionResult.d.ts

@@ -1,59 +0,0 @@
-import { DataTypes } from '@etsoo/shared';
-/**
- * Result errors
- * Indexable type
- */
-export interface IResultErrors {
-    readonly [key: string]: string[];
-}
-/**
- * Operation result interface
- */
-export interface IActionResult<D extends object = {}> {
-    /**
-     * Status code
-     */
-    readonly status?: number;
-    /**
-     * Result data
-     */
-    readonly data?: D;
-    /**
-     * Result errors
-     */
-    readonly errors?: IResultErrors;
-    /**
-     * Title
-     */
-    title?: string;
-    /**
-     * Detail
-     */
-    detail?: string;
-    /**
-     * Trace id
-     */
-    traceId?: string;
-    /**
-     * Type
-     */
-    type?: string;
-    /**
-     * Field name
-     */
-    field?: string;
-    /**
-     * Success or not
-     */
-    readonly ok: boolean;
-}
-/**
- * Action result with id data
- */
-export type IdActionResult<T extends DataTypes.IdType = number> = IActionResult<{
-    id: T;
-}>;
-/**
- * Action result with dynamic data
- */
-export type DynamicActionResult = IActionResult<Record<string, any>>;

package/lib/cjs/result/IActionResult.js

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

package/lib/mjs/result/IActionResult.d.ts

@@ -1,59 +0,0 @@
-import { DataTypes } from '@etsoo/shared';
-/**
- * Result errors
- * Indexable type
- */
-export interface IResultErrors {
-    readonly [key: string]: string[];
-}
-/**
- * Operation result interface
- */
-export interface IActionResult<D extends object = {}> {
-    /**
-     * Status code
-     */
-    readonly status?: number;
-    /**
-     * Result data
-     */
-    readonly data?: D;
-    /**
-     * Result errors
-     */
-    readonly errors?: IResultErrors;
-    /**
-     * Title
-     */
-    title?: string;
-    /**
-     * Detail
-     */
-    detail?: string;
-    /**
-     * Trace id
-     */
-    traceId?: string;
-    /**
-     * Type
-     */
-    type?: string;
-    /**
-     * Field name
-     */
-    field?: string;
-    /**
-     * Success or not
-     */
-    readonly ok: boolean;
-}
-/**
- * Action result with id data
- */
-export type IdActionResult<T extends DataTypes.IdType = number> = IActionResult<{
-    id: T;
-}>;
-/**
- * Action result with dynamic data
- */
-export type DynamicActionResult = IActionResult<Record<string, any>>;

package/lib/mjs/result/IActionResult.js

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

package/src/result/IActionResult.ts

@@ -1,72 +0,0 @@
-import { DataTypes } from '@etsoo/shared';
-
-/**
- * Result errors
- * Indexable type
- */
-export interface IResultErrors {
-    readonly [key: string]: string[];
-}
-
-/**
- * Operation result interface
- */
-export interface IActionResult<D extends object = {}> {
-    /**
-     * Status code
-     */
-    readonly status?: number;
-
-    /**
-     * Result data
-     */
-    readonly data?: D;
-
-    /**
-     * Result errors
-     */
-    readonly errors?: IResultErrors;
-
-    /**
-     * Title
-     */
-    title?: string;
-
-    /**
-     * Detail
-     */
-    detail?: string;
-
-    /**
-     * Trace id
-     */
-    traceId?: string;
-
-    /**
-     * Type
-     */
-    type?: string;
-
-    /**
-     * Field name
-     */
-    field?: string;
-
-    /**
-     * Success or not
-     */
-    readonly ok: boolean;
-}
-
-/**
- * Action result with id data
- */
-export type IdActionResult<T extends DataTypes.IdType = number> =
-    IActionResult<{
-        id: T;
-    }>;
-
-/**
- * Action result with dynamic data
- */
-export type DynamicActionResult = IActionResult<Record<string, any>>;