@ibiz-template/runtime 0.1.34 → 0.1.35

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

@@ -1,5 +1,10 @@
 import { IAppDEMethod, IAppDataEntity } from '@ibiz/model-core';
-import { IHttpResponse, ModelError, RuntimeError } from '@ibiz-template/core';
+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';
@@ -174,14 +179,15 @@ export class DEService implements IAppDEService {
    * 实体级别 AI 聊天会话
    *
    * @author chitanda
-   * @date 2023-10-12 11:10:00
+   * @date 2023-10-16 16:10:16
+   * @param {(data: IPortalAsyncAction) => void} onmessage
    * @param {IParams} context
    * @param {IParams} [params={}]
-   * @param {FetchEventSourceInit} [options={}]
+   * @param {IData} [data={}]
    * @return {*}  {Promise<void>}
    */
   aiChatSse(
-    onmessage: (data: unknown) => void,
+    onmessage: (data: IPortalAsyncAction) => void,
     context: IParams,
     params: IParams = {},
     data: IData = {},
@@ -197,8 +203,11 @@ export class DEService implements IAppDEService {
             'Content-Type': 'application/json',
           },
           body: JSON.stringify(data),
-          onmessage: (e: unknown) => {
-            onmessage(e);
+          onmessage: e => {
+            if (e.data) {
+              const json = JSON.parse(e.data);
+              onmessage(json as IPortalAsyncAction);
+            }
           },
           onclose: () => {
             resolve();

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-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':