@ibiz-template/runtime 0.1.37 → 0.2.0

package/out/service/service/entity/de.service.d.ts

@@ -87,7 +87,7 @@ export declare class DEService implements IAppDEService {
      * @param {IParams} [params2={}] 查询参数
      * @return {*}  {Promise<IHttpResponse>}
      */
-    exec(id: string, context: IParams, params?: IData, params2?: IParams): Promise<IHttpResponse>;
+    exec(id: string, context: IParams, params?: IData | IData[], params2?: IParams): Promise<IHttpResponse>;
     /**
      * 执行服务方法 ac 模式
      *
@@ -99,7 +99,7 @@ export declare class DEService implements IAppDEService {
      * @param {IParams} [params2={}] 查询参数
      * @return {*}  {Promise<IHttpResponse>}
      */
-    execAc(id: string, context: IParams, params?: IData, params2?: IParams): Promise<IHttpResponse>;
+    execAc(id: string, context: IParams, params?: IData | IData[], params2?: IParams): Promise<IHttpResponse>;
     /**
      * 实体级别 AI 聊天会话
      *

package/out/service/service/entity/de.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EACL,aAAa,EACb,kBAAkB,EAGnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAe,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,aAAa;IAsDjC,SAAS,CAAC,KAAK,EAAE,cAAc;IArD3C;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAEpC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE9D;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAiB;IAExC;;;;;;OAMG;gBACmB,KAAK,EAAE,cAAc;IAU3C;;;;;;;;;OASG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,GAAE,OAAe,GAAG,MAAM;IA6BhE;;;;;;;;;;OAUG;IACH,IAAI,CACF,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;IAQzB;;;;;;;;;;OAUG;IACH,MAAM,CACJ,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,EACd,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC;IAQzB;;;;;;;;;;OAUG;IACH,SAAS,CACP,SAAS,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,EAC7C,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;CAQhD"}
+{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EACL,aAAa,EACb,kBAAkB,EAGnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAe,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,aAAa;IAsDjC,SAAS,CAAC,KAAK,EAAE,cAAc;IArD3C;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAEpC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE9D;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAiB;IAExC;;;;;;OAMG;gBACmB,KAAK,EAAE,cAAc;IAU3C;;;;;;;;;OASG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,GAAE,OAAe,GAAG,MAAM;IA6BhE;;;;;;;;;;OAUG;IACH,IAAI,CACF,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;IAQzB;;;;;;;;;;OAUG;IACH,MAAM,CACJ,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC;IAQzB;;;;;;;;;;OAUG;IACH,SAAS,CACP,SAAS,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,EAC7C,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;CAQhD"}

package/out/service/service/entity/method/de-action.d.ts

@@ -23,7 +23,16 @@ export declare class DEActionMethod extends Method {
      * @type {boolean}
      */
     protected get isLocalMode(): boolean;
-    exec(context: IParams, data?: IData, params?: IParams): Promise<HttpResponse<IData>>;
+    /**
+     * 处理请求发送参数
+     * @author lxm
+     * @date 2023-10-19 02:50:36
+     * @param {IParams} context 上下文
+     * @param {(IData | IData[])} data 数据对象
+     * @return {*}  {(Promise<IData | IData[]>)}
+     */
+    inputHandle(context: IParams, data: IData | IData[]): Promise<IData | IData[]>;
+    exec(context: IParams, data?: IData | IData[], params?: IParams): Promise<HttpResponse<IData>>;
     /**
      * 创建数据
      *
@@ -33,7 +42,7 @@ export declare class DEActionMethod extends Method {
      * @param {IData} data
      * @return {*}  {Promise<IHttpResponse<IData>>}
      */
-    create(context: IParams, data: IData, params: IParams): Promise<IHttpResponse<IDataEntity>>;
+    create(context: IParams, data?: IData | IData[], params?: IParams): Promise<IHttpResponse<IDataEntity>>;
     /**
      * 删除数据
      *
@@ -54,7 +63,7 @@ export declare class DEActionMethod extends Method {
      * @param {IParams} [params={}]
      * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
-    update(context: IParams, data: IData | IDataEntity, params?: IParams): Promise<IHttpResponse<IDataEntity>>;
+    update(context: IParams, data?: IData | IData[], params?: IParams): Promise<IHttpResponse<IDataEntity>>;
     /**
      * 获取数据
      *
@@ -84,7 +93,7 @@ export declare class DEActionMethod extends Method {
      * @param {IData} entity
      * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
-    createTemp(context: IParams, entity: IData): Promise<IHttpResponse<IDataEntity>>;
+    createTemp(context: IParams, entity: IData | IData[]): Promise<IHttpResponse<IDataEntity>>;
     /**
      * 获取临时数据默认值
      *
@@ -114,7 +123,7 @@ export declare class DEActionMethod extends Method {
      * @param {IData} entity
      * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
-    updateTemp(context: IParams, entity: IData): Promise<IHttpResponse<IDataEntity>>;
+    updateTemp(context: IParams, entity: IData | IData[]): Promise<IHttpResponse<IDataEntity>>;
     /**
      * 获取临时数据
      *

package/out/service/service/entity/method/de-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAKpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAmF/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,WAAW,EACzB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IActC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}
+{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAKpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAED;;;;;;;OAOG;IACG,WAAW,CACf,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,KAAK,EAAE,GACpB,OAAO,CAAC,KAAK,GAAG,KAAK,EAAE,CAAC;IAOrB,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAmF/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAiBtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAkBtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}

package/out/service/service/entity/method/de-action.js

@@ -1,5 +1,5 @@
-import { HttpResponse, RuntimeModelError, } from '@ibiz-template/core';
-import { clone } from 'ramda';
+import { HttpResponse, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
+import { isArray, isNil } from 'lodash-es';
 import { Method } from './method';
 import { findDELogic } from '../../../../model';
 import { execDELogicAction, execFieldLogics } from '../../../../de-logic';
@@ -26,6 +26,20 @@ export class DEActionMethod extends Method {
     get isLocalMode() {
         return isLocalMode(this.method);
     }
+    /**
+     * 处理请求发送参数
+     * @author lxm
+     * @date 2023-10-19 02:50:36
+     * @param {IParams} context 上下文
+     * @param {(IData | IData[])} data 数据对象
+     * @return {*}  {(Promise<IData | IData[]>)}
+     */
+    async inputHandle(context, data) {
+        if (isArray(data)) {
+            return Promise.all(data.map(item => this.input.handle(context, item)));
+        }
+        return this.input.handle(context, data);
+    }
     async exec(context, data, params) {
         // 实体逻辑处理
         if (this.method.actionType === 'DELOGIC') {
@@ -33,14 +47,14 @@ export class DEActionMethod extends Method {
             if (!deLogic) {
                 throw new RuntimeModelError(this.method, '缺少实体处理逻辑');
             }
-            return execDELogicAction(deLogic, clone(context), data ? clone(data) : {}, params ? clone(params) : {});
+            return execDELogicAction(deLogic, context, data, params);
         }
         if (data && !this.isLocalMode) {
-            data = await this.input.handle(context, data);
+            data = await this.inputHandle(context, data);
         }
         // 执行变更属性逻辑
         if (data && !['READ', 'GETDRAFT'].includes(this.method.actionMode)) {
-            await execFieldLogics(this.entity, 'change', context, data, params || {});
+            await execFieldLogics(this.entity, 'change', context, data, params);
         }
         let result;
         switch (this.method.codeName) {
@@ -77,8 +91,13 @@ export class DEActionMethod extends Method {
             default: {
                 let path = this.calcPath(context);
                 if (this.method.needResourceKey) {
-                    path = `${path}/${context[this.entity.codeName.toLowerCase()] ||
-                        (data === null || data === void 0 ? void 0 : data[this.entity.keyAppDEFieldId])}`;
+                    let srfkey = context[this.entity.codeName.toLowerCase()];
+                    if (isNil(srfkey)) {
+                        srfkey = isArray(data)
+                            ? null
+                            : data === null || data === void 0 ? void 0 : data[this.entity.keyAppDEFieldId];
+                    }
+                    path = `${path}/${srfkey}`;
                 }
                 const res = await this.request(path, context, data, params);
                 res.data = await this.result.handle(context, res.data);
@@ -86,7 +105,9 @@ export class DEActionMethod extends Method {
             }
         }
         // 计算属性逻辑
-        await execFieldLogics(this.entity, 'compute', context, result.data, params || {});
+        if (result.data) {
+            await execFieldLogics(this.entity, 'compute', context, result.data, params);
+        }
         return result;
     }
     /**
@@ -99,6 +120,9 @@ export class DEActionMethod extends Method {
      * @return {*}  {Promise<IHttpResponse<IData>>}
      */
     async create(context, data, params) {
+        if (!data) {
+            throw new RuntimeError('create行为没有传data');
+        }
         if (this.isLocalMode) {
             return this.createTemp(context, this.createEntity(data));
         }
@@ -134,7 +158,10 @@ export class DEActionMethod extends Method {
      * @param {IParams} [params={}]
      * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
-    async update(context, data, params = {}) {
+    async update(context, data, params) {
+        if (!data) {
+            throw new RuntimeError('update行为没有传data');
+        }
         if (this.isLocalMode) {
             return this.updateTemp(context, this.createEntity(data));
         }
@@ -191,8 +218,15 @@ export class DEActionMethod extends Method {
     async createTemp(context, entity) {
         try {
             const s = await this.getService();
-            const data = await s.local.add(context, this.createEntity(entity));
-            return new HttpResponse(data);
+            const addData = this.createEntity(entity);
+            let resultData;
+            if (isArray(addData)) {
+                resultData = await Promise.all(addData.map(item => s.local.add(context, item)));
+            }
+            else {
+                resultData = await s.local.add(context, addData);
+            }
+            return new HttpResponse(resultData);
         }
         catch (err) {
             return new HttpResponse(err, 500);
@@ -261,11 +295,18 @@ export class DEActionMethod extends Method {
     async updateTemp(context, entity) {
         try {
             const s = await this.getService();
-            const data = s.local.update(context, this.createEntity(entity));
-            if (data) {
-                return new HttpResponse(data);
+            const updateData = this.createEntity(entity);
+            let resultData;
+            if (isArray(updateData)) {
+                resultData = await Promise.all(updateData.map(item => s.local.update(context, item)));
             }
-            return new HttpResponse(data, 500);
+            else {
+                resultData = await s.local.update(context, updateData);
+            }
+            if (resultData) {
+                return new HttpResponse(resultData);
+            }
+            return new HttpResponse(resultData, 500);
         }
         catch (err) {
             return new HttpResponse(err, 500);

package/out/service/service/entity/method/fetch.d.ts

@@ -15,7 +15,7 @@ import { IDataEntity } from '../../../../interface';
 export declare class FetchMethod extends Method {
     method: IAppDEDataSet;
     protected get isLocalMode(): boolean;
-    exec(context: IParams, data: IData, params: IParams): Promise<HttpResponse<IDataEntity[]>>;
+    exec(context: IParams, params?: IData | IData[], params2?: IParams): Promise<HttpResponse<IDataEntity[]>>;
     /**
      * 查询本地数据，根据属性
      *

package/out/service/service/entity/method/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAE9B,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IA8CvC;;;;;;OAMG;cACa,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,WAAW,EAAE,CAAC;IA8DzB;;;;;;;;OAQG;cACa,WAAW,CACzB,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IA6CzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAkBlC"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAE9B,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IA8CvC;;;;;;OAMG;cACa,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,WAAW,EAAE,CAAC;IA8DzB;;;;;;;;OAQG;cACa,WAAW,CACzB,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IA6CzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAkBlC"}

package/out/service/service/entity/method/fetch.js

@@ -1,6 +1,7 @@
 import { HttpResponse, ModelError, RuntimeModelError, } from '@ibiz-template/core';
 import { ascSort, descSort } from 'qx-util';
 import { clone, equals, isEmpty, isNil, where } from 'ramda';
+import { isArray } from 'lodash-es';
 import { SearchFilter } from '../../../utils';
 import { Method } from './method';
 import { execFieldLogics } from '../../../../de-logic';
@@ -18,10 +19,12 @@ export class FetchMethod extends Method {
     get isLocalMode() {
         return isLocalMode(this.method);
     }
-    async exec(context, data, params) {
+    async exec(context, params, params2) {
+        // 过滤参数，必须是对象
+        const searchParams = params && isArray(params) ? params : params2 || {};
         if (this.isLocalMode) {
             // 临时数据
-            const items = await this.searchLocal(null, new SearchFilter(context, data));
+            const items = await this.searchLocal(null, new SearchFilter(context, searchParams));
             return new HttpResponse(items, 200);
         }
         // 根据数据集合来源查询数据
@@ -30,12 +33,12 @@ export class FetchMethod extends Method {
             case 'INDEXDE':
             case 'CODELIST':
             case 'MULTIFORM':
-                res = await this.fetchCodeListSet(context, params);
+                res = await this.fetchCodeListSet(context, searchParams);
                 break;
             case 'REMOTE':
                 {
                     const path = this.calcPath(context);
-                    res = await this.request(path, context, data, params);
+                    res = await this.request(path, context, params, params2);
                 }
                 break;
             default:
@@ -45,8 +48,8 @@ export class FetchMethod extends Method {
         const items = res.data || [];
         res.data = items.map(item => this.createEntity(item));
         // 计算属性逻辑,每条数据走一遍
-        if (res.data.length) {
-            await Promise.all(res.data.map((item) => execFieldLogics(this.entity, 'compute', context, item, params)));
+        if (res.data) {
+            execFieldLogics(this.entity, 'compute', context, res.data, searchParams);
         }
         return res;
     }

package/out/service/service/entity/method/method.d.ts

@@ -56,14 +56,15 @@ export declare abstract class Method {
     /**
      * 执行行为
      *
-     * @author chitanda
-     * @date 2022-10-10 14:10:42
-     * @param {IParams} context
-     * @param {IData} [params={}]
-     * @param {IParams} [params2={}]
+     * @author lxm
+     * @date 2023-10-19 02:42:49
+     * @abstract
+     * @param {IParams} context 上下文
+     * @param {(IData | IData[])} [params] 请求参数
+     * @param {IParams} [params2] 查询参数
      * @return {*}  {Promise<HttpResponse>}
      */
-    abstract exec(context: IParams, params?: IData, params2?: IParams): Promise<HttpResponse>;
+    abstract exec(context: IParams, params?: IData | IData[], params2?: IParams): Promise<HttpResponse>;
     /**
      * 发送请求
      *
@@ -76,7 +77,7 @@ export declare abstract class Method {
      * @param {IParams} params
      * @return {*}  {Promise<HttpResponse<any>>}
      */
-    protected request(path: string, context: IParams, data?: IData, params?: IParams): Promise<HttpResponse<any>>;
+    protected request(path: string, context: IParams, data?: IData | IData[], params?: IParams): Promise<HttpResponse<any>>;
     protected mergeRequestPath(path: string, methodName: string): string;
     /**
      * 根据上下文计算当前请求路径
@@ -99,13 +100,12 @@ export declare abstract class Method {
     protected getService(): Promise<IAppDEService>;
     /**
      * 创建实体
-     *
-     * @author chitanda
-     * @date 2022-10-11 22:10:05
+     * @author lxm
+     * @date 2023-10-19 03:22:00
      * @protected
-     * @param {(IData | IDataEntity)} data
-     * @return {*}  {IDataEntity}
+     * @param {(IData[] | IDataEntity[] | IData | IDataEntity)} data
+     * @return {*}  {(IDataEntity | IDataEntity[])}
      */
-    protected createEntity(data: IData | IDataEntity): IDataEntity;
+    protected createEntity(data: IData[] | IDataEntity[] | IData | IDataEntity): IDataEntity | IDataEntity[];
 }
 //# sourceMappingURL=method.d.ts.map

package/out/service/service/entity/method/method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,8BAAsB,MAAM;IA2CxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IA3ChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC;;;;;;;;OAQG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAOhC;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GAEf,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IA8C7B,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAIpE;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAM5C;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAOpD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,GAAG,WAAW;CAM/D"}
+{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,8BAAsB,MAAM;IA2CxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IA3ChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC;;;;;;;;OAQG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAOhC;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GAEf,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IA8C7B,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAIpE;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAM5C;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAOpD;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CACpB,IAAI,EAAE,KAAK,EAAE,GAAG,WAAW,EAAE,GAAG,KAAK,GAAG,WAAW,GAClD,WAAW,GAAG,WAAW,EAAE;CAa/B"}

package/out/service/service/entity/method/method.js

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { RuntimeModelError } from '@ibiz-template/core';
-import { notNilEmpty } from 'qx-util';
+import { isArray } from 'lodash-es';
 import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { calcResPath } from '../../../utils';
 import { MethodInput } from './method-input';
@@ -49,13 +49,13 @@ export class Method {
             let res = null;
             switch (requestMethod) {
                 case 'POST':
-                    res = await this.app.net.post(this.mergeRequestPath(path, methodName), notNilEmpty(data) ? data : params || {});
+                    res = await this.app.net.post(this.mergeRequestPath(path, methodName), data || params || {});
                     break;
                 case 'GET':
                     res = await this.app.net.get(this.mergeRequestPath(path, methodName), data || params);
                     break;
                 case 'PUT': {
-                    res = await this.app.net.put(this.mergeRequestPath(path, methodName), notNilEmpty(data) ? data : params || {});
+                    res = await this.app.net.put(this.mergeRequestPath(path, methodName), data || params || {});
                     break;
                 }
                 case 'DELETE':
@@ -106,17 +106,22 @@ export class Method {
     }
     /**
      * 创建实体
-     *
-     * @author chitanda
-     * @date 2022-10-11 22:10:05
+     * @author lxm
+     * @date 2023-10-19 03:22:00
      * @protected
-     * @param {(IData | IDataEntity)} data
-     * @return {*}  {IDataEntity}
+     * @param {(IData[] | IDataEntity[] | IData | IDataEntity)} data
+     * @return {*}  {(IDataEntity | IDataEntity[])}
      */
     createEntity(data) {
-        if (data instanceof AppDataEntity) {
-            return data.clone();
+        const toEntity = (single) => {
+            if (single instanceof AppDataEntity) {
+                return single.clone();
+            }
+            return new AppDataEntity(this.entity, single);
+        };
+        if (isArray(data)) {
+            return data.map(item => toEntity(item));
         }
-        return new AppDataEntity(this.entity, data);
+        return toEntity(data);
     }
 }

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts

@@ -95,7 +95,7 @@ export declare class DynamicCodeListCache {
      * @param {IData} data
      * @returns {*}
      */
-    protected convertData(data: IData): Readonly<IData>;
+    protected convertData(data: IData): CodeListItem;
     /**
      * 加载服务获取数据，返回代码项
      *
@@ -107,6 +107,12 @@ export declare class DynamicCodeListCache {
      * @returns {*}  {Promise<CodeListItem[]>}
      */
     protected load(context?: IParams, params?: IParams): Promise<CodeListItem[]>;
+    /**
+     * 组装树形代码表数据
+     *
+     * @return {codeListItem[] | undefined}
+     */
+    protected prepareTreeData(items: IData[], pValue?: string | number): CodeListItem[] | undefined;
     /**
      * 获取动态的代码项
      *

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,YAAY;IAIlC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;IAanD;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAyC1B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;CAyC3B"}
+{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,YAAY;IAIlC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAuDhD;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAuE1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CACvB,KAAK,EAAE,KAAK,EAAE,EACd,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GACvB,YAAY,EAAE,GAAG,SAAS;IAwB7B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;CAyC3B"}

package/out/service/utils/dynamic-code-list/dynamic-code-list.js

@@ -1,5 +1,6 @@
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { isNil } from 'ramda';
+import { convertNavData, ScriptFactory } from '../../../utils';
 /**
  * 动态代码表缓存对象
  *
@@ -61,16 +62,45 @@ export class DynamicCodeListCache {
      * @returns {*}
      */
     convertData(data) {
-        // todo 根据模型转换
         const result = {};
+        const { valueAppDEFieldId, textAppDEFieldId, iconClsAppDEFieldId, iconClsXAppDEFieldId, iconPathAppDEFieldId, iconPathXAppDEFieldId, disableAppDEFieldId, dataAppDEFieldId, } = this.codeList;
         // 值属性
-        const { valueAppDEFieldId, textAppDEFieldId } = this.codeList;
         const value = valueAppDEFieldId ? data[valueAppDEFieldId] : data.srfkey;
         result.id = value;
         result.value = value;
         // 文本属性
         result.text = textAppDEFieldId ? data[textAppDEFieldId] : data.srfmajortext;
-        return Object.freeze(result);
+        if (iconClsAppDEFieldId ||
+            iconClsXAppDEFieldId ||
+            iconPathAppDEFieldId ||
+            iconPathXAppDEFieldId) {
+            result.sysImage = {};
+            // 图标样式属性
+            if (iconClsAppDEFieldId) {
+                result.sysImage.cssClass = data[iconClsAppDEFieldId];
+            }
+            // 图标样式(倍数)属性
+            if (iconClsXAppDEFieldId) {
+                result.sysImage.cssClassX = data[iconClsXAppDEFieldId];
+            }
+            // 图标路径属性
+            if (iconPathAppDEFieldId) {
+                result.sysImage.imagePath = data[iconPathAppDEFieldId];
+            }
+            // 图标路径(倍数)属性
+            if (iconPathXAppDEFieldId) {
+                result.sysImage.imagePathX = data[iconPathXAppDEFieldId];
+            }
+        }
+        // 禁止选择属性
+        if (disableAppDEFieldId) {
+            result.disableSelect = data[disableAppDEFieldId];
+        }
+        // 数据属性
+        if (dataAppDEFieldId && data[dataAppDEFieldId]) {
+            result.data = ScriptFactory.execSingleLine(data[dataAppDEFieldId]);
+        }
+        return result;
     }
     /**
      * 加载服务获取数据，返回代码项
@@ -84,32 +114,78 @@ export class DynamicCodeListCache {
      */
     async load(context = {}, params = {}) {
         const app = ibiz.hub.getApp(context.srfappid);
-        // *预定义加载
+        const { appDataEntityId, appDEDataSetId, minorSortAppDEFieldId, minorSortDir, pvalueAppDEFieldId, customCond, } = this.codeList;
+        // *处理查询参数
+        const tempParams = Object.assign({}, params);
+        // 排序
+        if (minorSortAppDEFieldId && minorSortDir) {
+            Object.assign(tempParams, {
+                sort: `${minorSortAppDEFieldId.toLowerCase()},${minorSortDir.toLowerCase()}`,
+            });
+        }
+        // 自定义查询
+        if (customCond) {
+            const navParams = ScriptFactory.execSingleLine(customCond);
+            const addParams = convertNavData(navParams, tempParams, context);
+            Object.assign(tempParams, addParams);
+        }
         // 特殊处理，避免预置代码表加载不全
-        if (!params.size) {
-            params = Object.assign(Object.assign({}, params), { size: 10000 });
+        if (!tempParams.size) {
+            tempParams.size = 10000;
         }
+        // *预定义加载
         if (this.isPredefined) {
-            const res = await app.net.get(`/dictionaries/codelist/${this.codeList.codeName}`, params);
+            const res = await app.net.get(`/dictionaries/codelist/${this.codeList.codeName}`, tempParams);
             return Object.freeze(res.data.items);
         }
         // *加载实体服务数据
-        const { appDataEntityId, appDEDataSetId } = this.codeList;
         if (!appDataEntityId) {
             throw new RuntimeModelError(this.codeList, '未配置应用实体');
         }
         if (!appDEDataSetId) {
             throw new RuntimeModelError(this.codeList, '未配置数据集');
         }
-        const res = await app.deService.exec(appDataEntityId, appDEDataSetId, context, {}, params);
+        const res = await app.deService.exec(appDataEntityId, appDEDataSetId, context, undefined, tempParams);
         let resultItems = [];
         if (res.data.length) {
-            resultItems = res.data.map((item) => {
-                return this.convertData(item);
+            res.data.forEach((item) => {
+                if (pvalueAppDEFieldId) {
+                    const tempItems = this.prepareTreeData(res.data);
+                    if (tempItems) {
+                        resultItems = tempItems;
+                    }
+                }
+                else {
+                    resultItems.push(this.convertData(item));
+                }
             });
-            // todo 动态树形代码表
         }
-        return resultItems;
+        return Object.freeze(resultItems);
+    }
+    /**
+     * 组装树形代码表数据
+     *
+     * @return {codeListItem[] | undefined}
+     */
+    prepareTreeData(items, pValue) {
+        const { pvalueAppDEFieldId } = this.codeList;
+        let filteredData = [];
+        filteredData = items.filter(item => {
+            if (pValue) {
+                // 有传父value去后台数据里找出来子项pValue等于父value的
+                return item[pvalueAppDEFieldId] === pValue;
+            }
+            // 没有传父value，只需要找出来没有父值属性的
+            return !item[pvalueAppDEFieldId];
+        });
+        if (filteredData.length === 0) {
+            return;
+        }
+        return filteredData.map(data => {
+            const tempCodeListItem = this.convertData(data);
+            tempCodeListItem.children = this.prepareTreeData(items, tempCodeListItem.value);
+            return tempCodeListItem;
+        });
     }
     /**
      * 获取动态的代码项

package/out/ui-action/uiaction-util.js

@@ -54,13 +54,13 @@ export class UIActionUtil {
         else if (result.refresh) {
             switch (result.refreshMode) {
                 case 1:
-                    await params.view.callUIAction(SysUIActionTag.REFRESH);
+                    params.view.callUIAction(SysUIActionTag.REFRESH);
                     break;
                 case 2:
-                    await ((_a = params.view.parentView) === null || _a === void 0 ? void 0 : _a.callUIAction(SysUIActionTag.REFRESH));
+                    (_a = params.view.parentView) === null || _a === void 0 ? void 0 : _a.callUIAction(SysUIActionTag.REFRESH);
                     break;
                 case 3:
-                    await ((_b = params.view.getTopView()) === null || _b === void 0 ? void 0 : _b.callUIAction(SysUIActionTag.REFRESH));
+                    (_b = params.view.getTopView()) === null || _b === void 0 ? void 0 : _b.callUIAction(SysUIActionTag.REFRESH);
                     break;
                 default:
             }

package/out/ui-logic/ui-logic-param/ui-logic-param.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-param.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-param/ui-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,eAAe;IAPzC;;;;;;OAMG;gBACgB,KAAK,EAAE,eAAe;IAEzC;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAsE/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}
+{"version":3,"file":"ui-logic-param.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-param/ui-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,eAAe;IAPzC;;;;;;OAMG;gBACgB,KAAK,EAAE,eAAe;IAEzC;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IA2E/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}

package/out/ui-logic/ui-logic-param/ui-logic-param.js

@@ -37,7 +37,13 @@ export class UILogicParam {
             return;
         }
         if (m.default) {
-            ctx.params[tag] = data && data.length > 0 ? data[0] : {};
+            // 配置了数据对象列表的，default给数组格式的数据
+            if (m.entityListParam) {
+                ctx.params[tag] = data || [];
+            }
+            else {
+                ctx.params[tag] = data && data.length > 0 ? data[0] : {};
+            }
         }
         else if (m.activeContainerParam) {
             ctx.params[tag] = parameters.ctrl || parameters.view;

package/out/utils/script/script-factory.d.ts

@@ -22,5 +22,15 @@ export declare class ScriptFactory {
      * @return {*}
      */
     static execScriptFn(args: IParams, scriptCode: string, options?: IScriptFunctionOpts): unknown;
+    /**
+     * 执行单行脚本
+     * @author lxm
+     * @date 2023-10-20 03:20:56
+     * @static
+     * @param {string} scriptCode 脚本字符串
+     * @param {IParams} [args={}] 作用域变量参数对象
+     * @return {*}  {unknown}
+     */
+    static execSingleLine(scriptCode: string, args?: IParams): unknown;
 }
 //# sourceMappingURL=script-factory.d.ts.map