@ibiz-template/runtime 0.0.1-alpha.2 → 0.0.1-alpha.21

package/src/command/app/open-app-view/open-app-view.ts

@@ -1,6 +1,7 @@
 import { IBizContext } from '@ibiz-template/core';
-import { IPSAppView } from '@ibiz-template/model';
+import { IPSAppRedirectView, IPSAppView } from '@ibiz-template/model';
 import { IModalData } from '../../../interface';
+import { openRedirectView } from '../../../utils';
 
 /**
  * 打开应用视图
@@ -36,7 +37,12 @@ export class OpenAppViewCommand {
   ): Promise<IModalData | void> {
     await appView.fill(true);
     if (appView.redirectView) {
-      return this.openRedirectView(appView);
+      return openRedirectView(
+        appView as IPSAppRedirectView,
+        context,
+        params,
+        _opts.data,
+      );
     }
     const { openMode = 'INDEXVIEWTAB' } = appView;
     switch (openMode) {
@@ -50,7 +56,10 @@ export class OpenAppViewCommand {
         throw new Error('未支持的视图打开模式: POPUPAPP');
       case 'POPOVER':
         return this.openPopover(appView, context, params);
-      case 'DRAWER':
+      case 'DRAWER_LEFT':
+      case 'DRAWER_RIGHT':
+      case 'DRAWER_TOP':
+      case 'DRAWER_BOTTOM':
         return this.openDrawer(appView, context, params);
       case 'USER':
         return this.openUserCustom(appView, context, params);
@@ -59,29 +68,6 @@ export class OpenAppViewCommand {
     }
   }
 
-  /**
-   * 打开重定向视图
-   *
-   * @author chitanda
-   * @date 2022-07-25 20:07:24
-   * @protected
-   * @param {IPSAppView} appView
-   * @param {IBizContext} [context]
-   * @param {IParams} [params={}]
-   */
-  protected openRedirectView(
-    appView: IPSAppView,
-    context?: IBizContext,
-    params: IParams = {},
-  ): void {
-    console.log(
-      'OpenAppViewCommand.openRedirectView',
-      appView,
-      context,
-      params,
-    );
-  }
-
   /**
    * 首页导航模式打开
    *

package/src/index.ts

@@ -4,5 +4,6 @@ export { install } from './install';
 export * from './command';
 export * from './constant';
 export * from './interface';
+export * from './register/register';
 export * from './utils';
 export * from './view-logic';

package/src/install.ts

@@ -1,4 +1,5 @@
 import { commands } from '@ibiz-template/command';
+import { Register } from './register/register';
 import { installCommand } from './command';
 
 /**
@@ -12,6 +13,8 @@ export function install(): void {
   const { ibiz } = window;
   // 挂载指令控制器
   ibiz.commands = commands;
+  // 挂载注册中心
+  ibiz.register = new Register();
   // 安装默认指令
   installCommand();
 }

package/src/interface/index.ts

@@ -2,3 +2,6 @@ export { IModal } from './i-modal/i-modal';
 export { IModalData } from './i-modal-data/i-modal-data';
 export { IUIActionResult } from './i-ui-action-result/i-ui-action-result';
 export * from './util';
+export * from './provider/i-editor-provider';
+export * from './register/i-register';
+export * from './register/i-editor-register';

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

@@ -0,0 +1,44 @@
+/* eslint-disable @typescript-eslint/no-unnecessary-type-constraint */
+import { EditorModel } from '@ibiz-template/model';
+
+/**
+ * 编辑器适配器的接口
+ *
+ * @author lxm
+ * @date 2022-09-19 19:09:10
+ * @export
+ * @interface IProvider
+ */
+export interface IEditorProvider<T extends unknown = unknown> {
+  /**
+   * 表单编辑器组件名称
+   *
+   * @author lxm
+   * @date 2022-09-20 10:09:50
+   * @type {string}
+   */
+  formEditor: string;
+
+  /**
+   * 表格编辑器组件名称
+   *
+   * @author lxm
+   * @date 2022-09-20 10:09:08
+   * @type {string}
+   */
+  rowEditor: string;
+
+  /**
+   * 创建编辑器控制器
+   *
+   * @author lxm
+   * @date 2022-09-20 10:09:57
+   * @param {EditorModel} editorModel 编辑器模型
+   * @param {unknown} parentController 父控制器
+   * @returns {*}  {Promise<T>}
+   */
+  createController(
+    editorModel: EditorModel,
+    parentController: unknown,
+  ): Promise<T>;
+}

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

