@etsoo/appscript 1.3.86 → 1.3.88

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

@@ -4,6 +4,8 @@ import { IApp } from '../app/IApp';
 import { IActionResult } from '../result/IActionResult';
 import { BaseApi } from './BaseApi';
 import { AuditLineDto, AuditLinePayload } from './dto/AuditLineDto';
+import { ResultPayload } from './dto/ResultPayload';
+import { MergeRQ } from './rq/MergeRQ';
 import { QueryRQ } from './rq/QueryRQ';
 import { TiplistRQ } from './rq/TiplistRQ';
 /**
@@ -39,6 +41,13 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @returns Result
      */
     protected listBase<T extends DataTypes.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>;
     /**
      * Query
      * @param rq Request data

package/lib/cjs/erp/EntityApi.js

@@ -40,6 +40,15 @@ class EntityApi extends BaseApi_1.BaseApi {
     listBase(rq, payload) {
         return this.api.post(`${this.flag}/List`, rq, payload);
     }
+    /**
+     * Merge
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    mergeBase(rq, payload) {
+        return this.api.put(`${this.flag}/Merge`, rq, payload);
+    }
     /**
      * Query
      * @param rq Request data

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

@@ -0,0 +1,18 @@
+import { DataTypes } from '@etsoo/shared';
+/**
+ * Merge request data
+ */
+export type MergeRQ<T extends DataTypes.IdType = number> = {
+    /**
+     * Source id
+     */
+    sourceId: T;
+    /**
+     * Target id
+     */
+    targetId: T;
+    /**
+     * Delete source at the same time
+     */
+    deleteSource?: boolean;
+};

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

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

package/lib/cjs/i18n/en.json

@@ -119,6 +119,7 @@
     "open": "Open",
     "openMenu": "Open menu",
     "operationSucceeded": "Operation succeeded",
+    "others": "Others",
     "pageNotFound": "Page Not Found",
     "passwordChangeSuccess": "Password changed successfully, please sign in again",
     "passwordRepeatError": "The two passwords entered are inconsistent",
@@ -189,6 +190,7 @@
     "taxNZIRD": "IRD",
     "taxUSEIN": "Employer identification number",
     "timeDifferenceInvalid": "The time difference between the device and the server is {0}, which exceeds the limit of {1} seconds. Please adjust the device time. If it is abnormal, please inform the administrator",
+    "title": "Title",
     "tokenExpiry": "Your session is about to expire. Click the Cancel button to continue",
     "type": "Type",
     "yes": "Yes",

package/lib/cjs/i18n/zh-Hans.json

@@ -119,6 +119,7 @@
     "open": "打开",
     "openMenu": "打开菜单",
     "operationSucceeded": "操作成功",
+    "others": "其他",
     "pageNotFound": "找不到页面",
     "passwordChangeSuccess": "密码修改成功，请重新登录",
     "passwordRepeatError": "两次输入的密码不一致",
@@ -189,6 +190,7 @@
     "taxNZIRD": "IRD",
     "taxUSEIN": "雇主识别号码(EIN)",
     "timeDifferenceInvalid": "设备时间和服务器时间差为{0}，超过{1}秒的限制，请调整设备时间，如果异常请告知管理员",
+    "title": "标题",
     "tokenExpiry": "您的会话即将过期。点击 取消 按钮继续使用",
     "type": "类型",
     "yes": "是",

package/lib/cjs/i18n/zh-Hant.json

@@ -119,6 +119,7 @@
     "open": "打開",
     "openMenu": "打開菜單",
     "operationSucceeded": "操作成功",
+    "others": "其他",
     "pageNotFound": "找不到頁面",
     "passwordChangeSuccess": "密碼修改成功，請重新登錄",
     "passwordRepeatError": "兩次輸入的密碼不一致",
@@ -189,6 +190,7 @@
     "taxNZIRD": "IRD",
     "taxUSEIN": "雇主識別號碼(EIN)",
     "timeDifferenceInvalid": "設備時間和服務器時間差為{0}，超過{1}秒的限制，請調整設備時間，如果異常請告知管理員",
