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

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

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

@@ -1,4 +1,4 @@
-import { recursiveIterate } from '@ibiz-template/core';
+import { mergeInLeft, recursiveIterate } from '@ibiz-template/core';
 import { IAppDataEntity, ISearchBar } from '@ibiz/model-core';
 import { isNil } from 'ramda';
 import {
@@ -6,10 +6,13 @@ import {
   ISearchBarEvent,
   ISearchBarController,
   IFilterNode,
+  IBackendSearchBarGroup,
+  IGridController,
 } from '../../../interface';
 import { convertNavData, ScriptFactory } from '../../../utils';
 import { ControlController } from '../../common';
 import { SearchBarFilterController } from './search-bar-filter.controller';
+import { SearchBarService } from './search-bar.service';
 
 /**
  * 搜索栏控制器
@@ -40,6 +43,40 @@ export class SearchBarController
    */
   filterControllers: SearchBarFilterController[] = [];
 
+  /**
+   * 搜索栏服务
+   * @author lxm
+   * @date 2023-05-15 11:03:34
+   * @type {EditFormService}
+   */
+  service!: SearchBarService;
+
+  /**
+   * 当前编辑的分组
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-20 18:06:37
+   */
+  currentEditGroup: IBackendSearchBarGroup | null = null;
+
+  /**
+   * 是否为后台分组
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-21 10:17:43
+   */
+  isBackendSearchGroup = true;
+
+  /**
+   * 表格控制器
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-22 13:50:16
+   */
+  get grid(): IGridController | undefined {
+    return this.ctx.getController('grid') as IGridController;
+  }
+
   /**
    * 实体模型
    * @author lxm
@@ -60,6 +97,8 @@ export class SearchBarController
     if (this.model.enableFilter) {
       this.resetFilter();
     }
+    this.state.searchBarGroups = [];
+    this.state.selectedSearchGroupItem = null;
   }
 
   protected async onCreated(): Promise<void> {
@@ -73,7 +112,14 @@ export class SearchBarController
       this.calcQuickSearchPlaceholder();
     }
 
+    // 实例部件服务
+    if (this.isBackendSearchGroup && this.view.model.codeName) {
+      this.service = new SearchBarService(this.model, this.view.model.codeName);
+      await this.service.init(this.context);
+    }
+
     await this.initSearchBarFilters();
+    await this.initSearBarGroups();
   }
 
   /**
@@ -144,7 +190,10 @@ export class SearchBarController
       params.query = this.state.query;
     }
     // 快速分组
-    if (this.state.selectedGroupItem?.data) {
+    if (
+      this.state.selectedGroupItem?.data &&
+      typeof this.state.selectedGroupItem.data === 'string'
+    ) {
       const navParams = ScriptFactory.execSingleLine(
         this.state.selectedGroupItem.data,
       ) as IData;
@@ -167,13 +216,7 @@ export class SearchBarController
    * @date 2023-10-16 03:52:44
    */
   resetFilter(): void {
-    this.state.filterNodes = [
-      {
-        leaf: false,
-        logicType: 'AND',
-        children: [{ leaf: true, field: null, valueOP: null, value: null }],
-      },
-    ];
+    this.state.filterNodes = this.getOriginFilterNodes();
     this.evt.emit('onSearch', undefined);
   }
 
@@ -202,7 +245,7 @@ export class SearchBarController
    * @date 2023-10-13 05:53:35
    * @return {*}  {IData}
    */
-  calcFilters(): IData | undefined {
+  calcFilters(): IData[] | undefined {
     if (!this.model.enableFilter) {
       return;
     }
@@ -248,4 +291,129 @@ export class SearchBarController
       value: node.value,
     };
   }
+
+  /**
+   * 获取初始过滤项树节点数据集合
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-21 17:29:47
+   */
+  protected getOriginFilterNodes(): IFilterNode[] {
+    return [
+      {
+        leaf: false,
+        logicType: 'AND',
+        children: [{ leaf: true, field: null, valueOP: null, value: null }],
+      },
+    ];
+  }
+
+  /**
+   * 初始化搜索栏分组项(获取后台分组清单并合并模型)
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-19 14:43:46
+   */
+  async initSearBarGroups(): Promise<void> {
+    this.state.searchBarGroups = [];
+    if (this.isBackendSearchGroup) {
+      if (this.model.searchBarGroups && this.model.searchBarGroups.length > 0) {
+        this.state.searchBarGroups = this.model.searchBarGroups.map(item => ({
+          ...item,
+          show: true,
+          saved: false,
+          searchGroupData: {},
+        }));
+      }
+      // 请求并合并searchBarGroups ，这里只能拿到清单
+      const res = await this.service.fetch();
+      if (res.ok) {
+        res.data.forEach((group: IData) => {
+          // 已经存在的覆盖，否则新增
+          const existGroup = this.state.searchBarGroups.find(
+            item => item.id === group.id,
+          );
+          if (existGroup) {
+            mergeInLeft(existGroup, group);
+            existGroup.saved = true;
+          } else {
+            this.state.searchBarGroups.push({
+              ...group,
+              appId: this.context.srfappid,
+              show: true,
+              saved: true,
+              searchGroupData: {},
+            } as IBackendSearchBarGroup);
+          }
+        });
+      }
+    }
+  }
+
+  /**
+   * 处理保存
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-19 16:17:15
+   */
+  async handleSave(): Promise<void> {
+    if (this.grid && this.state.selectedSearchGroupItem) {
+      const filters = this.calcFilters();
+      const saveParams = {
+        filternodes: this.state.filterNodes,
+        searchconds: filters,
+        sort: this.grid.state.sortQuery,
+        columnstates: this.grid.state.columnStates,
+        show: this.state.selectedSearchGroupItem.show,
+      };
+      // 根据是否保存过决定是更新还是新建
+      if (this.state.selectedSearchGroupItem.saved) {
+        await this.service.update(this.state.selectedSearchGroupItem.id!, {
+          theme_model: saveParams,
+          show: this.state.selectedSearchGroupItem.show,
+        });
+        ibiz.message.success('保存成功');
+      } else {
+        const res = await this.service.createWithParams(
+          this.state.selectedSearchGroupItem.id!,
+          saveParams,
+        );
+        if (res.ok) {
+          const savedGroup = this.state.searchBarGroups.find(
+            group => group.id === res.data.id,
+          );
+          if (savedGroup) {
+            savedGroup.saved = true;
+          }
+          ibiz.message.success('保存成功');
+        }
+      }
+    }
+  }
+
+  /**
+   * 处理点击后台分组
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-21 10:29:24
+   */
+  async handleGroupClick(groupItem: IBackendSearchBarGroup): Promise<void> {
+    this.state.selectedSearchGroupItem = groupItem;
+    if (groupItem.saved) {
+      // 请求获取到搜索分组数据
+      const res = await this.service.get(groupItem.id!);
+      if (res.ok) {
+        mergeInLeft(groupItem, res.data);
+      }
+    }
+    if (groupItem.searchGroupData && groupItem.searchGroupData.filternodes) {
+      this.state.filterNodes = groupItem.searchGroupData.filternodes;
+    } else {
+      this.state.filterNodes = this.getOriginFilterNodes();
+    }
+    if (this.grid && groupItem && groupItem.searchGroupData) {
+      this.grid.setGroupParams(groupItem.searchGroupData);
+      await this.grid.load({ isInitialLoad: true });
+    }
+  }
 }

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

