@ibiz-template/runtime 0.0.2-beta.0 → 0.0.3-beta.0

package/src/controller/view/main-view.ts

@@ -0,0 +1,76 @@
+import { ViewModel } from '@ibiz-template/model';
+import { EntityService } from '../../service';
+import { ViewController } from './view';
+
+/**
+ * 主数据视图控制器
+ *
+ * @export
+ * @class MainViewController
+ * @extends {ViewController<T>}
+ * @template T
+ */
+export class MainViewController<
+  T extends ViewModel = ViewModel,
+> extends ViewController<T> {
+  /**
+   * 实体服务
+   *
+   * @author lxm
+   * @date 2022-09-29 15:09:46
+   * @protected
+   * @type {EntityService}
+   */
+  protected entityService?: EntityService;
+
+  /**
+   * 主数据
+   *
+   * @type {IData}
+   * @memberof TabExpViewController
+   */
+  mainData?: IData;
+
+  /**
+   * 加载主数据
+   *
+   * @returns {*}  {Promise<IData>}
+   * @memberof TabExpViewController
+   */
+  public async load(): Promise<IData> {
+    // 初始化实体服务
+    if (!this.entityService) {
+      this.entityService = await this.app.es.getService(
+        this.model.appEntity.codeName,
+        this.context,
+      );
+    }
+    const res = await this.entityService.exec('Get', this.context, this.params);
+    this.mainData = res.data;
+    this.calcCaption(res.data);
+    if (this.toolbarState) {
+      this.toolbarState.update(res.data);
+    }
+    return res.data;
+  }
+
+  /**
+   * 设置视图标题
+   *
+   * @author lxm
+   * @date 2022-08-31 16:08:49
+   * @param {string} caption
+   */
+  calcCaption(data: IData): void {
+    // 全局关闭信息栏或者全局开启信息栏但是视图不显示信息栏时，不设置信息栏标题
+    if (!ibiz.config.enableDataInfoBar || !this.model.showDataInfoBar) {
+      return;
+    }
+    const majorText = data[this.model.appEntity.textName];
+    if (majorText) {
+      this.setCaption(`${this.model.caption} - ${majorText}`);
+    } else if (!this.context[this.model.appEntity.deName]) {
+      this.setCaption(`${this.model.caption} - 新建`);
+    }
+  }
+}

package/src/controller/view/tab-exp-view.ts

@@ -0,0 +1,55 @@
+import { TabExpViewModel } from '@ibiz-template/model';
+import { createUUID } from 'qx-util';
+import { ViewMode } from '../../constant';
+import { TabExpViewNerve } from '../neuron';
+import { MainViewController } from './main-view';
+
+/**
+ * 分页导航视图控制器
+ *
+ * @author lxm
+ * @date 2022-09-08 16:09:49
+ * @export
+ * @class TabExpViewController
+ * @extends {MainViewController}
+ */
+export class TabExpViewController<
+  T extends TabExpViewModel = TabExpViewModel,
+> extends MainViewController<T> {
+  declare nerve: TabExpViewNerve;
+
+  /**
+   * 分页面板绘制参数
+   *
+   * @memberof TabExpViewController
+   */
+  tabExpPages: {
+    [key: string]: {
+      key: string;
+    };
+  } = {};
+
+  protected createNerve(): TabExpViewNerve {
+    return new TabExpViewNerve(this);
+  }
+
+  protected async onInit(): Promise<void> {
+    await super.onInit();
+
+    // 初始化drPages
+    const { tabExpPages } = this.model.tabExpPanel;
+    if (tabExpPages.length) {
+      tabExpPages.forEach(page => {
+        this.tabExpPages[page.name] = {
+          key: createUUID(),
+        };
+      });
+    }
+
+    this.nerve.self.evt.on('mounted', () => {
+      if (this.modal.mode !== ViewMode.EMBED && this.model.source.loadDefault) {
+        this.load();
+      }
+    });
+  }
+}

package/src/controller/view/view.ts

