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

package/src/interface/api/common/i-api-logic-params.ts

@@ -0,0 +1,29 @@
+import { IApiContext, IApiData, IApiParams } from '@ibiz-template/core';
+
+/**
+ * @description 逻辑通用参数接口
+ * @export
+ * @interface IApiLogicParams
+ */
+export interface IApiLogicParams {
+  /**
+   * @description 上下文参数
+   * @type {IApiContext}
+   * @memberof IApiLogicParams
+   */
+  context: IApiContext;
+
+  /**
+   * @description 视图参数
+   * @type {IApiParams}
+   * @memberof IApiLogicParams
+   */
+  params: IApiParams;
+
+  /**
+   * @description 数据集合
+   * @type {IApiData[]}
+   * @memberof IApiLogicParams
+   */
+  data: IApiData[];
+}

package/src/interface/api/common/i-api-ui-logic-params.ts

@@ -1,33 +1,12 @@
-import { IApiContext, IApiData, IApiParams } from '@ibiz-template/core';
 import { IApiControlController, IApiViewController } from '../controller';
+import { IApiLogicParams } from './i-api-logic-params';
 
 /**
- * @description 界面逻辑通用参数(界面行为，事件，界面逻辑，实体逻辑等)
+ * @description 界面逻辑通用参数接口
  * @export
  * @interface IApiUILogicParams
  */