@@ -0,0 +1,161 @@
+import { IHttpResponse } from '@ibiz-template/core';
+import { ISearchBar } from '@ibiz/model-core';
+import { IAppService } from '../../../interface';
+
+/**
+ * 搜索栏服务
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2023-12-22 10:28:32
+ */
+export class SearchBarService {
+  /**
+   * 应用
+   *
+   */
+  app!: IAppService;
+
+  /**
+   * 视图标识
+   *
+   */
+  viewTag!: string;
+
+  /**
+   * 部件模型
+   *
+   */
+  readonly model: ISearchBar;
+
+  /**
+   * Creates an instance of ControlService.
+   *
+   */
+  constructor(model: ISearchBar, viewTag: string) {
+    this.model = model;
+    this.viewTag = viewTag;
+  }
+
+  async init(_context?: IContext): Promise<void> {
+    this.app = ibiz.hub.getApp(this.model.appId);
+  }
+
+  /**
+   * 主题管理URL
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-22 10:51:49
+   */
+  themeUrl = '/extension/app_view_themes';
+
+  /**
+   * 执行查询多条数据的方法
+   *
+   */
+  async fetch(): Promise<IHttpResponse> {
+    const res = await this.app.net.post(`${this.themeUrl}/fetch_default`, {
+      app_view_tag: this.viewTag,
+      sort: 'create_time,asc',
+    });
+    if (res.ok) {
+      res.data = this.convertBackDataToFront(res.data as IData[]);
+    }
+    return res;
+  }
+
+  /**
+   * 执行获取单条数据方法
+   *
+   */
+  async get(id: string): Promise<IHttpResponse> {
+    const res = await this.app.net.get(`${this.themeUrl}/${id}`, {
+      app_view_tag: this.viewTag,
+    });
+    if (res.ok) {
+      [res.data] = this.convertBackDataToFront([res.data] as IData[]);
+    }
+    return res;
+  }
+
+  /**
+   * 删除单条数据
+   *
+   */
+  async remove(id: string): Promise<IHttpResponse> {
+    const res = await this.app.net.delete(`${this.themeUrl}/${id}`, {
+      app_view_tag: this.viewTag,
+    });
+    return res;
+  }
+
+  /**
+   * 新建数据
+   *
+   */
+  async create(caption: string): Promise<IHttpResponse> {
+    const res = await this.app.net.post(`${this.themeUrl}`, {
+      name: caption,
+      app_view_tag: this.viewTag,
+    });
+    return res;
+  }
+
+  /**
+   * 新建数据（带参数,给平台配置建立的分组用）
+   *
+   */
+  async createWithParams(id: string, data: IData): Promise<IHttpResponse> {
+    const res = await this.app.net.post(`${this.themeUrl}`, {
+      id,
+      theme_model: JSON.stringify(data),
+      app_view_tag: this.viewTag,
+      show: data.show,
+    });
+    return res;
+  }
+
+  /**
+   * 更新数据
+   *
+   */
+  async update(id: string, data: IData): Promise<IHttpResponse> {
+    const updateParams = { app_view_tag: this.viewTag };
+    if (data.theme_model) {
+      Object.assign(updateParams, {
+        theme_model: JSON.stringify(data.theme_model),
+      });
+    }
+    if (data.caption) {
+      Object.assign(updateParams, {
+        name: data.caption,
+      });
+    }
+    if (typeof data.show === 'boolean') {
+      Object.assign(updateParams, {
+        show: data.show,
+      });
+    }
+    const res = await this.app.net.put(`${this.themeUrl}/${id}`, updateParams);
+    return res;
+  }
+
+  /**
+   * 转换后台数据成前端需要的格式
+   * @param {IData} data
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-22 11:19:50
+   */
+  convertBackDataToFront(data: IData[]): IData[] {
+    return data.map(item => {
+      const tempItem = { ...item };
+      if (item.name) {
+        tempItem.caption = item.name;
+      }
+      if (item.theme_model) {
+        tempItem.searchGroupData = JSON.parse(item.theme_model);
+      }
+      return tempItem;
+    });
+  }
+}

