@ibiz-template/runtime 0.1.33 → 0.1.35

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

@@ -1,5 +1,5 @@
 import { IAppDataEntity } from '@ibiz/model-core';
-import { IHttpResponse } from '@ibiz-template/core';
+import { IHttpResponse, IPortalAsyncAction } from '@ibiz-template/core';
 import { DECache } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
 import { Method } from './method/method';
@@ -69,12 +69,13 @@ export declare class DEService implements IAppDEService {
      * 获取实体服务方法实例
      *
      * @author chitanda
-     * @date 2022-10-10 14:10:53
+     * @date 2023-10-12 17:10:10
      * @protected
      * @param {string} id
+     * @param {boolean} [acMode=false]
      * @return {*}  {Method}
      */
-    protected getMethod(id: string): Method;
+    protected getMethod(id: string, acMode?: boolean): Method;
     /**
      * 执行服务方法
      *
@@ -87,5 +88,39 @@ export declare class DEService implements IAppDEService {
      * @return {*}  {Promise<IHttpResponse>}
      */
     exec(id: string, context: IParams, params?: IData, params2?: IParams): Promise<IHttpResponse>;
+    /**
+     * 执行服务方法 ac 模式
+     *
+     * @author chitanda
+     * @date 2022-09-13 19:09:55
+     * @param {string} id 执行服务方法标识
+     * @param {IParams} context
+     * @param {IData} [params={}] 请求参数
+     * @param {IParams} [params2={}] 查询参数
+     * @return {*}  {Promise<IHttpResponse>}
+     */
+    execAc(id: string, context: IParams, params?: IData, params2?: IParams): Promise<IHttpResponse>;
+    /**
+     * 实体级别 AI 聊天会话
+     *
+     * @author chitanda
+     * @date 2023-10-16 16:10:16
+     * @param {(data: IPortalAsyncAction) => void} onmessage
+     * @param {IParams} context
+     * @param {IParams} [params={}]
+     * @param {IData} [data={}]
+     * @return {*}  {Promise<void>}
+     */
+    aiChatSse(onmessage: (data: IPortalAsyncAction) => void, context: IParams, params?: IParams, data?: IData): Promise<void>;
+    /**
+     * 计算请求路径
+     *
+     * @author chitanda
+     * @date 2023-10-12 11:10:56
+     * @protected
+     * @param {IParams} context
+     * @return {*}  {string}
+     */
+    protected calcSsePath(context: IParams): string;
 }
 //# sourceMappingURL=de.service.d.ts.map

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,EAAE,aAAa,EAA4B,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,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;AAEzD;;;;;;;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;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAwBvC;;;;;;;;;;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;CAO1B"}
+{"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"}

package/out/service/service/entity/de.service.js

@@ -1,11 +1,12 @@
-import { ModelError, RuntimeError } from '@ibiz-template/core';
-import { DECache } from '../../utils';
+import { ModelError, RuntimeError, } from '@ibiz-template/core';
+import { DECache, calcResPath } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
 import { FileService } from '../file/file.service';
 import { findModelChild } from '../../../model';
 import { DEActionMethod } from './method/de-action';
 import { FetchMethod } from './method/fetch';
 import { ConfigService } from '../config/config.service';
+import { AcFetchMethod } from './method/ac-fetch';
 /**
  * 实体服务
  *
@@ -49,14 +50,16 @@ export class DEService {
      * 获取实体服务方法实例
      *
      * @author chitanda
-     * @date 2022-10-10 14:10:53
+     * @date 2023-10-12 17:10:10
      * @protected
      * @param {string} id
+     * @param {boolean} [acMode=false]
      * @return {*}  {Method}
      */
