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

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

@@ -1,10 +1,16 @@
-import { IAppUIAction, IDEUIPFPluginLogic } from '@ibiz/model-core';
+import {
+  IDEUILogic,
+  IDEUILogicNode,
+  IAppDataEntity,
+  IDEUIPFPluginLogic,
+} from '@ibiz/model-core';
 import { RuntimeError } from '@ibiz-template/core';
 import { getPluginRegisterKey } from './common-register';
 import { IUILogicNodeProvider } from '../../interface';
+import { CustomRegister } from '../custom-register';
 
 /** 界面逻辑节点适配器前缀 */
-export const UILOGINNODE_PROVIDER_PREFIX = 'UI_LOGIN_NODE';
+export const UILOGICNODE_PROVIDER_PREFIX = 'UI_LOGIC_NODE';
 
 /**
  * 注册界面逻辑节点适配器
@@ -17,38 +23,86 @@ export const UILOGINNODE_PROVIDER_PREFIX = 'UI_LOGIN_NODE';
  */
 export function registerUILogicNodeProvider(
   key: string,
-  callback: () => IUILogicNodeProvider,
+  callback: (node: IDEUILogicNode) => IUILogicNodeProvider,
 ): void {
-  ibiz.register.register(`${UILOGINNODE_PROVIDER_PREFIX}_${key}`, callback);
+  ibiz.register.register(`${UILOGICNODE_PROVIDER_PREFIX}_${key}`, callback);
+}
+
+function getProvider(
+  key: string,
+  logic: IDEUILogicNode,
+): IUILogicNodeProvider | undefined {
+  return ibiz.register.get(
+    `${UILOGICNODE_PROVIDER_PREFIX}_${key}`,
+    logic,
+  ) as IUILogicNodeProvider;
 }
 
 /**
- * 获取界面逻辑节点适配器
- *
- * @author chitanda
- * @date 2023-11-01 17:11:43
+ * @description 获取界面逻辑节点插件适配器
  * @export
  * @param {IDEUIPFPluginLogic} model
- * @return {*}  {Promise<IUILogicNodeProvider>}
+ * @returns {*}  {(Promise<IUILogicNodeProvider | undefined>)}
  */
-export async function getUILogicNodeProvider(
+export async function getUILogicNodePluginProvider(
   model: IDEUIPFPluginLogic,
 ): Promise<IUILogicNodeProvider | undefined> {
   let provider: IUILogicNodeProvider | undefined;
-  const { sysPFPluginId, appId } = model as Required<IAppUIAction>;
-
-  const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
-  if (pluginKey) {
-    provider = ibiz.register.get(
-      `${UILOGINNODE_PROVIDER_PREFIX}_${pluginKey}`,
-    ) as IUILogicNodeProvider;
-    if (provider) {
-      return provider;
-    }
-    throw new RuntimeError(
-      ibiz.i18n.t('runtime.register.helper.frontEndPluginNode', {
-        pluginKey,
-      }),
-    );
+  const { sysPFPluginId, appId } = model;
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) provider = getProvider(pluginKey, model);
+    if (!provider)
+      ibiz.log.warn(
+        ibiz.i18n.t('runtime.register.helper.frontEndPluginNode', {
+          pluginKey,
+        }),
+      );
   }
+  return provider;
+}
+
+/**
+ * @description 获取界面逻辑节点适配器
+ * @export
+ * @param {IDEUILogicNode} model
+ * @returns {*}  {(Promise<IUILogicNodeProvider>)}
+ */
+export async function getUILogicNodeProvider(
+  model: IDEUILogicNode,
+  logic: IDEUILogic,
+  entity: IAppDataEntity,
+): Promise<IUILogicNodeProvider> {
+  let provider: IUILogicNodeProvider | undefined;
+  const { logicNodeType } = model as Required<IDEUIPFPluginLogic>;
+
+  // 自定义注册
+  const registerKey = CustomRegister.getRegisterKey(
+    UILOGICNODE_PROVIDER_PREFIX,
+    {
+      mainModel: model,
+      logic,
+      entity,
+    },
+  );
+  provider = getProvider(registerKey, model);
+  if (provider) return provider;
+  ibiz.log.debug(
+    ibiz.i18n.t('runtime.register.helper.uiLogicNodeCustomRegistration', {
+      registerKey,
+    }),
+  );
+
+  // 找插件适配器
+  provider = await getUILogicNodePluginProvider(model);
+  if (provider) return provider;
+
+  // 找节点类型适配器
+  provider = getProvider(logicNodeType, model);
+  if (provider) return provider;
+  throw new RuntimeError(
+    ibiz.i18n.t('runtime.register.helper.frontEndTypeNode', {
+      logicNodeType,
+    }),
+  );
 }

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

