@ibiz-template/runtime 0.1.32 → 0.1.34

package/src/logic-scheduler/index.ts

@@ -13,6 +13,7 @@ import { TimerTrigger } from './trigger/timer-trigger';
 import { AppUILogicExecutor } from './executor/app-ui-logic-executor';
 import { ViewEventTrigger } from './trigger/view-event-trigger';
 import { ControlEventTrigger } from './trigger/control-event-trigger';
+import { AppDEUIActionExecutor } from './executor/app-ui-action-executor';
 
 export {
   LogicSchedulerCenter,
@@ -61,10 +62,13 @@ export function installLogicSchedule(): void {
   );
 
   // 执行器
+  // 脚本
   ibiz.scheduler.executorFactory.register(
     'SCRIPT',
     (logic, scheduler) => new ScriptExecutor(logic, scheduler),
   );
+
+  // 实体逻辑
   ibiz.scheduler.executorFactory.register(
     'APPDEUILOGIC',
     (logic, scheduler) => new AppDEUILogicExecutor(logic, scheduler),
@@ -73,8 +77,16 @@ export function installLogicSchedule(): void {
     'DEUILOGIC',
     (logic, scheduler) => new AppDEUILogicExecutor(logic, scheduler),
   );
+
+  // 界面逻辑
   ibiz.scheduler.executorFactory.register(
     'APPUILOGIC',
     (logic, scheduler) => new AppUILogicExecutor(logic, scheduler),
   );
+
+  // 界面行为
+  ibiz.scheduler.executorFactory.register(
+    'APPDEUIACTION',
+    (logic, scheduler) => new AppDEUIActionExecutor(logic, scheduler),
+  );
 }

package/src/logic-scheduler/scheduler/control-logic-scheduler.ts

@@ -16,6 +16,12 @@ export class ControlLogicScheduler extends LogicScheduler {
     const filterLogics = logics.filter(
       item => item.triggerType !== 'APPVIEWENGINE',
     );
+    filterLogics.forEach(logic => {
+      // 部件事件的部件名称在itemName上，统一写到ctrlName,与视图逻辑保持一致。
+      if (logic.triggerType === 'CTRLEVENT') {
+        (logic as IData).ctrlName = logic.itemName;
+      }
+    });
     super(filterLogics as ISchedulerLogic[]);
   }
 }

package/src/logic-scheduler/scheduler/logic-scheduler.ts

@@ -3,7 +3,6 @@ import type {
   IUILogicParams,
   ISchedulerLogic,
   ITriggerMatchParams,
-  EventBase,
 } from '../../interface';
 import { LogicExecutor } from '../executor/logic-executor';
 import { LogicTrigger } from '../trigger/logic-trigger';
