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

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/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/vo/tree-node-data/tree-data-set-node-data.ts

@@ -1,4 +1,6 @@
+/* eslint-disable no-constructor-return */
 import { IDETreeDataSetNode, IDETreeNodeDataItem } from '@ibiz/model-core';
+import { updateKeyDefine } from '@ibiz-template/core';
 import { IIcon, ITreeNodeData } from '../../../interface';
 import { calcDeCodeNameById } from '../../../model';
 import { ScriptFactory } from '../../../utils';
@@ -70,6 +72,57 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
     if (model.leafFlagAppDEFieldId) {
       this.leaf = fieldValueToBoolean(data[model.leafFlagAppDEFieldId]);
     }
+
+    /** 数据项映射 */
+    const dataItemkeyMap = new Map<string | symbol, string | symbol>();
+    const dataItemDefaults: IData = {};
+    model.detreeNodeDataItems?.forEach(dataItem => {
+      const uiKey = dataItem.id!.toLowerCase();
+      // 后台实体属性
+      const deFieldKey = dataItem.appDEFieldId!.toLowerCase();
+      dataItemkeyMap.set(uiKey, deFieldKey);
+      if (dataItem.defaultValue) {
+        dataItemDefaults[uiKey] = dataItem.defaultValue;
+      }
+    });
+
+    return new Proxy<TreeDataSetNodeData>(this, {
+      set(target, p, value): boolean {
+        if (Object.prototype.hasOwnProperty.call(target.deData, p)) {
+          target.deData[p] = value;
+        } else if (dataItemkeyMap.has(p)) {
+          target.deData[dataItemkeyMap.get(p)!] = value;
+        } else {
+          target[p] = value;
+        }
+        return true;
+      },
+
+      get(target, p, _receiver): unknown {
+        if (target[p] !== undefined) {
+          return target[p];
+        }
+        if (dataItemkeyMap.has(p)) {
+          return target.deData[dataItemkeyMap.get(p)!] || dataItemDefaults[p];
+        }
+        if (target.deData[p] !== undefined) {
+          return target.deData[p];
+        }
+      },
+
+      ownKeys(target): ArrayLike<string | symbol> {
+        // 整合所有并排除重复
+        const allKeys = [
+          ...new Set([
+            ...Object.keys(target),
+            ...dataItemkeyMap.keys(),
+            ...Object.keys(target.deData),
+          ]),
+        ];
+        updateKeyDefine(target, allKeys);
+        return allKeys;
+      },
+    });
   }
 
   protected calcIcon(model: IDETreeDataSetNode): IIcon | undefined {

package/src/service/vo/tree-node-data/tree-node-data.ts

@@ -12,6 +12,8 @@ import { IIcon, ITreeNodeData } from '../../../interface';
 export abstract class TreeNodeData implements ITreeNodeData {
   _uuid: string = createUUID();
 
+  _nodeType: string;
+
   id!: string;
 
   value?: string | undefined;
@@ -40,6 +42,9 @@ export abstract class TreeNodeData implements ITreeNodeData {
 
   textHtml?: string;
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [key: string | symbol]: any;
+
   constructor(
     model: IDETreeNode,
     parentNodeData: ITreeNodeData | undefined,
@@ -47,6 +52,7 @@ export abstract class TreeNodeData implements ITreeNodeData {
   ) {
     this.leaf = opts.leaf === true;
     this.parent = parentNodeData;
+    this._nodeType = model.treeNodeType!;
 
     // 所有节点都要继承父的上下文，如果父存在则复制父的资源上下文，否则返回空对象。
     if (this.parent) {