@@ -0,0 +1,63 @@
+import { IAppDataEntity, IDEUILogic } from '@ibiz/model-core';
+import { RuntimeError } from '@ibiz-template/core';
+import { IUILogicProvider } from '../../interface';
+import { CustomRegister } from '../custom-register';
+
+/** 界面逻辑适配器前缀 */
+export const UILOGIC_PROVIDER_PREFIX = 'UILOGIC';
+
+/**
+ * @description 注册界面逻辑适配器
+ * @export
+ * @param {string} key
+ * @param {Callback} callback
+ */
+export function registerUILogicProvider(
+  key: string,
+  callback: (uiLogic: IDEUILogic, entity: IAppDataEntity) => IUILogicProvider,
+): void {
+  ibiz.register.register(`${UILOGIC_PROVIDER_PREFIX}_${key}`, callback);
+}
+
+function getProvider(
+  key: string,
+  uiLogic: IDEUILogic,
+  entity: IAppDataEntity,
+): IUILogicProvider | undefined {
+  return ibiz.register.get(
+    `${UILOGIC_PROVIDER_PREFIX}_${key}`,
+    uiLogic,
+    entity,
+  ) as IUILogicProvider;
+}
+
+/**
+ * @description 获取界面逻辑适配器
+ * @export
+ * @param {IDEUILogic} model
+ * @param {IAppDataEntity} entity
+ * @returns {*}  {IUILogicProvider}
+ */
+export function getUILogicProvider(
+  mainModel: IDEUILogic,
+  entity: IAppDataEntity,
+): IUILogicProvider {
+  // 找自定义注册的适配器
+  const registerKey = CustomRegister.getRegisterKey(UILOGIC_PROVIDER_PREFIX, {
+    mainModel,
+    entity,
+  });
+  let provider = getProvider(registerKey, mainModel, entity);
+  if (provider) return provider;
+  ibiz.log.debug(
+    ibiz.i18n.t('runtime.register.helper.uiLogicCustomRegistration', {
+      registerKey,
+    }),
+  );
+
+  // 找默认适配器
+  provider = getProvider('DEFAULT', mainModel, entity);
+  if (!provider)
+    throw new RuntimeError(ibiz.i18n.t('runtime.register.helper.uiLogic'));
+  return provider;
+}

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

@@ -111,7 +111,13 @@ export class DEActionMethod extends Method {
           ibiz.i18n.t('runtime.service.lackEntityLogic'),
         );
       }
