@ibiz-template/runtime 0.0.4-beta.4 → 0.0.4-beta.5

package/src/engine/engine-factory.ts

@@ -1,7 +1,8 @@
-import { Logger } from '@ibiz-template/core';
-import { IAppView } from '@ibiz/model-core';
-import { PresetViewEngine } from './preset-view-engine';
-import { ViewEngine } from './view-engine';
+import { IAppViewEngine } from '@ibiz/model-core';
+import { IViewEngine } from './interface';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type NewEngine = (...args: any[]) => IViewEngine;
 
 /**
  * 引擎工厂
@@ -12,78 +13,26 @@ import { ViewEngine } from './view-engine';
  */
 export class EngineFactory {
   /**
-   * 预置视图引擎classMap
-   * @author lxm
-   * @date 2023-04-25 07:28:36
-   * @protected
-   */
-  protected presetViewEngines = new Map<string, typeof PresetViewEngine>();
-
-  /**
-   * 通用视图引擎classMap
+   * 视图引擎classMap
    * @author lxm
    * @date 2023-04-25 07:28:36
    * @protected
    */
-  protected viewEngines = new Map<string, typeof ViewEngine>();
-
-  /**
-   * 注册预置视图引擎class
-   * @author lxm
-   * @date 2023-04-25 07:39:52
-   * @param {string} key
-   * @param {IPresetViewEngine} engine
-   */
-  registerPreset(key: string, engine: typeof PresetViewEngine): void {
-    this.presetViewEngines.set(key, engine);
-  }
-
-  /**
-   * 注销预置视图引擎
-   * @author lxm
-   * @date 2023-04-25 07:40:01
-   * @param {string} key
-   */
-  unRegisterPreset(key: string): void {
-    this.presetViewEngines.delete(key);
-  }
+  protected viewEngines = new Map<string, NewEngine>();
 
   /**
-   * 获取预置视图引擎实例
-   * @author lxm
-   * @date 2023-04-26 07:27:05
-   * @param {IAppView} model
-   * @param {...ConstructorParameters<typeof PresetViewEngine>} args 引擎构造函数参数
-   * @return {*}  {(PresetViewEngine | undefined)}
-   */
-  getPresetViewEngine(
-    model: IAppView,
-    ...args: ConstructorParameters<typeof PresetViewEngine>
-  ): PresetViewEngine | undefined {
-    const { viewType, viewStyle } = model;
-    const key1 = `${viewType}_${viewStyle}`;
-    if (this.presetViewEngines.has(key1)) {
-      return new (this.presetViewEngines.get(key1)!)(...args);
-    }
-    if (this.presetViewEngines.has(viewType!)) {
-      return new (this.presetViewEngines.get(viewType!)!)(...args);
-    }
-    Logger.debug('没有预置视图引擎');
-  }
-
-  /**
-   * 注册通用视图引擎
+   * 注册视图引擎
    * @author lxm
    * @date 2023-04-25 07:40:23
    * @param {string} key
    * @param {IViewEngine} engine
    */
-  register(key: string, engine: typeof ViewEngine): void {
+  register(key: string, engine: NewEngine): void {
     this.viewEngines.set(key, engine);
   }
 
   /**
-   * 注销通用视图引擎
+   * 注销视图引擎
    * @author lxm
    * @date 2023-04-25 07:40:32
    * @param {string} key
@@ -93,24 +42,26 @@ export class EngineFactory {
   }
 
   /**
-   * 获取通用视图引擎
+   * 获取视图引擎
    * @author lxm
-   * @date 2023-04-25 07:40:43
+   * @date 2023-05-04 02:26:34
    * @param {IAppView} model
-   * @return {*}  {(IViewEngine | undefined)}
+   * @param {IViewController} viewController 视图控制器
+   * @return {*}  {(ViewEngine | undefined)}
    */
   getEngine(
-    model: IAppView,
-    ...args: ConstructorParameters<typeof ViewEngine>
-  ): ViewEngine | undefined {
-    const { viewType, viewStyle } = model;
-    const key1 = `${viewType}_${viewStyle}`;
-    if (this.viewEngines.has(key1)) {
-      return new (this.viewEngines.get(key1)!)(...args);
-    }
-    if (this.viewEngines.has(viewType!)) {
-      return new (this.viewEngines.get(viewType!)!)(...args);
+    model: IAppViewEngine,
+    ...args: Parameters<NewEngine>
+  ): IViewEngine | undefined {
+    const { engineType, engineCat } = model;
+
+    const key = `${engineCat}_${engineType}`;
+    const func = this.viewEngines.get(key);
+
+    // 存在则执行，生成对象
+    if (func) {
+      return func(...args);
     }
-    Logger.debug('没有预置视图引擎');
+    ibiz.log.error(`没有${key}对应的引擎`, model);
   }
 }

package/src/engine/index.ts

@@ -1,4 +1,3 @@
+export * from './interface';
 export * from './engine-factory';
 export * from './preset-view-engine';
-export * from './view-engine-base';
-export * from './view-engine';

package/src/engine/interface/i-grid-view-engine.ts

@@ -0,0 +1,11 @@
+import { IPresetViewEngine } from './i-preset-view-engine';
+
+/**
+ * 表格视图引擎接口
+ * @author lxm
+ * @date 2023-05-04 06:40:21
+ * @export
+ * @interface IGridViewEngine
+ * @extends {IPresetViewEngine}
+ */
+export interface IGridViewEngine extends IPresetViewEngine {}

package/src/engine/interface/i-index-view-engine.ts

@@ -0,0 +1,11 @@
+import { IPresetViewEngine } from './i-preset-view-engine';
+
+/**
+ * 首页视图引擎接口
+ * @author lxm
+ * @date 2023-05-04 06:40:21
+ * @export
+ * @interface IIndexViewEngine
+ * @extends {IPresetViewEngine}
+ */
+export interface IIndexViewEngine extends IPresetViewEngine {}

package/src/engine/interface/i-preset-view-engine.ts

@@ -0,0 +1,24 @@
+import { IViewEngine } from './i-view-engine';
+
+/**
+ * 预置视图引擎接口
+ * @author lxm
+ * @date 2023-05-04 02:04:44
+ * @export
+ * @interface IPresetViewEngine
+ */
+export interface IPresetViewEngine extends IViewEngine {
+  /**
+   * 初始化视图state默认值
+   * @author lxm
+   * @date 2023-05-04 01:31:30
+   */
+  initViewState(): void;
+
+  /**
+   * 初始化方法，在视图控制器的created生命周期内执行。
+   * @author lxm
+   * @date 2023-05-04 01:35:33
+   */
+  init(): void;
+}

package/src/engine/interface/i-view-engine.ts

@@ -0,0 +1,21 @@
+/**
+ * 通用视图引擎接口
+ * @author lxm
+ * @date 2023-05-04 02:02:50
+ * @export
+ * @interface IViewEngine
+ */
+export interface IViewEngine {
+  /**
+   * 执行视图预置界面行为能力
+   * @author lxm
+   * @date 2023-05-08 10:30:36
+   * @param {string} key 预置界面行为tag标识
+   * @param {...any[]} args 预置界面行为需要的参数
+   * @return {*}  {(Promise<R | undefined>)} 返回undefined说明引擎没适配界面行为处理
+   */
+  call<A extends IData>(
+    key: string,
+    args?: A,
+  ): Promise<IData | null | undefined>;
+}

package/src/engine/interface/index.ts

@@ -0,0 +1,4 @@
+export * from './i-preset-view-engine';
+export * from './i-index-view-engine';
+export * from './i-grid-view-engine';
+export * from './i-view-engine';

package/src/engine/preset-view-engine.ts

@@ -1,6 +1,5 @@
-import { IAppViewLogic } from '@ibiz/model-core';
-import { executeViewLogic } from '../view-logic';
-import { ViewEngineBase } from './view-engine-base';
+import { IToolbarController, IViewController } from '../controller';
+import { IPresetViewEngine } from './interface/i-preset-view-engine';
 
 /**
  * 预置视图引擎
@@ -9,43 +8,47 @@ import { ViewEngineBase } from './view-engine-base';
  * @export
  * @class PresetViewEngine
  */
-export class PresetViewEngine extends ViewEngineBase {
+export class PresetViewEngine implements IPresetViewEngine {
   /**
-   * 执行视图逻辑
-   *
+   * Creates an instance of PresetViewEngine.
    * @author lxm
-   * @date 2022-09-08 10:09:38
-   * @param {IPSAppViewLogic} appViewLogic 视图逻辑
-   * @param {IDatum[]} data 数据
-   * @param {MouseEvent} event 原生事件
+   * @date 2023-05-06 08:18:28
+   * @param {IViewController} view 视图控制器
    */
-  async executeViewLogic(
-    appViewLogic: IAppViewLogic,
-    data: IDatum[],
-    event?: MouseEvent,
-  ): Promise<void> {
-    // todo 后面没用了
-    const result = await executeViewLogic(
-      appViewLogic,
-      this.controller.context,
-      data,
-      this.controller.params,
-      {
-        event,
-        controller: this.controller,
-      },
-    );
+  constructor(protected view: IViewController) {
+    this.init();
+  }
 
-    // 界面行为执行后续处理
-    if (result.refresh) {
-      await this.controller.refresh();
-    }
-    if (result.closeView) {
-      await this.controller.closeView();
+  /**
+   * 获取视图数据部件的数据
+   * @author lxm
+   * @date 2023-05-08 12:46:19
+   * @return {*}  {IData[]}
+   */
+  getData(): IData[] {
+    return [];
+  }
+
+  async call(key: string, _args?: IData): Promise<IData | null | undefined> {
+    if (key === 'GetData') {
+      return { data: this.getData() };
     }
+    return undefined;
+  }
+
+  get toolbar() {
+    return this.view.getController('toolbar') as IToolbarController;
+  }
+
+  initViewState(): void {
+    const { caption } = this.view.model;
+    this.view.state.caption = caption!;
+    this.view.state.complete = false;
+    this.view.state.isLoading = false;
   }
 
-  init() {
-    this.controller.childNames.push('toolbar', 'layoutpanel');
+  init(): void {
+    const { childNames } = this.view;
+    childNames.push('toolbar', 'layoutpanel');
   }
 }

package/src/index.ts

@@ -5,7 +5,6 @@ export * from './command';
 export * from './constant';
 export * from './interface';
 export * from './plugin';
-export * from './provider';
 export * from './register';
 export * from './service';
 export * from './utils';

package/src/install.ts

@@ -1,11 +1,11 @@
 import { GlobalConfig } from './config/global-config';
 import { RegisterCenter } from './register/register-center';
 import { installCommand } from './command';
-import { presetUIActionProvider } from './provider';
 import { AuthService } from './service';
 import { AppHub } from './app-hub';
 import { EngineFactory } from './engine';
 import { GlobalUtil } from './global';
+import { presetUIActionProvider } from './utils';
 
 /**
  * 安装运行时
@@ -29,6 +29,6 @@ export function install(): void {
   ibiz.engine = new EngineFactory();
   // 安装默认指令
   installCommand();
-  // 注册预置的界面行为适配器
+  // 注册界面行为适配器
   presetUIActionProvider();
 }

package/src/interface/{i-app-hub-service → common/i-app-hub-service}/i-app-hub-service.ts

@@ -1,7 +1,12 @@
-import { IAppDataEntity, IAppView, IApplication } from '@ibiz/model-core';
-import { Convert } from '../../hub';
-import { ModelLoaderProvider } from '../provider';
-import { Application } from '../../application';
+import {
+  IAppDataEntity,
+  IAppView,
+  IApplication,
+  IAppDEUIAction,
+} from '@ibiz/model-core';
+import { Application } from '../../../application';
+import { Convert } from '../../../hub';
+import { ModelLoaderProvider } from '../../provider';
 
 /**
  * 应用 hub 服务
@@ -127,4 +132,13 @@ export interface IAppHubService {
    * @return {*}  {Application}
    */
   getApp(app?: string | IApplication): Application;
+
+  /**
+   * 获取界面行为
+   * @author lxm
+   * @date 2023-05-11 04:57:45
+   * @param {string} id 界面行为id，由@分隔的界面行为，格式是“界面行为标识@应用实体标识@应用标识”
+   * @return {*}  {(Promise<IAppDEUIAction | undefined>)}
+   */
+  getUIAction(id: string): Promise<IAppDEUIAction | undefined>;
 }

package/src/interface/{i-app-service → common/i-app-service}/i-app-service.ts

@@ -3,7 +3,7 @@ import {
   AuthorityService,
   CodeListService,
   DEServiceUtil,
-} from '../../service';
+} from '../../../service';
 
 /**
  * 应用服务

package/src/interface/common/i-modal/i-modal.ts

@@ -0,0 +1,55 @@
+import { ViewMode } from '../../../constant';
+import { IModalData } from '../i-modal-data/i-modal-data';
+
+/**
+ * 模态操作对象，在模态等形式打开视图时，操作类需给视图注入此对象实现类
+ *
+ * @author chitanda
+ * @date 2022-08-17 18:08:20
+ * @export
+ * @interface IModal
+ */
+export interface IModal {
+  /**
+   * 打开方式(默认路由)
+   *
+   * @author lxm
+   * @date 2022-09-01 10:09:15
+   * @type {string}
+   */
+  mode: ViewMode;
+
+  /**
+   * 路由绘制的视图才有，用于表示所在路由层级
+   *
+   * @type {number}
+   * @memberof IModal
+   */
+  routeDepth?: number;
+
+  /**
+   * 视图使用模式
+   * 1：默认模式，2: 模式弹出，4：嵌入
+   * @author lxm
+   * @date 2023-05-12 06:20:27
+   * @type {number}
+   */
+  viewUsage: number;
+
+  /**
+   * 关闭模态窗
+   *
+   * @author chitanda
+   * @date 2022-08-17 18:08:58
+   * @param {(IDatum | IDatum[])} data
+   */
+  dismiss(data?: IModalData): void;
+
+  /**
+   * 添加关闭前的判断回调，返回false,阻止关闭
+   * @author lxm
+   * @date 2023-05-12 07:30:58
+   * @param {(() => Promise<boolean> | boolean)} callback
+   */
+  addBeforeDismiss(callback: () => Promise<boolean> | boolean): void;
+}

package/src/interface/{i-ui-action-result → common/i-ui-action-result}/i-ui-action-result.ts

@@ -42,7 +42,7 @@ export interface IUIActionResult {
    * @date 2022-08-17 18:08:20
    * @type {IDatum[]}
    */
-  data?: IDatum[];
+  data?: IData[];
 
   /**
    * 后续逻辑使用的上下文

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

@@ -0,0 +1,49 @@
+import { IViewController } from '../../../controller';
+
+/**
+ * 界面逻辑通用参数(界面行为，事件，界面逻辑，实体逻辑等)
+ * @author lxm
+ * @date 2023-05-08 09:31:01
+ * @export
+ * @interface IUILogicParams
+ */
+export interface IUILogicParams {
+  /**
+   * 上下文
+   * @author lxm
+   * @date 2023-03-21 05:53:33
+   * @type {IContext}
+   */
+  context: IContext;
+  /**
+   * 视图参数
+   * @author lxm
+   * @date 2023-03-21 05:54:23
+   * @type {IParams}
+   */
+  params: IParams;
+
+  /**
+   * 涉及的数据集合
+   * @author lxm
+   * @date 2023-03-21 05:54:33
+   * @type {IDatum[]}
+   */
+  data: IDatum[];
+
+  /**
+   * 当前上下文对应的视图控制器
+   * @author lxm
+   * @date 2023-03-21 05:58:31
+   * @type {Neuron}
+   */
+  view: IViewController;
+
+  /**
+   * 原生JS事件对象
+   * @author lxm
+   * @date 2023-03-21 05:57:51
+   * @type {MouseEvent}
+   */
+  event?: MouseEvent;
+}

package/src/interface/common/index.ts

@@ -0,0 +1,18 @@
+export { IAppDEUIService } from './i-app-de-ui-service/i-app-de-ui-service';
+export { IAppHubService } from './i-app-hub-service/i-app-hub-service';
+export { IAppService } from './i-app-service/i-app-service';
+export { IAppUIService } from './i-app-ui-service/i-app-ui-service';
+export { IDrawerOptions } from './i-drawer-options/i-drawer-options';
+export {
+  IPopoverOptions,
+  Placement,
+} from './i-popover-options/i-popover-options';
+export { IModal } from './i-modal/i-modal';
+export { IModalData } from './i-modal-data/i-modal-data';
+export { IModalOptions } from './i-modal-options/i-modal-options';
+export { IPluginFactory } from './i-plugin-factory/i-plugin-factory';
+export { IPluginItem } from './i-plugin-item/i-plugin-item';
+export { IUIActionResult } from './i-ui-action-result/i-ui-action-result';
+export { IUIActionHandler } from './i-ui-action-handler/i-ui-action-handler';
+export { IGlobalConfig } from './i-global-config/i-global-config';
+export { IUILogicParams } from './i-ui-logic-params/i-ui-logic-params';

package/src/interface/index.ts

@@ -1,21 +1,4 @@
-export { IAppDEUIService } from './i-app-de-ui-service/i-app-de-ui-service';
-export { IAppHubService } from './i-app-hub-service/i-app-hub-service';
-export { IAppService } from './i-app-service/i-app-service';
-export { IAppUIService } from './i-app-ui-service/i-app-ui-service';
-export { IDrawerOptions } from './i-drawer-options/i-drawer-options';
-export {
-  IPopoverOptions,
-  Placement,
-} from './i-popover-options/i-popover-options';
-export { IModal } from './i-modal/i-modal';
-export { IModalData } from './i-modal-data/i-modal-data';
-export { IModalOptions } from './i-modal-options/i-modal-options';
-export { IPluginFactory } from './i-plugin-factory/i-plugin-factory';
-export { IPluginItem } from './i-plugin-item/i-plugin-item';
-export { IUIActionResult } from './i-ui-action-result/i-ui-action-result';
-export { IUIActionHandler } from './i-ui-action-handler/i-ui-action-handler';
-export { IGlobalConfig } from './i-global-config/i-global-config';
-
+export * from './common';
 export * from './util';
 export * from './provider';
 export * from './register';

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

@@ -0,0 +1,8 @@
+/**
+ * 适配器基类
+ * @author lxm
+ * @date 2023-05-06 06:48:25
+ * @export
+ * @interface IProvider
+ */
+export interface IProvider {}

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

@@ -1,4 +1,5 @@
-import { IUIActionHandler } from '../i-ui-action-handler/i-ui-action-handler';
+import { IAppDEUIAction } from '@ibiz/model-core';
+import { IUIActionResult, IUILogicParams } from '../common';
 
 /**
  * 界面行为适配器的接口
@@ -10,11 +11,15 @@ import { IUIActionHandler } from '../i-ui-action-handler/i-ui-action-handler';
  */
 export interface IUIActionProvider {
   /**
-   * 获取界面行为处理器
-   *
+   * 执行界面行为
    * @author lxm
-   * @date 2022-10-25 15:10:52
-   * @returns {*}  {Promise<IUIActionHandler>}
+   * @date 2023-05-08 09:55:06
+   * @param {IAppDEUIAction} action
+   * @param {IUILogicParams} params
+   * @return {*}  {Promise<IUIActionResult>}
    */
-  getHandler(): Promise<IUIActionHandler>;
+  exec(
+    action: IAppDEUIAction,
+    params: IUILogicParams,
+  ): Promise<IUIActionResult>;
 }

package/src/interface/provider/index.ts

@@ -1,3 +1,4 @@
+export * from './i-provider';
 export * from './i-ui-action-provider';
 export { ModelLoaderProvider } from './model-loader-provider';
 export * from './i-view-provider';

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

@@ -20,5 +20,5 @@ export interface IControlRegister extends IRegister<IControlProvider> {
    * @param {IControl} model 部件模型
    * @returns {*}  {(IControlProvider)}
    */
-  get(model: IControl): Promise<IControlProvider>;
+  get(model: IControl): Promise<IControlProvider | undefined>;
 }

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

@@ -20,5 +20,5 @@ export interface IEditorRegister extends IRegister<IEditorProvider> {
    * @param {EditorModel} model 编辑器模型
    * @returns {*}  {(IEditorProvider)}
    */
-  get(model: IEditor): Promise<IEditorProvider>;
+  get(model: IEditor): Promise<IEditorProvider | undefined>;
 }

package/src/interface/register/i-form-detail-register.ts

@@ -20,5 +20,5 @@ export interface IFormDetailRegister extends IRegister<IFormDetailProvider> {
    * @param {FormDetailModel} model 编辑器模型
    * @returns {*}  {(IFormDetailProvider)}
    */
-  get(model: IDEFormDetail): Promise<IFormDetailProvider>;
+  get(model: IDEFormDetail): Promise<IFormDetailProvider | undefined>;
 }

package/src/interface/register/i-grid-column-register.ts

@@ -20,5 +20,5 @@ export interface IGridColumnRegister extends IRegister<IGridColumnProvider> {
    * @param {IDEGridColumn} model 编辑器模型
    * @returns {*}  {(IGridColumnProvider)}
    */
-  get(model: IDEGridColumn): Promise<IGridColumnProvider>;
+  get(model: IDEGridColumn): Promise<IGridColumnProvider | undefined>;
 }

package/src/interface/register/i-panel-item-register.ts

@@ -20,5 +20,5 @@ export interface IPanelItemRegister extends IRegister<IPanelItemProvider> {
    * @param {IPanelItem} model 编辑器模型
    * @returns {*}  {(IPanelItemProvider)}
    */
-  get(model: IPanelItem): Promise<IPanelItemProvider>;
+  get(model: IPanelItem): Promise<IPanelItemProvider | undefined>;
 }

package/src/interface/util/i-open-view-util/i-open-view-util.ts

@@ -1,5 +1,5 @@
 import { IAppView } from '@ibiz/model-core';
-import { IModalData } from '../../i-modal-data/i-modal-data';
+import { IModalData } from '../../common';
 
 /**
  * 打开视图工具类

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

@@ -1,6 +1,4 @@
-import { IDrawerOptions } from '../../i-drawer-options/i-drawer-options';
-import { IPopoverOptions } from '../../i-popover-options/i-popover-options';
-import { IModalOptions } from '../../i-modal-options/i-modal-options';
+import { IPopoverOptions, IDrawerOptions, IModalOptions } from '../../common';
 import { IOverlayContainer } from '../i-overlay-container/i-overlay-container';
 import { IOverlayPopoverContainer } from '../i-overlay-popover-container/i-overlay-popover-container';
 

package/src/model/index.ts

@@ -1 +1,3 @@
 export * from './utils';
+export * from './layout-helper/layout-helper';
+export * from './main-state/main-state';