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

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

@@ -1,27 +1,16 @@
 /* eslint-disable no-param-reassign */
 /* eslint-disable no-prototype-builtins */
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { recursiveIterate } from '@ibiz-template/core';
-import { IDEGantt, IDETreeColumn, IDETreeNode } from '@ibiz/model-core';
+import { IDEGantt, IDETreeNode } from '@ibiz/model-core';
 import {
   IGanttController,
   IGanttEvent,
   IGanttNodeData,
   IGanttState,
   IGanttStyle,
-  IGridColumnProvider,
-  MDCtrlLoadParams,
 } from '../../../interface';
-import { MDControlController } from '../../common';
 import { GanttService } from './gantt.service';
-import { ContextMenuController } from '../context-menu';
-import {
-  GridColumnController,
-  GridFieldColumnController,
-  GridUAColumnController,
-} from '../grid';
-import { getGridColumnProvider } from '../../../register';
-import { UIActionUtil } from '../../../ui-action';
+import { TreeGridExController } from '../tree-grid-ex';
 
 /**
  * 甘特图控制器
@@ -34,61 +23,11 @@ import { UIActionUtil } from '../../../ui-action';
  * @implements {IGanttController}
  */
 export class GanttController
-  extends MDControlController<IDEGantt, IGanttState, IGanttEvent>
+  extends TreeGridExController<IDEGantt, IGanttState, IGanttEvent>
   implements IGanttController
 {
   declare service: GanttService;
 
-  /**
-   * 表格列适配器
-   *
-   * @type {{ [key: string]: IGridColumnProvider }}
-   * @memberof GanttController
-   */
-  providers: { [key: string]: IGridColumnProvider } = {};
-
-  /**
-   * 所有表格列控制器集合
-   *
-   * @type {{ [key: string]: GridColumnController }}
-   * @memberof GanttController
-   */
-  columns: { [key: string]: GridColumnController } = {};
-
-  /**
-   * 所有表格属性列的控制器
-   *
-   * @type {{ [key: string]: GridFieldColumnController }}
-   * @memberof GanttController
-   */
-  fieldColumns: { [key: string]: GridFieldColumnController } = {};
-
-  /**
-   * 所有表格操作列的控制器
-   *
-   * @type {{ [key: string]: GridUAColumnController }}
-   * @memberof GanttController
-   */
-  uaColumns: { [key: string]: GridUAColumnController } = {};
-
-  /**
-   * 上下文菜单控制器
-   *
-   * @author tony001
-   * @date 2023-12-11 16:12:57
-   * @type {{ [p: string]: ContextMenuController }}
-   */
-  contextMenus: { [p: string]: ContextMenuController } = {};
-
-  /**
-   * 是否启用快速搜索
-   *
-   * @author tony001
-   * @date 2023-12-11 16:12:13
-   * @type {boolean}
-   */
-  enableQuickSearch: boolean = false;
-
   /**
    * 初始化状态
    *
@@ -98,9 +37,6 @@ export class GanttController
    */
   protected initState(): void {
     super.initState();
-    this.state.size = 0;
-    this.state.query = '';
-    this.state.columnStates = [];
     this.state.rootNodes = [];
     this.state.ganttStyle = {};
   }
@@ -114,148 +50,16 @@ export class GanttController
    */
   protected onDataChange(msg: IData): void {}
 
-  protected async onCreated(): Promise<void> {
-    await super.onCreated();
-    await this.initGridColumns();
-    this.initColumnStates();
-
-    // 快速搜索
-    if (this.model.detreeNodes?.[0].enableQuickSearch) {
-      this.enableQuickSearch = true;
-    }
-
-    // 计算快速搜索占位符
-    if (this.dataEntity) {
-      const searchFields = this.dataEntity.appDEFields?.filter(field => {
-        return field.enableQuickSearch;
-      });
-      const placeHolders: string[] = [];
-      searchFields?.forEach(searchField => {
-        if (searchField?.lnlanguageRes && searchField.lnlanguageRes.lanResTag) {
-          placeHolders.push(
-            ibiz.i18n.t(
-              searchField.lnlanguageRes.lanResTag,
-              searchField.logicName,
-            ),
-          );
-        } else if (searchField?.logicName) {
-          placeHolders.push(searchField.logicName);
-        }
-      });
-      if (placeHolders.length > 0) {
-        this.state.placeHolder = placeHolders.join('、');
-      }
-    }
-
-    this.service = new GanttService(this.model);
-    await this.service.init(this.context);
-
-    // 初始化上下文菜单控制器
-    this.model.detreeNodes!.forEach(node => {
-      if (node.decontextMenu?.detoolbarItems?.length) {
-        this.contextMenus[node.decontextMenu.id!] = new ContextMenuController(
-          node.decontextMenu,
-          this.context,
-          this.params,
-          this.ctx,
-        );
-      }
-    });
-
-    // 上下文菜单控制器初始化
-    await Promise.all(
-      Object.values(this.contextMenus).map(menu => menu.created()),
-    );
-  }
-
-  /**
-   * 初始化表格列
-   *
-   * @protected
-   * @return {*}  {Promise<void>}
-   * @memberof GanttController
-   */
-  protected async initGridColumns(): Promise<void> {
-    if (this.model.detreeColumns) {
-      await Promise.all(
-        this.model.detreeColumns.map(async column =>
-          this.initColumnsController(column),
-        ),
-      );
-    }
-  }
-
   /**
-   * 初始化表格属性列，操作列，编辑项控制器
+   * 初始化对应类型的部件服务
    *
    * @protected
-   * @param {IDETreeColumn} column
    * @return {*}  {Promise<void>}
    * @memberof GanttController
    */
-  protected async initColumnsController(column: IDETreeColumn): Promise<void> {
-    // 初始化适配器
-    const provider = await getGridColumnProvider(column);
-    if (!provider) {
-      return;
-    }
-    this.providers[column.codeName!] = provider;
-
-    // 初始化表格列控制器
-    // 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') {
-      this.fieldColumns[column.codeName!] =
-        controller as GridFieldColumnController;
-    } else if (column.columnType === 'UAGRIDCOLUMN') {
-      this.uaColumns[column.codeName!] = controller as GridUAColumnController;
-    }
-  }
-
-  /**
-   * 初始化表格列状态
-   *
-   * @protected
-   * @memberof GanttController
-   */
-  protected initColumnStates(): void {
-    recursiveIterate(
-      this.model,
-      (column: IDETreeColumn) => {
-        if (column.columnType !== 'GROUPGRIDCOLUMN') {
-          this.state.columnStates.push({
-            key: column.codeName!,
-            caption: column.caption!,
-            hidden: !!column.hideDefault,
-            uaColumn: column.columnType === 'UAGRIDCOLUMN',
-          });
-        }
-      },
-      { childrenFields: ['detreeColumns'] },
-    );
-    this.calcColumnFixed();
-  }
-
-  /**
-   * 计算列的固定状态
-   *
-   * @protected
-   * @memberof GanttController
-   */
-  protected calcColumnFixed(): void {
-    const showColumns = this.state.columnStates.filter(
-      column => !column.hidden,
-    );
-    const allNum = showColumns.length;
-    showColumns.forEach((column, index) => {
-      if (column.uaColumn) {
-        column.fixed = index + 1 <= Math.floor(allNum / 2) ? 'left' : 'right';
-      } else {
-        column.fixed = 'right';
-      }
-    });
+  protected async initService(): Promise<void> {
+    this.service = new GanttService(this.model);
+    await this.service.init(this.context);
   }
 
   /**
@@ -268,252 +72,6 @@ export class GanttController
     this.state.ganttStyle = style;
   }
 
-  /**
-   * 加载
-   *
-   * @author tony001
-   * @date 2023-12-12 11:12:08
-   * @param {MDCtrlLoadParams} [args={}]
-   * @return {*}  {Promise<IGanttNodeData[]>}
-   */
-  async load(args: MDCtrlLoadParams = {}): Promise<IGanttNodeData[]> {
-    const isInitialLoad = args.isInitialLoad === true;
-    if (isInitialLoad) {
-      await this.startLoading();
-    }
-    let nodes;
-    try {
-      nodes = await this.loadNodes();
-    } finally {
-      if (isInitialLoad) {
-        await this.endLoading();
-      }
-    }
-    await this.afterLoad(args, nodes);
-    this.state.isLoaded = true;
-    await this.evt.emit('onLoadSuccess', {
-      isInitialLoad,
-    });
-
-    return nodes;
-  }
-
-  /**
-   * 获取节点模型
-   *
-   * @param {string} id
-   * @return {*}  {(IDETreeNode | undefined)}
-   * @memberof GanttController
-   */
-  getNodeModel(id: string): IDETreeNode | undefined {
-    return this.model.detreeNodes?.find(item => item.id === id);
-  }
-
-  /**
-   * 获取查询参数
-   *
-   * @author tony001
-   * @date 2023-12-12 11:12:22
-   * @param {IParams} [extraParams]
-   * @return {*}  {Promise<IParams>}
-   */
-  async getFetchParams(extraParams?: IParams): Promise<IParams> {
-    const params = await super.getFetchParams(extraParams);
-    if (this.state.query) {
-      params.query = this.state.query;
-    }
-    return params;
-  }
-
-  /**
-   * 加载节点
-   *
-   * @author tony001
-   * @date 2023-12-12 11:12:33
-   * @param {IGanttNodeData} [parentNode]
-   * @return {*}  {Promise<IGanttNodeData[]>}
-   */
-  async loadNodes(parentNode?: IGanttNodeData): Promise<IGanttNodeData[]> {
-    const params = await this.getFetchParams();
-    const hasQuery = !!params.query;
-
-    this.state.isLoading = true;
-
-    let nodes: IGanttNodeData[] | undefined;
-    try {
-      // 请求服务获取子节点数据
-      nodes =
-        (await this.service.fetchGanttChildNodes(parentNode, {
-          context: this.context.clone(),
-          params,
-          hasQuery,
-          defaultExpandedKeys: [],
-        })) || [];
-    } finally {
-      this.state.isLoading = false;
-    }
-
-    // 有父节点绑定到父节点数据上，无父节点替换rootNodes
-    if (parentNode) {
-      parentNode.children = nodes;
-    } else {
-      this.state.rootNodes = nodes;
-    }
-
-    // 更新items
-    this.state.items = [];
-    recursiveIterate(
-      { children: this.state.rootNodes },
-      (node: IGanttNodeData) => {
-        this.state.items.push(node);
-      },
-    );
-    return nodes;
-  }
-
-  /**
-   * 甘特节点点击事件
-   *
-   * @param {IGanttNodeData} nodeData
-   * @return {*}  {Promise<void>}
-   * @memberof GanttController
-   */
-  async onGanttNodeClick(nodeData: IGanttNodeData): Promise<void> {
-    // 单选时，单击才会触发选中逻辑
-    if (this.state.singleSelect) {
-      // 选中相关处理
-      const { selectedData } = this.state;
-      // 选中里没有则添加，有则删除
-      const filterArr = selectedData.filter(item => item.id !== nodeData.id);
-      if (filterArr.length === selectedData.length) {
-        this.setSelection(
-          this.state.singleSelect
-            ? [nodeData]
-            : selectedData.concat([nodeData]),
-        );
-      } else {
-        this.setSelection(filterArr);
-      }
-    }
-
-    // 激活事件
-    if (this.state.mdctrlActiveMode === 1) {
-      await this.setActive(nodeData);
-    }
-  }
-
-  /**
-   * 甘特节点双击事件
-   *
-   * @param {IGanttNodeData} nodeData
-   * @return {*}  {Promise<void>}
-   * @memberof GanttController
-   */
-  async onDbGanttNodeClick(nodeData: IGanttNodeData): Promise<void> {
-    if (this.state.mdctrlActiveMode === 2) {
-      await this.setActive(nodeData);
-    }
-  }
-
-  /**
-   * 设置激活
-   *
-   * @param {IGanttNodeData} item
-   * @return {*}  {Promise<void>}
-   * @memberof GanttController
-   */
-  setActive(item: IGanttNodeData): Promise<void> {
-    const nodeParams = this.parseGanttNodeData(item);
-    return this.evt.emit('onActive', { ...nodeParams, nodeData: item });
-  }
-
-  /**
-   * 设置选中
-   *
-   * @param {IData[]} selection
-   * @memberof GanttController
-   */
-  setSelection(selection: IData[]): void {
-    // 通过id过滤出原始的树节点数据，避免外部使用的时候传入的选中数据有问题。
-    const selectionIds = selection.map(item => item.id);
-    const filterArr = this.state.items.filter(item =>
-      selectionIds.includes(item.id),
-    );
-    super.setSelection(filterArr);
-  }
-
-  /**
-   * 执行界面行为
-   *
-   * @param {string} uiActionId
-   * @param {IGanttNodeData} nodeData
-   * @param {MouseEvent} event
-   * @param {string} appId
-   * @return {*}  {Promise<void>}
-   * @memberof GanttController
-   */
-  async doUIAction(
-    uiActionId: string,
-    nodeData: IGanttNodeData,
-    event: MouseEvent,
-    appId: string,
-  ): Promise<void> {
-    const eventArgs = this.getEventArgs();
-    const nodeParams = this.parseGanttNodeData(nodeData);
-    const result = await UIActionUtil.exec(
-      uiActionId!,
-      {
-        ...eventArgs,
-        ...nodeParams,
-        event,
-      },
-      appId,
-    );
-    if (result.closeView) {
-      this.view.closeView();
-    } else if (result.refresh) {
-      switch (result.refreshMode) {
-        // 刷新当前节点的子
-        case 1:
-          this.refreshNodeChildren(nodeData);
-          break;
-        // 刷新当前节点的父节点的子
-        case 2:
-          this.refreshNodeChildren(nodeData, true);
-          break;
-        // 刷新所有节点数据
-        case 3:
-          this.refresh();
-          break;
-        default:
-      }
-    }
-  }
-
-  /**
-   * 解析甘特节点获取通用数据，和完整的上下文和视图参数。
-   *
-   * @protected
-   * @param {IGanttNodeData} nodeData
-   * @return {*}  {{
-   *     data: IData[];
-   *     context: IContext;
-   *     params: IParams;
-   *   }}
-   * @memberof GanttController
-   */
-  protected parseGanttNodeData(nodeData: IGanttNodeData): {
-    data: IData[];
-    context: IContext;
-    params: IParams;
-  } {
-    return {
-      data: [{ ...nodeData, ...(nodeData.deData || {}) }],
-      context: Object.assign(this.context.clone(), nodeData.context || {}),
-      params: { ...this.params, ...(nodeData.params || {}) },
-    };
-  }
-
   /**
    * 转化节点数据项
    * vo -> do
@@ -581,47 +139,4 @@ export class GanttController
       }
     }
   }
-
-  /**
-   * 刷新指定树节点的子节点数据
-   *
-   * @param {(IGanttNodeData | IData)} nodeData 指定树节点数据，可以是节点数据，也可以是对应的实体数据
-   * @param {boolean} [refreshParent=false] 是否是刷新给定节点数据的父节点的子节点数据
-   * @return {*}  {Promise<void>}
-   * @memberof GanttController
-   */
-  async refreshNodeChildren(
-    nodeData: IGanttNodeData | IData,
-    refreshParent = false,
-  ): Promise<void> {
-    const key = nodeData.srfkey ? 'srfkey' : 'id';
-    const currentNode = this.state.items.find(
-      item => item[key] === nodeData[key],
-    );
-    if (!currentNode) {
-      ibiz.log.error('找不到对应的树节点数据', nodeData);
-      return;
-    }
-
-    // 刷新父，但是没父，刷新根
-    if (refreshParent) {
-      const { parent } = currentNode;
-      // 没有父，或者父是不显示的根节点，那么刷新所有
-      if (
-        !parent ||
-        (!this.model.rootVisible && this.state.rootNodes.includes(parent))
-      ) {
-        this.refresh();
-        return;
-      }
-    }
-
-    const targetNode = refreshParent ? currentNode.parent! : currentNode;
-
-    const nodes = await this.loadNodes(targetNode);
-    this.evt.emit('onAfterRefreshParent', {
-      parentNode: targetNode,
-      children: nodes,
-    });
-  }
 }

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