-      result = await execDELogicAction(deLogic, context, data, params);
+      result = await execDELogicAction(
+        deLogic,
+        this.entity,
+        context,
+        data,
+        params,
+      );
     } else {
       if (data) {
         if (!this.isLocalMode) {

package/src/ui-logic/index.ts

@@ -1,25 +1,20 @@
 import { RuntimeError } from '@ibiz-template/core';
 import { IDEUILogic } from '@ibiz/model-core';
-import { IUILogicParams } from '../interface';
-import { UILogic } from './ui-logic';
+import { IUILogicParams, IUILogicProvider } from '../interface';
+import { getUILogicProvider } from '../register';
 
 /**
- * 界面行为实例缓存
+ * 界面逻辑实例缓存
  */
-const uiLogicMap: WeakMap<IDEUILogic, UILogic> = new Map();
+const uiLogicMap: WeakMap<IDEUILogic, IUILogicProvider> = new Map();
 
 /**
- * 执行界面行为
- *
- * @author chitanda
- * @date 2023-02-09 11:02:23
+ * @description 执行界面逻辑
  * @export
- * @param {IPSDEUILogic} deUILogic
- * @param {IContext} context
- * @param {(IData[] | null)} data
- * @param {IParams} params
- * @param {IParams} [opt]
- * @return {*}  {Promise<unknown>}
+ * @param {string} deUILogicId 界面逻辑标识
+ * @param {string} appDataEntityId 应用实体标识
+ * @param {IUILogicParams} parameters 界面逻辑参数
+ * @returns {*}  {Promise<unknown>}
  */
 export async function execUILogic(
   deUILogicId: string,
@@ -28,7 +23,11 @@ export async function execUILogic(
 ): Promise<unknown> {
   const app = ibiz.hub.getApp(parameters.context.srfappid);
   const deUILogic = await app.getDEUILogic(deUILogicId, appDataEntityId);
-  if (!deUILogic) {
+  const appDataEntity = await ibiz.hub.getAppDataEntity(
+    appDataEntityId,
+    parameters.context.srfappid,
+  );
+  if (!deUILogic || !appDataEntity) {
     throw new RuntimeError(
       ibiz.i18n.t('runtime.uiLogic.interfaceLogic', {
         appDataEntityId,
@@ -37,7 +36,9 @@ export async function execUILogic(
     );
   }
   if (!uiLogicMap.has(deUILogic)) {
-    uiLogicMap.set(deUILogic, new UILogic(deUILogic));
+    const provider = getUILogicProvider(deUILogic, appDataEntity);
+    await provider.init();
+    uiLogicMap.set(deUILogic, provider);
   }
   ibiz.log.debug(
     ibiz.i18n.t('runtime.uiLogic.startExecutingInterfaceLogic', {

package/src/ui-logic/provider.ts

@@ -0,0 +1,122 @@
+import { IAppDataEntity, IDEUILogic, IDEUILogicNode } from '@ibiz/model-core';
+import {
+  registerUILogicProvider,
+  registerUILogicNodeProvider,
+} from '../register';
+import { UILogic } from './ui-logic';
+import {
+  EndNode,
+  StartNode,
+  MsgBoxNode,
+  DataSetNode,
+  DEActionNode,
+  PFPluginNode,
+  RawJSCodeNode,
+  SortParamNode,
+  BindParamNode,
+  CopyParamNode,
+  RenewParamNode,
+  ResetParamNode,
+  DebugParamNode,
+  DEUIActionNode,
+  AppendParamNode,
+  PrepareJSParamNode,
+  ExecuteDELogicNode,
+  ThrowExceptionNode,
+  ViewCtrlInvokeNode,
+  ViewCtrlFireEventNode,
+} from './ui-logic-node';
+
+/**
+ * @description 注册界面逻辑适配器
+ * @export
+ */
+export function presetUILogicProvider(): void {
+  // 注册默认界面逻辑
+  registerUILogicProvider(
+    'DEFAULT',
+    (uiLogic: IDEUILogic, entity: IAppDataEntity) =>
+      new UILogic(uiLogic, entity),
+  );
+  // 注册界面逻辑节点
+  registerUILogicNodeProvider(
+    'BEGIN',
+    (node: IDEUILogicNode) => new StartNode(node),
+  );
+  registerUILogicNodeProvider(
+    'END',
+    (node: IDEUILogicNode) => new EndNode(node),
+  );
+  registerUILogicNodeProvider(
+    'DEACTION',
+    (node: IDEUILogicNode) => new DEActionNode(node),
+  );
+  registerUILogicNodeProvider(
+    'DEUIACTION',
+    (node: IDEUILogicNode) => new DEUIActionNode(node),
+  );
+  registerUILogicNodeProvider(
+    'PREPAREJSPARAM',
+    (node: IDEUILogicNode) => new PrepareJSParamNode(node),
+  );
+  registerUILogicNodeProvider(
+    'RESETPARAM',
+    (node: IDEUILogicNode) => new ResetParamNode(node),
+  );
+  registerUILogicNodeProvider(
+    'COPYPARAM',
+    (node: IDEUILogicNode) => new CopyParamNode(node),
+  );
+  registerUILogicNodeProvider(
+    'BINDPARAM',
+    (node: IDEUILogicNode) => new BindParamNode(node),
+  );
+  registerUILogicNodeProvider(
+    'VIEWCTRLINVOKE',
+    (node: IDEUILogicNode) => new ViewCtrlInvokeNode(node),
+  );
+  registerUILogicNodeProvider(
+    'MSGBOX',
+    (node: IDEUILogicNode) => new MsgBoxNode(node),
+  );
+  registerUILogicNodeProvider(
+    'DEBUGPARAM',
+    (node: IDEUILogicNode) => new DebugParamNode(node),
+  );
+  registerUILogicNodeProvider(
+    'APPENDPARAM',
+    (node: IDEUILogicNode) => new AppendParamNode(node),
+  );
+  registerUILogicNodeProvider(
+    'SORTPARAM',
+    (node: IDEUILogicNode) => new SortParamNode(node),
+  );
+  registerUILogicNodeProvider(
+    'RENEWPARAM',
+    (node: IDEUILogicNode) => new RenewParamNode(node),
+  );
+  registerUILogicNodeProvider(
+    'DEDATASET',
+    (node: IDEUILogicNode) => new DataSetNode(node),
+  );
+  registerUILogicNodeProvider(
+    'THROWEXCEPTION',
+    (node: IDEUILogicNode) => new ThrowExceptionNode(node),
+  );
+  registerUILogicNodeProvider(
+    'VIEWCTRLFIREEVENT',
+    (node: IDEUILogicNode) => new ViewCtrlFireEventNode(node),
+  );
+  registerUILogicNodeProvider(
+    'DELOGIC',
+    (node: IDEUILogicNode) => new ExecuteDELogicNode(node),
+  );
+  registerUILogicNodeProvider(
+    'PFPLUGIN',
+    (node: IDEUILogicNode) => new PFPluginNode(node),
+  );
+  registerUILogicNodeProvider(
+    'RAWJSCODE',
+    (node: IDEUILogicNode) => new RawJSCodeNode(node),
+  );
+}

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

@@ -51,7 +51,7 @@ export class UILogicContext implements IUILogicContext {
   /**
    * 数据
    */
-  get data(): IData {
+  get data(): IData[] {
     return this.parameters.data;
   }
 

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

@@ -1,9 +1,22 @@
+import { IUILogicLinkCond } from '../../../interface';
+import { UILogicContext } from '../../ui-logic-context';
+
 /**
- * 界面逻辑连接条件
- *
- * @author chitanda
- * @date 2023-02-10 15:02:28
+ * @description 界面逻辑连接条件
  * @export
+ * @abstract
  * @class UILogicLinkCond
+ * @implements {IUILogicLinkCond}
  */
-export abstract class UILogicLinkCond {}
+export abstract class UILogicLinkCond implements IUILogicLinkCond {
+  /**
+   * @description 条件判断
+   * @abstract
+   * @param {UILogicContext} ctx 界面逻辑执行上下文
+   * @param {IContext} context 上下文
+   * @param {IData} data 逻辑数据
+   * @returns {*}  {boolean}
+   * @memberof UILogicLinkCond
+   */
+  abstract test(ctx: UILogicContext, context: IContext, data: IData): boolean;
+}

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

@@ -6,6 +6,7 @@ import {
 import { UILogicContext } from '../../ui-logic-context';
 import { UILogicLinkCond } from '../ui-logic-link-cond/ui-logic-link-cond';
 import { UILogicLinkSingleCond } from '../ui-logic-link-single-cond/ui-logic-link-single-cond';
+import { IUILogicLinkGroupCond } from '../../../interface';
 
 /**
  * 界面逻辑连接条件组
@@ -16,7 +17,10 @@ import { UILogicLinkSingleCond } from '../ui-logic-link-single-cond/ui-logic-lin
  * @class UILogicLinkGroupCond
  * @extends {UILogicLinkCond}
  */
-export class UILogicLinkGroupCond extends UILogicLinkCond {
+export class UILogicLinkGroupCond
+  extends UILogicLinkCond
+  implements IUILogicLinkGroupCond
+{
   /**
    * 操作标识
    *

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

@@ -5,6 +5,7 @@ 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';
+import { IUILogicLinkSingleCond } from '../../../interface';
 
 /**
  * 界面逻辑连接条件项
@@ -15,7 +16,10 @@ import { UILogicLinkCond } from '../ui-logic-link-cond/ui-logic-link-cond';
  * @class UILogicLinkSingleCond
  * @extends {UILogicLinkCond}
  */
-export class UILogicLinkSingleCond extends UILogicLinkCond {
+export class UILogicLinkSingleCond
+  extends UILogicLinkCond
+  implements IUILogicLinkSingleCond
+{
   /**
    * 源参数
    *

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

@@ -3,6 +3,7 @@ import { IDEUILogicLink } from '@ibiz/model-core';
 import { UILogicContext } from '../ui-logic-context';
 import { UILogicNode } from '../ui-logic-node/ui-logic-node';
 import { UILogicLinkGroupCond } from './ui-logic-link-group-cond/ui-logic-link-group-cond';
+import { IUILogicLink, IUILogicLinkGroupCond } from '../../interface';
 
 /**
  * 界面逻辑连接
@@ -12,7 +13,7 @@ import { UILogicLinkGroupCond } from './ui-logic-link-group-cond/ui-logic-link-g
  * @export
  * @class UILogicLink
  */
-export class UILogicLink {
+export class UILogicLink implements IUILogicLink {
   /**
    * 源节点
    *
@@ -32,13 +33,11 @@ export class UILogicLink {
   dstNode: UILogicNode | null = null;
 
   /**
-   * 连接条件组
-   *
-   * @author chitanda
-   * @date 2023-02-15 17:02:49
-   * @type {(UILogicLinkGroupCond | null)}
+   * @description 连接条件组
+   * @type {(IUILogicLinkGroupCond  | null)}
+   * @memberof UILogicLink
    */
-  groupCond: UILogicLinkGroupCond | null = null;
+  groupCond: IUILogicLinkGroupCond | null = null;
 
   /**
    * Creates an instance of UILogicLink.

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

@@ -1,7 +1,7 @@
 import { IDEUIPFPluginLogic } from '@ibiz/model-core';
 import { UILogicContext } from '../../ui-logic-context';
 import { UILogicNode } from '../ui-logic-node';
-import { getUILogicNodeProvider } from '../../../register';
+import { getUILogicNodePluginProvider } from '../../../register';
 
 /**
  * 前端插件节点
@@ -22,9 +22,9 @@ export class PFPluginNode extends UILogicNode {
         sysPFPluginId: this.model.sysPFPluginId,
       }),
     );
-    const provider = await getUILogicNodeProvider(this.model);
+    const provider = await getUILogicNodePluginProvider(this.model);
     if (provider) {
-      await provider.exec(this.model, ctx);
+      await provider.exec(ctx);
     }
   }
 }

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