@ibiz-template/runtime 0.0.1-beta.17 → 0.0.2-beta.1

package/src/controller/neuron/nerve/view/tree-exp-view-nerve.ts

@@ -0,0 +1,38 @@
+import { ViewNerve, TreeExpViewNeuron, TreeNeuron, Neuron } from '../..';
+import { TreeExpViewController } from '../../..';
+
+/**
+ * 树导航视图神经系统
+ *
+ * @author lxm
+ * @date 2022-10-14 14:10:48
+ * @export
+ * @class TreeExpViewNerve
+ * @extends {ViewNerve<TreeExpViewNeuron, TreeExpViewController>}
+ */
+export class TreeExpViewNerve extends ViewNerve<
+  TreeExpViewNeuron,
+  TreeExpViewController
+> {
+  tree!: TreeNeuron;
+
+  protected createNeuron(): TreeExpViewNeuron {
+    return new TreeExpViewNeuron(this.bindAbility());
+  }
+
+  inclusive(name: string): boolean {
+    return name === 'tree' || super.inclusive(name);
+  }
+
+  connect(name: string, neuron: Neuron): void {
+    super.connect(name, neuron);
+    if (name === 'tree') {
+      this.tree = neuron as TreeNeuron;
+    }
+  }
+
+  destroy(): void {
+    super.destroy();
+    this.tree = undefined as never;
+  }
+}

package/src/controller/neuron/neuron/view.ts