+    "title": "標題",
     "tokenExpiry": "您的會話即將過期。點擊 取消 按鈕繼續使用",
     "type": "類型",
     "yes": "是",

package/lib/cjs/index.d.ts

@@ -40,6 +40,7 @@ export * from './erp/dto/ResultPayload';
 export * from './erp/rq/LoginIdRQ';
 export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';
+export * from './erp/rq/MergeRQ';
 export * from './erp/rq/OrgListRQ';
 export * from './erp/rq/OrgQueryRQ';
 export * from './erp/rq/ParsePinRQ';

package/lib/cjs/index.js

@@ -64,6 +64,7 @@ __exportStar(require("./erp/dto/ResultPayload"), exports);
 __exportStar(require("./erp/rq/LoginIdRQ"), exports);
 __exportStar(require("./erp/rq/LoginRQ"), exports);
 __exportStar(require("./erp/rq/MemberListRQ"), exports);
+__exportStar(require("./erp/rq/MergeRQ"), exports);
 __exportStar(require("./erp/rq/OrgListRQ"), exports);
 __exportStar(require("./erp/rq/OrgQueryRQ"), exports);
 __exportStar(require("./erp/rq/ParsePinRQ"), exports);

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

@@ -4,6 +4,8 @@ import { IApp } from '../app/IApp';
 import { IActionResult } from '../result/IActionResult';
 import { BaseApi } from './BaseApi';
 import { AuditLineDto, AuditLinePayload } from './dto/AuditLineDto';
+import { ResultPayload } from './dto/ResultPayload';
+import { MergeRQ } from './rq/MergeRQ';
 import { QueryRQ } from './rq/QueryRQ';
 import { TiplistRQ } from './rq/TiplistRQ';
 /**
@@ -39,6 +41,13 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @returns Result
      */
     protected listBase<T extends DataTypes.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>;
     /**
      * Query
      * @param rq Request data

package/lib/mjs/erp/EntityApi.js

@@ -37,6 +37,15 @@ export class EntityApi extends BaseApi {
     listBase(rq, payload) {
         return this.api.post(`${this.flag}/List`, rq, payload);
     }
+    /**
+     * Merge
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    mergeBase(rq, payload) {
+        return this.api.put(`${this.flag}/Merge`, rq, payload);
+    }
     /**
      * Query
      * @param rq Request data

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

@@ -0,0 +1,18 @@
+import { DataTypes } from '@etsoo/shared';
+/**
+ * Merge request data
+ */
+export type MergeRQ<T extends DataTypes.IdType = number> = {
+    /**
+     * Source id
+     */
+    sourceId: T;
+    /**
+     * Target id
+     */
+    targetId: T;
+    /**
+     * Delete source at the same time
+     */
+    deleteSource?: boolean;
+};

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

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

package/lib/mjs/i18n/en.json

@@ -119,6 +119,7 @@
     "open": "Open",
     "openMenu": "Open menu",
     "operationSucceeded": "Operation succeeded",
+    "others": "Others",
     "pageNotFound": "Page Not Found",
     "passwordChangeSuccess": "Password changed successfully, please sign in again",
     "passwordRepeatError": "The two passwords entered are inconsistent",
@@ -189,6 +190,7 @@
     "taxNZIRD": "IRD",
     "taxUSEIN": "Employer identification number",
     "timeDifferenceInvalid": "The time difference between the device and the server is {0}, which exceeds the limit of {1} seconds. Please adjust the device time. If it is abnormal, please inform the administrator",
+    "title": "Title",
     "tokenExpiry": "Your session is about to expire. Click the Cancel button to continue",
     "type": "Type",
     "yes": "Yes",

package/lib/mjs/i18n/zh-Hans.json

@@ -119,6 +119,7 @@
     "open": "打开",
     "openMenu": "打开菜单",
     "operationSucceeded": "操作成功",