-    getMethod(id) {
-        if (this.methodMap.has(id)) {
-            return this.methodMap.get(id);
+    getMethod(id, acMode = false) {
+        const cacheId = acMode ? `ac-${id}` : id;
+        if (this.methodMap.has(cacheId)) {
+            return this.methodMap.get(cacheId);
         }
         const model = findModelChild(this.model.appDEMethods, id);
         let method = null;
@@ -66,12 +69,17 @@ export class DEService {
                 break;
             case 'FETCH':
             case 'FETCHTEMP':
-                method = new FetchMethod(this.model, model);
+                if (acMode) {
+                    method = new AcFetchMethod(this.model, model);
+                }
+                else {
+                    method = new FetchMethod(this.model, model);
+                }
                 break;
             default:
                 throw new ModelError(model, `未支持的服务方法类型: ${model.methodType}`);
         }
-        this.methodMap.set(id, method);
+        this.methodMap.set(cacheId, method);
         return method;
     }
     /**
@@ -92,4 +100,72 @@ export class DEService {
         }
         throw new RuntimeError(`${this.model.codeName}未支持「${id}」方法`);
     }
+    /**
+     * 执行服务方法 ac 模式
+     *
+     * @author chitanda
+     * @date 2022-09-13 19:09:55
+     * @param {string} id 执行服务方法标识
+     * @param {IParams} context
+     * @param {IData} [params={}] 请求参数
+     * @param {IParams} [params2={}] 查询参数
+     * @return {*}  {Promise<IHttpResponse>}
+     */
+    execAc(id, context, params, params2 = {}) {
+        const method = this.getMethod(id, true);
+        if (method) {
+            return method.exec(context, params, params2);
+        }
+        throw new RuntimeError(`${this.model.codeName}未支持「${id}」方法`);
+    }
+    /**
+     * 实体级别 AI 聊天会话
+     *
+     * @author chitanda
+     * @date 2023-10-16 16:10:16
+     * @param {(data: IPortalAsyncAction) => void} onmessage
+     * @param {IParams} context
+     * @param {IParams} [params={}]
+     * @param {IData} [data={}]
+     * @return {*}  {Promise<void>}
+     */
+    aiChatSse(onmessage, context, params = {}, data = {}) {
+        const app = ibiz.hub.getApp(this.model.appId);
+        const path = this.calcSsePath(context);
+        return new Promise((resolve, reject) => {
+            app.net.sse(`/${path}`, Object.assign({ srfactag: 'AIChat' }, params), {
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify(data),
+                onmessage: e => {
+                    if (e.data) {
+                        const json = JSON.parse(e.data);
+                        onmessage(json);
+                    }
+                },
+                onclose: () => {
+                    resolve();
+                },
+                onerror: (e) => {
+                    reject(e);
+                },
+            });
+        });
+    }
+    /**
+     * 计算请求路径
+     *
+     * @author chitanda
+     * @date 2023-10-12 11:10:56
+     * @protected
+     * @param {IParams} context
+     * @return {*}  {string}
+     */
+    calcSsePath(context) {
+        const srfkey = context[this.model.codeName.toLowerCase()];
+        const curPath = `/${this.model.codeName2.toLowerCase()}/ssechatcompletion${srfkey ? `/${srfkey}` : ''}`;
+        const resPath = calcResPath(context, this.model);
+        return resPath + curPath;
+    }
 }

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

@@ -0,0 +1,14 @@
+import { FetchMethod } from './fetch';
+/**
+ * ac 模式下的数据集获取请求
+ *
+ * @author chitanda
+ * @date 2023-10-12 17:10:03
+ * @export
+ * @class AcFetchMethod
+ * @extends {FetchMethod}
+ */
+export declare class AcFetchMethod extends FetchMethod {
+    protected mergeRequestPath(path: string, methodName: string): string;
+}
+//# sourceMappingURL=ac-fetch.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ac-fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/ac-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC;;;;;;;;GAQG;AACH,qBAAa,aAAc,SAAQ,WAAW;IAC5C,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;CAGrE"}

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

@@ -0,0 +1,15 @@
+import { FetchMethod } from './fetch';
+/**
+ * ac 模式下的数据集获取请求
+ *
+ * @author chitanda
+ * @date 2023-10-12 17:10:03
+ * @export
+ * @class AcFetchMethod
+ * @extends {FetchMethod}
+ */
+export class AcFetchMethod extends FetchMethod {
+    mergeRequestPath(path, methodName) {
+        return `${path}/ac/${methodName}?srfac=ac`;
+    }
+}

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

@@ -77,6 +77,7 @@ export declare abstract class Method {
      * @return {*}  {Promise<HttpResponse<any>>}
      */
     protected request(path: string, context: IParams, data?: IData, params?: IParams): Promise<HttpResponse<any>>;
+    protected mergeRequestPath(path: string, methodName: string): string;
     /**
      * 根据上下文计算当前请求路径
      *

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;IA2C7B;;;;;;;;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;;;;;;;;;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"}

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

@@ -49,17 +49,17 @@ export class Method {
             let res = null;
             switch (requestMethod) {
                 case 'POST':
-                    res = await this.app.net.post(`${path}/${methodName}`, notNilEmpty(data) ? data : params);
+                    res = await this.app.net.post(this.mergeRequestPath(path, methodName), notNilEmpty(data) ? data : params);
                     break;
                 case 'GET':
-                    res = await this.app.net.get(`${path}/${methodName}`, data || params);
+                    res = await this.app.net.get(this.mergeRequestPath(path, methodName), data || params);
                     break;
                 case 'PUT': {
-                    res = await this.app.net.put(`${path}/${methodName}`, notNilEmpty(data) ? data : params);
+                    res = await this.app.net.put(this.mergeRequestPath(path, methodName), notNilEmpty(data) ? data : params);
                     break;
                 }
                 case 'DELETE':
-                    res = await this.app.net.delete(`${path}/${methodName}`, data || params);
+                    res = await this.app.net.delete(this.mergeRequestPath(path, methodName), data || params);
                     break;
                 default:
                     if (requestMethod) {
@@ -73,6 +73,9 @@ export class Method {
         }
         throw new RuntimeModelError(this.method, `未支持的行为类型[${actionType}]`);
     }
+    mergeRequestPath(path, methodName) {
+        return `${path}/${methodName}`;
+    }
     /**
      * 根据上下文计算当前请求路径
      *

package/out/ui-logic/ui-logic-context.d.ts

@@ -29,17 +29,7 @@ export declare class UILogicContext {
     /**
      * 视图参数
      */
-    get viewParams(): IParams;
-    /**
-     * Creates an instance of DELogicContext.
-     * @author lxm
-     * @date 2023-03-24 09:15:14
-     * @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
-     * @param {IParams} context 上下文
-     * @param {IData} data 数据对象
-     * @param {IParams} viewParams 视图参数
-     * @param {IParams} [opt] 额外参数
-     */
+    get viewParam(): IParams;
     /**
      * Creates an instance of UILogicContext.
      * @author lxm

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

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;IAgDvB,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IAhDnC;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,UAAU,IAAI,OAAO,CAExB;IAED;;;;;;;;;OASG;IACH;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;OAKG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;OAMG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}
+{"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;IA4CvB,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IA5CnC;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAKtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAKvB;IAED;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;OAKG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;OAMG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}

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

@@ -11,6 +11,9 @@ export class UILogicContext {
      * 上下文
      */
     get context() {
+        if (Object.prototype.hasOwnProperty.call(this.params, 'context')) {
+            return this.params.context;
+        }
         return this.parameters.context;
     }
     /**
@@ -22,19 +25,12 @@ export class UILogicContext {
     /**
      * 视图参数
      */
-    get viewParams() {
+    get viewParam() {
+        if (Object.prototype.hasOwnProperty.call(this.params, 'viewParam')) {
+            return this.params.viewParam;
+        }
         return this.parameters.params;
     }
-    /**
-     * Creates an instance of DELogicContext.
-     * @author lxm
-     * @date 2023-03-24 09:15:14
-     * @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
-     * @param {IParams} context 上下文
-     * @param {IData} data 数据对象
-     * @param {IParams} viewParams 视图参数
-     * @param {IParams} [opt] 额外参数
-     */
     /**
      * Creates an instance of UILogicContext.
      * @author lxm

package/out/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-link-single-cond.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,eAAe;IAmCrC,KAAK,EAAE,sBAAsB;IAlChD;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAE7B;IAED,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;gBAEkB,KAAK,EAAE,sBAAsB;IAMhD;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAgCnE"}
+{"version":3,"file":"ui-logic-link-single-cond.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,eAAe;IAmCrC,KAAK,EAAE,sBAAsB;IAlChD;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAE7B;IAED,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;gBAEkB,KAAK,EAAE,sBAAsB;IAMhD;;;;;;;;;OASG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAsCnE"}

package/out/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.js

@@ -1,5 +1,6 @@
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { testCond } from '../../../utils';
+import { handleSrcVal } from '../../utils';
 import { UILogicLinkCond } from '../ui-logic-link-cond/ui-logic-link-cond';
 /**
  * 界面逻辑连接条件项
@@ -40,7 +41,10 @@ export class UILogicLinkSingleCond extends UILogicLinkCond {
      * @return {*}  {boolean}
      */
     test(ctx, context, data) {
-        const dst = ctx.params[this.dstParam];
+        const dstVal = handleSrcVal(ctx, {
+            srcDEUILogicParamId: this.dstParam,
+            srcFieldName: this.dstField,
+        });
         switch (this.type) {
             case 'ENTITYFIELD': {
                 if (!this.value) {
@@ -48,20 +52,23 @@ export class UILogicLinkSingleCond extends UILogicLinkCond {
                 }
                 // 数据对象属性
                 const value = data[this.value] != null ? data[this.value] : context[this.value];
-                return testCond(dst[this.dstField], this.op, value);
+                return testCond(dstVal, this.op, value);
             }
             case 'SRCENTITYFIELD': {
                 if (!this.value) {
                     throw new RuntimeModelError(this.model, '当前条件值类型为[源数据对象属性],缺少配置条件值');
                 }
                 // 源数据对象属性
-                const src = ctx.params[this.srcParam];
-                return testCond(dst[this.dstField], this.op, src[this.value]);
+                const srcVal = handleSrcVal(ctx, {
+                    srcDEUILogicParamId: this.srcParam,
+                    srcFieldName: this.value,
+                });
+                return testCond(dstVal, this.op, srcVal);
             }
             case 'CURTIME': // 当前时间
                 throw new ModelError(this.model, `暂未支持条件值类型为[当前时间]`);
             default: // 直接使用目标对象参数属性和值做对比
-                return testCond(dst[this.dstField], this.op, this.value);
+                return testCond(dstVal, this.op, this.value);
         }
     }
 }

package/out/ui-logic/ui-logic-node/data-set-node/data-set-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-set-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/data-set-node/data-set-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,WAAW;IAClC,KAAK,EAAE,mBAAmB,CAAC;IAE7B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAoB/C"}
+{"version":3,"file":"data-set-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/data-set-node/data-set-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,WAAW;IAClC,KAAK,EAAE,mBAAmB,CAAC;IAE7B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAsB/C"}

package/out/ui-logic/ui-logic-node/data-set-node/data-set-node.js

@@ -1,3 +1,4 @@
+import { RuntimeModelError } from '@ibiz-template/core';
 import { UILogicNode } from '../ui-logic-node';
 /**
  * 数据集合节点
@@ -11,9 +12,12 @@ import { UILogicNode } from '../ui-logic-node';
 export class DataSetNode extends UILogicNode {
     async exec(ctx) {
         const { dstAppDEDataSetId, dstAppDataEntityId, dstDEUILogicParamId, retDEUILogicParamId, } = this.model;
-        const requestData = ctx.params[dstDEUILogicParamId];
+        if (!dstDEUILogicParamId) {
+            throw new RuntimeModelError(this.model, '缺少配置过滤参数');
+        }
+        const queryParams = ctx.params[dstDEUILogicParamId];
         const app = ibiz.hub.getApp(ctx.context.srfappid);
-        const res = await app.deService.exec(dstAppDataEntityId, dstAppDEDataSetId, ctx.context, requestData, ctx.viewParams);
+        const res = await app.deService.exec(dstAppDataEntityId, dstAppDEDataSetId, ctx.context, queryParams);
         if (res.ok) {
             ctx.params[retDEUILogicParamId] = res.data;
         }

package/out/ui-logic/ui-logic-node/de-action-node/de-action-node.js

@@ -20,7 +20,7 @@ export class DEActionNode extends UILogicNode {
         }
         const requestData = ctx.params[dstDEUILogicParamId];
         const app = ibiz.hub.getApp(ctx.context.srfappid);
-        const res = await app.deService.exec(dstAppDataEntityId, dstAppDEActionId, ctx.context, requestData, ctx.viewParams);
+        const res = await app.deService.exec(dstAppDataEntityId, dstAppDEActionId, ctx.context, requestData, ctx.viewParam);
         if (res.ok) {
             ctx.params[retDEUILogicParamId] = res.data;
         }

package/out/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-ui-action-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,WAAW;IACrC,KAAK,EAAE,gBAAgB,CAAC;IAE1B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAqB/C"}
+{"version":3,"file":"de-ui-action-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,WAAW;IACrC,KAAK,EAAE,gBAAgB,CAAC;IAE1B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAuB/C"}

package/out/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.js

@@ -27,6 +27,6 @@ export class DEUIActionNode extends UILogicNode {
                 actionData = [param];
             }
         }
-        await UIActionUtil.execAndResolved(dstAppDEUIActionId, Object.assign(Object.assign({}, parameters), { data: actionData }));
+        await UIActionUtil.execAndResolved(dstAppDEUIActionId, Object.assign(Object.assign({}, parameters), { context: ctx.context, params: ctx.viewParam, data: actionData }));
     }
 }

package/out/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute-de-logic-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,WAAW;IACzC,KAAK,EAAE,iBAAiB,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAsC/C"}
+{"version":3,"file":"execute-de-logic-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,WAAW;IACzC,KAAK,EAAE,iBAAiB,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAqC/C"}

package/out/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.js

@@ -27,8 +27,7 @@ export class ExecuteDELogicNode extends UILogicNode {
         if (!dstParam) {
             throw new RuntimeError(`没有找到传入参数${dstDEUILogicParamId}`);
         }
-        // todo 需要传入参数格式约束
-        const result = await execDELogicById(dstAppDELogicId, dstAppDataEntityId, dstParam.context, dstParam.data, dstParam.params);
+        const result = await execDELogicById(dstAppDELogicId, dstAppDataEntityId, ctx.context, dstParam, ctx.params);
         // 如果有返回值参数返回值填入。
         if (retDEUILogicParamId) {
             ctx.params[retDEUILogicParamId] = result;

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;IAqE/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;IAsE/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}

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

@@ -28,7 +28,8 @@ export class UILogicParam {
     calc(ctx) {
         const tag = this.model.id;
         const m = this.model;
-        const { context, viewParams, data, parameters } = ctx;
+        const { parameters } = ctx;
+        const { context, params, data } = parameters;
         const app = ibiz.hub.getApp(context.srfappid);
         // 特殊变量的特殊处理
         if (m.codeName === 'layoutPanel') {
@@ -103,7 +104,7 @@ export class UILogicParam {
         }
         else if (m.viewNavDataParam) {
             // 视图导航数据
-            ctx.params[tag] = viewParams;
+            ctx.params[tag] = params;
         }
         else if (m.viewSessionParam) {
             throw new ModelError(m, `未支持的逻辑参数类型: 当前视图会话`);

package/out/ui-logic/utils/handle-src-val.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CA6DT"}
+{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CAyDT"}

package/out/ui-logic/utils/handle-src-val.js

@@ -15,16 +15,12 @@ export function handleSrcVal(ctx, srcValParams) {
     // 没有源值类型就是逻辑参数
     const srcValueType = srcValParams.srcValueType || 'SRCDLPARAM';
     // 取属性值
-    let srcField = srcFieldName;
+    const srcField = srcFieldName;
     let value;
     switch (srcValueType) {
         // 源逻辑参数
         case 'SRCDLPARAM':
             value = ctx.params[srcDEUILogicParamId];
-            // 如果是实体参数对象则转换成小写。
-            if (ctx.isEntityParam(srcDEUILogicParamId)) {
-                srcField = srcField === null || srcField === void 0 ? void 0 : srcField.toLowerCase();
-            }
             break;
         // 空值类型
         case 'NULLVALUE':
@@ -37,13 +33,13 @@ export function handleSrcVal(ctx, srcValParams) {
             return ibiz.util.rawValue.format(srcValue);
         case 'WEBCONTEXT': // 网页请求上下文
         case 'VIEWPARAM': // 视图参数
-            value = ctx.viewParams;
+            value = ctx.parameters.params;
             break;
         case 'APPLICATION': // 系统全局对象
         case 'SESSION': // 用户全局对象
         case 'APPDATA': // 应用上下文
         case 'DATACONTEXT': // 数据上下文
-            value = ctx.context;
+            value = ctx.parameters.context;
             break;
         // 当前环境参数
         case 'ENVPARAM':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.33",
+    "@ibiz-template/core": "^0.1.34",
     "@ibiz/model-core": "^0.0.19",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "769acca4bc7229f5d27f57e803a9f1d3ea7172ac"
+  "gitHead": "b2dfac469067544cc9a5e527cc7c4f581d603bc9"
 }

package/src/controller/common/control/control.controller.ts

@@ -147,6 +147,13 @@ export class ControlController<
     this.initControlScheduler(this.model.controlLogics);
   }
 
+  protected async onMounted(): Promise<void> {
+    await super.onMounted();
+
+    // 启动定时器触发
+    this.scheduler?.startTimerTrigger();
+  }
+
   protected async onDestroyed(): Promise<void> {
     await super.onDestroyed();
     if (this.scheduler) {
@@ -213,7 +220,21 @@ export class ControlController<
   } {
     const context = this.context.clone();
     const params = { ...this.params };
-    const data = args?.data || this.getData() || [];
+
+    let data = this.getData() || [];
+    if (args?.data) {
+      data = Array.isArray(args.data) ? args.data : [args.data];
+    }
+
+    // 合并附加上下文
+    if (args?.context) {
+      Object.assign(context, args.context);
+    }
+
+    // 合并附加视图参数
+    if (args?.viewParam) {
+      Object.assign(params, args.viewParam);
+    }
     return { context, params, data };
   }
 
@@ -243,6 +264,9 @@ export class ControlController<
    * @memberof ControlController
    */
   protected handleControlParams(): void {
+    if (!this.model.controlParam) {
+      return;
+    }
     const { ctrlParams } = this.model.controlParam!;
     let params = {};
     if (notNilEmpty(ctrlParams)) {

package/src/controller/common/control/md-control.controller.ts

@@ -198,7 +198,7 @@ export class MDControlController<
 
       // *查询参数处理
       const { context } = this.handlerAbilityParams(args);
-      const params = await this.getFetchParams(args?.params);
+      const params = await this.getFetchParams(args?.viewParam);
 
       const res = await this.service.fetch(context, params);
       // 更新分页数据总条数

package/src/controller/common/editor/editor.controller.ts

@@ -164,8 +164,7 @@ export class EditorController<T extends IEditor = IEditor>
     if (navigateParams && data) {
       selfParams = convertNavData(navigateParams!, data, params, context);
     }
-    const _params: IParams = { ...params, ...selfParams };
-    return { context: _context, params: _params };
+    return { context: _context, params: selfParams };
   }
 
   /**