package/src/controller/control/tree/tree.controller.ts

@@ -26,6 +26,7 @@ import {
   getChildNodeRSs,
   getUIActionItemsByActionLevel,
 } from '../../../model';
+import { ControllerEvent } from '../../utils';
 
 export type DropNodeRS = {
   minorEntityId: string;
@@ -42,12 +43,20 @@ export type DropNodeRS = {
  * @extends {MDControlController<IDETree, ITreeState, ITreeEvent>}
  * @implements {ITreeController}
  */
-export class TreeController
-  extends MDControlController<IDETree, ITreeState, ITreeEvent>
-  implements ITreeController
+export class TreeController<
+    T extends IDETree = IDETree,
+    S extends ITreeState = ITreeState,
+    E extends ITreeEvent = ITreeEvent,
+  >
+  extends MDControlController<T, S, E>
+  implements ITreeController<T, S, E>
 {
   declare service: TreeService;
 
+  protected get _evt(): ControllerEvent<ITreeEvent> {
+    return this.evt;
+  }
+
   /**
    * 上下文菜单控制器
    * @author lxm
@@ -124,8 +133,7 @@ export class TreeController
     this.initDropNodeRss();
     this.initNodeClickTBUIActionItem();
 
-    this.service = new TreeService(this.model);
-    await this.service.init(this.context);
+    await this.initService();
 
     // 初始化上下文菜单控制器
     this.model.detreeNodes!.forEach(node => {
@@ -145,6 +153,18 @@ export class TreeController
     );
   }
 
+  /**
+   * 初始化对应类型的部件服务
+   * @author lxm
+   * @date 2023-12-21 11:25:33
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  protected async initService(): Promise<void> {
+    this.service = new TreeService(this.model);
+    await this.service.init(this.context);
+  }
+
   /**
    * 初始化节点拖入关系处理
    * @author lxm
@@ -218,7 +238,7 @@ export class TreeController
     }
     await this.afterLoad(args, nodes);
     this.state.isLoaded = true;
-    await this.evt.emit('onLoadSuccess', {
+    await this._evt.emit('onLoadSuccess', {
       isInitialLoad,
     });
 
@@ -267,6 +287,19 @@ export class TreeController
       this.state.rootNodes = nodes;
     }
 
+    await this.afterLoadNodes(nodes);
+
+    return nodes;
+  }
+
+  /**
+   * loadNodes加载完子数据之后的处理
+   * @author lxm
+   * @date 2023-12-22 02:37:50
+   * @param {ITreeNodeData[]} nodes 加载回来的子数据
+   * @return {*}  {Promise<void>}
+   */
+  async afterLoadNodes(nodes: ITreeNodeData[]): Promise<void> {
     // 更新items
     this.state.items = [];
     recursiveIterate(
@@ -276,9 +309,8 @@ export class TreeController
       },
     );
 
+    // 重新计算展开节点标识
     this.state.expandedKeys = this.calcExpandedKeys(nodes);
-
-    return nodes;
   }
 
   /**
@@ -363,7 +395,7 @@ export class TreeController
 
   setActive(item: ITreeNodeData): Promise<void> {
     const nodeParams = this.parseTreeNodeData(item);
-    return this.evt.emit('onActive', { ...nodeParams, nodeData: item });
+    return this._evt.emit('onActive', { ...nodeParams, nodeData: item });
   }
 
   setSelection(selection: IData[]): void {
@@ -388,6 +420,21 @@ export class TreeController
     return this.model.detreeNodes?.find(item => item.id === id);
   }
 
+  /**
+   * 通过标识获取节点数据
+   * @author lxm
+   * @date 2023-12-22 02:21:38
+   * @param {string} id 可以是节点id也可以是_uuid
+   * @return {*}  {(ITreeNodeData | undefined)}
+   */
+  getNodeData(key: string): ITreeNodeData | undefined {
+    const find = this.state.items.find(item => item.id === key);
+    if (find) {
+      return find;
+    }
+    return this.state.items.find(item => item._uuid === key);
+  }
+
   /**
    * 执行界面行为
    *
@@ -517,7 +564,7 @@ export class TreeController
     const targetNode = refreshParent ? currentNode.parent! : currentNode;
 
     const nodes = await this.loadNodes(targetNode);
-    this.evt.emit('onAfterRefreshParent', {
+    this._evt.emit('onAfterRefreshParent', {
       parentNode: targetNode,
       children: nodes,
     });
@@ -761,7 +808,7 @@ export class TreeController
     await this.updateDeNodeData(modifiedNodeDatas);
 
     // *通知界面修改移入的父节点的子节点数据
-    this.evt.emit('onAfterNodeDrop', { isChangedParent });
+    this._evt.emit('onAfterNodeDrop', { isChangedParent });
   }
 
   /**

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

@@ -69,7 +69,9 @@ export interface TreeFetchOpts {
  * @class GridService
  * @extends {MDControlService<IDETree>}
  */
-export class TreeService extends MDControlService<IDETree> {
+export class TreeService<
+  T extends IDETree = IDETree,
+> extends MDControlService<T> {
   /**
    * 获取子节点数据
    *

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

@@ -1,2 +1,4 @@
 export * from './tree-grid-ex.controller';
 export * from './tree-grid-ex.service';
+export * from './tree-grid-ex-column/index';
+export * from './tree-grid-ex-row.state';

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

@@ -0,0 +1,3 @@
+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 { TreeGridExUAColumnController } from './tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller';