@ibiz-template/runtime 0.1.33 → 0.1.35

package/src/interface/service/service/i-app-de.service.ts

@@ -1,4 +1,4 @@
-import { IHttpResponse } from '@ibiz-template/core';
+import { IHttpResponse, IPortalAsyncAction } from '@ibiz-template/core';
 import { DECache } from '../../../service/utils';
 import { IFileService } from './i-file.service';
 import { IWorkFlowService } from './i-wf.service';
@@ -66,4 +66,40 @@ export interface IAppDEService {
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse>;
+
+  /**
+   * 触发实体服务方法 ac 模式
+   *
+   * @author chitanda
+   * @date 2023-10-12 17:10:27
+   * @param {string} id
+   * @param {IParams} context
+   * @param {(IData | IData[])} [params]
+   * @param {IParams} [params2]
+   * @return {*}  {Promise<IHttpResponse>}
+   */
+  execAc(
+    id: string,
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse>;
+
+  /**
+   * 实体级别 AI 聊天单次会话
+   *
+   * @author chitanda
+   * @date 2023-10-12 16:10:03
+   * @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>;
 }

package/src/interface/util/i-overlay-controller/i-overlay-controller.ts

@@ -1,4 +1,9 @@
-import { IPopoverOptions, IDrawerOptions, IModalOptions } from '../../common';
+import {
+  IPopoverOptions,
+  IDrawerOptions,
+  IModalOptions,
+  IFloatWindowOptions,
+} from '../../common';
 import { IOverlayContainer } from '../i-overlay-container/i-overlay-container';
 import { IOverlayPopoverContainer } from '../i-overlay-popover-container/i-overlay-popover-container';
 
@@ -111,4 +116,37 @@ export interface IOverlayController {
     props?: IParams,
     opts?: IModalOptions,
   ): IOverlayContainer;
+
+  /**
+   * 模态
+   *
+   * @author chitanda
+   * @date 2022-11-08 15:11:40
+   * @template T
+   * @param {unknown} component 组件名称，组件对象，或者绘制函数
+   * @param {IParams} [props] 组件props
+   * @param {IFloatWindowOptions} [opts]
+   * @return {*}  {Promise<T>}
+   */
+  floatWindow<T = void>(
+    component: unknown,
+    props?: IParams,
+    opts?: IFloatWindowOptions,
+  ): Promise<T>;
+
+  /**
+   * 创建全局模态容器
+   *
+   * @author chitanda
+   * @date 2022-11-09 15:11:58
+   * @param {unknown} component 组件名称，组件对象，或者绘制函数
+   * @param {IParams} [props] 组件props
+   * @param {IFloatWindowOptions} [opts]
+   * @return {*}  {IOverlayContainer}
+   */
+  createFloatWindow(
+    component: unknown,
+    props?: IParams,
+    opts?: IFloatWindowOptions,
+  ): IOverlayContainer;
 }

package/src/logic-scheduler/executor/app-ui-action-executor.ts

@@ -0,0 +1,20 @@
+import { IUILogicParams } from '../../interface';
+import { UIActionUtil } from '../../ui-action';
+import { LogicExecutor } from './logic-executor';
+
+/**
+ * 应用界面行为执行
+ * @author lxm
+ * @date 2023-07-17 01:57:27
+ * @export
+ * @class AppUILogicExecutor
+ * @extends {LogicExecutor}
+ */
+export class AppDEUIActionExecutor extends LogicExecutor {
+  declare type: 'APPDEUIACTION';
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  execute(executeParams: IUILogicParams): any {
+    UIActionUtil.execAndResolved(this.logic.appDEUIActionId!, executeParams);
+  }
+}

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,11 @@
 import { IAppDEMethod, IAppDataEntity } from '@ibiz/model-core';
-import { IHttpResponse, ModelError, RuntimeError } from '@ibiz-template/core';
-import { DECache } from '../../utils';
+import {
+  IHttpResponse,
+  IPortalAsyncAction,
+  ModelError,
+  RuntimeError,
+} from '@ibiz-template/core';
+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 +14,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 +92,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 +111,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 +123,7 @@ export class DEService implements IAppDEService {
           `未支持的服务方法类型: ${model.methodType}`,
         );
     }