@@ -0,0 +1,23 @@
+import { EditorModel } from '@ibiz-template/model';
+import { IEditorProvider } from '../provider/i-editor-provider';
+import { IRegister } from './i-register';
+
+/**
+ * 注册器接口
+ *
+ * @author lxm
+ * @date 2022-09-19 19:09:14
+ * @export
+ * @interface IRegister
+ */
+export interface IEditorRegister extends IRegister<IEditorProvider> {
+  /**
+   * 获取适配器
+   *
+   * @author lxm
+   * @date 2022-09-20 00:09:57
+   * @param {EditorModel} model 编辑器模型
+   * @returns {*}  {(IEditorProvider | undefined)}
+   */
+  getByModel(model: EditorModel): IEditorProvider | undefined;
+}

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

@@ -0,0 +1,40 @@
+/**
+ * 注册器接口
+ *
+ * @author lxm
+ * @date 2022-09-19 19:09:14
+ * @export
+ * @interface IRegister
+ */
+export interface IRegister<T> {
+  providers: Map<string, T>;
+
+  /**
+   * 注册适配器
+   *
+   * @author lxm
+   * @date 2022-09-19 19:09:48
+   * @param {string} key
+   * @param {T} provider
+   */
+  register(key: string, provider: T): void;
+
+  /**
+   * 注销适配器
+   *
+   * @author lxm
+   * @date 2022-09-19 19:09:59
+   * @param {string} key
+   */
+  unRegister(key: string): void;
+
+  /**
+   * 获取适配器
+   *
+   * @author lxm
+   * @date 2022-09-19 19:09:13
+   * @param {string} key
+   * @returns {*}  {T}
+   */
+  get(key: string): T | undefined;
+}

package/src/interface/util/i-loading-util/i-loading-util.ts

@@ -22,4 +22,18 @@ export interface ILoadingUtil {
    * @date 2022-08-17 17:08:48
    */
   hide(): void;
+  /**
+   * 显示顶部全局加载动画
+   *
+   * @author chitanda
+   * @date 2022-10-08 16:10:18
+   */
+  showRedirect(): void;
+  /**
+   * 隐藏顶部全局加载动画
+   *
+   * @author chitanda
+   * @date 2022-10-08 16:10:29
+   */
+  hideRedirect(): void;
 }

package/src/register/register.ts

@@ -0,0 +1,20 @@
+import { IEditorRegister } from '../interface';
+
+/**
+ * 注册中心
+ *
+ * @author lxm
+ * @date 2022-09-19 19:09:10
+ * @export
+ * @class Register
+ */
+export class Register {
+  /**
+   * 编辑器注册器
+   *
+   * @author lxm
+   * @date 2022-09-19 22:09:08
+   * @type {IEditorRegister}
+   */
+  editorRegister!: IEditorRegister;
+}

package/src/types.ts

@@ -7,6 +7,7 @@ import {
   IModalUtil,
   ILoadingUtil,
 } from './interface';
