@ibiz-template/runtime 0.4.15 → 0.4.17-dev.0

package/src/controller/control/form/edit-form/edit-form.service.ts

@@ -21,12 +21,12 @@ export class EditFormService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async get(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     let res = await this.exec(
@@ -48,12 +48,12 @@ export class EditFormService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async getDraft(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     let res = await this.exec(
@@ -75,11 +75,14 @@ export class EditFormService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:48
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}
    */
-  async remove(context: IParams, params: IParams = {}): Promise<IHttpResponse> {
+  async remove(
+    context: IContext,
+    params: IParams = {},
+  ): Promise<IHttpResponse> {
     const res = await this.exec(
       this.model.removeControlAction?.appDEMethodId || 'remove',
       context,
@@ -94,12 +97,12 @@ export class EditFormService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IData} data 数据
    * @returns {*}
    */
   async create(
-    context: IParams,
+    context: IContext,
     data: IData,
   ): Promise<IHttpResponse<ControlVO>> {
     const _data = data instanceof ControlVO ? data.getOrigin() : data;
@@ -118,12 +121,12 @@ export class EditFormService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IData} data 数据
    * @returns {*}
    */
   async update(
-    context: IParams,
+    context: IContext,
     data: IData,
   ): Promise<IHttpResponse<ControlVO>> {
     const _data = data instanceof ControlVO ? data.getOrigin() : data;
@@ -142,12 +145,12 @@ export class EditFormService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IData} data 数据
    * @returns {*}
    */
   async goBack(
-    context: IParams,
+    context: IContext,
     data: IData,
   ): Promise<IHttpResponse<ControlVO>> {
     const wizardForm = this.model as IDEWizardEditForm;
@@ -170,13 +173,13 @@ export class EditFormService<
    * @author lxm
    * @date 2022-09-15 21:09:34
    * @param {string} methodName
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params={}]
    * @returns {*}  {Promise<IHttpResponse<ControlVO>>}
    */
   async updateFormItem(
     methodName: string,
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     let res = await this.exec(methodName, context, params);
@@ -189,19 +192,20 @@ export class EditFormService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IData} data 数据
    * @param {IParams} [params={}] 视图参数
    * @returns {*}
    */
   async wfStart(
-    context: IParams,
+    context: IContext,
     params: IParams,
     data: IData,
   ): Promise<IHttpResponse<IData>> {
     const wfForm = this.model as IWFEditForm;
     const methodName = wfForm.wfstartControlAction?.appDEMethodId || 'wfstart';
     const entityService = await this.app.deService.getService(
+      context,
       this.model.appDataEntityId!,
     );
     return entityService.wf.exec(
@@ -217,13 +221,13 @@ export class EditFormService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IData} data 数据
    * @param {IParams} [params={}] 视图参数
    * @returns {*}
    */
   async wfSubmit(
-    context: IParams,
+    context: IContext,
     params: IParams,
     data: IData,
   ): Promise<IHttpResponse<IData>> {
@@ -238,6 +242,7 @@ export class EditFormService<
     }
 
     const entityService = await this.app.deService.getService(
+      context,
       this.model.appDataEntityId!,
     );
     return entityService.wf.exec(

package/src/controller/control/form/form/form.service.ts

@@ -20,13 +20,13 @@ export class FormService<
    * @author lxm
    * @date 2023-12-13 03:16:19
    * @param {IData} data 表单数据
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} params 视图参数
    * @param {('create' | 'update')} type 新建还是更新
    */
   setDefault(
     data: IData,
-    context: IParams,
+    context: IContext,
     params: IParams,
     type: 'create' | 'update',
   ): void {

package/src/controller/control/form/search-form/search-form.service.ts

@@ -21,12 +21,12 @@ export class SearchFormService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async getDraft(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     const tempData = this.getFilteredData({ ...params });

package/src/controller/control/gantt/gantt.controller.ts

@@ -202,7 +202,8 @@ export class GanttController
     this.providers[column.codeName!] = provider;
 
     // 初始化表格列控制器
-    const controller = await provider.createController(column, this);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const controller = await provider.createController(column, this as any);
     this.columns[column.codeName!] = controller as GridColumnController;
     // 分类存放控制器
     if (column.columnType === 'DEFGRIDCOLUMN') {

package/src/controller/control/grid/grid/grid.controller.ts

@@ -962,6 +962,7 @@ export class GridController
           tempExportColumn.codeList = app.codeList.getCodeList(item.codeListId);
           tempExportColumn.codeListItems = await app.codeList.get(
             item.codeListId,
+            this.context,
           );
         }
         return tempExportColumn;

package/src/controller/control/grid/grid/grid.service.ts

@@ -69,16 +69,17 @@ export class GridService extends MDControlService<IDEGrid> {
    * @author lxm
    * @date 2022-09-15 21:09:34
    * @param {string} methodName
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params={}]
    * @returns {*}  {Promise<IHttpResponse<ControlVO>>}
    */
   async updateGridEditItem(
     methodName: string,
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     const entityService = await this.app.deService.getService(
+      context,
       this.model.appDataEntityId!,
     );
     let res = await entityService.exec(methodName, context, params);

package/src/controller/control/kanban/kanban.service.ts

@@ -16,12 +16,12 @@ export class KanbanService extends DataViewControlService<IDEKanban> {
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {ControlVO} data 数据
    * @returns {*}
    */
   async updateGroup(
-    context: IParams,
+    context: IContext,
     data: ControlVO,
   ): Promise<IHttpResponse<ControlVO>> {
     const updateAction =

package/src/controller/control/map/map.service.ts

@@ -22,7 +22,7 @@ export class MapService extends MDControlService<ISysMap> {
    * 加载所有地图项的数据
    * @author lxm
    * @date 2023-10-30 06:27:32
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params={}]
    * @return {*}  {Promise<IHttpResponse<IMapData[]>>}
    */

package/src/controller/control/report-panel/report-panel.service.ts

@@ -16,12 +16,12 @@ export class ReportPanelService<
   /**
    * 执行查询报表数据的方法
    *
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async fetch(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     this.dataEntity = await ibiz.hub.getAppDataEntity(

package/src/controller/control/tree/tree.service.ts

@@ -35,7 +35,7 @@ export interface TreeFetchOpts {
    * @type {IParams}
    * @memberof TreeFetchOpts
    */
-  context: IParams;
+  context: IContext;
   /**
    * 视图参数
    *
@@ -252,7 +252,7 @@ export class TreeService extends MDControlService<IDETree> {
     parentNodeData: ITreeNodeData | undefined,
     opts: TreeFetchOpts,
   ): {
-    context: IParams;
+    context: IContext;
     params: IParams;
     navContext: IParams;
     navParams: IParams;

package/src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts

@@ -127,7 +127,8 @@ export class TreeGridExController
     this.providers[column.codeName!] = provider;
 
     // 初始化表格列控制器
-    const controller = await provider.createController(column, this);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const controller = await provider.createController(column, this as any);
     this.columns[column.codeName!] = controller as GridColumnController;
     // 分类存放控制器
     if (column.columnType === 'DEFGRIDCOLUMN') {

package/src/controller/control/wizard-panel/wizard-panel.service.ts

@@ -21,12 +21,12 @@ export class WizardPanelService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async initialize(
-    context: IParams,
+    context: IContext,
     data: IData = {},
     params: IParams = {},
   ): Promise<IHttpResponse<IData>> {
@@ -41,12 +41,12 @@ export class WizardPanelService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async finish(
-    context: IParams,
+    context: IContext,
     data: IData = {},
     params: IParams = {},
   ): Promise<IHttpResponse<IData>> {

package/src/controller/utils/value-default/value-default.ts

@@ -5,7 +5,7 @@ import { isNil, isNotNil } from 'ramda';
 
 export type DefaultValueOrigins = {
   data: IData;
-  context: IParams;
+  context: IContext;
   params: IParams;
 };
 

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

@@ -22,14 +22,14 @@ export class DELogicContext {
    * 实体逻辑执行参数
    * @author lxm
    * @date 2023-10-16 02:22:31
-   * @type {{ context: IParams; data: IData[]; params: IParams }}
+   * @type {{ context: IContext; data: IData[]; params: IParams }}
    */
-  parameters: { context: IParams; data: IData[]; params: IParams };
+  parameters: { context: IContext; data: IData[]; params: IParams };
 
   /**
    * 上下文
    */
-  get context(): IParams {
+  get context(): IContext {
     if (Object.prototype.hasOwnProperty.call(this.params, 'context')) {
       return this.params.context;
     }
@@ -58,13 +58,13 @@ export class DELogicContext {
    * @author lxm
    * @date 2023-03-24 09:15:14
    * @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IData} data 数据对象
    * @param {IParams} params 视图参数
    */
   constructor(
     private deLogicParams: Map<string, DELogicParam>,
-    context: IParams,
+    context: IContext,
     data: IData | IData[],
     params: IParams,
   ) {

package/src/de-logic/de-logic-link/de-logic-link-group-cond/de-logic-link-group-cond.ts

@@ -69,11 +69,11 @@ export class DELogicLinkGroupCond extends DELogicLinkCond {
    * @author lxm
    * @date 2023-02-15 17:02:19
    * @param {DELogicContext} ctx
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} data
    * @return {*}  {boolean}
    */
-  test(ctx: DELogicContext, context: IParams, data: IData): boolean {
+  test(ctx: DELogicContext, context: IContext, data: IData): boolean {
     let bol = true;
     if (this.conds.length === 0) {
       throw new RuntimeModelError(this.model, `界面连接条件逻辑组未配置逻辑项`);

package/src/de-logic/de-logic-link/de-logic-link-single-cond/de-logic-link-single-cond.ts

@@ -72,11 +72,11 @@ export class DELogicLinkSingleCond extends DELogicLinkCond {
    * @author lxm
    * @date 2023-02-15 18:02:05
    * @param {DELogicContext} ctx
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} data
    * @return {*}  {boolean}
    */
-  test(ctx: DELogicContext, context: IParams, data: IData): boolean {
+  test(ctx: DELogicContext, context: IContext, data: IData): boolean {
     const dst = ctx.params[this.dstParam];
     switch (this.type) {
       case 'ENTITYFIELD': {

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

@@ -58,7 +58,7 @@ export class DELogicLink {
    * @author lxm
    * @date 2023-02-08 22:02:18
    * @param {DELogicContext} ctx
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} data
    * @return {*}  {Promise<boolean>} 是否连接成功
    */

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

@@ -38,7 +38,7 @@ export abstract class DELogicNode {
    * @author lxm
    * @date 2023-02-08 22:02:44
    * @param {DELogicContext} ctx
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} data
    * @param {IParams} [opt]
    */

package/src/de-logic/de-logic-param/de-logic-param.ts

@@ -27,7 +27,7 @@ export class DELogicParam {
    * @author lxm
    * @date 2023-02-08 20:02:33
    * @param {DELogicContext} ctx
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} data
    * @param {IParams} [opt]
    */

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

@@ -145,7 +145,7 @@ export class DELogic {
    * @date 2023-02-08 21:02:58
    * @protected
    * @param {DELogicContext} ctx
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} data
    * @param {IParams} [opt]
    */
@@ -163,13 +163,13 @@ export class DELogic {
    *
    * @author lxm
    * @date 2023-02-08 21:02:09
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} data
    * @param {IParams} [opt]
    * @return {*}  {Promise<IData>}
    */
   async exec(
-    context: IParams,
+    context: IContext,
     data: IData | IData[],
     params: IParams,
   ): Promise<unknown> {

package/src/de-logic/index.ts

@@ -35,7 +35,7 @@ async function findDeLogic(
  * @date 2023-02-09 11:02:23
  * @export
  * @param {IAppDELogic} deDELogic
- * @param {IParams} context
+ * @param {IContext} context
  * @param {(IData)} data
  * @param {IParams} params
  * @param {IParams} [opt]
@@ -43,7 +43,7 @@ async function findDeLogic(
  */
 export async function execDELogic(
   deDELogic: IAppDELogic,
-  context: IParams,
+  context: IContext,
   data: IData | IData[] = {},
   params: IParams = {},
 ): Promise<unknown> {
@@ -62,7 +62,7 @@ export async function execDELogic(
  * @export
  * @param {string} deDELogicId
  * @param {string} dataEntityId
- * @param {IParams} context
+ * @param {IContext} context
  * @param {IData} data
  * @param {IParams} params
  * @return {*}  {Promise<unknown>}
@@ -70,7 +70,7 @@ export async function execDELogic(
 export async function execDELogicById(
   deDELogicId: string,
   dataEntityId: string,
-  context: IParams,
+  context: IContext,
   data: IData,
   params: IParams,
 ): Promise<unknown> {
@@ -91,7 +91,7 @@ export async function execDELogicById(
  * @date 2023-03-16 12:44:43
  * @export
  * @param {IAppDELogic} deDELogic
- * @param {IParams} context
+ * @param {IContext} context
  * @param {(IData)} data
  * @param {IParams} params
  * @param {IParams} [opt]
@@ -99,7 +99,7 @@ export async function execDELogicById(
  */
 export async function execDELogicAction(
   deDELogic: IAppDELogic,
-  context: IParams,
+  context: IContext,
   data?: IData | IData[],
   params?: IParams,
 ): Promise<HttpResponse<IData>> {
@@ -125,7 +125,7 @@ export async function execDELogicAction(
  * @export
  * @param {IAppDataEntity} entity
  * @param {('compute' | 'change' | 'default')} type
- * @param {IParams} context
+ * @param {IContext} context
  * @param {IData} data
  * @param {IParams} params
  * @return {*}  {Promise<void>}
@@ -133,7 +133,7 @@ export async function execDELogicAction(
 async function execSingleFieldLogics(
   entity: IAppDataEntity,
   type: 'compute' | 'change' | 'default',
-  context: IParams,
+  context: IContext,
   data: IData,
   params: IParams,
 ): Promise<void> {
@@ -157,7 +157,7 @@ async function execSingleFieldLogics(
  * @export
  * @param {IAppDataEntity} entity
  * @param {('compute' | 'change' | 'default')} type
- * @param {IParams} context
+ * @param {IContext} context
  * @param {IData | IData[]} data 单条或多条数据
  * @param {IParams} params
  * @return {*}  {Promise<void>}
@@ -165,7 +165,7 @@ async function execSingleFieldLogics(
 export async function execFieldLogics(
   entity: IAppDataEntity,
   type: 'compute' | 'change' | 'default',
-  context: IParams,
+  context: IContext,
   data: IData | IData[],
   params: IParams = {},
 ): Promise<void> {

package/src/hub/config/app-config-service.ts

@@ -3,6 +3,7 @@ import { AppViewConfigService } from './app-view-config-service';
 
 /**
  * 应用设置服务
+ *
  * @author lxm
  * @date 2023-07-03 07:07:47
  * @export

package/src/hub/config/app-view-config-service.ts

@@ -1,6 +1,15 @@
 import { RuntimeError } from '@ibiz-template/core';
 import { IAppViewConfigService, IViewConfig } from '../../interface';
 
+/**
+ * 应用视图配置服务
+ *
+ * @author chitanda
+ * @date 2023-12-21 16:12:06
+ * @export
+ * @class AppViewConfigService
+ * @implements {IAppViewConfigService}
+ */
 export class AppViewConfigService implements IAppViewConfigService {
   /**
    * 视图配置信息集合
@@ -9,23 +18,47 @@ export class AppViewConfigService implements IAppViewConfigService {
    */
   protected viewConfigs = new Map<string, IViewConfig>();
 
+  /**
+   * 计算应用视图 标识
+   *
+   * @author chitanda
+   * @date 2023-04-20 18:04:48
+   * @protected
+   * @param {string} tag
+   * @return {*}  {string}
+   */
+  protected calcAppViewId(tag: string): string {
+    let id = '';
+    if (tag.indexOf('.') !== -1) {
+      const ids = tag.split('.');
+      id = ids[ids.length - 1];
+    } else {
+      id = tag.toLowerCase();
+    }
+    return id;
+  }
+
   has(key: string): boolean {
-    return this.viewConfigs.has(key);
+    const id = this.calcAppViewId(key);
+    return this.viewConfigs.has(id);
   }
 
-  set(id: string, viewConfig: IViewConfig): void {
+  set(key: string, viewConfig: IViewConfig): void {
+    const id = this.calcAppViewId(key);
     this.viewConfigs.set(id, viewConfig);
   }
 
   async get(key: string): Promise<IViewConfig> {
+    const id = this.calcAppViewId(key);
     // 没有的时候请求视图模型并设置
-    if (!this.viewConfigs.has(key)) {
-      const model = await ibiz.hub.getAppView(key);
+    if (!this.viewConfigs.has(id)) {
+      const model = await ibiz.hub.getAppView(id);
       if (!model) {
-        throw new RuntimeError(`视图[${key}]不存在`);
+        throw new RuntimeError(`视图[${id}]不存在`);
       }
       this.set(model.id!, {
         id: model.id!,
+        appId: model.appId!,
         codeName: model.codeName!,
         openMode: model.openMode!,
         viewType: model.viewType!,
@@ -35,7 +68,7 @@ export class AppViewConfigService implements IAppViewConfigService {
         redirectView: model.redirectView,
       });
     }
-    return this.viewConfigs.get(key)!;
+    return this.viewConfigs.get(id)!;
   }
 
   getSync(key: string): IViewConfig | null {

package/src/install.ts

@@ -14,6 +14,7 @@ import { presetUIActionProvider } from './ui-action';
 import { installLogicSchedule } from './logic-scheduler';
 import { install as installPlatformProvider } from './platform/provider';
 import { getPlatformProvider } from './register';
+import { UIDomainManager } from './utils';
 
 /**
  * 安装运行时
@@ -38,6 +39,8 @@ export function install(): void {
   ibiz.asyncAction = new AsyncActionService();
   // 挂载引擎工厂
   ibiz.engine = new EngineFactory();
+  // 挂载界面域管理
+  ibiz.uiDomainManager = new UIDomainManager();
   // 安装默认指令
   installCommand();
   // 注册界面行为适配器

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

@@ -156,4 +156,13 @@ export interface IAppHubService {
    * @return {*}  {IAppService}
    */
   getApp(app?: string | IApplication): IAppService;
+
+  /**
+   * 获取所有应用实例
+   *
+   * @author chitanda
+   * @date 2023-12-22 16:12:09
+   * @return {*}  {IAppService[]}
+   */
+  getAllApps(): IAppService[];
 }