@@ -10,6 +10,7 @@ import {
   IOptViewAbility,
   IPickupGridViewAbility,
   IPickupViewAbility,
+  ITreeExpViewAbility,
   IViewAbility,
   IWFDynaActionViewAbility,
   IWFDynaEditView3Ability,
@@ -27,6 +28,7 @@ import {
   IOptViewEvent,
   IPickupGridViewEvent,
   IPickupViewEvent,
+  ITreeExpViewEvent,
   IViewEvent,
   IWFDynaActionViewEvent,
   IWFDynaEditView3Event,
@@ -91,3 +93,9 @@ export class AppPortalViewNeuron extends Neuron<
   IAppPortalViewEvent,
   IAppPortalViewAbility
 > {}
+
+// 导航类
+export class TreeExpViewNeuron extends Neuron<
+  ITreeExpViewEvent,
+  ITreeExpViewAbility
+> {}

package/src/controller/neuron/neuron/widget.ts

@@ -12,6 +12,7 @@ import {
   IPickupViewPanelAbility,
   ISearchFormAbility,
   IToolbarAbility,
+  ITreeAbility,
   IViewPanelAbility,
 } from '../../interface/ability';
 import {
@@ -26,6 +27,7 @@ import {
   IPickupViewPanelEvent,
   ISearchFormEvent,
   IToolbarEvent,
+  ITreeEvent,
   IViewPanelEvent,
 } from '../../interface/event';
 
@@ -46,6 +48,7 @@ export class MDControlNeuron extends Neuron<
 > {}
 export class GridNeuron extends Neuron<IGridEvent, IGridAbility> {}
 export class ListNeuron extends Neuron<IListEvent, IListAbility> {}
+export class TreeNeuron extends Neuron<ITreeEvent, ITreeAbility> {}
 
 // *面板部件
 export class ViewPanelNeuron extends Neuron<

package/src/controller/utils/button-state/button-state.ts

@@ -3,9 +3,12 @@ import {
   IPSAppDEUIAction,
   IPSUIAction,
 } from '@ibiz-template/model';
+import { Application } from '../../../application';
 import { IButtonState } from '../../interface';
 
 export class ButtonState implements IButtonState {
+  protected app: Application;
+
   disabled: boolean = false;
 
   visible: boolean = true;
@@ -23,6 +26,7 @@ export class ButtonState implements IButtonState {
   declare entity: AppEntityModel;
 
   constructor(name: string, uiAction: IPSUIAction, entity: AppEntityModel) {
+    this.app = ibiz.hub.getApp(entity.modelService.app);
     this.name = name;
     // 赋值uiAction
     Object.defineProperty(this, 'uiAction', {
@@ -49,7 +53,7 @@ export class ButtonState implements IButtonState {
   }
 
   update(data?: IData | undefined): void {
-    const permitted = ibiz.authority.hasUIActionPermitted(
+    const permitted = this.app.authority.hasUIActionPermitted(
       this.uiAction,
       data,
       this.entity,

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

@@ -38,7 +38,7 @@ export class EditViewController<
 
   protected async onInit(): Promise<void> {
     await super.onInit();
-    this.entityService = await ibiz.entityService.getService(
+    this.entityService = await this.app.es.getService(
       this.model.appEntity.codeName,
       this.context,
     );

package/src/controller/view/index.ts

@@ -16,3 +16,4 @@ export * from './wf-dyna-start-view';
 export * from './wf-dyna-action-view';
 export * from './wf-step-trace-view';
 export { AppPortalViewController } from './app-portal-view';
+export { TreeExpViewController } from './tree-exp-view';

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

@@ -0,0 +1,49 @@
+import { TreeExpViewModel } from '@ibiz-template/model';
+import { ViewMode } from '../../constant';
+import { TreeExpViewNerve } from '../neuron';
+import { ViewController } from './view';
+
+/**
+ * 树导航视图控制器
+ *
+ * @author lxm
+ * @date 2022-09-08 16:09:49
+ * @export
+ * @class TreeExpViewController
+ * @extends {ViewController}
+ */
+export class TreeExpViewController<
+  T extends TreeExpViewModel = TreeExpViewModel,
+> extends ViewController<T> {
+  declare nerve: TreeExpViewNerve;
+
+  protected createNerve(): TreeExpViewNerve {
+    return new TreeExpViewNerve(this);
+  }
+
+  protected async onInit(): Promise<void> {
+    await super.onInit();
+    // 数据看板适配器
+    const { tree } = this.model;
+    if (tree) {
+      this.providers[tree.name] = await ibiz.register.control.get(tree);
+    }
+    this.nerve.self.evt.on('mounted', () => {
+      if (this.modal.mode !== ViewMode.EMBED && this.model.source.loadDefault) {
+        this.load();
+      }
+    });
+  }
+
+  /**
+   * 加载方法
+   *
+   * @author lxm
+   * @date 2022-08-31 11:08:10
+   */
+  async load(): Promise<IData[]> {
+    // 调用数部件加载
+    const { tree } = this.nerve;
+    return tree.call.load();
+  }
+}

package/src/controller/view/view.ts

@@ -3,7 +3,6 @@ import {
   DefectModelError,
   IPSAppViewLogic,
   IPSDETBUIActionItem,
-  ModelUtil,
   ViewModel,
 } from '@ibiz-template/model';
 import { createUUID, notNilEmpty } from 'qx-util';
@@ -15,6 +14,7 @@ import { IModal, IModalData } from '../../interface';
 import { ViewMode } from '../../constant';
 import { convertNavData } from '../../utils';
 import { executeViewLogic } from '../../view-logic';
+import { Application } from '../../application';
 
 /**
  * 视图控制器
@@ -35,6 +35,15 @@ export class ViewController<T extends ViewModel = ViewModel> {
    */
   model!: T;
 
+  /**
+   * 当前视图所归属的应用
+   *
+   * @author chitanda
+   * @date 2022-12-21 11:12:29
+   * @type {Application}
+   */
+  app!: Application;
+
   /**
    * 当为模态、飘窗等非路由模式打开时，外部会注入此方法，用于关闭视图。
    *
@@ -175,10 +184,8 @@ export class ViewController<T extends ViewModel = ViewModel> {
    */
   protected async onInit(): Promise<void> {
     this.emit('neuronInit', this.nerve.self);
-    this.model = (await ModelUtil.getViewModel(
-      this.modelPath,
-      this.context,
-    )) as T;
+    this.model = (await ibiz.model.getView(this.modelPath)) as T;
+    this.app = ibiz.hub.getApp(this.model.modelService.app);
 
     // 处理上下文和导航参数
     this.handleViewParams();

package/src/controller/view/wf-step-trace-view.ts

@@ -44,7 +44,7 @@ export class WFStepTraceViewController extends ViewController {
     if (!this.deName) {
       throw new RuntimeError('没有接收到deName');
     }
-    this.entityService = await ibiz.entityService.getService(
+    this.entityService = await this.app.es.getService(
       this.deName,
       this.context,
     );

package/src/install.ts

@@ -2,12 +2,9 @@ import { GlobalConfig } from './config/global-config';
 import { RegisterCenter } from './register/register-center';
 import { installCommand } from './command';
 import { presetUIActionProvider } from './provider';
-import {
-  AuthorityService,
-  AuthService,
-  CodeListService,
-  ServiceUtil,
-} from './service';
+import { AuthService } from './service';
+import { GlobalModel } from './model';
+import { RuntimeHub } from './runtime-hub';
 
 /**
  * 安装运行时
@@ -18,18 +15,15 @@ import {
  */
 export function install(): void {
   const { ibiz } = window;
+  ibiz.hub = new RuntimeHub();
+  // 全局模型对象
+  ibiz.model = new GlobalModel();
   // 挂载注册中心
   ibiz.register = new RegisterCenter();
   // 初始化全局配置
   ibiz.config = new GlobalConfig();
-  // 代码表服务
-  ibiz.codeListService = new CodeListService();
-  // 应用实体服务工具类
-  ibiz.entityService = new ServiceUtil();
   // 挂载认证服务
   ibiz.auth = new AuthService();
-  // 挂载权限服务
-  ibiz.authority = new AuthorityService();
   // 安装默认指令
   installCommand();
   // 注册预置的界面行为适配器

package/src/interface/i-plugin-factory/i-plugin-factory.ts

@@ -28,7 +28,7 @@ export interface IPluginFactory {
    */
   loadPlugin(plugin: IPSSysPFPlugin): Promise<boolean>;
   /**
-   * 加载应用饮用插件
+   * 加载应用引用插件
    *
    * @author chitanda
    * @date 2022-10-31 16:10:58

package/src/model.ts

@@ -0,0 +1,188 @@
+import {
+  AppMenuItemModel,
+  DefectModelError,
+  IModelService,
+  IPSAppFunc,
+  IPSAppView,
+  IPSSubAppRef,
+  ModelConst,
+  ModelService,
+  ModelUtil,
+  SubModelService,
+  ViewModel,
+} from '@ibiz-template/model';
+
+/**
+ * 全局模型处理
+ *
+ * @author chitanda
+ * @date 2022-12-20 17:12:34
+ * @export
+ * @class GlobalModel
+ */
+export class GlobalModel {
+  protected util = new ModelUtil();
+
+  /**
+   * 所有视图对应的应用标识
+   *
+   * @author chitanda
+   * @date 2022-12-20 19:12:37
+   * @protected
+   * @type {Map<string, string>} Map<视图模型标识, 应用标识>
+   */
+  protected views: Map<string, string> = new Map();
+
+  /**
+   * 初始化模型加载
+   *
+   * @author chitanda
+   * @date 2022-12-22 21:12:37
+   * @param {string} [dynaModelTag]
+   * @return {*}  {Promise<void>}
+   */
+  async init(dynaModelTag?: string): Promise<void> {
+    // 构造跟 hub 模型加载
+    const help = await this.util.create(async modelPath => {
+      const url = `${ibiz.env.remoteModelUrl}${modelPath}?dynamodeltag=${dynaModelTag}`;
+      const res = await ibiz.net.get(url);
+      if (res.ok) {
+        if (modelPath.endsWith('PSSYSAPP.json')) {
+          res.data.id = ibiz.env.appId;
+        }
+        return res.data as IModel;
+      }
+      return {};
+    }, ibiz.env.hub);
+    // 根模型对象
+    const root = (await help.getModelService()) as unknown as ModelService;
+    this.setViews(
+      ModelConst.DEFAULT_SANDBOX,
+      root.app.getAllPSAppViews() || [],
+    );
+    await ibiz.hub.createApp(ModelConst.DEFAULT_SANDBOX, root);
+    const appRefs = root.app.getAllPSSubAppRefs();
+    if (appRefs) {
+      for (let i = 0; i < appRefs.length; i++) {
+        const app = appRefs[i];
+        this.setViews(app.M.id, app.getAllPSAppViews() || []);
+      }
+    }
+  }
+
+  /**
+   * 初始化子应用模型实例
+   *
+   * @author chitanda
+   * @date 2022-12-20 18:12:05
+   * @protected
+   * @param {IPSSubAppRef} app
+   * @return {*}  {Promise<SubModelService>}
+   */
+  protected async initSubApp(appRef: IPSSubAppRef): Promise<SubModelService> {
+    const appId = appRef.M.id;
+    const help = await this.util.createSub(async modelPath => {
+      const url = `${ibiz.env.remoteModelUrl}/subapps/${appId}${modelPath}?dynamodeltag=${appRef.M.dynamodeltag}`;
+      const res = await ibiz.net.get(url);
+      if (res.ok) {
+        if (modelPath.endsWith('PSSYSAPP.json')) {
+          res.data.id = appId;
+        }
+        return res.data as IModel;
+      }
+      return {};
+    }, appId);
+    const service =
+      (await help.getModelService()) as unknown as SubModelService;
+    await ibiz.hub.createApp(appId, service);
+    return service;
+  }
+
+  /**
+   * 设置视图指定层级缓存
+   *
+   * @author chitanda
+   * @date 2022-12-20 19:12:23
+   * @protected
+   * @param {string} appTag
+   * @param {IPSAppView[]} views
+   */
+  protected setViews(appTag: string, views: IPSAppView[]): void {
+    views.forEach(view => {
+      this.views.set(view.modelPath!, appTag);
+    });
+  }
+
+  /**
+   * 获取指定应用的模型服务，服务不存在则创建
+   *
+   * @author chitanda
+   * @date 2022-12-22 15:12:03
+   * @protected
+   * @param {string} appTag
+   * @return {*}  {Promise<IModelService>}
+   */
+  protected async getAppModelService(appTag: string): Promise<IModelService> {
+    try {
+      const service = await this.util.getModelService(appTag);
+      return service;
+    } catch (error) {
+      const rootService = await this.util.getModelService();
+      const app = rootService.app.findPSSubAppRef(appTag);
+      if (!app) {
+        throw new DefectModelError(rootService.app, `子应用[${appTag}]不存在`);
+      }
+      return this.initSubApp(app!);
+    }
+  }
+
+  /**
+   * 根据路径
+   *
+   * @author chitanda
+   * @date 2022-12-20 20:12:54
+   * @param {string} path
+   * @return {*}  {Promise<ViewModel>}
+   */
+  async getView(path: string): Promise<ViewModel> {
+    if (!this.views.has(path)) {
+      throw new Error(`未找到视图模型: ${path}`);
+    }
+    const appTag = this.views.get(path)!;
+    const service = await this.getAppModelService(appTag);
+    const view = await service.factory.getView(path);
+    if (view) {
+      return view;
+    }
+    throw new DefectModelError(service.app, `未找到视图[${path}]`);
+  }
+
+  /**
+   * 根据菜单项所归属应用，获取应用功能
+   *
+   * @author chitanda
+   * @date 2022-12-22 15:12:59
+   * @param {AppMenuItemModel} menu
+   * @return {*}  {(Promise<IPSAppFunc | null>)}
+   */
+  async getAppFunc(menu: AppMenuItemModel): Promise<IPSAppFunc | null> {
+    const { appId } = menu;
+    if (appId === ModelConst.DEFAULT_SANDBOX) {
+      return menu.appFunc;
+    }
+    const service = await this.getAppModelService(appId);
+    return service.app.findPSAppFunc(menu.source.M.getPSAppFunc);
+  }
+
+  /**
+   * 获取指定应用模型服务
+   *
+   * @author chitanda
+   * @date 2022-12-20 21:12:58
+   * @param {IContext} [context]
+   * @return {*}
+   */
+  async getModelService(context?: IContext) {
+    return this.util.getModelService(context?.srfsandbox);
+  }
+}

package/src/runtime-hub.ts

@@ -0,0 +1,76 @@
+import {
+  IPSApplication,
+  ModelConst,
+  ModelObject,
+  ModelService,
+} from '@ibiz-template/model';
+import { Application } from './application';
+
+/**
+ * 运行时总集
+ *
+ * @author chitanda
+ * @date 2022-12-21 14:12:00
+ * @export
+ * @class RuntimeHub
+ */
+export class RuntimeHub {
+  /**
+   * 应用总集
+   *
+   * @author chitanda
+   * @date 2022-12-21 14:12:45
+   * @protected
+   * @type {Map<string, Application>}
+   */
+  protected appMap: Map<string, Application> = new Map();
+
+  /**
+   * 创建应用对象
+   *
+   * @author chitanda
+   * @date 2022-12-21 14:12:33
+   * @param {string} key 应用标识
+   * @param {ModelService} service 应用所对应的模型服务
+   * @return {*}  {Promise<Application>}
+   */
+  async createApp(key: string, service: ModelService): Promise<Application> {
+    const app = new Application(service);
+    this.appMap.set(key, app);
+    await app.init();
+    return app;
+  }
+
+  getApp(key?: string): Application;
+
+  getApp(appModel?: IPSApplication): Application;
+
+  getApp(model?: ModelObject): Application;
+
+  /**
+   * 根据标识获取应用对象
+   *
+   * @author chitanda
+   * @date 2022-12-21 20:12:53
+   * @param {(string | IPSApplication)} [app]
+   * @return {*}  {Application}
+   */
+  getApp(app?: string | IPSApplication | ModelObject): Application {
+    let key: string | null = null;
+    if (app) {
+      if (app instanceof Object) {
+        if (app instanceof ModelObject) {
+          key = app.modelService.app.appId;
+        } else {
+          key = (app as IPSApplication).appId;
+        }
+      } else {
+        key = app;
+      }
+    }
+    if (!key) {
+      key = ModelConst.DEFAULT_SANDBOX;
+    }
+    return this.appMap.get(key)!;
+  }
+}

package/src/service/authority/authority.service.ts

@@ -2,8 +2,8 @@ import { MenuPermissionMode, RuntimeError } from '@ibiz-template/core';
 import {
   AppEntityModel,
   AppMenuItemModel,
-  getModelService,
   IPSDEUIAction,
+  ModelService,
 } from '@ibiz-template/model';
 
 /**
@@ -15,6 +15,8 @@ import {
  * @class AuthorityService
  */
 export class AuthorityService {
+  protected isInit: boolean = false;
+
   /**
    * 统一资源集合
    *
@@ -55,6 +57,8 @@ export class AuthorityService {
    */
   private opPrivs: string[] = [];
 
+  constructor(protected modelService: ModelService) {}
+
   /**
    * 权限服务初始化
    *
@@ -94,7 +98,7 @@ export class AuthorityService {
    * @returns {*}  {Promise<void>}
    */
   async calcOPPrivs(resCodes: string[]): Promise<void> {
-    const appModel = (await getModelService()).app;
+    const appModel = this.modelService.app;
     // 先置空
     this.opPrivs = [];
     if (appModel.getAllPSDEOPPrivs()?.length) {
@@ -108,6 +112,9 @@ export class AuthorityService {
         }
       });
     }
+    // throw new Error(
+    //   '多应用模式下，需要补充每个应用自己的计算。整体结构需要改到app下去',
+    // );
   }
 
   /**

package/src/service/dto/method.dto.ts

@@ -7,6 +7,7 @@ import {
   UnsupportedModelError,
 } from '@ibiz-template/model';
 import { isNilOrEmpty } from 'qx-util';
+import { Application } from '../../application';
 import { Entity } from '../entity/entity';
 
 /**
@@ -18,6 +19,8 @@ import { Entity } from '../entity/entity';
  * @class MethodDto
  */
 export class MethodDto {
+  protected app?: Application;
+
   protected fields: IPSAppDEMethodDTOField[];
 
   protected dtoMap: Map<string, MethodDto> = new Map();
@@ -43,7 +46,12 @@ export class MethodDto {
    * @param {IPSAppDEMethodDTO} dto
    */
   constructor(protected dto?: IPSAppDEMethodDTO) {
-    this.fields = dto?.getPSAppDEMethodDTOFields() || [];
+    if (dto) {
+      this.app = ibiz.hub.getApp(dto.getPSModelService().app);
+      this.fields = dto.getPSAppDEMethodDTOFields() || [];
+    } else {
+      this.fields = [];
+    }
   }
 
   /**
@@ -73,7 +81,7 @@ export class MethodDto {
         case 'DTOS': {
           const dto = await this.getFieldDto(field);
           const refEntity = field.getRefPSAppDataEntity()!;
-          const service = await ibiz.entityService.getService(
+          const service = await this.app!.es.getService(
             refEntity.codeName,
             context,
           );
@@ -107,7 +115,7 @@ export class MethodDto {
    * @return {*}  {Promise<IData>}
    */
   async set(context: IContext, data: IData): Promise<Entity> {
-    const service = await ibiz.entityService.getService(this.entity.codeName);
+    const service = await this.app!.es.getService(this.entity.codeName);
     const all = await this.fields
       .filter(field => field.type === 'DTOS')
       .map(async field => {

package/src/service/index.ts

@@ -3,6 +3,7 @@ export * from './utils';
 export * from './service';
 export * from './constant';
 export * from './vo/control.vo';
+export * from './vo/tree-node-data';
 
 export { AuthService } from './auth/auth.service';
 export { AuthorityService } from './authority/authority.service';