@ibiz-template/runtime 0.7.41-alpha.125 → 0.7.41-alpha.127

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

@@ -1,6 +1,7 @@
 import { IDEUILogicNode } from '@ibiz/model-core';
 import { UILogicContext } from '../ui-logic-context';
 import { UILogicLink } from '../ui-logic-link/ui-logic-link';
+import { IUILogicNode } from '../../interface';
 
 /**
  * 逻辑节点
@@ -10,7 +11,7 @@ import { UILogicLink } from '../ui-logic-link/ui-logic-link';
  * @export
  * @class UILogicNode
  */
-export abstract class UILogicNode {
+export abstract class UILogicNode implements IUILogicNode {
   /**
    * 节点连接
    *
@@ -22,10 +23,8 @@ export abstract class UILogicNode {
 
   /**
    * Creates an instance of UILogicNode.
-   *
-   * @author chitanda
-   * @date 2023-02-08 16:02:19
-   * @param {UILogicNodeModel} model
+   * @param {IDEUILogicNode} model
+   * @memberof UILogicNode
    */
   constructor(public model: IDEUILogicNode) {
     this.links = (model.deuilogicLinks || []).map(
@@ -34,15 +33,11 @@ export abstract class UILogicNode {
   }
 
   /**
-   * 执行界面行为
-   *
-   * @description 此实现无需关心是否循环后续处理问题
-   * @author chitanda
-   * @date 2023-02-08 22:02:44
-   * @param {UILogicContext} ctx
-   * @param {IContext} context
-   * @param {IData} data
-   * @param {IParams} [opt]
+   * @description 执行逻辑
+   * @abstract
+   * @param {UILogicContext} ctx 界面逻辑执行上下文
+   * @returns {*}  {Promise<void>}
+   * @memberof UILogicNode
    */
   abstract exec(ctx: UILogicContext): Promise<void>;
 }

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

@@ -1,37 +1,11 @@
 /* eslint-disable no-await-in-loop */
-import {
-  IBizContext,
-  ModelError,
-  RuntimeModelError,
-} from '@ibiz-template/core';
-import { IDEUILogic } from '@ibiz/model-core';
+import { IBizContext, RuntimeModelError } from '@ibiz-template/core';
 import { clone } from 'ramda';
-import { IUILogicParams } from '../interface';
+import { IAppDataEntity, IDEUILogic } from '@ibiz/model-core';
+import { IUILogic, IUILogicParams, IUILogicNode } from '../interface';
 import { UILogicContext } from './ui-logic-context';
-import {
-  AppendParamNode,
-  BindParamNode,
-  CopyParamNode,
-  DataSetNode,
-  DEActionNode,
-  DebugParamNode,
-  DEUIActionNode,
-  EndNode,
-  ExecuteDELogicNode,
-  MsgBoxNode,
-  PFPluginNode,
-  PrepareJSParamNode,
-  RawJSCodeNode,
-  RenewParamNode,
-  ResetParamNode,
-  SortParamNode,
-  StartNode,
-  ThrowExceptionNode,
-  UILogicNode,
-  ViewCtrlFireEventNode,
-  ViewCtrlInvokeNode,
-} from './ui-logic-node';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
+import { getUILogicNodeProvider } from '../register';
 
 /**
  * 界面逻辑
@@ -41,16 +15,16 @@ import { UILogicParam } from './ui-logic-param/ui-logic-param';
  * @export
  * @class UILogic
  */
-export class UILogic {
+export class UILogic implements IUILogic {
   /**
    * 所有节点实例
    *
    * @author chitanda
    * @date 2023-02-08 21:02:38
    * @protected
-   * @type {Map<string, UILogicNode>}
+   * @type {Map<string, IUILogicNode>}
    */
-  protected nodes: Map<string, UILogicNode> = new Map();
+  protected nodes: Map<string, IUILogicNode> = new Map();
 
   /**
    * 所有参数实例
@@ -64,94 +38,37 @@ export class UILogic {
 
   /**
    * Creates an instance of UILogic.
-   * @author chitanda
-   * @date 2023-02-08 17:02:26
    * @param {IDEUILogic} model
+   * @param {IAppDataEntity} entity
+   * @memberof UILogic
    */
-  constructor(protected model: IDEUILogic) {
-    if (!model.deuilogicNodes?.length) {
+  constructor(
+    public model: IDEUILogic,
+    public entity: IAppDataEntity,
+  ) {}
+
+  /**
+   * @description 初始化
+   * @returns {*}  {Promise<void>}
+   * @memberof UILogic
+   */
+  async init(): Promise<void> {
+    if (!this.model.deuilogicNodes?.length) {
       throw new RuntimeModelError(
-        model,
+        this.model,
         ibiz.i18n.t('runtime.uiLogic.noLogicalNodesConfigured'),
       );
     }
-    model.deuilogicNodes.forEach(node => {
-      const { logicNodeType } = node;
-      let logicNode;
-      switch (logicNodeType) {
-        case 'BEGIN': // 开始
-          logicNode = new StartNode(node);
-          break;
-        case 'END': // 结束
-          logicNode = new EndNode(node);
-          break;
-        case 'DEACTION': // 实体行为
-          logicNode = new DEActionNode(node);
-          break;
-        case 'DEUIACTION': // 实体界面行为调用
-          logicNode = new DEUIActionNode(node);
-          break;
-        case 'PREPAREJSPARAM': // 准备参数
-          logicNode = new PrepareJSParamNode(node);
-          break;
-        case 'RESETPARAM': // 重置参数
-          logicNode = new ResetParamNode(node);
-          break;
-        case 'COPYPARAM': // 拷贝参数
-          logicNode = new CopyParamNode(node);
-          break;
-        case 'BINDPARAM': // 绑定参数
-          logicNode = new BindParamNode(node);
-          break;
-        case 'VIEWCTRLINVOKE': // 视图部件调用
-          logicNode = new ViewCtrlInvokeNode(node);
-          break;
-        case 'MSGBOX': // 消息弹窗
-          logicNode = new MsgBoxNode(node);
-          break;
-        case 'DEBUGPARAM': // 调试逻辑参数
-          logicNode = new DebugParamNode(node);
-          break;
-        case 'APPENDPARAM': // 附加到数组参数
-          logicNode = new AppendParamNode(node);
-          break;
-        case 'SORTPARAM': // 排序数组参数
-          logicNode = new SortParamNode(node);
-          break;
-        case 'RENEWPARAM': // 重新建立参数
-          logicNode = new RenewParamNode(node);
-          break;
-        case 'DEDATASET': // 实体数据集
-          logicNode = new DataSetNode(node);
-          break;
-        case 'THROWEXCEPTION': // 抛出异常
-          logicNode = new ThrowExceptionNode(node);
-          break;
-        case 'VIEWCTRLFIREEVENT': // 视图部件事件触发
-          logicNode = new ViewCtrlFireEventNode(node);
-          break;
-        case 'DELOGIC': // 实体逻辑
-          logicNode = new ExecuteDELogicNode(node);
-          break;
-        case 'PFPLUGIN': // 前端插件调用
-          logicNode = new PFPluginNode(node);
-          break;
-        case 'RAWJSCODE':
-          logicNode = new RawJSCodeNode(node);
-          break;
-        default:
-          throw new ModelError(
-            node,
-            ibiz.i18n.t('runtime.deLogic.deLogicNode.unsupportedLogical', {
-              logicNodeType,
-            }),
-          );
-      }
-      this.nodes.set(node.id!, logicNode);
-    });
-    model.deuilogicParams!.forEach(param => {
-      this.params.set(param.id!, new UILogicParam(param));
-    });
+    await Promise.all(
+      this.model.deuilogicNodes.map(async node => {
+        const provider = await getUILogicNodeProvider(
+          node,
+          this.model,
+          this.entity,
+        );
+        if (provider) this.nodes.set(node.id!, provider);
+      }),
+    );
     // 将已经实例化的逻辑节点挂载到逻辑连接上
     this.nodes.forEach(node => {
       node.links.forEach(link => {
@@ -161,18 +78,16 @@ export class UILogic {
         }
       });
     });
+    this.model.deuilogicParams!.forEach(param => {
+      this.params.set(param.id!, new UILogicParam(param));
+    });
   }
 
   /**
-   * 初始化逻辑参数
-   *
-   * @author chitanda
-   * @date 2023-02-08 21:02:58
+   * @description 初始化逻辑参数
    * @protected
    * @param {UILogicContext} ctx
-   * @param {IContext} context
-   * @param {IData} data
-   * @param {IParams} [opt]
+   * @memberof UILogic
    */
   protected initLogicParams(ctx: UILogicContext): void {
     this.params.forEach(param => {
@@ -184,14 +99,10 @@ export class UILogic {
   }
 
   /**
-   * 执行视图逻辑
-   *
-   * @author chitanda
-   * @date 2023-02-08 21:02:09
-   * @param {IContext} context
-   * @param {IData} data
-   * @param {IParams} [opt]
-   * @return {*}  {Promise<IData>}
+   * @description 执行逻辑
+   * @param {IUILogicParams} parameters 逻辑参数
+   * @returns {*}  {Promise<unknown>}
+   * @memberof UILogic
    */
   async exec(parameters: IUILogicParams): Promise<unknown> {
     // 克隆传入应用上下文参数和视图参数
@@ -219,21 +130,15 @@ export class UILogic {
   }
 
   /**
-   * 开始根据连线递归执行逻辑
-   *
-   * @author chitanda
-   * @date 2023-02-09 15:02:32
+   * @description 开始根据连线递归执行逻辑
    * @protected
-   * @param {UILogicNode} node
+   * @param {IUILogicNode} node
    * @param {UILogicContext} ctx
-   * @param {IContext} context
-   * @param {(IData[] | null)} data
-   * @param {IParams} params
-   * @param {IParams} [opt]
-   * @return {*}  {(Promise<IData | null>)}
+   * @returns {*}  {Promise<void>}
+   * @memberof UILogic
    */
   protected async deepExec(
-    node: UILogicNode,
+    node: IUILogicNode,
     ctx: UILogicContext,
   ): Promise<void> {
     // 执行逻辑节点

package/src/utils/dr-ctrl-util/index.ts

@@ -80,7 +80,13 @@ export async function calcItemVisible(
     const entityModel = await ibiz.hub.getAppDataEntity(appDeId, appId);
     const deLogic = findDELogic(testAppDELogicId, entityModel);
     if (deLogic) {
-      const result = await execDELogicAction(deLogic, context, data, params);
+      const result = await execDELogicAction(
+        deLogic,
+        entityModel,
+        context,
+        data,
+        params,
+      );
       return !!result.data;
     }
   }

package/out/interface/common/i-ui-logic-params/i-ui-logic-params.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"i-ui-logic-params.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-ui-logic-params/i-ui-logic-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEvE;;;;;;;GAOG;AACH,MAAM,WAAW,cAAe,SAAQ,iBAAiB;IACvD;;;;;OAKG;IACH,IAAI,EAAE,eAAe,CAAC;IAEtB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,kBAAkB,CAAC;CAC3B"}