@ibiz-template/runtime 0.4.16 → 0.4.17-dev.1

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/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[];
 }

package/src/interface/common/i-data-ability-params/i-data-ability-params.ts

@@ -12,7 +12,7 @@ export interface IDataAbilityParams {
    * @date 2023-03-21 05:53:33
    * @type {IParams}
    */
-  context?: IParams;
+  context?: IContext;
 
   /**
    * 当前这次操作附加的视图参数

package/src/interface/controller/controller/control/i-grid.controller.ts

@@ -67,6 +67,15 @@ export interface IGridController
    * @memberof IGridController
    */
   validate(row: IGridRowState): Promise<boolean>;
+
+  /**
+   * 设置点击分组后回显相关参数
+   * @param {IData} data
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-21 10:54:45
+   */
+  setGroupParams(data: IData): void;
 }
 
 interface AdditionalProperties {

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

@@ -1,20 +1,19 @@
-import { IDETreeGrid } from '@ibiz/model-core';
+import { IDETreeGridEx } from '@ibiz/model-core';
 import { ITreeGridExEvent } from '../../event';
 import { ITreeGridExState } from '../../state';
-import { IMDControlController } from './i-md-control.controller';
+import { ITreeController } from './i-tree.controller';
 
 /**
  * 树表格(增强)部件控制器
  *
- * @author zk
- * @date 2023-09-21 11:09:17
+ * @author lxm
+ * @date 2023-12-21 11:04:25
  * @export
- * @interface ITreeGridController
- * @extends {IMDControlController<IDETreeGrid, ITreeGridState, ITreeGridEvent>}
+ * @interface ITreeGridExController
+ * @extends {ITreeController<T, S, E>}
  */
-export interface ITreeGridExController
-  extends IMDControlController<
-    IDETreeGrid,
-    ITreeGridExState,
-    ITreeGridExEvent
-  > {}
+export interface ITreeGridExController<
+  T extends IDETreeGridEx = IDETreeGridEx,
+  S extends ITreeGridExState = ITreeGridExState,
+  E extends ITreeGridExEvent = ITreeGridExEvent,
+> extends ITreeController<T, S, E> {}

package/src/interface/controller/controller/control/i-tree.controller.ts

@@ -11,8 +11,11 @@ import { IMDControlController } from './i-md-control.controller';
  * @interface ITreeController
  * @extends {IMDControlController}
  */
-export interface ITreeController
-  extends IMDControlController<IDETree, ITreeState, ITreeEvent> {
+export interface ITreeController<
+  T extends IDETree = IDETree,
+  S extends ITreeState = ITreeState,
+  E extends ITreeEvent = ITreeEvent,
+> extends IMDControlController<T, S, E> {
   /**
    * 树节点点击事件
    *

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

@@ -33,6 +33,7 @@ export * from './i-context-menu.controller';
 export * from './i-kanban.controller';
 export * from './i-tree-grid.controller';
 export * from './i-tree-grid-ex.controller';
+export * from './tree-grid-ex-column/index';
 export * from './i-medit-view-panel.controller';
 export * from './i-chart-exp-bar.controller';
 export * from './i-map.controller';

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

@@ -0,0 +1,12 @@
+import { ITreeGridExController } from '../i-tree-grid-ex.controller';
+
+/**
+ * 树表格（增强）列控制器
+ * @author lxm
+ * @date 2023-05-24 07:34:51
+ * @export
+ * @interface IGridColumnController
+ */
+export interface ITreeGridExColumnController {
+  treeGrid: ITreeGridExController;
+}

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

@@ -0,0 +1 @@
+export * from './i-tree-grid-ex-column.controller';

package/src/interface/controller/controller/i.controller.ts

@@ -17,6 +17,15 @@ export interface IController<
   S extends object = object,
   E extends IComponentEvent = IComponentEvent,
 > extends IEnforceableController {
+  /**
+   * 控制器实例的唯一标识,创建时自动生成
+   *
+   * @author chitanda
+   * @date 2023-12-22 15:12:18
+   * @type {string}
+   */
+  readonly id: string;
+
   /**
    * UI状态
    *

package/src/interface/controller/event/control/i-tree-grid-ex.event.ts

@@ -1,4 +1,4 @@
-import { IMDControlEvent } from './i-md-control.event';
+import { ITreeEvent } from './i-tree.event';
 
 /**
  * 树表格(增强)部件事件
@@ -9,4 +9,4 @@ import { IMDControlEvent } from './i-md-control.event';
  * @interface ITreeGridExEvent
  * @extends {IMDControlEvent}
  */
-export interface ITreeGridExEvent extends IMDControlEvent {}
+export interface ITreeGridExEvent extends ITreeEvent {}

package/src/interface/controller/state/control/i-search-bar.state.ts

@@ -1,5 +1,6 @@
 import { ISearchBarGroup } from '@ibiz/model-core';
 import { IControlState } from './i-control.state';
+import { IColumnState } from './i-grid.state';
 
 export interface IFilterBranchNode {
   /**
@@ -111,4 +112,76 @@ export interface ISearchBarState extends IControlState {
    * @type {IFilterNode[]}
    */
   filterNodes: IFilterNode[];
+
+  /**
+   * 选中的后台分组项
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-21 11:40:29
+   */
+  selectedSearchGroupItem: IBackendSearchBarGroup | null;
+
+  /**
+   * 搜索栏后台分组项
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-19 14:45:33
+   */
+  searchBarGroups: IBackendSearchBarGroup[];
+}
+
+/**
+ * 搜索分组数据接口
+ *
+ */
+export interface ISearchGroupData {
+  /**
+   * 表格列状态
+   */
+  columnstates?: Array<IColumnState>;
+
+  /**
+   * 过滤项树节点数据集合
+   */
+  filternodes?: Array<IFilterNode>;
+
+  /**
+   * 自定义搜索条件
+   */
+  searchconds?: IData;
+
+  /**
+   * 表格排序
+   */
+  sort?: string;
+}
+
+/**
+ * 后台分组接口
+ *
+ */
+export interface IBackendSearchBarGroup extends ISearchBarGroup {
+  /**
+   * 是否保存过
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-22 14:25:09
+   */
+  saved: boolean;
+
+  /**
+   * 是否显示
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-21 11:36:54
+   */
+  show: boolean;
+
+  /**
+   * 搜索分组数据
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-21 11:24:21
+   */
+  searchGroupData: ISearchGroupData;
 }

package/src/interface/controller/state/control/i-tree-grid-ex.state.ts

@@ -1,6 +1,6 @@
+import { IButtonContainerState } from '../../common';
 import { IColumnState } from './i-grid.state';
-import { IMDControlState } from './i-md-control.state';
-import { ITreeNodeData } from './i-tree.state';
+import { ITreeNodeData, ITreeState } from './i-tree.state';
 
 /**
  * 树表格(增强)部件状态
@@ -11,9 +11,7 @@ import { ITreeNodeData } from './i-tree.state';
  * @interface ITreeGridExState
  * @extends {IMDControlState}
  */
-export interface ITreeGridExState extends IMDControlState {
-  items: ITreeNodeData[];
-
+export interface ITreeGridExState extends ITreeState {
   /**
    * 表格列状态数组
    * 顺序就是列的排序
@@ -25,32 +23,37 @@ export interface ITreeGridExState extends IMDControlState {
   columnStates: IColumnState[];
 
   /**
-   * 树的根节点
+   * 树表格(增强)行状态Map
    *
-   * @author zk
-   * @date 2023-09-21 02:09:29
-   * @type {ITreeNodeData[]}
-   * @memberof ITreeGridState
+   * @author lxm
+   * @date 2022-09-05 19:09:12
+   * @type {IGridRowState[]}
    */
-  rootNodes: ITreeNodeData[];
+  rows: { [p: string]: ITreeGridExRowState };
+}
 
+/**
+ * 树表格(增强)行状态
+ * @author lxm
+ * @date 2023-12-21 02:22:02
+ * @export
+ * @interface ITreeGridExRowState
+ */
+export interface ITreeGridExRowState {
   /**
-   * 外部提供的默认展开的节点集合
-   *
-   * @author zk
-   * @date 2023-09-21 02:09:48
-   * @type {string[]}
-   * @memberof ITreeGridState
+   * 行数据（一般是树节点的数据）
+   * @author lxm
+   * @date 2023-12-21 02:27:46
+   * @type {ITreeNodeData}
    */
-  defaultExpandedKeys: string[];
+  data: ITreeNodeData;
 
   /**
-   * 实际默认展开节点集合
+   * 操作列状态(p是操作列的标识)
    *
-   * @author zk
-   * @date 2023-09-21 02:09:42
-   * @type {string[]}
-   * @memberof ITreeGridState
+   * @author lxm
+   * @date 2022-09-07 22:09:38
+   * @type {({ [p: string]: IButtonContainerState  })}
    */
-  expandedKeys: string[];
+  uaColStates: { [p: string]: IButtonContainerState };
 }

package/src/interface/controller/state/control/i-tree.state.ts

@@ -69,7 +69,7 @@ export interface ITreeState extends IMDControlState {
  * @export
  * @class ITreeNodeData
  */
-export interface ITreeNodeData {
+export interface ITreeNodeData extends IData {
   /**
    * 节点数据的唯一标识（创建的时候自动生成）
    * @author lxm
@@ -78,6 +78,14 @@ export interface ITreeNodeData {
    */
   _uuid: string;
 
+  /**
+   * 节点类型
+   * @description 值模式 [云树视图节点类型] {STATIC：静态、 DE：动态（实体）、 CODELIST：动态（代码表） }
+   * @type {( string | 'STATIC' | 'DE' | 'CODELIST')}
+   * 来源  getTreeNodeType
+   */
+  _nodeType?: string;
+
   /**
    * 节点标识(对应节点模型的id)
    *

package/src/interface/provider/i-de-method.provider.ts

@@ -1,5 +1,6 @@
 import { IAppDEMethod, IAppDataEntity } from '@ibiz/model-core';
 import { Method } from '../../service';
+import { IAppDEService } from '../service';
 
 /**
  * 额外创建参数
@@ -16,6 +17,14 @@ export interface IDEMethodCreateOptions {
    * @type {boolean}
    */
   acMode: boolean;
+  /**
+   * 是否为本地模式
+   *
+   * @author chitanda
+   * @date 2023-12-22 15:12:59
+   * @type {boolean}
+   */
+  localMode?: boolean;
 }
 
 /**
@@ -28,6 +37,7 @@ export interface IDEMethodCreateOptions {
  */
 export interface IDEMethodProvider {
   create(
+    service: IAppDEService,
     entity: IAppDataEntity,
     method: IAppDEMethod,
     opts: IDEMethodCreateOptions,

package/src/interface/provider/i-grid-column.provider.ts

@@ -1,10 +1,5 @@
 import { IDEGridColumn } from '@ibiz/model-core';
-import {
-  IGanttController,
-  IGridColumnController,
-  IGridController,
-  ITreeGridExController,
-} from '../controller';
+import { IGridColumnController, IGridController } from '../controller';
 
 /**
  * 表格列适配器的接口
@@ -36,7 +31,7 @@ export interface IGridColumnProvider {
    */
   createController(
     columnModel: IDEGridColumn,
-    grid: IGridController | ITreeGridExController | IGanttController,
+    grid: IGridController,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ): Promise<IGridColumnController>;
 }

package/src/interface/provider/i-tree-grid-ex-column.provider.ts

@@ -0,0 +1,39 @@
+import { IDETreeColumn } from '@ibiz/model-core';
+import {
+  ITreeGridExColumnController,
+  ITreeGridExController,
+} from '../controller';
+
+/**
+ * 树表格（增强）列适配器的接口
+ *
+ * @author lxm
+ * @date 2022-09-19 19:09:10
+ * @export
+ * @interface ITreeGridExColumnProvider
+ */
+export interface ITreeGridExColumnProvider {
+  /**
+   * 树表格（增强）列组件
+   *
+   * @author lxm
+   * @date 2022-09-20 10:09:50
+   * @type {unknown}
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  component: any;
+
+  /**
+   * 创建树表格（增强）列控制器
+   *
+   * @author lxm
+   * @date 2022-11-09 10:11:07
+   * @param {GridColumnModel} columnModel 列模型
+   * @param {GridController} grid 树表格（增强）控制器
+   * @returns {*}  {Promise<GridColumnController>}
+   */
+  createController(
+    columnModel: IDETreeColumn,
+    treeGrid: ITreeGridExController,
+  ): Promise<ITreeGridExColumnController>;
+}

package/src/interface/provider/index.ts

@@ -16,3 +16,4 @@ export type {
   IDEMethodProvider,
   IDEMethodCreateOptions,
 } from './i-de-method.provider';
+export type { ITreeGridExColumnProvider } from './i-tree-grid-ex-column.provider';