@etsoo/appscript 1.4.89 → 1.4.91

package/README.md

@@ -86,6 +86,12 @@ $ yarn add @etsoo/appscript
 #### RepeatOption.ts ####
 -   RepeatOption - Repeat options
 
+### custom - Custom dynamic component rendering
+
+#### CustomFieldData.ts ####
+-   CustomFieldSpace - Custom field space (12 columns)
+-   CustomFieldData - Custom field data
+
 ### def - Type definition
 
 #### ListItem.ts ####

package/lib/cjs/custom/CustomField.d.ts

@@ -0,0 +1,32 @@
+import { CustomFieldData } from './CustomFieldData';
+/**
+ * Custom field reference
+ * 自定义字段引用
+ */
+export type CustomFieldRef = {
+    /**
+     * Get value
+     */
+    getValue(): unknown;
+    /**
+     * Set value
+     * @param value Value
+     */
+    setValue(value: unknown): void;
+};
+/**
+ * Custom field props
+ * 自定义字段属性
+ */
+export type CustomFieldProps<D extends CustomFieldData> = {
+    field: D;
+    onChange: (name: string, value: unknown) => void;
+    defaultValue?: unknown;
+};
+/**
+ * Custom field interface
+ * 自定义字段接口
+ */
+export interface ICustomField<D extends CustomFieldData, R> {
+    (props: CustomFieldProps<D>): R;
+}

package/lib/cjs/custom/CustomField.js

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

package/lib/cjs/custom/CustomFieldData.d.ts

@@ -0,0 +1,48 @@
+import { IdType, ListType2 } from '@etsoo/shared';
+/**
+ * Custom field space (12 columns)
+ * 自定义字段空间（12列）
+ */
+export type CustomFieldSpace = 'quater' | 'half' | 'half1' | 'full' | 'five' | 'seven';
+/**
+ * Custom field data
+ * 自定义字段数据
+ */
+export type CustomFieldData = {
+    /**
+     * Type
+     */
+    type: string;
+    /**
+     * Field name
+     */
+    name?: string;
+    /**
+     * Options
+     */
+    options?: ListType2[];
+    /**
+     * Refs
+     */
+    refs?: [string, ...IdType[]];
+    /**
+     * Space
+     */
+    space?: CustomFieldSpace;
+    /**
+     * Grid item proerties
+     */
+    gridItemProps?: Record<string, any>;
+    /**
+     * Main slot properties
+     */
+    mainSlotProps?: Record<string, any>;
+    /**
+     * Label
+     */
+    label?: string;
+    /**
+     * Helper text
+     */
+    helperText?: string;
+};

package/lib/cjs/custom/CustomFieldData.js

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

package/lib/cjs/erp/EntityApi.js

@@ -38,7 +38,11 @@ class EntityApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     listBase(rq, payload) {
-        return this.api.post(`${this.flag}/List`, rq, payload);
+        let { queryPaging, ...rest } = rq;
+        if (typeof queryPaging === 'number') {
+            queryPaging = { currentPage: 0, batchSize: queryPaging };
+        }
+        return this.api.post(`${this.flag}/List`, { queryPaging, ...rest }, payload);
     }
     /**
      * Merge

package/lib/cjs/erp/OrgApi.js

@@ -33,7 +33,7 @@ class OrgApi extends EntityApi_1.EntityApi {
         else {
             if (typeof serviceId === 'object')
                 return undefined;
-            return this.listBase({ items, serviceId }, { defaultValue: [], showLoading: false });
+            return this.listBase({ queryPaging: items, serviceId }, { defaultValue: [], showLoading: false });
         }
     }
     /**

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

@@ -1,4 +1,5 @@
 import { IdType } from '@etsoo/shared';
+import { QueryPagingData } from './QueryPagingData';
 /**
  * Tiplist request data
  * com.etsoo.CoreFramework.Models.TiplistRQ
@@ -17,7 +18,7 @@ export type TiplistRQ<T extends IdType = number> = {
      */
     keyword?: string;
     /**
-     * Max items to return
+     * Query paging data or items to read
      */
-    items?: number;
+    queryPaging?: QueryPagingData | number;
 };

package/lib/cjs/index.d.ts

@@ -25,6 +25,8 @@ export * from './business/EntityStatus';
 export * from './business/ProductUnit';
 export * from './business/RepeatOption';
 export * from './business/ShoppingCart';
+export * from './custom/CustomField';
+export * from './custom/CustomFieldData';
 export * from './def/ListItem';
 export * from './erp/dto/AuditLineDto';
 export * from './erp/dto/CurrencyDto';

package/lib/cjs/index.js

@@ -46,6 +46,9 @@ __exportStar(require("./business/EntityStatus"), exports);
 __exportStar(require("./business/ProductUnit"), exports);
 __exportStar(require("./business/RepeatOption"), exports);
 __exportStar(require("./business/ShoppingCart"), exports);
+// custom
+__exportStar(require("./custom/CustomField"), exports);
+__exportStar(require("./custom/CustomFieldData"), exports);
 // def
 __exportStar(require("./def/ListItem"), exports);
 // erp dto

package/lib/mjs/custom/CustomField.d.ts

@@ -0,0 +1,32 @@
+import { CustomFieldData } from './CustomFieldData';
+/**
+ * Custom field reference
+ * 自定义字段引用
+ */
+export type CustomFieldRef = {
+    /**
+     * Get value
+     */
+    getValue(): unknown;
+    /**
+     * Set value
+     * @param value Value
+     */
+    setValue(value: unknown): void;
+};
+/**
+ * Custom field props
+ * 自定义字段属性
+ */
+export type CustomFieldProps<D extends CustomFieldData> = {
+    field: D;
+    onChange: (name: string, value: unknown) => void;
+    defaultValue?: unknown;
+};
+/**
+ * Custom field interface
+ * 自定义字段接口
+ */
+export interface ICustomField<D extends CustomFieldData, R> {
+    (props: CustomFieldProps<D>): R;
+}

package/lib/mjs/custom/CustomField.js

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

package/lib/mjs/custom/CustomFieldData.d.ts

@@ -0,0 +1,48 @@
+import { IdType, ListType2 } from '@etsoo/shared';
+/**
+ * Custom field space (12 columns)
+ * 自定义字段空间（12列）
+ */
+export type CustomFieldSpace = 'quater' | 'half' | 'half1' | 'full' | 'five' | 'seven';
+/**
+ * Custom field data
+ * 自定义字段数据
+ */
+export type CustomFieldData = {
+    /**
+     * Type
+     */
+    type: string;
+    /**
+     * Field name
+     */
+    name?: string;
+    /**
+     * Options
+     */
+    options?: ListType2[];
+    /**
+     * Refs
+     */
+    refs?: [string, ...IdType[]];
+    /**
+     * Space
+     */
+    space?: CustomFieldSpace;
+    /**
+     * Grid item proerties
+     */
+    gridItemProps?: Record<string, any>;
+    /**
+     * Main slot properties
+     */
+    mainSlotProps?: Record<string, any>;
+    /**
+     * Label
+     */
+    label?: string;
+    /**
+     * Helper text
+     */
+    helperText?: string;
+};

package/lib/mjs/custom/CustomFieldData.js

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

package/lib/mjs/erp/EntityApi.js

@@ -35,7 +35,11 @@ export class EntityApi extends BaseApi {
      * @returns Result
      */
     listBase(rq, payload) {
-        return this.api.post(`${this.flag}/List`, rq, payload);
+        let { queryPaging, ...rest } = rq;
+        if (typeof queryPaging === 'number') {
+            queryPaging = { currentPage: 0, batchSize: queryPaging };
+        }
+        return this.api.post(`${this.flag}/List`, { queryPaging, ...rest }, payload);
     }
     /**
      * Merge

package/lib/mjs/erp/OrgApi.js

@@ -30,7 +30,7 @@ export class OrgApi extends EntityApi {
         else {
             if (typeof serviceId === 'object')
                 return undefined;
-            return this.listBase({ items, serviceId }, { defaultValue: [], showLoading: false });
+            return this.listBase({ queryPaging: items, serviceId }, { defaultValue: [], showLoading: false });
         }
     }
     /**

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

@@ -1,4 +1,5 @@
 import { IdType } from '@etsoo/shared';
+import { QueryPagingData } from './QueryPagingData';
 /**
  * Tiplist request data
  * com.etsoo.CoreFramework.Models.TiplistRQ
@@ -17,7 +18,7 @@ export type TiplistRQ<T extends IdType = number> = {
      */
     keyword?: string;
     /**
-     * Max items to return
+     * Query paging data or items to read
      */
-    items?: number;
+    queryPaging?: QueryPagingData | number;
 };

package/lib/mjs/index.d.ts

@@ -25,6 +25,8 @@ export * from './business/EntityStatus';
 export * from './business/ProductUnit';
 export * from './business/RepeatOption';
 export * from './business/ShoppingCart';
+export * from './custom/CustomField';
+export * from './custom/CustomFieldData';
 export * from './def/ListItem';
 export * from './erp/dto/AuditLineDto';
 export * from './erp/dto/CurrencyDto';

package/lib/mjs/index.js

@@ -29,6 +29,9 @@ export * from './business/EntityStatus';
 export * from './business/ProductUnit';
 export * from './business/RepeatOption';
 export * from './business/ShoppingCart';