+    "others": "其他",
     "pageNotFound": "找不到页面",
     "passwordChangeSuccess": "密码修改成功，请重新登录",
     "passwordRepeatError": "两次输入的密码不一致",
@@ -189,6 +190,7 @@
     "taxNZIRD": "IRD",
     "taxUSEIN": "雇主识别号码(EIN)",
     "timeDifferenceInvalid": "设备时间和服务器时间差为{0}，超过{1}秒的限制，请调整设备时间，如果异常请告知管理员",
+    "title": "标题",
     "tokenExpiry": "您的会话即将过期。点击 取消 按钮继续使用",
     "type": "类型",
     "yes": "是",

package/lib/mjs/i18n/zh-Hant.json

@@ -119,6 +119,7 @@
     "open": "打開",
     "openMenu": "打開菜單",
     "operationSucceeded": "操作成功",
+    "others": "其他",
     "pageNotFound": "找不到頁面",
     "passwordChangeSuccess": "密碼修改成功，請重新登錄",
     "passwordRepeatError": "兩次輸入的密碼不一致",
@@ -189,6 +190,7 @@
     "taxNZIRD": "IRD",
     "taxUSEIN": "雇主識別號碼(EIN)",
     "timeDifferenceInvalid": "設備時間和服務器時間差為{0}，超過{1}秒的限制，請調整設備時間，如果異常請告知管理員",
+    "title": "標題",
     "tokenExpiry": "您的會話即將過期。點擊 取消 按鈕繼續使用",
     "type": "類型",
     "yes": "是",

package/lib/mjs/index.d.ts

@@ -40,6 +40,7 @@ export * from './erp/dto/ResultPayload';
 export * from './erp/rq/LoginIdRQ';
 export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';
+export * from './erp/rq/MergeRQ';
 export * from './erp/rq/OrgListRQ';
 export * from './erp/rq/OrgQueryRQ';
 export * from './erp/rq/ParsePinRQ';

package/lib/mjs/index.js

@@ -47,6 +47,7 @@ export * from './erp/dto/ResultPayload';
 export * from './erp/rq/LoginIdRQ';
 export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';
+export * from './erp/rq/MergeRQ';
 export * from './erp/rq/OrgListRQ';
 export * from './erp/rq/OrgQueryRQ';
 export * from './erp/rq/ParsePinRQ';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.86",
+    "version": "1.3.88",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,20 +54,20 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.24",
         "@etsoo/restclient": "^1.0.87",
-        "@etsoo/shared": "^1.1.94",
+        "@etsoo/shared": "^1.1.95",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
     "devDependencies": {
         "@babel/cli": "^7.21.0",
-        "@babel/core": "^7.21.3",
-        "@babel/plugin-transform-runtime": "^7.21.0",
-        "@babel/preset-env": "^7.20.2",
+        "@babel/core": "^7.21.4",
+        "@babel/plugin-transform-runtime": "^7.21.4",
+        "@babel/preset-env": "^7.21.4",
         "@babel/runtime-corejs3": "^7.21.0",
         "@types/jest": "^29.5.0",
         "jest": "^29.5.0",
         "jest-environment-jsdom": "^29.5.0",
         "ts-jest": "^29.0.5",
-        "typescript": "^5.0.2"
+        "typescript": "^5.0.3"
     }
 }

package/src/erp/EntityApi.ts

@@ -4,6 +4,8 @@ import { IApp } from '../app/IApp';
 import { IActionResult } from '../result/IActionResult';
 import { BaseApi } from './BaseApi';
 import { AuditLineDto, AuditLinePayload } from './dto/AuditLineDto';
+import { ResultPayload } from './dto/ResultPayload';
+import { MergeRQ } from './rq/MergeRQ';
 import { QueryRQ } from './rq/QueryRQ';
 import { TiplistRQ } from './rq/TiplistRQ';
 