+import { Register } from './register/register';
 
 declare module '@ibiz-template/core' {
   interface IBizSys {
@@ -62,5 +63,14 @@ declare module '@ibiz-template/core' {
      * @type {IOpenViewUtil}
      */
     openView: IOpenViewUtil;
+
+    /**
+     * 注册中心
+     *
+     * @author lxm
+     * @date 2022-09-19 19:09:23
+     * @type {Register}
+     */
+    register: Register;
   }
 }

package/src/utils/app-de-ui-action-util/app-de-ui-action-util.ts

@@ -1,4 +1,9 @@
-import { IPSAppDEUIAction, IPSNavigateContext } from '@ibiz-template/model';
+import { IBizContext } from '@ibiz-template/core';
+import {
+  IPSAppDEUIAction,
+  IPSNavigateContext,
+  UnsupportedModelError,
+} from '@ibiz-template/model';
 import { notNilEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
 import { IUIActionResult } from '../../interface';
@@ -20,7 +25,7 @@ export class AppDEUIActionUtil {
    * @date 2022-08-29 15:08:47
    * @static
    * @param {IPSAppDEUIAction} action
-   * @param {IContext} context
+   * @param {IBizContext} context
    * @param {(IData | null)} data
    * @param {IParams} [params]
    * @param {IData} [opts]
@@ -28,18 +33,17 @@ export class AppDEUIActionUtil {
    */
   static async exec(
     action: IPSAppDEUIAction,
-    context: IContext,
+    context: IBizContext,
     data: IData[] | null,
     params: IParams,
     opts?: IData,
   ): Promise<IUIActionResult> {
-    console.log(action);
     // **用户操作确认**
     if (action.enableConfirm && action.confirmMsg) {
       // todo 用户操作确认
     }
 
-    const { intercom } = opts!;
+    const { neuron } = opts!;
     const result: IUIActionResult = {
       refresh: action.reloadData,
       closeView: action.closeEditView,
@@ -85,18 +89,18 @@ export class AppDEUIActionUtil {
 
     // *刷新引用视图
     if (result.refresh) {
-      if (!intercom.call.refresh) {
+      if (!neuron.call.refresh) {
         throw new Error(`该视图不存在刷新能力`);
       }
-      await intercom.call.refresh();
+      await neuron.call.refresh();
     }
 
     // *关闭引用视图
     if (result.closeView) {
-      if (!intercom.call.closeView) {
+      if (!neuron.call.closeView) {
         throw new Error(`该视图不存在关闭视图能力`);
       }
-      await intercom.call.closeView();
+      await neuron.call.closeView();
     }
 
     return result;
@@ -110,22 +114,22 @@ export class AppDEUIActionUtil {
    * @protected
    * @static
    * @param {IPSAppDEUIAction} action 界面行为
-   * @param {IContext} context 上下文
+   * @param {IBizContext} context 上下文
    * @param {(IData[] | null)} data 数据集合
    * @param {IParams} params 视图参数
    * @returns {*}  {Promise<{
-   *     resultContext: IContext; 处理后的上下文
+   *     resultContext: IBizContext; 处理后的上下文
    *     resultData: IData[]; 处理后的数据集合
    *     resultParams: IParams; 处理后的视图参数
    *   }>}
    */
   protected static async handleParams(
     action: IPSAppDEUIAction,
-    context: IContext,
+    context: IBizContext,
     data: IData[] | null,
     params: IParams,
   ): Promise<{
-    resultContext: IContext;
+    resultContext: IBizContext;
     resultData: IData[];
     resultParams: IParams;
   }> {
@@ -146,7 +150,7 @@ export class AppDEUIActionUtil {
     }
 
     // 处理上下文导航参数
-    let resultContext: IData = {};
+    let tempContext = {};
     const navContexts = action.getPSNavigateContexts() || [];
 
     // 单项数据主键时，在导航参数开头加一个主键的导航参数，可以被配置的同名导航参数覆盖。
@@ -163,13 +167,15 @@ export class AppDEUIActionUtil {
     }
 
     if (notNilEmpty(navContexts)) {
-      resultContext = convertNavData(
+      tempContext = convertNavData(
         navContexts!,
         context,
         params,
         data?.[0] || {},
       );
     }
+    const resultContext = new IBizContext(tempContext, context);
+
     // 处理导航视图参数
     let resultParams: IData = {};
     const navParams = action.getPSNavigateParams();
@@ -198,7 +204,7 @@ export class AppDEUIActionUtil {
     data: IData[] | null,
     opts?: IData,
   ): Promise<IUIActionResult> {
-    const { intercom, event } = opts!;
+    const { neuron, event } = opts!;
     const { uIActionTag } = action;
     const result: IUIActionResult = {};
 
@@ -213,64 +219,81 @@ export class AppDEUIActionUtil {
         'Import',
       ].indexOf(uIActionTag) !== -1
     ) {
-      console.log(`${uIActionTag}暂未支持`);
-      return result;
+      throw new UnsupportedModelError(action, `${uIActionTag}暂未支持`);
     }
 
     // 打开新建数据视图
     if (uIActionTag === 'New') {
-      if (!intercom.call.newData) {
+      if (!neuron.call.newData) {
         throw new Error(`该视图不存在newData能力`);
       }
-      await intercom.call.newData(event);
+      await neuron.call.newData(event);
     }
-    // 打开新建数据视图
+    // 打开编辑数据视图
     if (uIActionTag === 'Edit') {
-      if (!intercom.call.openData) {
+      if (!neuron.call.openData) {
         throw new Error(`该视图不存在openData能力`);
       }
-      await intercom.call.openData(data?.[0], event);
+      await neuron.call.openData(data?.[0], event);
     }
 
     // 保存能力
-    const saveTags = ['SaveAndExit', 'Save', 'SaveAndStart', 'SaveRow'];
+    const saveTags = ['SaveAndExit', 'Save', 'SaveRow'];
     if (saveTags.indexOf(uIActionTag) !== -1) {
-      if (!intercom.call.save) {
+      if (!neuron.call.save) {
         throw new Error(`该视图不存在save能力`);
       }
-      await intercom.call.save();
+      await neuron.call.save();
     }
 
     // 保存并新建
     if (uIActionTag === 'SaveAndNew') {
-      if (!intercom.call.saveAndNew) {
+      if (!neuron.call.saveAndNew) {
         throw new Error(`该视图不存在saveAndNew能力`);
       }
-      await intercom.call.saveAndNew();
+      await neuron.call.saveAndNew();
     }
 
     // 删除能力
     if (uIActionTag === 'Remove' || uIActionTag === 'RemoveAndExit') {
-      if (!intercom.call.remove) {
+      if (!neuron.call.remove) {
         throw new Error(`该视图不存在remove能力`);
       }
-      await intercom.call.remove();
+      await neuron.call.remove();
     }
 
     // 新建行能力
     if (uIActionTag === 'NewRow') {
-      if (!intercom.call.newRow) {
+      if (!neuron.call.newRow) {
         throw new Error(`该视图不存在newRow能力`);
       }
-      await intercom.call.newRow();
+      await neuron.call.newRow();
+    }
+
+    // 切换搜索表单能力
+    if (uIActionTag === 'ToggleFilter') {
+      if (!neuron.call.toggleFilter) {
+        throw new Error(`该视图不存在ToggleFilter能力`);
+      }
+      neuron.call.toggleFilter();
+    }
+
+    // 工作流相关
+    if (uIActionTag === 'SaveAndStart') {
+      if (!neuron.call.wfStart) {
+        throw new Error(`该视图不存在SaveAndStart能力`);
+      }
+      await neuron.call.wfStart();
+    }
+    if (uIActionTag === 'ViewWFStep') {
+      if (!neuron.call.wfSubmit) {
+        throw new Error(`该视图不存在ViewWFStep能力`);
+      }
+      await neuron.call.wfSubmit();
     }
 
     // 需要关闭视图的
-    if (
-      ['SaveAndExit', 'Exit', 'SaveAndStart', 'RemoveAndExit'].indexOf(
-        uIActionTag,
-      ) !== -1
-    ) {
+    if (['SaveAndExit', 'Exit', 'RemoveAndExit'].indexOf(uIActionTag) !== -1) {
       result.closeView = true;
     }
 
@@ -288,7 +311,7 @@ export class AppDEUIActionUtil {
    * @date 2022-08-29 15:08:51
    * @static
    * @param {IPSAppDEUIAction} action
-   * @param {IContext} context
+   * @param {IBizContext} context
    * @param {(IData[] | null)} data
    * @param {IParams} params
    * @param {IData} [opts]
@@ -296,7 +319,7 @@ export class AppDEUIActionUtil {
    */
   static async executeFrontUIAction(
     action: IPSAppDEUIAction,
-    context: IContext,
+    context: IBizContext,
     _data: IData[] | null,
     params: IParams,
     opts?: IData,
@@ -324,14 +347,14 @@ export class AppDEUIActionUtil {
    * @date 2022-08-28 20:08:35
    * @export
    * @param {IPSAppDEUIAction} action
-   * @param {IContext} context
+   * @param {IBizContext} context
    * @param {IData[]} data
    * @param {IParams} params
    * @returns {*}  {Promise<IUIActionResult>}
    */
   static async executeBackEndUIAction(
     action: IPSAppDEUIAction,
-    context: IContext,
+    context: IBizContext,
     _data: IData[],
     params: IParams,
   ): Promise<IUIActionResult> {

package/src/utils/index.ts

@@ -1,2 +1,3 @@
 export { AppDEUIActionUtil } from './app-de-ui-action-util/app-de-ui-action-util';
 export * from './nav-params/nav-params';
+export { openRedirectView } from './open-redirect-view/open-redirect-view';