+// custom
+export * from './custom/CustomField';
+export * from './custom/CustomFieldData';
 // def
 export * from './def/ListItem';
 // erp dto

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.4.89",
+    "version": "1.4.91",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -53,7 +53,7 @@
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.42",
-        "@etsoo/restclient": "^1.1.4",
+        "@etsoo/restclient": "^1.1.5",
         "@etsoo/shared": "^1.2.40",
         "crypto-js": "^4.2.0"
     },
@@ -67,7 +67,7 @@
         "@types/jest": "^29.5.12",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
-        "ts-jest": "^29.1.2",
+        "ts-jest": "^29.1.3",
         "typescript": "^5.4.5"
     }
 }

package/src/custom/CustomField.ts

@@ -0,0 +1,36 @@
+import { CustomFieldData } from './CustomFieldData';
+
+/**
+ * Custom field reference
+ * 自定义字段引用
+ */
+export type CustomFieldRef = {
+    /**
+     * Get value
+     */
+    getValue(): unknown;
+
+    /**
+     * Set value
+     * @param value Value
+     */
+    setValue(value: unknown): void;
+};
+
+/**
+ * Custom field props
+ * 自定义字段属性
+ */
+export type CustomFieldProps<D extends CustomFieldData> = {
+    field: D;
+    onChange: (name: string, value: unknown) => void;
+    defaultValue?: unknown;
+};
+
+/**
+ * Custom field interface
+ * 自定义字段接口
+ */
+export interface ICustomField<D extends CustomFieldData, R> {
+    (props: CustomFieldProps<D>): R;
+}

package/src/custom/CustomFieldData.ts

@@ -0,0 +1,64 @@
+import { IdType, ListType2 } from '@etsoo/shared';
+
+/**
+ * Custom field space (12 columns)
+ * 自定义字段空间（12列）
+ */
+export type CustomFieldSpace =
+    | 'quater'
+    | 'half'
+    | 'half1'
+    | 'full'
+    | 'five'
+    | 'seven';
+
+/**
+ * Custom field data
+ * 自定义字段数据
+ */
+export type CustomFieldData = {
+    /**
+     * Type
+     */
+    type: string;
+
+    /**
+     * Field name
+     */
+    name?: string;
+
+    /**
+     * Options
+     */
+    options?: ListType2[];
+
+    /**
+     * Refs
+     */
+    refs?: [string, ...IdType[]];
+
+    /**
+     * Space
+     */
+    space?: CustomFieldSpace;
+
+    /**
+     * Grid item proerties
+     */
+    gridItemProps?: Record<string, any>;
+
+    /**
+     * Main slot properties
+     */
+    mainSlotProps?: Record<string, any>;
+
+    /**
+     * Label
+     */
+    label?: string;
+
+    /**
+     * Helper text
+     */
+    helperText?: string;
+};

package/src/erp/EntityApi.ts

@@ -74,7 +74,15 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
         RQ extends TiplistRQ<T>,
         R extends object
     >(rq: RQ, payload?: IApiPayload<R[]>) {
-        return this.api.post(`${this.flag}/List`, rq, payload);
+        let { queryPaging, ...rest } = rq;
+        if (typeof queryPaging === 'number') {
+            queryPaging = { currentPage: 0, batchSize: queryPaging };
+        }
+        return this.api.post(
+            `${this.flag}/List`,
+            { queryPaging, ...rest },
+            payload
+        );
     }
 
     /**

package/src/erp/OrgApi.ts

@@ -58,7 +58,7 @@ export class OrgApi extends EntityApi {
         } else {
             if (typeof serviceId === 'object') return undefined;
             return this.listBase<number, OrgListRQ, ListType>(
-                { items, serviceId },
+                { queryPaging: items, serviceId },
                 { defaultValue: [], showLoading: false }
             );
         }

package/src/erp/rq/TiplistRQ.ts

@@ -1,4 +1,5 @@
 import { IdType } from '@etsoo/shared';
+import { QueryPagingData } from './QueryPagingData';
 
 /**
  * Tiplist request data
@@ -21,7 +22,7 @@ export type TiplistRQ<T extends IdType = number> = {
     keyword?: string;
 
     /**
-     * Max items to return
+     * Query paging data or items to read
      */
-    items?: number;
+    queryPaging?: QueryPagingData | number;
 };

package/src/index.ts

@@ -33,6 +33,10 @@ export * from './business/ProductUnit';
 export * from './business/RepeatOption';
 export * from './business/ShoppingCart';
 
+// custom
+export * from './custom/CustomField';
+export * from './custom/CustomFieldData';
+
 // def
 export * from './def/ListItem';