@ibiz-template/runtime 0.5.3-beta.0 → 0.5.3-beta.10

package/src/app-hub.ts

@@ -1,7 +1,12 @@
 import { IAppDataEntity, IAppView, IApplication } from '@ibiz/model-core';
 import { RuntimeError } from '@ibiz-template/core';
 import { Application } from './application';
-import { IAppHubService, IAppService, ModelLoaderProvider } from './interface';
+import {
+  IAppDEService,
+  IAppHubService,
+  IAppService,
+  ModelLoaderProvider,
+} from './interface';
 import { AppConfigService, Convert } from './hub';
 import { HubController } from './controller';
 import { ConfigService } from './service';
@@ -61,6 +66,16 @@ export class AppHub implements IAppHubService {
    */
   protected view2appMap: Map<string, string> = new Map();
 
+  /**
+   * 当前注册的应用视图优先级
+   *
+   * @author chitanda
+   * @date 2024-01-15 15:01:57
+   * @protected
+   * @type {Map<string, number>}
+   */
+  protected view2appPriorityMap: Map<string, number> = new Map();
+
   /**
    * 实例化的应用视图模型
    *
@@ -171,13 +186,28 @@ export class AppHub implements IAppHubService {
    * 设置应用视图所属应用
    *
    * @author chitanda
-   * @date 2023-04-17 23:04:37
+   * @date 2024-01-15 15:01:41
    * @param {string} tag 视图 codeName 或者视图 id
    * @param {string} [appId=ibiz.env.appId]
+   * @param {number} [priority=-1] 视图的优先级，值越小优先级越高。1为最高优先级
    */
-  setAppView(tag: string, appId: string = ibiz.env.appId): void {
+  setAppView(
+    tag: string,
+    appId: string = ibiz.env.appId,
+    priority: number = -1,
+  ): void {
     const id = this.calcAppViewId(tag);
+    if (this.view2appMap.has(id)) {
+      const _priority = this.view2appPriorityMap.get(id);
+      // 已经存在优先级高的视图直接跳过，若优先级相同或更高则覆盖
+      if (_priority && _priority < priority) {
+        return;
+      }
+    }
     this.view2appMap.set(id, appId);
+    if (priority !== -1) {
+      this.view2appPriorityMap.set(id, priority);
+    }
   }
 
   /**
@@ -372,6 +402,25 @@ export class AppHub implements IAppHubService {
     return [];
   }
 
+  /**
+   * 获取应用实体服务
+   *
+   * @author chitanda
+   * @date 2024-01-10 13:01:01
+   * @param {string} appId
+   * @param {string} entityId
+   * @param {IContext} context
+   * @return {*}  {Promise<IAppDEService>}
+   */
+  async getAppDEService(
+    appId: string,
+    entityId: string,
+    context: IContext,
+  ): Promise<IAppDEService> {
+    const app = await this.getAppAsync(appId);
+    return app.deService.getService(context, entityId);
+  }
+
   reset(): void {
     this.appMap.clear();
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/application.ts

@@ -130,7 +130,7 @@ export class Application implements IAppService {
   async init(): Promise<void> {
     await this.authority.init();
     await this.loadAppModelStyle();
-    if (ibiz.env.enableMqtt && ibiz.appData) {
+    if (ibiz.env.enableMqtt && ibiz.appData && ibiz.auth.isAnonymous !== true) {
       this.mqtt = new MqttService(
         ibiz.appData.mqtttopic,
         getToken()!,

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

@@ -71,7 +71,14 @@ export class OpenAppViewCommand {
       );
     }
     const { openMode = 'INDEXVIEWTAB' } = appView;
-    switch (opts.openMode || openMode) {
+    const viewOpenMode = opts.openMode || openMode;
+    if (viewOpenMode !== undefined && viewOpenMode !== 'INDEXVIEWTAB') {
+      // 除了走路由的，其他情况toRouteDepth转为undefined，避免影响后续操作
+      if (context.toRouteDepth) {
+        context.toRouteDepth = undefined;
+      }
+    }
+    switch (viewOpenMode) {
       case 'INDEXVIEWTAB':
         if (opts.noWaitRoute) {
           this.openIndexViewTab(appView, context, params);

package/src/constant/control-type.ts

@@ -213,4 +213,9 @@ export enum ControlType {
    * 标题栏
    */
   CAPTIONBAR = 'CAPTIONBAR',
+
+  /**
+   * 上下文菜单
+   */
+  CONTEXT_MENU = 'CONTEXTMENU',
 }

package/src/controller/common/editor/editor.controller.ts

@@ -1,10 +1,13 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { IEditor, INavigateParamContainer } from '@ibiz/model-core';
+import { DataTypes } from '@ibiz-template/core';
+import dayjs from 'dayjs';
 import { convertNavData } from '../../../utils';
 import {
   IEditorContainerController,
   IEditorController,
 } from '../../../interface/controller';
+import { ValueExUtil } from '../../utils';
 
 /**
  * 编辑器控制器基类
@@ -88,6 +91,28 @@ export class EditorController<T extends IEditor = IEditor>
     return !!this.model.readOnly;
   }
 
+  /**
+   * 值格式化
+   * @author lxm
+   * @date 2024-01-11 10:18:33
+   * @readonly
+   * @type {(string | undefined)}
+   */
+  get valueFormat(): string | undefined {
+    return this.parent.valueFormat;
+  }
+
+  /**
+   * 数据类型
+   * @author lxm
+   * @date 2024-01-11 10:18:55
+   * @readonly
+   * @type {(number  | undefined)}
+   */
+  get dataType(): number | undefined {
+    return this.parent.dataType;
+  }
+
   /**
    * Creates an instance of EditorController.
    * @author lxm
@@ -195,4 +220,33 @@ export class EditorController<T extends IEditor = IEditor>
   toBoolean(value: string): boolean {
     return Object.is('true', value);
   }
+
+  /**
+   * 值格式化
+   * @author lxm
+   * @date 2023-08-25 05:18:11
+   * @param {unknown} value
+   * @return {*}  {string}
+   */
+  formatValue(value: unknown = ''): string {
+    // 根据数据类型增强转换显示文本
+    if (this.model.valueType !== 'SIMPLE') {
+      return ValueExUtil.toText(this.model, value);
+    }
+
+    // 根据格式化配置格式化显示
+    const strVal = `${value}`;
+    if (!this.valueFormat) {
+      return strVal;
+    }
+    const isDate = DataTypes.isDate(this.dataType!);
+    if (isDate) {
+      const formatVal = dayjs(strVal).format(this.valueFormat);
+      if (formatVal !== 'Invalid Date') {
+        return formatVal;
+      }
+      return strVal;
+    }
+    return ibiz.util.text.format(strVal, this.valueFormat);
+  }
 }

package/src/controller/common/view/view.controller.ts

@@ -314,6 +314,7 @@ export class ViewController<
   }
 
   protected async onDestroyed(): Promise<void> {
+    const srfSessionId = this.context.srfsessionid;
     await super.onDestroyed();
     // 执行视图引擎的doDestroyed
     if (this.engines.length) {
@@ -325,8 +326,8 @@ export class ViewController<
       this.scheduler.destroy();
     }
     // 销毁界面域，谁创建谁销毁
-    if (this.id === this.context.srfsessionid) {
-      ibiz.uiDomainManager.destroy(this.context.srfsessionid);
+    if (this.id === srfSessionId) {
+      ibiz.uiDomainManager.destroy(srfSessionId);
     }
     this.context.destroy();
     ibiz.log.debug(`视图[${this.model.name}](${this.model.id})销毁`);

package/src/controller/constant/control/index.ts

@@ -1,3 +1,4 @@
 export * from './form/form-notify.state';
 export * from './grid/grid-notify.state';
 export * from './panel/panel-notify.state';
+export * from './tree-grid-ex/tree-grid-ex-notify.state';

package/src/controller/constant/control/tree-grid-ex/tree-grid-ex-notify.state.ts

@@ -0,0 +1,5 @@
+/* eslint-disable no-shadow */
+export enum TreeGridExNotifyState {
+  LOAD = 'LOAD',
+  SAVE = 'SAVE',
+}

package/src/controller/control/chart/chart.controller.ts

@@ -107,7 +107,7 @@ export class ChartController
     if (!this.options) {
       throw new RuntimeError('options还没计算');
     }
-    this.chart.setOption(this.options);
+    this.chart.setOption(this.options, { notMerge: true });
     this.resizeChart();
   }
 

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

@@ -1,5 +1,9 @@
 /* eslint-disable no-param-reassign */
-import { debounceAndAsyncMerge, recursiveIterate } from '@ibiz-template/core';
+import {
+  RuntimeModelError,
+  debounceAndAsyncMerge,
+  recursiveIterate,
+} from '@ibiz-template/core';
 import { IControlLogic, IDEForm, IDEFormDetail } from '@ibiz/model-core';
 import {
   IFormState,
@@ -177,6 +181,12 @@ export abstract class FormController<
         if (!detailProvider) {
           return;
         }
+        if (form.details[detail.id!]) {
+          throw new RuntimeModelError(
+            detail,
+            `初始化异常: 表单成员[${detail.id}](${detail.detailType})已存在，表单项标识重复请检查配置`,
+          );
+        }
         form.providers[detail.id!] = detailProvider;
         const detailController = await detailProvider.createController(
           detail,

package/src/controller/control/form/form-detail/form-detail/form-detail.controller.ts

@@ -389,6 +389,10 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
    * @date 2023-10-11 05:03:26
    */
   async onClick(event?: MouseEvent): Promise<void> {
+    if (event) {
+      // 阻止冒泡
+      event.stopPropagation();
+    }
     this.form.evt.emit('onFormDetailEvent', {
       formDetailName: this.model.id!,
       formDetailEventName: FormDetailEventName.CLICK,

package/src/controller/control/form/form-detail/form-tab-page/form-tab-page.controller.ts

@@ -2,6 +2,7 @@ import { IDEFormTabPage } from '@ibiz/model-core';
 import { IFormDetailContainerController } from '../../../../../interface';
 import { FormDetailController } from '../form-detail';
 import { FormTabPageState } from './form-tab-page.state';
+import { FormTabPanelController } from '../form-tab-panel';
 
 /**
  * 表单分页部件分页控制器
@@ -21,4 +22,17 @@ export class FormTabPageController
   protected createState(): FormTabPageState {
     return new FormTabPageState(this.parent?.state);
   }
+
+  /**
+   * 是否激活的分页
+   * @author lxm
+   * @date 2024-01-17 03:16:24
+   * @readonly
+   * @type {boolean}
+   */
+  get isActive(): boolean {
+    return (
+      (this.parent as FormTabPanelController).state.activeTab === this.model.id
+    );
+  }
 }

package/src/controller/control/form/form-detail/form-tab-panel/form-tab-panel.controller.ts

@@ -21,4 +21,20 @@ export class FormTabPanelController
   protected createState(): FormTabPanelState {
     return new FormTabPanelState(this.parent?.state);
   }
+
+  protected async onInit(): Promise<void> {
+    await super.onInit();
+    // 初始化默认的激活分页
+    this.state.activeTab = this.model.deformTabPages?.[0].id || '';
+  }
+
+  /**
+   * 分页点击切换处理
+   * @author lxm
+   * @date 2024-01-17 02:59:38
+   * @param {string} tabId
+   */
+  onTabChange(tabId: string): void {
+    this.state.activeTab = tabId;
+  }
 }

package/src/controller/control/form/form-detail/form-tab-panel/form-tab-panel.state.ts

@@ -6,4 +6,12 @@ import { FormDetailState } from '../form-detail';
  * @author: zhujiamin
  * @Date: 2023-01-04 10:26:34
  */
-export class FormTabPanelState extends FormDetailState {}
+export class FormTabPanelState extends FormDetailState {
+  /**
+   * 当前激活的分页
+   * @author lxm
+   * @date 2024-01-17 02:05:58
+   * @type {string}
+   */
+  activeTab: string = '';
+}

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

@@ -724,7 +724,7 @@ export class GridController<
             this.state.columnStates.push({
               key: column.codeName!,
               caption: column.caption!,
-              hidden: !!column.hideDefault,
+              hidden: !!column.hideDefault || !!column.hiddenDataItem,
               uaColumn: column.columnType === 'UAGRIDCOLUMN',
             });
           }

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

@@ -21,7 +21,7 @@ export class GridService extends MDControlService<IDEGrid> {
     super.initUIDataMap();
     if (this.model.degridColumns) {
       const dataItems = this.model.degridDataItems || [];
-      // *初始化表格数据项的属性映射
+      // *初始化表格属性列和实体数据的属性映射
       this.model.degridColumns?.forEach((column: IDEGridFieldColumn) => {
         const uiKey = column.id!.toLowerCase();
         // 列映射应用实体属性
@@ -51,16 +51,6 @@ export class GridService extends MDControlService<IDEGrid> {
         this.dataUIMap.set(uiKey, mapField);
       });
     }
-
-    //* 如果属性列和表格数据列名称不一致，补充不一致的属性列的名称映射
-    // this.model.fieldColumns.forEach(fieldColumn => {
-    //   if (fieldColumn.source.dataItemName !== fieldColumn.codeName) {
-    //     const value = this.dataUIMap.get(fieldColumn.source.dataItemName);
-    //     if (value) {
-    //       this.dataUIMap.set(fieldColumn.codeName, value);
-    //     }
-    //   }
-    // });
   }
 
   /**

package/src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts

@@ -68,6 +68,16 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
     return !!this.model.deuiactionId;
   }
 
+  /**
+   * 属性列对应值在数据里的属性字段名称
+   * @author lxm
+   * @date 2023-06-25 09:26:04
+   * @readonly
+   */
+  get fieldName(): string {
+    return this.model.id!.toLowerCase();
+  }
+
   protected async onInit(): Promise<void> {
     await super.onInit();
 
@@ -116,7 +126,7 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
    * @readonly
    */
   clickable(row: GridRowState): boolean {
-    const value = row.data[this.model.codeName!];
+    const value = row.data[this.fieldName!];
     return (this.isLinkColumn || this.hasAction) && value;
   }
 
@@ -160,7 +170,7 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
    * @returns {*}  {Promise<void>}
    */
   async openLinkView(row: GridRowState, event: MouseEvent): Promise<void> {
-    const curValue = row.data[this.model.codeName!];
+    const curValue = row.data[this.fieldName!];
     if (!curValue) {
       // 当前值不存在，不继续走打开链接视图逻辑
       return;

package/src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts

@@ -109,16 +109,6 @@ export class GridFieldEditColumnController
     return undefined;
   }
 
-  /**
-   * 列数据属性字段名称
-   * @author lxm
-   * @date 2023-06-25 09:26:04
-   * @readonly
-   */
-  get fieldName(): string {
-    return this.model.dataItemName!;
-  }
-
   /**
    * 初始化方法，生成表格编辑项控制器
    *

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

@@ -1,3 +1,4 @@
 export { TreeGridExColumnController } from './tree-grid-ex-column/tree-grid-ex-column.controller';
 export { TreeGridExFieldColumnController } from './tree-grid-ex-field-column/tree-grid-ex-field-column.controller';
+export { TreeGridExNodeColumnController } from './tree-grid-ex-field-column/tree-grid-ex-node-column.controller';
 export { TreeGridExUAColumnController } from './tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller';

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

@@ -1,5 +1,7 @@
 import { IDETreeColumn } from '@ibiz/model-core';
 import { TreeGridExController } from '../../tree-grid-ex.controller';
+import { TreeGridExNotifyState } from '../../../../constant';
+import { TreeGridExRowState } from '../../tree-grid-ex-row.state';
 
 /**
  * 树表格（增强）列控制器
@@ -118,4 +120,24 @@ export class TreeGridExColumnController<
   protected async onInit(): Promise<void> {
     // 初始化操作
   }
+
+  /**
+   * 表格状态变更通知
+   *
+   * @author lxm
+   * @date 2022-09-20 18:09:07
+   */
+  gridStateNotify(
+    _row: TreeGridExRowState,
+    _state: TreeGridExNotifyState,
+  ): void {
+    // 子类实现具体逻辑
+  }
+
+  async dataChangeNotify(
+    _row: TreeGridExRowState,
+    _names: string[],
+  ): Promise<void> {
+    // 子类实现具体逻辑
+  }
 }

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

@@ -1,6 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { IDETreeDEFColumn } from '@ibiz/model-core';
+import { IDETreeDEFColumn, IDETreeNodeColumn } from '@ibiz/model-core';
 import { TreeGridExColumnController } from '../tree-grid-ex-column/tree-grid-ex-column.controller';
+import { TreeGridExNodeColumnController } from './tree-grid-ex-node-column.controller';
+import { TreeGridExNotifyState } from '../../../../constant';
+import { ITreeGridExRowState } from '../../../../../interface';
 
 /**
  * 树表格（增强）属性列控制器
@@ -10,4 +13,87 @@ import { TreeGridExColumnController } from '../tree-grid-ex-column/tree-grid-ex-
  * @class TreeGridExFieldColumnController
  * @extends {TreeGridExColumnController<IDETreeDEFColumn>}
  */
-export class TreeGridExFieldColumnController extends TreeGridExColumnController<IDETreeDEFColumn> {}
+export class TreeGridExFieldColumnController extends TreeGridExColumnController<IDETreeDEFColumn> {
+  /**
+   * 树表格列标识（用于取数和各种比较判断）
+   * @author lxm
+   * @date 2024-01-09 11:33:37
+   * @readonly
+   * @type {string}
+   */
+  get name(): string {
+    return this.model.id!;
+  }
+
+  /**
+   * 该树表格列对应不同节点模型的节点列控制器
+   * @author lxm
+   * @date 2024-01-08 05:40:56
+   * @type {Map<string, IDETreeNodeColumn>}
+   */
+  nodeColumnControllerMap: Map<string, TreeGridExNodeColumnController> =
+    new Map();
+
+  async init(): Promise<void> {
+    await this.onInit();
+    await this.initNodeColumnController();
+  }
+
+  /**
+   * 解析模型并初始化相关属性
+   * @author lxm
+   * @date 2024-01-08 05:59:12
+   * @return {*}  {Promise<void>}
+   */
+  async initNodeColumnController(): Promise<void> {
+    this.treeGrid.model.detreeNodes?.forEach(node => {
+      if (node.treeNodeType !== 'DE') {
+        return;
+      }
+      const nodeColumn = node.detreeNodeColumns?.find(
+        (column: IDETreeNodeColumn) => {
+          return column.detreeColumnId === this.model.id;
+        },
+      );
+
+      // 没有指定树表格列的不创建
+      if (nodeColumn) {
+        this.nodeColumnControllerMap.set(
+          node.id!,
+          new TreeGridExNodeColumnController(this, node),
+        );
+      }
+    });
+
+    // 都走一遍初始化
+    await Promise.all(
+      Array.from(this.nodeColumnControllerMap.values()).map(controller =>
+        controller.init(),
+      ),
+    );
+  }
+
+  /**
+   * 初始化属性列界面行为组按钮状态
+   * @author lxm
+   * @date 2024-01-11 01:48:38
+   * @param {ITreeGridExRowState} row
+   */
+  initActionStates(row: ITreeGridExRowState): void {
+    const nodeColumn = this.nodeColumnControllerMap.get(row.data._nodeId);
+    if (nodeColumn) {
+      nodeColumn.initActionStates(row);
+    }
+  }
+
+  gridStateNotify(
+    row: ITreeGridExRowState,
+    state: TreeGridExNotifyState,
+  ): void {
+    super.gridStateNotify(row, state);
+    const nodeColumn = this.nodeColumnControllerMap.get(row.data._nodeId);
+    if (nodeColumn) {
+      nodeColumn.gridStateNotify(row, state);
+    }
+  }
+}