@ibiz-template/runtime 0.4.17-dev.0 → 0.5.0-beta.0

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

@@ -1,171 +1,16 @@
-import { IHttpResponse } from '@ibiz-template/core';
-import {
-  IDETreeDataSetNode,
-  IDETreeNode,
-  IDETreeNodeRS,
-} from '@ibiz/model-core';
-import { isArray } from 'qx-util';
-import { ITreeNodeData } from '../../../interface';
-
-import { ControlVO, TreeDataSetNodeData, UIMapField } from '../../../service';
-import { TreeFetchOpts, TreeService } from '../tree/tree.service';
+import { IDETreeGridEx } from '@ibiz/model-core';
+import { TreeService } from '../tree/tree.service';
 
 /**
  * 树表格增强部件服务
  *
- * @author zk
- * @date 2023-09-25 05:09:52
+ * @author lxm
+ * @date 2023-12-21 10:50:35
  * @export
- * @class TreeGridService
- * @extends {TreeService}
+ * @class TreeGridExService
+ * @extends {TreeService<T>}
+ * @template T
  */
-export class TreeGridExService extends TreeService {
-  /**
-   * 表格列映射关系
-   *
-   * @author zk
-   * @date 2023-09-25 05:09:11
-   * @type {Map<string, Map<string, UIMapField>>}
-   * @memberof TreeGridService
-   */
-  multipleUiMap: Map<string, Map<string, UIMapField>> = new Map();
-
-  /**
-   * 初始化节点属性映射
-   *
-   * @author lxm
-   * @date 2022-08-31 18:08:37
-   */
-  initUIDataMap(): void {
-    super.initUIDataMap();
-    this.model.detreeNodes?.forEach((item: IDETreeNode) => {
-      const dataMap: Map<string, UIMapField> = new Map();
-      item.detreeNodeDataItems?.forEach(dataItem => {
-        const uiKey = dataItem.id!.toLowerCase();
-        const deField = dataItem.appDEFieldId!;
-        // 后台实体属性
-        const deFieldKey = deField.toLowerCase();
-        const mapField = new UIMapField(uiKey, deFieldKey, {
-          isOriginField: true,
-          dataType: dataItem.dataType,
-        });
-        dataMap.set(uiKey, mapField);
-      });
-      this.multipleUiMap.set(item.id!, dataMap);
-    });
-  }
-
-  /**
-   * 获取实体数据集数据
-   *
-   * @protected
-   * @param {TreeNodeRSModel} nodeRS
-   * @param {TreeFetchOpts} opts
-   * @returns {*}
-   * @memberof TreeService
-   */
-  protected async getDENodeDatas(
-    nodeModel: IDETreeDataSetNode,
-    nodeRS: IDETreeNodeRS | undefined,
-    parentNodeData: ITreeNodeData | undefined,
-    opts: TreeFetchOpts,
-  ): Promise<TreeDataSetNodeData[]> {
-    const { appDEDataSetId, appDataEntityId } = nodeModel;
-
-    // 处理查询参数,没有关系的时候不处理参数了
-    const { context, params, navContext, navParams } = nodeRS
-      ? this.getNodeRSFilterParams(nodeRS, parentNodeData, opts)
-      : {
-          context: opts.context,
-          params: opts.params,
-          navContext: {},
-          navParams: {},
-        };
-
-    // 设置查询长度
-    params.size = nodeModel.maxSize || 1000;
-    // 排序属性
-    if (nodeModel.sortAppDEFieldId && nodeModel.sortDir) {
-      Object.assign(params, {
-        sort: `${nodeModel.sortAppDEFieldId.toLowerCase()},${nodeModel.sortDir.toLowerCase()}`,
-      });
-    }
-
-    // 请求实体数据
-    const response = await this.app.deService.exec(
-      appDataEntityId!,
-      appDEDataSetId!,
-      context,
-      params,
-    );
-
-    if (response.data.length) {
-      const { data } = this.handleResponseForMultiple(response, nodeModel.id!);
-      const nodeDatas = data.map((item: ControlVO) => {
-        return new TreeDataSetNodeData(nodeModel, parentNodeData, {
-          data: item,
-          leaf: !!opts.leaf,
-          navContext,
-          navParams,
-        });
-      });
-      return nodeDatas;
-    }
-    return [];
-  }
-
-  /**
-   * 处理多数据源响应
-   *
-   * @author zk
-   * @date 2023-09-21 04:09:06
-   * @param {IHttpResponse} response
-   * @param {string} tag 多数据源dataUIMap标识
-   * @return {*}  {IHttpResponse}
-   * @memberof TreeGridService
-   */
-  handleResponseForMultiple(
-    response: IHttpResponse,
-    tag: string,
-  ): IHttpResponse {
-    const res = super.handleResponse(response) as IHttpResponse<
-      IData[] | IData
-    >;
-    if (res.headers) {
-      if (res.headers['x-page']) {
-        res.page = Number(res.headers['x-page']);
-      }
-      if (res.headers['x-per-page']) {
-        res.size = Number(res.headers['x-per-page']);
-      }
-      if (res.headers['x-total']) {
-        res.total = Number(res.headers['x-total']);
-      }
-    }
-    if (res.ok) {
-      if (isArray(res.data)) {
-        res.data = (res.data as IData[]).map(item =>
-          this.toUIDataForMultiple(item, tag),
-        );
-      } else {
-        res.data = this.toUIDataForMultiple(res.data, tag);
-      }
-    }
-    return res;
-  }
-
-  /**
-   * 实体数据转ui数据
-   *
-   * @author zk
-   * @date 2023-09-21 06:09:06
-   * @param {IData} entityData 实体数据
-   * @param {string} tag 多数据源dataUIMap标识
-   * @return {*}  {ControlVO}
-   * @memberof TreeGridService
-   */
-  toUIDataForMultiple(entityData: IData, tag: string): ControlVO {
-    const dataUIMap = this.multipleUiMap.get(tag);
-    return new ControlVO(entityData, dataUIMap);
-  }
-}
+export class TreeGridExService<
+  T extends IDETreeGridEx = IDETreeGridEx,
+> extends TreeService<T> {}

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/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-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';

package/src/interface/service/service/i-app-de.service.ts

@@ -3,6 +3,7 @@ import { DECache } from '../../../service/utils';
 import { IFileService } from './i-file.service';
 import { IWorkFlowService } from './i-wf.service';
 import { IConfigService } from './i-config.service';
+import { IDataEntity } from '../i-data-entity/i-data-entity';
 
 /**
  * 实体服务
@@ -321,6 +322,18 @@ export interface IAppDEService {
     data?: IData,
   ): Promise<IHttpResponse>;
 
+  /**
+   * 创建当前数据对象实例
+   *
+   * @author chitanda
+   * @date 2023-12-23 19:12:01
+   * @param {(IData[] | IDataEntity[] | IData | IDataEntity)} data
+   * @return {*}  {(IDataEntity | IDataEntity[])}
+   */
+  createEntity(
+    data: IData[] | IDataEntity[] | IData | IDataEntity,
+  ): IDataEntity | IDataEntity[];
+
   /**
    * 当前实体服务销毁时调用
    *

package/src/register/helper/index.ts

@@ -11,3 +11,4 @@ export * from './view-register';
 export * from './async-action-register';
 export * from './platform-register';
 export * from './de-method-register';
+export * from './tree-grid-ex-column-register';

package/src/register/helper/tree-grid-ex-column-register.ts

@@ -0,0 +1,67 @@
+import { IDETreeColumn } from '@ibiz/model-core';
+import { ITreeGridExColumnProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
+
+/** 表格列适配器前缀 */
+export const TREEGRIDEX_COLUMN_PROVIDER_PREFIX = 'TREEGRIDEX_COLUMN';
+
+/**
+ * 注册表格列适配器
+ * @author lxm
+ * @date 2023-05-06 09:14:16
+ * @export
+ * @param {string} key
+ * @param {() => ITreeGridExColumnProvider} callback 生成表格列适配器的回调
+ */
+export function registerTreeGridExColumnProvider(
+  key: string,
+  callback: () => ITreeGridExColumnProvider,
+): void {
+  ibiz.register.register(
+    `${TREEGRIDEX_COLUMN_PROVIDER_PREFIX}_${key}`,
+    callback,
+  );
+}
+
+function getProvider(key: string): ITreeGridExColumnProvider | undefined {
+  return ibiz.register.get(
+    `${TREEGRIDEX_COLUMN_PROVIDER_PREFIX}_${key}`,
+  ) as ITreeGridExColumnProvider;
+}
+
+/**
+ * 获取表格列适配器
+ * @author lxm
+ * @date 2023-05-06 09:29:23
+ * @export
+ * @param {IAppView} model
+ * @return {*}  {Promise<ITreeGridExColumnProvider>}
+ */
+export async function getTreeGridExColumnProvider(
+  model: IDETreeColumn,
+): Promise<ITreeGridExColumnProvider | undefined> {
+  let provider: ITreeGridExColumnProvider | undefined;
+  const { columnType, appId, renderSysPFPluginId } =
+    model as Required<IDETreeColumn>;
+
+  // 树表格列插件
+  if (renderSysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(renderSysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到树表格列插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
+  }
+
+  // 找表格列类型
+  provider = getProvider(columnType);
+  if (!provider) {
+    ibiz.log.error(`找不到表格列类型${columnType}对应的适配器`);
+  } else {
+    return provider;
+  }
+}

package/src/service/de-service-util.ts

@@ -32,11 +32,13 @@ export class DEServiceUtil {
 
   /**
    * 实体服务构造方法缓存
+   *
    * @author lxm
    * @date 2023-05-15 08:37:13
    * @protected
    */
-  protected constructorCache: Map<string, DEServiceConstructor> = new Map();
+  protected static constructorCache: Map<string, DEServiceConstructor> =
+    new Map();
 
   /**
    * Creates an instance of DEServiceUtil.
@@ -55,8 +57,8 @@ export class DEServiceUtil {
    * @param {string} id 实体标识
    * @param {DEServiceConstructor} constructor
    */
-  register(id: string, constructor: DEServiceConstructor): void {
-    this.constructorCache.set(id, constructor);
+  static register(id: string, constructor: DEServiceConstructor): void {
+    this.constructorCache.set(id.toUpperCase(), constructor);
   }
 
   /**
@@ -82,7 +84,7 @@ export class DEServiceUtil {
       if (!entityModel) {
         throw new RuntimeError(`未找到应用实体[${id}]`);
       }
-      const constructor = this.constructorCache.get(id);
+      const constructor = DEServiceUtil.constructorCache.get(id.toUpperCase());
       let service: IAppDEService;
       if (constructor) {
         service = await constructor(sandboxId, entityModel);