@@ -75,6 +77,19 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
         return this.api.post(`${this.flag}/List`, rq, payload);
     }
 
+    /**
+     * Merge
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    protected mergeBase<T extends DataTypes.IdType = number>(
+        rq: MergeRQ<T>,
+        payload?: ResultPayload
+    ) {
+        return this.api.put(`${this.flag}/Merge`, rq, payload);
+    }
+
     /**
      * Query
      * @param rq Request data

package/src/erp/rq/MergeRQ.ts

@@ -0,0 +1,21 @@
+import { DataTypes } from '@etsoo/shared';
+
+/**
+ * Merge request data
+ */
+export type MergeRQ<T extends DataTypes.IdType = number> = {
+    /**
+     * Source id
+     */
+    sourceId: T;
+
+    /**
+     * Target id
+     */
+    targetId: T;
+
+    /**
+     * Delete source at the same time
+     */
+    deleteSource?: boolean;
+};

package/src/i18n/en.json

@@ -119,6 +119,7 @@
     "open": "Open",
     "openMenu": "Open menu",
     "operationSucceeded": "Operation succeeded",
+    "others": "Others",
     "pageNotFound": "Page Not Found",
     "passwordChangeSuccess": "Password changed successfully, please sign in again",
     "passwordRepeatError": "The two passwords entered are inconsistent",
@@ -189,6 +190,7 @@
     "taxNZIRD": "IRD",
     "taxUSEIN": "Employer identification number",
     "timeDifferenceInvalid": "The time difference between the device and the server is {0}, which exceeds the limit of {1} seconds. Please adjust the device time. If it is abnormal, please inform the administrator",
+    "title": "Title",
     "tokenExpiry": "Your session is about to expire. Click the Cancel button to continue",
     "type": "Type",
     "yes": "Yes",

package/src/i18n/zh-Hans.json

@@ -119,6 +119,7 @@
     "open": "打开",
     "openMenu": "打开菜单",
     "operationSucceeded": "操作成功",
+    "others": "其他",
     "pageNotFound": "找不到页面",
     "passwordChangeSuccess": "密码修改成功，请重新登录",
     "passwordRepeatError": "两次输入的密码不一致",
@@ -189,6 +190,7 @@
     "taxNZIRD": "IRD",
     "taxUSEIN": "雇主识别号码(EIN)",
     "timeDifferenceInvalid": "设备时间和服务器时间差为{0}，超过{1}秒的限制，请调整设备时间，如果异常请告知管理员",
+    "title": "标题",
     "tokenExpiry": "您的会话即将过期。点击 取消 按钮继续使用",
     "type": "类型",
     "yes": "是",

package/src/i18n/zh-Hant.json

@@ -119,6 +119,7 @@
     "open": "打開",
     "openMenu": "打開菜單",
     "operationSucceeded": "操作成功",
+    "others": "其他",
     "pageNotFound": "找不到頁面",
     "passwordChangeSuccess": "密碼修改成功，請重新登錄",
     "passwordRepeatError": "兩次輸入的密碼不一致",
@@ -189,6 +190,7 @@
     "taxNZIRD": "IRD",
     "taxUSEIN": "雇主識別號碼(EIN)",
     "timeDifferenceInvalid": "設備時間和服務器時間差為{0}，超過{1}秒的限制，請調整設備時間，如果異常請告知管理員",
+    "title": "標題",
     "tokenExpiry": "您的會話即將過期。點擊 取消 按鈕繼續使用",
     "type": "類型",
     "yes": "是",

package/src/index.ts

@@ -53,6 +53,7 @@ export * from './erp/dto/ResultPayload';
 export * from './erp/rq/LoginIdRQ';
 export * from './erp/rq/LoginRQ';
 export * from './erp/rq/MemberListRQ';
+export * from './erp/rq/MergeRQ';
 export * from './erp/rq/OrgListRQ';
 export * from './erp/rq/OrgQueryRQ';
 export * from './erp/rq/ParsePinRQ';