@@ -263,12 +262,16 @@ export class LogicScheduler {
    * @param {Partial<IUILogicParams>} executeParams 执行参数
    * @return {*}  {(boolean | undefined)}
    */
-  triggerControlEvent(ctrlName: string, event: EventBase): void {
+  triggerControlEvent(
+    ctrlName: string,
+    eventName: string,
+    executeParams?: Partial<IUILogicParams>,
+  ): void {
     const matchParams = {
       ctrlName,
-      eventName: event.eventName,
+      eventName,
       triggerType: 'CTRLEVENT',
     } as const;
-    this.triggerAndExecute(matchParams, event);
+    this.triggerAndExecute(matchParams, executeParams);
   }
 }

package/src/logic-scheduler/trigger/control-event-trigger.ts

@@ -38,7 +38,9 @@ export class ControlEventTrigger extends LogicTrigger {
     const superResult = super.match(matchParams);
     return (
       superResult &&
-      matchParams.ctrlName === this.logic.ctrlName &&
+      // 忽略大小写匹配
+      matchParams.ctrlName!.toLowerCase() ===
+        this.logic.ctrlName!.toLowerCase() &&
       this.listenEventNames.includes(matchParams.eventName!)
     );
   }

package/src/service/service/entity/de.service.ts

@@ -1,6 +1,6 @@
 import { IAppDEMethod, IAppDataEntity } from '@ibiz/model-core';
 import { IHttpResponse, ModelError, RuntimeError } from '@ibiz-template/core';
-import { DECache } from '../../utils';
+import { DECache, calcResPath } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
 import { Method } from './method/method';
 import { FileService } from '../file/file.service';
@@ -9,6 +9,7 @@ import { DEActionMethod } from './method/de-action';
 import { FetchMethod } from './method/fetch';
 import { IAppDEService } from '../../../interface';
 import { ConfigService } from '../config/config.service';
+import { AcFetchMethod } from './method/ac-fetch';
 
 /**
  * 实体服务
@@ -86,14 +87,16 @@ export 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 {
-    if (this.methodMap.has(id)) {
-      return this.methodMap.get(id)!;
+  protected getMethod(id: string, acMode: boolean = false): Method {
+    const cacheId = acMode ? `ac-${id}` : id;
+    if (this.methodMap.has(cacheId)) {
+      return this.methodMap.get(cacheId)!;
     }
     const model = findModelChild(this.model.appDEMethods!, id) as IAppDEMethod;
     let method: Method | null = null;
@@ -103,7 +106,11 @@ export class DEService implements IAppDEService {
         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(
@@ -111,7 +118,7 @@ export class DEService implements IAppDEService {
           `未支持的服务方法类型: ${model.methodType}`,
         );
     }
-    this.methodMap.set(id, method);
+    this.methodMap.set(cacheId, method);
     return method;
   }
 
@@ -138,4 +145,87 @@ export class DEService implements IAppDEService {
     }
     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: string,
+    context: IParams,
+    params?: IData,
+    params2: IParams = {},
+  ): Promise<IHttpResponse> {
+    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: (data: unknown) => void,
+    context: IParams,
+    params: IParams = {},
+    data: IData = {},
+  ): Promise<void> {
+    const app = ibiz.hub.getApp(this.model.appId);
+    const path = this.calcSsePath(context);
+    return new Promise((resolve, reject) => {
+      app.net.sse(
+        `/${path}`,
+        { srfactag: 'AIChat', ...params },
+        {
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(data),
+          onmessage: (e: unknown) => {
+            onmessage(e);
+          },
+          onclose: () => {
+            resolve();
+          },
+          onerror: (e: unknown) => {
+            reject(e);
+          },
+        },
+      );
+    });
+  }
+
+  /**
+   * 计算请求路径
+   *
+   * @author chitanda
+   * @date 2023-10-12 11:10:56
+   * @protected
+   * @param {IParams} context
+   * @return {*}  {string}
+   */
+  protected calcSsePath(context: IParams): string {
+    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/src/service/service/entity/method/ac-fetch.ts

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

package/src/service/service/entity/method/de-action.ts

@@ -4,6 +4,7 @@ import {
   RuntimeModelError,
 } from '@ibiz-template/core';
 import { IAppDEAction } from '@ibiz/model-core';
+import { clone } from 'ramda';
 import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
 import { findDELogic } from '../../../../model';
@@ -47,7 +48,12 @@ 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) {

package/src/service/service/entity/method/method.ts

@@ -110,23 +110,26 @@ export abstract class Method {
       switch (requestMethod) {
         case 'POST':
           res = await this.app.net.post(
-            `${path}/${methodName}`,
+            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}`,
+            this.mergeRequestPath(path, methodName),
             notNilEmpty(data) ? data! : params!,
           );
           break;
         }
         case 'DELETE':
           res = await this.app.net.delete(
-            `${path}/${methodName}`,
+            this.mergeRequestPath(path, methodName),
             data || params,
           );
           break;
@@ -145,6 +148,10 @@ export abstract class Method {
     throw new RuntimeModelError(this.method, `未支持的行为类型[${actionType}]`);
   }
 
+  protected mergeRequestPath(path: string, methodName: string): string {
+    return `${path}/${methodName}`;
+  }
+
   /**
    * 根据上下文计算当前请求路径
    *

package/src/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.ts

@@ -2,6 +2,7 @@ import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { IDELogicLinkSingleCond } from '@ibiz/model-core';
 import { testCond } from '../../../utils';
 import { UILogicContext } from '../../ui-logic-context';
+import { handleSrcVal } from '../../utils';
 import { UILogicLinkCond } from '../ui-logic-link-cond/ui-logic-link-cond';
 
 /**
@@ -65,7 +66,10 @@ export class UILogicLinkSingleCond extends UILogicLinkCond {
    * @return {*}  {boolean}
    */
   test(ctx: UILogicContext, context: IContext, data: IData): boolean {
-    const dst = ctx.params[this.dstParam];
+    const dstVal = handleSrcVal(ctx, {
+      srcDEUILogicParamId: this.dstParam,
+      srcFieldName: this.dstField,
+    }) as string;
     switch (this.type) {
       case 'ENTITYFIELD': {
         if (!this.value) {
@@ -77,7 +81,7 @@ 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) {
@@ -87,13 +91,16 @@ export class UILogicLinkSingleCond extends UILogicLinkCond {
           );
         }
         // 源数据对象属性
-        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,
+        }) as string;
+        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/src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts

@@ -1,7 +1,8 @@
 /* eslint-disable no-await-in-loop */
-import { ModelError } from '@ibiz-template/core';
+import { ModelError, RuntimeError } from '@ibiz-template/core';
 import { IDEUILogicNodeParam } from '@ibiz/model-core';
 import { clone } from 'ramda';
+import { ScriptFactory } from '../../../utils';
 import { UILogicContext } from '../../ui-logic-context';
 import { handleSrcVal } from '../../utils';
 import { UILogicNode } from '../ui-logic-node';
@@ -73,6 +74,11 @@ export class PrepareJSParamNode extends UILogicNode {
     ctx: UILogicContext,
   ): void {
     const { dstFieldName, dstDEUILogicParamId } = nodeParam;
+
+    if (!dstDEUILogicParamId) {
+      throw new RuntimeError('没有目标参数对象id');
+    }
+
     // 目标参数
     let dstField = dstFieldName;
 
@@ -84,7 +90,23 @@ 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/src/ui-logic/ui-logic-param/ui-logic-param.ts

@@ -32,6 +32,13 @@ 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] : {};
     } else if (m.activeContainerParam) {