@ibiz-template/runtime 0.1.32 → 0.1.34

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,EAAE,aAAa,EAA4B,MAAM,qBAAqB,CAAC;AAC9E,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;;;;;;;;;OASG;IACH,SAAS,CACP,SAAS,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,EAClC,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,IAAI,CAAC;IA0BhB;;;;;;;;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 { 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,68 @@ 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-12 11:10:00
+     * @param {IParams} context
+     * @param {IParams} [params={}]
+     * @param {FetchEventSourceInit} [options={}]
+     * @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) => {
+                    onmessage(e);
+                },
+                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/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;AAChD,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;IA8E/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,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"}

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

@@ -1,4 +1,5 @@
 import { HttpResponse, RuntimeModelError, } from '@ibiz-template/core';
+import { clone } from 'ramda';
 import { Method } from './method';
 import { findDELogic } from '../../../../model';
 import { execDELogicAction, execFieldLogics } from '../../../../de-logic';
@@ -32,7 +33,7 @@ export class DEActionMethod extends Method {
             if (!deLogic) {
                 throw new RuntimeModelError(this.method, '缺少实体处理逻辑');
             }
-            return execDELogicAction(deLogic, context, data || {}, params || {});
+            return execDELogicAction(deLogic, clone(context), data ? clone(data) : {}, params ? clone(params) : {});
         }
         if (data && !this.isLocalMode) {
             data = await this.input.handle(context, data);

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-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/prepare-js-param-node/prepare-js-param-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepare-js-param-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,WAAW;IAC3C,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA4C9C;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CACrB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAmBP;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAMP;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,CAClB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,CAClB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CACnB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAaP;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;CAQR"}
+{"version":3,"file":"prepare-js-param-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,WAAW;IAC3C,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA4C9C;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CACrB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAwCP;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAMP;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,CAClB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,CAClB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAKP;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CACnB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;IAaP;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CACjB,SAAS,EAAE,mBAAmB,EAC9B,GAAG,EAAE,cAAc,GAClB,IAAI;CAQR"}

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

@@ -1,6 +1,7 @@
 /* eslint-disable no-await-in-loop */
-import { ModelError } from '@ibiz-template/core';
+import { ModelError, RuntimeError } from '@ibiz-template/core';
 import { clone } from 'ramda';
+import { ScriptFactory } from '../../../utils';
 import { handleSrcVal } from '../../utils';
 import { UILogicNode } from '../ui-logic-node';
 /**
@@ -63,6 +64,9 @@ export class PrepareJSParamNode extends UILogicNode {
      */
     setParamValue(nodeParam, ctx) {
         const { dstFieldName, dstDEUILogicParamId } = nodeParam;
+        if (!dstDEUILogicParamId) {
+            throw new RuntimeError('没有目标参数对象id');
+        }
         // 目标参数
         let dstField = dstFieldName;
         // 实体参数对象转小写
@@ -72,7 +76,17 @@ export class PrepareJSParamNode extends UILogicNode {
         // 源参数
         const srcVal = handleSrcVal(ctx, nodeParam);
         if (dstField) {
-            ctx.params[dstDEUILogicParamId][dstField] = srcVal;
+            // 赋值属性的时候支持脚本写法
+            try {
+                ScriptFactory.execScriptFn({ srcVal, dstParam: ctx.params[dstDEUILogicParamId] }, `dstParam.${dstFieldName} = srcVal`, {
+                    singleRowReturn: false,
+                    isAsync: false,
+                });
+            }
+            catch (error) {
+                ibiz.log.error(`给目标参数属性${dstFieldName}赋值报错，目标参数：`, ctx.params[dstDEUILogicParamId]);
+                throw error;
+            }
         }
         else {
             ctx.params[dstDEUILogicParamId] = srcVal;

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

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

@@ -30,6 +30,11 @@ export class UILogicParam {
         const m = this.model;
         const { context, viewParams, data, parameters } = ctx;
         const app = ibiz.hub.getApp(context.srfappid);
+        // 特殊变量的特殊处理
+        if (m.codeName === 'layoutPanel') {
+            ctx.params[tag] = parameters.view.layoutPanel.panelItems;
+            return;
+        }
         if (m.default) {
             ctx.params[tag] = data && data.length > 0 ? data[0] : {};
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,8 +29,8 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.32",
-    "@ibiz/model-core": "^0.0.18",
+    "@ibiz-template/core": "^0.1.34",
+    "@ibiz/model-core": "^0.0.19",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
     "@types/systemjs": "^6.13.3",
@@ -46,7 +46,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.1.0",
-    "@ibiz/model-core": "^0.0.18",
+    "@ibiz/model-core": "^0.0.19",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "594d722ab71f8c9e5fa88e685597b221c70e56e0"
+  "gitHead": "6b6ab37103623fbc1994241b511829a2013a72c0"
 }

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);
       // 更新分页数据总条数
@@ -309,7 +309,7 @@ export class MDControlController<
 
       // 刷新数据，补全这一页缺少的数据
       if (needRefresh) {
-        this.refresh();
+        await this.refresh();
       }
     } catch (error) {
       await this._evt.emit('onRemoveError', undefined);

package/src/controller/common/editor/code-list-editor.controller.ts

@@ -37,6 +37,9 @@ export class CodeListEditorController<
       );
       return dataItems;
     }
-    throw new RuntimeModelError(this.model, '请配置代码表');
+    throw new RuntimeModelError(
+      this.model,
+      `编辑器类型[${this.model.editorType}]，未配置代码表`,
+    );
   }
 }

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 };
   }
 
   /**

package/src/controller/common/view/view.controller.ts

@@ -265,6 +265,7 @@ export class ViewController<
     // 初始化计时器服务
     await this.initCounters();
 
+    // 初始化视图逻辑调度器
     const appViewLogics = getViewLogics(this.model);
     if (appViewLogics.length) {
       this.scheduler = ibiz.scheduler.createViewScheduler(appViewLogics);
@@ -414,6 +415,7 @@ export class ViewController<
       panel.evt.on('onControlEvent', event => {
         this.scheduler!.triggerControlEvent(
           event.triggerControlName,
+          event.triggerEventName,
           event.triggerEvent,
         );
       });

package/src/controller/control/calendar/calendar.controller.ts

@@ -76,7 +76,7 @@ export class CalendarController
     const isInitialLoad = args.isInitialLoad === true;
     // *查询参数处理
     const { context } = this.handlerAbilityParams(args);
-    const params = await this.getFetchParams(args?.params);
+    const params = await this.getFetchParams(args?.viewParam);
     // *发起请求
     await this.startLoading();
     let items;

package/src/controller/control/data-view/data-view.controller.ts

@@ -155,13 +155,13 @@ export class DataViewControlController<
               tempData = tempData.getOrigin();
             }
             if (tempData) {
-              group.groupActionGroupState!.update(
+              group.groupActionGroupState?.update(
                 tempData,
                 this.model.appDataEntityId!,
               );
             }
           } else {
-            group.groupActionGroupState!.update(
+            group.groupActionGroupState?.update(
               undefined,
               this.model.appDataEntityId!,
             );
@@ -173,7 +173,7 @@ export class DataViewControlController<
           return group.children.indexOf(data) !== -1;
         });
         if (actionGroup) {
-          actionGroup.groupActionGroupState!.update(
+          actionGroup.groupActionGroupState?.update(
             actionGroup.selectedData![0],
             this.model.appDataEntityId!,
           );