-    this.methodMap.set(id, method);
+    this.methodMap.set(cacheId, method);
     return method;
   }
 
@@ -138,4 +150,91 @@ 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-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> {
+    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 => {
+            if (e.data) {
+              const json = JSON.parse(e.data);
+              onmessage(json as IPortalAsyncAction);
+            }
+          },
+          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/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-context.ts

@@ -22,6 +22,9 @@ export class UILogicContext {
    * 上下文
    */
   get context(): IContext {
+    if (Object.prototype.hasOwnProperty.call(this.params, 'context')) {
+      return this.params.context;
+    }
     return this.parameters.context;
   }
 
@@ -35,20 +38,13 @@ export class UILogicContext {
   /**
    * 视图参数
    */
-  get viewParams(): IParams {
+  get viewParam(): IParams {
+    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/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/data-set-node/data-set-node.ts

@@ -1,3 +1,4 @@
+import { RuntimeModelError } from '@ibiz-template/core';
 import { IDEUIDEDataSetLogic } from '@ibiz/model-core';
 import { UILogicContext } from '../../ui-logic-context';
 import { UILogicNode } from '../ui-logic-node';
@@ -21,14 +22,16 @@ export class DataSetNode extends UILogicNode {
       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,
+      queryParams,
     );
     if (res.ok) {
       ctx.params[retDEUILogicParamId!] = res.data;

package/src/ui-logic/ui-logic-node/de-action-node/de-action-node.ts

@@ -35,7 +35,7 @@ export class DEActionNode extends UILogicNode {
       dstAppDEActionId!,
       ctx.context,
       requestData,
-      ctx.viewParams,
+      ctx.viewParam,
     );
     if (res.ok) {
       ctx.params[retDEUILogicParamId!] = res.data;

package/src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts

@@ -34,6 +34,8 @@ export class DEUIActionNode extends UILogicNode {
 
     await UIActionUtil.execAndResolved(dstAppDEUIActionId!, {
       ...parameters,
+      context: ctx.context,
+      params: ctx.viewParam,
       data: actionData,
     });
   }

package/src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts

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

package/src/ui-logic/ui-logic-param/ui-logic-param.ts

@@ -30,7 +30,8 @@ export class UILogicParam {
   calc(ctx: UILogicContext): void {
     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);
 
     // 特殊变量的特殊处理
@@ -90,7 +91,7 @@ export class UILogicParam {
       ctx.params[tag] = {};
     } else if (m.viewNavDataParam) {
       // 视图导航数据
-      ctx.params[tag] = viewParams;
+      ctx.params[tag] = params;
     } else if (m.viewSessionParam) {
       throw new ModelError(m, `未支持的逻辑参数类型: 当前视图会话`);
     }

package/src/ui-logic/utils/handle-src-val.ts

@@ -39,17 +39,13 @@ export function handleSrcVal(
   // 没有源值类型就是逻辑参数
   const srcValueType = srcValParams.srcValueType || 'SRCDLPARAM';
   // 取属性值
-  let srcField = srcFieldName;
+  const srcField = srcFieldName;
 
   let value: unknown;
   switch (srcValueType) {
     // 源逻辑参数
     case 'SRCDLPARAM':
       value = ctx.params[srcDEUILogicParamId!];
-      // 如果是实体参数对象则转换成小写。
-      if (ctx.isEntityParam(srcDEUILogicParamId!)) {
-        srcField = srcField?.toLowerCase();
-      }
       break;
     // 空值类型
     case 'NULLVALUE':
@@ -62,13 +58,13 @@ export function handleSrcVal(
       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':