@@ -59,7 +59,7 @@ export class GanttService extends TreeService {
    * @param {TreeFetchOpts} opts
    * @return {*}  {(Promise<IGanttNodeData[] | undefined>)}
    */
-  async fetchGanttChildNodes(
+  async fetchChildNodes(
     parentNodeData: IGanttNodeData | undefined,
     opts: TreeFetchOpts,
   ): Promise<IGanttNodeData[] | undefined> {
@@ -69,7 +69,7 @@ export class GanttService extends TreeService {
     if (!parentNodeData) {
       // 没有父节点的加载根节点数据
       const rootNode = getRootNode(this.model);
-      childrenNodes = await this.fetchGanttNodeDatasByType(
+      childrenNodes = await this.fetchNodeDatasByType(
         rootNode,
         undefined,
         undefined,
@@ -91,7 +91,7 @@ export class GanttService extends TreeService {
             this.model,
             childNodeRS.childDETreeNodeId!,
           );
-          return this.fetchGanttNodeDatasByType(
+          return this.fetchNodeDatasByType(
             childNode,
             childNodeRS,
             parentNodeData,
@@ -120,7 +120,7 @@ export class GanttService extends TreeService {
    * @param {TreeFetchOpts} opts
    * @return {*}  {Promise<IGanttNodeData[]>}
    */
-  protected async fetchGanttNodeDatasByType(
+  protected async fetchNodeDatasByType(
     nodeModel: IDETreeNode,
     nodeRS: IDETreeNodeRS | undefined,
     parentNodeData: IGanttNodeData | undefined,
@@ -181,7 +181,7 @@ export class GanttService extends TreeService {
               (!expandFirstOnly || (expandFirstOnly && index === 0))) ||
             isExpandedRoot
           ) {
-            const subChildrenNodes = await this.fetchGanttChildNodes(
+            const subChildrenNodes = await this.fetchChildNodes(
               childNode,
               opts,
             );

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

@@ -581,10 +581,10 @@ export class KanbanController
   /**
    * 打开批操作工具栏
    *
-   * @param {string} groupKey
+   * @param {string | number} groupKey
    * @memberof KanbanController
    */
-  openBatch(groupKey: string): void {
+  openBatch(groupKey: string | number): void {
     this.state.selectGroupKey = groupKey;
     this.state.batching = true;
     this.state.selectedData = [];

package/src/controller/control/list/list.controller.ts

@@ -3,7 +3,6 @@ import {
   IListState,
   IListEvent,
   IListController,
-  IToolbarController,
   MDCtrlLoadParams,
   IMDControlGroupState,
   CodeListItem,
@@ -52,59 +51,6 @@ export class ListController
     }
   }
 
-  /**
-   * 工具栏
-   *
-   * @author zk
-   * @date 2023-08-02 06:08:34
-   * @readonly
-   * @type {(IToolbarController | undefined)}
-   * @memberof ListController
-   */
-  protected get batchToolbarController(): IToolbarController | undefined {
-    const controller = this.view.getController(
-      `${this.model.name!}_batchtoolbar`,
-    );
-    return controller as IToolbarController;
-  }
-
-  /**
-   * 工具栏
-   *
-   * @author zk
-   * @date 2023-08-02 06:08:34
-   * @readonly
-   * @type {(IToolbarController | undefined)}
-   * @memberof ListController
-   */
-  protected get quickToolbarController(): IToolbarController | undefined {
-    const controller = this.view.getController(
-      `${this.model.name!}_quicktoolbar`,
-    );
-    return controller as IToolbarController;
-  }
-
-  /**
-   * 根据数据计算工具栏权限和状态
-   *
-   * @author zk
-   * @date 2023-08-02 06:08:11
-   * @param {IData[]} selection
-   * @memberof ListController
-   */
-  setSelection(selection: IData[]): void {
-    super.setSelection(selection);
-    const data = selection?.[0];
-    this.batchToolbarController?.calcButtonState(
-      data,
-      this.model.appDataEntityId,
-    );
-    this.quickToolbarController?.calcButtonState(
-      data,
-      this.model.appDataEntityId,
-    );
-  }
-
   /**
    * 加载更多
    * @author lxm

package/src/controller/control/md-ctrl/md-ctrl.controller.ts

@@ -84,7 +84,7 @@ export class MDCtrlController
   async loadMore(): Promise<void> {
     // 修复加载更多时，数据未加载成功 但是还是会继续加载的问题
     if (this.state.total > this.state.items.length && !this.state.isLoading) {
-      await this.load({ isLoadMore: true });
+      await this.load({ isLoadMore: true, silent: true });
     }
   }
 

package/src/controller/control/search-bar/index.ts

@@ -1 +1,2 @@
 export * from './search-bar.controller';
+export { SearchBarFilterController } from './search-bar-filter.controller';