@@ -1,4 +1,4 @@
-import { IBizContext, RuntimeError } from '@ibiz-template/core';
+import { IBizContext } from '@ibiz-template/core';
 import {
   DefectModelError,
   IPSAppViewLogic,
@@ -347,12 +347,15 @@ export class ViewController<T extends ViewModel = ViewModel> {
     event: MouseEvent,
   ): Promise<void> {
     if (!item.getPSAppViewUIAction()) {
-      throw new DefectModelError(item, '菜单项没有配置界面行为！');
+      throw new DefectModelError(item, '没有配置界面行为！');
     }
     const viewLogicKey = `${item.getPSAppViewUIAction()!.name}_click`;
     const appViewLogic = this.model.source.findPSAppViewLogic(viewLogicKey);
     if (!appViewLogic) {
-      throw new RuntimeError('没有找到对应的视图逻辑');
+      throw new DefectModelError(
+        item.getPSAppViewUIAction()!,
+        '没有找到对应的视图逻辑',
+      );
     }
     return this.executeViewLogic(appViewLogic, this.getData(), event);
   }

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

@@ -18,6 +18,14 @@ export interface IModal {
    */
   mode: ViewMode;
 
+  /**
+   * 路由层级
+   *
+   * @type {number}
+   * @memberof IModal
+   */
+  level?: number;
+
   /**
    * 关闭模态窗
    *

package/src/service/service/widget/tree-service.ts

@@ -1,12 +1,37 @@
 import {
   IPSDETreeCodeListNode,
   IPSDETreeDataSetNode,
+  IPSDETreeNode,
   IPSDETreeStaticNode,
   TreeModel,
 } from '@ibiz-template/model';
 import { TreeNodeData } from '../../vo/tree-node-data';
 import { MDControlService } from './md-control-service';
 
+interface TreeFetchOpts {
+  /**
+   * 是否有过滤搜索
+   *
+   * @type {boolean}
+   * @memberof TreeFetchOpts
+   */
+  hasQuery: boolean;
+  /**
+   * 上下文
+   *
+   * @type {IContext}
+   * @memberof TreeFetchOpts
+   */
+  context: IContext;
+  /**
+   * 视图参数
+   *
+   * @type {IParams}
+   * @memberof TreeFetchOpts
+   */
+  params: IParams;
+}
+
 /**
  * 树部件服务
  *
@@ -36,10 +61,13 @@ export class TreeService extends MDControlService<TreeModel> {
    * @returns {*}
    * @memberof TreeService
    */
-  async fetchChildNodes(parentNode?: TreeNodeData, hasQuery: boolean = false) {
+  async fetchChildNodes(
+    parentNode: TreeNodeData | undefined,
+    opts: TreeFetchOpts,
+  ) {
     const childNodeModels = this.model.getChildNodes(
       parentNode?.nodeId || this.model.rootNode.id,
-      hasQuery,
+      opts.hasQuery,
     );
 
     if (childNodeModels.length === 0) {
@@ -50,20 +78,21 @@ export class TreeService extends MDControlService<TreeModel> {
       childNodeModels.map(async childNode => {
         if (childNode.treeNodeType === 'STATIC') {
           const nodeData = await this.getStaticNodeData(
-            childNode as IPSDETreeStaticNode,
+            childNode.source as IPSDETreeStaticNode,
+            opts,
           );
           return [nodeData];
         }
         if (childNode.treeNodeType === 'DE') {
           return this.getDENodeDatas(
-            childNode as IPSDETreeDataSetNode,
-            hasQuery,
+            childNode.source as IPSDETreeDataSetNode,
+            opts,
           );
         }
         if (childNode.treeNodeType === 'CODELIST') {
           return this.getCodeListNodeDatas(
-            childNode as IPSDETreeCodeListNode,
-            hasQuery,
+            childNode.source as IPSDETreeCodeListNode,
+            opts,
           );
         }
         return null;
@@ -82,6 +111,22 @@ export class TreeService extends MDControlService<TreeModel> {
     // todo 查询回来之后，看是否默认打开，默认展开继续递归加载子节点。
   }
 
+  getBaseNodeData(nodeModel: IPSDETreeNode, opts: TreeFetchOpts) {
+    const nodeData: TreeNodeData = {
+      nodeId: nodeModel.nodeType,
+      id: nodeModel.nodeType,
+      text: '',
+      leaf:
+        this.model.getChildNodes(nodeModel.nodeType, opts.hasQuery).length ===
+        0,
+    };
+    if (nodeData.leaf === false) {
+      nodeData.children = [];
+      // nodeData.loading = false;
+    }
+    return nodeData;
+  }
+
   /**
    * 获取静态节点数据
    *
@@ -93,24 +138,17 @@ export class TreeService extends MDControlService<TreeModel> {
    */
   protected async getStaticNodeData(
     nodeModel: IPSDETreeStaticNode,
-    hasQuery: boolean = false,
+    opts: TreeFetchOpts,
   ): Promise<TreeNodeData> {
-    const treeData: TreeNodeData = {
-      nodeId: nodeModel.nodeType,
-      id: nodeModel.nodeType,
-      text: nodeModel.text,
-      leaf: true,
-    };
-
-    treeData.leaf =
-      this.model.getChildNodes(treeData.nodeId, hasQuery).length === 0;
+    const nodeData: TreeNodeData = this.getBaseNodeData(nodeModel, opts);
+    nodeData.text = nodeModel.text;
 
     // todo 仅展开首节点
     if (nodeModel.expanded) {
-      treeData.children = await this.fetchChildNodes(treeData, hasQuery);
+      nodeData.children = await this.fetchChildNodes(nodeData, opts);
     }
 
-    return treeData;
+    return nodeData;
   }
 
   /**
@@ -123,20 +161,35 @@ export class TreeService extends MDControlService<TreeModel> {
    */
   protected async getDENodeDatas(
     nodeModel: IPSDETreeDataSetNode,
-    _hasQuery: boolean = false,
+    opts: TreeFetchOpts,
   ) {
     const appde = nodeModel.getPSAppDataEntity();
     await appde!.fill();
     const methodName = nodeModel.getPSAppDEDataSet()!.codeName;
 
     const service = await this.app.es.getService(appde!.codeName);
-    const response = await service.exec(methodName, {});
-    console.log(response);
+    const response = await service.exec(methodName, opts.context, opts.params);
+    const baseNodeData: TreeNodeData = this.getBaseNodeData(nodeModel, opts);
+    if (response.data.length) {
+      const nodeDatas = response.data.map((item: IData) => {
+        return { ...baseNodeData, id: item.srfkey, text: item.srfmajortext };
+      });
+      return nodeDatas;
+    }
+    return [];
   }
 
+  /**
+   * 获取代码表节点数据
+   *
+   * @protected
+   * @param {IPSDETreeCodeListNode} _nodeModel
+   * @param {TreeFetchOpts} _opts
+   * @memberof TreeService
+   */
   protected async getCodeListNodeDatas(
     _nodeModel: IPSDETreeCodeListNode,
-    _hasQuery: boolean = false,
+    _opts: TreeFetchOpts,
   ) {
     // todo 代码表查询
   }

package/src/service/vo/tree-node-data.ts

@@ -30,7 +30,7 @@ export interface TreeNodeData {
   text: string;
 
   /**
-   * 是否没有子节点
+   * 是否是叶子节点（没有子节点的节点）
    *
    * @type {boolean}
    * @memberof TreeNodeData
@@ -44,4 +44,6 @@ export interface TreeNodeData {
    * @memberof TreeNodeData
    */
   children?: TreeNodeData[];
+
+  // todo 其他界面绘制相关属性
 }

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

@@ -1,5 +1,5 @@
 import { IBizContext } from '@ibiz-template/core';
-import { IPSAppDEUIAction } from '@ibiz-template/model';
+import { IPSAppDEUIAction, UnsupportedModelError } from '@ibiz-template/model';
 import { OpenAppViewCommand } from '../../../command';
 import { IUIActionResult } from '../../../interface';
 import { UIActionHandler } from './ui-action-handler';
@@ -21,26 +21,39 @@ export class FrontUIActionHandler extends UIActionHandler {
     params: IParams,
     opts?: IData | undefined,
   ): Promise<IUIActionResult> {
-    const frontPSAppView = action.getFrontPSAppView();
-    if (!frontPSAppView) {
-      throw new Error('未配置打开视图');
+    switch (action.frontProcessType) {
+      case 'OPENHTMLPAGE':
+        window.open(action.htmlPageUrl, '_blank');
+        break;
+      case 'TOP':
+      case 'WIZARD': {
+        const frontPSAppView = action.getFrontPSAppView();
+        if (!frontPSAppView) {
+          throw new Error('未配置打开视图');
+        }
+        await frontPSAppView.fill(true);
+        // 处理参数
+        const { resultContext, resultParams } = await this.handleParams(
+          action,
+          context,
+          data,
+          params,
+        );
+        await ibiz.commands.execute(
+          OpenAppViewCommand.TAG,
+          frontPSAppView,
+          resultContext,
+          resultParams,
+          opts,
+        );
+        break;
+      }
+      default:
+        throw new UnsupportedModelError(
+          action,
+          `未支持的前台处理模式[${action.frontProcessType}]`,
+        );
     }
-    await frontPSAppView.fill(true);
-    // 处理参数
-    const { resultContext, resultParams } = await this.handleParams(
-      action,
-      context,
-      data,
-      params,
-    );
-    await ibiz.commands.execute(
-      OpenAppViewCommand.TAG,
-      frontPSAppView,
-      resultContext,
-      resultParams,
-      opts,
-    );
-
     return {};
   }
 }