-export interface IApiUILogicParams {
-  /**
-   * @description 上下文参数
-   * @type {IApiContext}
-   * @memberof IApiUILogicParams
-   */
-  context: IApiContext;
-
-  /**
-   * @description 视图参数
-   * @type {IApiParams}
-   * @memberof IApiUILogicParams
-   */
-  params: IApiParams;
-
-  /**
-   * @description 数据集合
-   * @type {IApiData[]}
-   * @memberof IApiUILogicParams
-   */
-  data: IApiData[];
-
+export interface IApiUILogicParams extends IApiLogicParams {
   /**
    * @description 当前上下文对应的视图控制器
    * @type {IApiViewController}

package/src/interface/api/common/index.ts

@@ -23,3 +23,5 @@ export type { IApiModalOptions } from './i-api-modal-option';
 export type { IApiUILogicParams } from './i-api-ui-logic-params';
 export type { IApiUIActionResult } from './i-api-ui-action-result';
 export type { IApiErrorHandler } from './i-api-error-handler';
+export type { IApiDeLogicParams } from './i-api-de-logic-params';
+export type { IApiLogicContext } from './i-api-logic-context';

package/src/interface/api/controller/control/form-detail/i-api-form-detail.controller.ts

@@ -13,7 +13,7 @@ import { IApiFormDetailContainerController } from './i-api-form-detail-container
 export interface IApiFormDetailController extends IApiEnforceableController {
   /**
    * @description 表单成员状态
-   * @type {IApiFormState}
+   * @type {IApiFormDetailState}
    * @memberof IApiFormDetailController
    */
   state: IApiFormDetailState;

package/src/interface/common/i-logic-context/i-logic-context.ts

@@ -0,0 +1,27 @@
+import { IApiLogicContext } from '../../api';
+
+/**
+ * @description 逻辑执行上下文接口
+ * @export
+ * @interface ILogicContext
+ */
+export interface ILogicContext extends IApiLogicContext {
+  /**
+   * @description 上下文
+   * @type {IContext}
+   * @memberof ILogicContext
+   */
+  readonly context: IContext;
+  /**
+   * @description 数据
+   * @type {IData[]}
+   * @memberof ILogicContext
+   */
+  readonly data: IData[];
+  /**
+   * @description 视图参数
+   * @type {IParams}
+   * @memberof ILogicContext
+   */
+  readonly viewParam: IParams;
+}

package/src/interface/common/i-logic-link-cond/i-logic-link-cond.ts

@@ -0,0 +1,18 @@
+import { ILogicContext } from '../i-logic-context/i-logic-context';
+
+/**
+ * @description 逻辑连接条件接口
+ * @export
+ * @interface ILogicLinkCond
+ */
+export interface ILogicLinkCond {
+  /**
+   * @description 条件判断
+   * @param {ILogicContext} ctx 逻辑执行上下文
+   * @param {IContext} context 上下文
+   * @param {IData} data 数据
+   * @returns {*}  {boolean}
+   * @memberof ILogicLinkCond
+   */
+  test(ctx: ILogicContext, context: IContext, data: IData): boolean;
+}

package/src/interface/common/index.ts

@@ -30,7 +30,6 @@ export type {
   IGlobalMobConfig,
   IGlobalImgCompressConfig,
 } from './i-global-config';
-export type { IUILogicParams } from './i-ui-logic-params/i-ui-logic-params';
 export type { IDataAbilityParams } from './i-data-ability-params/i-data-ability-params';
 export type { IAppConfigService } from './i-app-config-service/i-app-config-service';
 export type {
@@ -44,3 +43,5 @@ export type { ISortItem } from './i-sort-item/i-sort-item';
 export type { IRedrawData } from './i-redraw-data/i-redraw-data';
 export type { IOverlayContainerOptions } from './i-overlay-container-options/i-overlay-container-options';
 export type { IViewShellHooks } from './i-view-shell-hooks/i-view-shell-hooks';
+export type { ILogicContext } from './i-logic-context/i-logic-context';
+export type { ILogicLinkCond } from './i-logic-link-cond/i-logic-link-cond';

package/src/interface/de-logic/i-de-logic-context.ts

@@ -0,0 +1,9 @@
+import { ILogicContext } from '../common';
+
+/**
+ * @description 实体逻辑执行上下文
+ * @export
+ * @interface IDeLogicContext
+ * @extends {ILogicContext}
+ */
+export interface IDeLogicContext extends ILogicContext {}

package/src/interface/de-logic/i-de-logic-link-cond.ts

@@ -0,0 +1,33 @@
+import { ILogicLinkCond } from '../common';
+import { IDeLogicContext } from './i-de-logic-context';
+
+/**
+ * @description 实体逻辑连接条件接口
+ * @export
+ * @interface IDeLogicLinkCond
+ */
+export interface IDeLogicLinkCond extends ILogicLinkCond {
+  /**
+   * @description 条件判断
+   * @param {IDeLogicContext} ctx 实体逻辑执行上下文
+   * @param {IContext} context 上下文
+   * @param {IData} data 数据
+   * @returns {*}  {boolean}
+   * @memberof IDeLogicLinkCond
+   */
+  test(ctx: IDeLogicContext, context: IContext, data: IData): boolean;
+}
+
+/**
+ * @description 实体逻辑连接条件项接口
+ * @export
+ * @interface IDeLogicLinkSingleCond
+ */
+export interface IDeLogicLinkSingleCond extends IDeLogicLinkCond {}
+
+/**
+ * @description 实体逻辑连接条件组接口
+ * @export
+ * @interface IDeLogicLinkGroupCond
+ */
+export interface IDeLogicLinkGroupCond extends IDeLogicLinkCond {}

package/src/interface/de-logic/i-de-logic-link.ts

@@ -0,0 +1,47 @@
+import { IDELogicLink } from '@ibiz/model-core';
+import { IDeLogicNode } from './i-de-logic-node';
+import { IDeLogicLinkGroupCond } from './i-de-logic-link-cond';
+import { IDeLogicContext } from './i-de-logic-context';
+
+/**
+ * @description 实体逻辑连线接口
+ * @export
+ * @interface IDeLogicLink
+ */
+export interface IDeLogicLink {
+  /**
+   * @description 源节点
+   * @type {(IDeLogicNode | null)}
+   * @memberof IDeLogicLink
+   */
+  srcNode: IDeLogicNode | null;
+
+  /**
+   * @description 目标节点
+   * @type {(IDeLogicNode | null)}
+   * @memberof IDeLogicLink
+   */
+  dstNode: IDeLogicNode | null;
+
+  /**
+   * @description 模型
+   * @type {IDELogicLink}
+   * @memberof IDeLogicLink
+   */
+  model: IDELogicLink;
+
+  /**
+   * @description 连接条件组
+   * @type {(IDeLogicLinkGroupCond | null)}
+   * @memberof IDeLogicLink
+   */
+  groupCond: IDeLogicLinkGroupCond | null;
+
+  /**
+   * @description 执行连接
+   * @param {IDeLogicContext} ctx 实体逻辑执行上下文
+   * @returns {*}  {Promise<boolean>}
+   * @memberof IDeLogicLink
+   */
+  exec(ctx: IDeLogicContext): Promise<boolean>;
+}

package/src/interface/de-logic/i-de-logic-node.ts

@@ -0,0 +1,9 @@
+import { IDELogicNodeProvider } from '../provider';
+
+/**
+ * @description 实体逻辑节点接口
+ * @export
+ * @interface IDeLogicNode
+ * @extends {IDELogicNodeProvider}
+ */
+export interface IDeLogicNode extends IDELogicNodeProvider {}

package/src/interface/de-logic/i-de-logic-params.ts

@@ -0,0 +1,9 @@
+import { IApiDeLogicParams } from '../api';
+
+/**
+ * @description 实体逻辑通用参数接口
+ * @export
+ * @interface IDeLogicParams
+ * @extends {IApiDeLogicParams}
+ */
+export interface IDeLogicParams extends IApiDeLogicParams {}

package/src/interface/de-logic/i-de-logic.ts

@@ -0,0 +1,23 @@
+import { IAppDELogic, IAppDataEntity } from '@ibiz/model-core';
+import { IDELogicProvider } from '../provider';
+
+/**
+ * @description 实体逻辑节点接口
+ * @export
+ * @interface IDeLogic
+ * @extends {IDELogicProvider}
+ */
+export interface IDeLogic extends IDELogicProvider {
+  /**
+   * @description 模型
+   * @type {IAppDELogic}
+   * @memberof IDELogic
+   */
+  model: IAppDELogic;
+  /**
+   * @description 实体模型
+   * @type {IAppDataEntity}
+   * @memberof IDELogic
+   */
+  entity: IAppDataEntity;
+}

package/src/interface/de-logic/index.ts

@@ -0,0 +1,10 @@
+export type { IDeLogic } from './i-de-logic';
+export type { IDeLogicParams } from './i-de-logic-params';
+export type { IDeLogicContext } from './i-de-logic-context';
+export type {
+  IDeLogicLinkCond,
+  IDeLogicLinkGroupCond,
+  IDeLogicLinkSingleCond,
+} from './i-de-logic-link-cond';
+export type { IDeLogicNode } from './i-de-logic-node';
+export type { IDeLogicLink } from './i-de-logic-link';

package/src/interface/index.ts

@@ -10,3 +10,4 @@ export * from './model';
 export * from './studio';
 export * from './ui-logic';
 export * from './util';
+export * from './de-logic';

package/src/interface/provider/i-de-logic-node.provider.ts

@@ -0,0 +1,29 @@
+import { IDELogicNode } from '@ibiz/model-core';
+import { IDeLogicContext, IDeLogicLink } from '../de-logic';
+
+/**
+ * @description 实体逻辑前端节点适配器
+ * @export
+ * @interface IDELogicNodeProvider
+ */
+export interface IDELogicNodeProvider {
+  /**
+   * @description 逻辑连线
+   * @type {IDeLogicLink[]}
+   * @memberof IDELogicNodeProvider
+   */
+  links: IDeLogicLink[];
+  /**
+   * @description 节点模型
+   * @type {IDELogicNode}
+   * @memberof IDELogicNodeProvider
+   */
+  model: IDELogicNode;
+  /**
+   * @description 执行实体逻辑
+   * @param {IDeLogicContext} ctx 实体逻辑执行上下文
+   * @returns {*}  {Promise<void>}
+   * @memberof IDELogicNodeProvider
+   */
+  exec(ctx: IDeLogicContext): Promise<void>;
+}

package/src/interface/provider/i-de-logic.provider.ts

@@ -0,0 +1,22 @@
+import { IDeLogicParams } from '../de-logic';
+
+/**
+ * @description 实体逻辑适配器接口
+ * @export
+ * @interface IDELogicProvider
+ */
+export interface IDELogicProvider {
+  /**
+   * @description 初始化
+   * @returns {*}  {Promise<void>}
+   * @memberof IDELogicProvider
+   */
+  init(): Promise<void>;
+  /**
+   * @description 执行实体逻辑
+   * @param {IDeLogicParams} parameters 实体逻辑执行参数
+   * @returns {*}  {Promise<unknown>}
+   * @memberof IDELogicProvider
+   */
+  exec(parameters: IDeLogicParams): Promise<unknown>;
+}

package/src/interface/provider/i-ui-action.provider.ts

@@ -1,5 +1,6 @@
 import { IAppDEUIAction } from '@ibiz/model-core';
-import { IUIActionResult, IUILogicParams } from '../common';
+import { IUIActionResult } from '../common';
+import { IUILogicParams } from '../ui-logic';
 
 /**
  * 界面行为适配器的接口

package/src/interface/provider/i-ui-logic-node.provider.ts

@@ -1,23 +1,29 @@
-import { IDEUIPFPluginLogic } from '@ibiz/model-core';
-import { IUILogicContext } from '../ui-logic';
+import { IDEUILogicNode } from '@ibiz/model-core';
+import { IUILogicContext, IUILogicLink } from '../ui-logic';
 
 /**
- * 界面逻辑前端节点适配器
- *
- * @author chitanda
- * @date 2023-11-01 17:11:16
+ * @description 界面逻辑前端节点适配器
  * @export
  * @interface IUILogicNodeProvider
  */
 export interface IUILogicNodeProvider {
   /**
-   * 执行界面逻辑 节点
-   *
-   * @author chitanda
-   * @date 2023-11-01 18:11:17
-   * @param {IDEUIPFPluginLogic} model
-   * @param {IUILogicContext} ctx
-   * @return {*}  {Promise<unknown>}
+   * @description 逻辑连线
+   * @type {IUILogicLink[]}
+   * @memberof IUILogicNodeProvider
    */
-  exec(model: IDEUIPFPluginLogic, ctx: IUILogicContext): Promise<unknown>;
+  links: IUILogicLink[];
+  /**
+   * @description 节点模型
+   * @type {IDEUILogicNode}
+   * @memberof IUILogicNodeProvider
+   */
+  model: IDEUILogicNode;
+  /**
+   * @description 执行界面逻辑
+   * @param {IUILogicContext} ctx 界面逻辑执行上下文
+   * @returns {*}  {Promise<void>}
+   * @memberof IUILogicNodeProvider
+   */
+  exec(ctx: IUILogicContext): Promise<void>;
 }

package/src/interface/provider/i-ui-logic.provider.ts

@@ -0,0 +1,22 @@
+import { IUILogicParams } from '../ui-logic';
+
+/**
+ * @description 界面逻辑适配器接口
+ * @export
+ * @interface IUILogicProvider
+ */
+export interface IUILogicProvider {
+  /**
+   * @description 初始化
+   * @returns {*}  {Promise<void>}
+   * @memberof IUILogicProvider
+   */
+  init(): Promise<void>;
+  /**
+   * @description 执行界面逻辑
+   * @param {IUILogicParams} parameters 界面逻辑执行参数
+   * @returns {*}  {Promise<unknown>}
+   * @memberof IUILogicProvider
+   */
+  exec(parameters: IUILogicParams): Promise<unknown>;
+}

package/src/interface/provider/index.ts

@@ -31,3 +31,6 @@ export type {
   ILoginContext,
   IAppFuncBlockProvider,
 } from './i-app-func-block.provider';
+export type { IUILogicProvider } from './i-ui-logic.provider';
+export type { IDELogicProvider } from './i-de-logic.provider';
+export type { IDELogicNodeProvider } from './i-de-logic-node.provider';

package/src/interface/register/i-register-params.ts

@@ -1,10 +1,17 @@
 import {
   IAppDataEntity,
+  IAppDELogic,
   IAppDEMethod,
+  IAppMenuItem,
   IAppUIAction,
   IAppView,
   IControl,
   IControlItem,
+  IDBPortletPart,
+  IDELogicNode,
+  IDEToolbarItem,
+  IDEUILogic,
+  IDEUILogicNode,
   IEditor,
 } from '@ibiz/model-core';
 
@@ -13,57 +20,64 @@ import {
  */
 export interface IRegisterParams {
   /**
-   * 部件项模型
-   *
-   * @author ljx
-   * @date 2024-04-15 16:10:54
-   * @type {IModel}
-   */
-  controlItemModel?: IControlItem;
-
-  /**
-   * 部件模型
-   *
-   * @author ljx
-   * @date 2024-04-15 16:10:54
-   * @type {IPanel}
-   */
-  controlModel?: IControl;
-
-  /**
-   * 视图模型
-   *
-   * @author ljx
-   * @date 2024-04-15 16:10:54
+   * @description 部件模型
    * @type {IControl}
+   * @memberof IRegisterParams
    */
-  viewModel?: IAppView;
+  control?: IControl;
 
   /**
-   * @description 界面行为模型
-   * @type {IAppUIAction}
+   * @description 视图模型
+   * @type {IAppView}
    * @memberof IRegisterParams
    */
-  uiActionModel?: IAppUIAction;
+  view?: IAppView;
 
   /**
-   * @description 实体方法模型
-   * @type {IDEMethodProvider}
+   * @description 应用实体模型
+   * @type {IAppDataEntity}
    * @memberof IRegisterParams
    */
-  deMethodModel?: IAppDEMethod;
+  entity?: IAppDataEntity;
 
   /**
-   * @description 实体模型
-   * @type {string}
+   * @description 逻辑模型
+   * @type {(IDEUILogic | IAppDELogic)}
    * @memberof IRegisterParams
    */
-  entityModel?: IAppDataEntity;
+  logic?: IDEUILogic | IAppDELogic;
 
   /**
-   * @description 编辑器模型
-   * @type {IEditor}
+   * @description 主模型
+   * @type {(IAppView
+   *     | IAppDataEntity
+   *     | IAppUIAction
+   *     | IControl
+   *     | IControlItem
+   *     | IAppDEMethod
+   *     | IEditor
+   *     | IDEUILogic
+   *     | IAppDELogic
+   *     | IAppMenuItem
+   *     | IDBPortletPart
+   *     | IDEToolbarItem
+   *     | IDEUILogicNode
+   *     | IDELogicNode)}
    * @memberof IRegisterParams
    */
-  editorModel?: IEditor;
+  mainModel:
+    | IAppView
+    | IAppDataEntity
+    | IAppUIAction
+    | IControl
+    | IControlItem
+    | IAppDEMethod
+    | IEditor
+    | IDEUILogic
+    | IAppDELogic
+    | IAppMenuItem
+    | IDBPortletPart
+    | IDEToolbarItem
+    | IDEUILogicNode
+    | IDELogicNode;
 }

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

@@ -1,95 +1,9 @@
-export interface IUILogicContext {
-  /**
-   * 上一次返回值
-   */
-  lastReturn: unknown;
-
-  /**
-   * 上下文
-   */
-  readonly context: IContext;
-
-  /**
-   * 数据
-   */
-  readonly data: IData;
-
-  /**
-   * 视图参数
-   */
-  readonly viewParam: IParams;
-
-  /**
-   * 界面逻辑参数
-   *
-   * @author chitanda
-   * @date 2023-11-01 17:11:52
-   * @type {Record<string, unknown>}
-   */
-  readonly params: Record<string, unknown>;
-
-  /**
-   * UI 逻辑执行返回值
-   *
-   * @author chitanda
-   * @date 2023-11-01 17:11:29
-   * @type {unknown}
-   */
-  result: unknown;
-
-  /**
-   * 是否存在结束节点
-   *
-   * @author chitanda
-   * @date 2023-11-01 17:11:57
-   * @type {boolean}
-   */
-  isEndNode: boolean;
-
-  /**
-   * 默认参数节点名称
-   *
-   * @default 'Default'
-   * @author chitanda
-   * @date 2023-11-01 17:11:31
-   * @type {string}
-   */
-  defaultParamName: string;
-
-  /**
-   * 重置实体逻辑参数
-   *
-   * @author chitanda
-   * @date 2023-11-01 17:11:18
-   * @param {string} name
-   */
-  resetParam(name: string): void;
-
-  /**
-   * 设置上一次返回值
-   *
-   * @author chitanda
-   * @date 2023-11-01 17:11:31
-   * @param {string} name
-   */
-  renewParam(name: string): void;
-
-  /**
-   * 设置上一次返回值
-   *
-   * @author chitanda
-   * @date 2023-11-01 17:11:48
-   * @param {unknown} value
-   */
-  setLastReturn(value: unknown): void;
-
-  /**
-   * 是否是实体参数变量（即后台数据对象）
-   *
-   * @author chitanda
-   * @date 2023-11-01 17:11:01
-   * @param {string} paramId
-   * @return {*}  {boolean}
-   */
-  isEntityParam(paramId: string): boolean;
-}
+import { ILogicContext } from '../common';
+
+/**
+ * @description 界面逻辑执行上下文
+ * @export
+ * @interface IUILogicContext
+ * @extends {ILogicContext}
+ */
+export interface IUILogicContext extends ILogicContext {}