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

package/src/controller/control/form/edit-form/edit-form.service.ts

@@ -21,12 +21,12 @@ export class EditFormService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async get(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     let res = await this.exec(
@@ -48,12 +48,12 @@ export class EditFormService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async getDraft(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     let res = await this.exec(
@@ -75,11 +75,14 @@ export class EditFormService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:48
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}
    */
-  async remove(context: IParams, params: IParams = {}): Promise<IHttpResponse> {
+  async remove(
+    context: IContext,
+    params: IParams = {},
+  ): Promise<IHttpResponse> {
     const res = await this.exec(
       this.model.removeControlAction?.appDEMethodId || 'remove',
       context,
@@ -94,12 +97,12 @@ export class EditFormService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IData} data 数据
    * @returns {*}
    */
   async create(
-    context: IParams,
+    context: IContext,
     data: IData,
   ): Promise<IHttpResponse<ControlVO>> {
     const _data = data instanceof ControlVO ? data.getOrigin() : data;
@@ -118,12 +121,12 @@ export class EditFormService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IData} data 数据
    * @returns {*}
    */
   async update(
-    context: IParams,
+    context: IContext,
     data: IData,
   ): Promise<IHttpResponse<ControlVO>> {
     const _data = data instanceof ControlVO ? data.getOrigin() : data;
@@ -142,12 +145,12 @@ export class EditFormService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IData} data 数据
    * @returns {*}
    */
   async goBack(
-    context: IParams,
+    context: IContext,
     data: IData,
   ): Promise<IHttpResponse<ControlVO>> {
     const wizardForm = this.model as IDEWizardEditForm;
@@ -170,13 +173,13 @@ export class EditFormService<
    * @author lxm
    * @date 2022-09-15 21:09:34
    * @param {string} methodName
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params={}]
    * @returns {*}  {Promise<IHttpResponse<ControlVO>>}
    */
   async updateFormItem(
     methodName: string,
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     let res = await this.exec(methodName, context, params);
@@ -189,19 +192,20 @@ export class EditFormService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IData} data 数据
    * @param {IParams} [params={}] 视图参数
    * @returns {*}
    */
   async wfStart(
-    context: IParams,
+    context: IContext,
     params: IParams,
     data: IData,
   ): Promise<IHttpResponse<IData>> {
     const wfForm = this.model as IWFEditForm;
     const methodName = wfForm.wfstartControlAction?.appDEMethodId || 'wfstart';
     const entityService = await this.app.deService.getService(
+      context,
       this.model.appDataEntityId!,
     );
     return entityService.wf.exec(
@@ -217,13 +221,13 @@ export class EditFormService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IData} data 数据
    * @param {IParams} [params={}] 视图参数
    * @returns {*}
    */
   async wfSubmit(
-    context: IParams,
+    context: IContext,
     params: IParams,
     data: IData,
   ): Promise<IHttpResponse<IData>> {
@@ -238,6 +242,7 @@ export class EditFormService<
     }
 
     const entityService = await this.app.deService.getService(
+      context,
       this.model.appDataEntityId!,
     );
     return entityService.wf.exec(

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

@@ -20,13 +20,13 @@ export class FormService<
    * @author lxm
    * @date 2023-12-13 03:16:19
    * @param {IData} data 表单数据
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} params 视图参数
    * @param {('create' | 'update')} type 新建还是更新
    */
   setDefault(
     data: IData,
-    context: IParams,
+    context: IContext,
     params: IParams,
     type: 'create' | 'update',
   ): void {

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

@@ -21,12 +21,12 @@ export class SearchFormService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async getDraft(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     const tempData = this.getFilteredData({ ...params });

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

@@ -202,7 +202,8 @@ export class GanttController
     this.providers[column.codeName!] = provider;
 
     // 初始化表格列控制器
-    const controller = await provider.createController(column, this);
+    // 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') {

package/src/controller/control/grid/grid/grid-column.controller.ts

@@ -2,6 +2,7 @@ import { IDEGridColumn, IDEGridDataItem } from '@ibiz/model-core';
 import { ScriptFactory } from '../../../../utils';
 import { GridRowState } from './grid-row.state';
 import { GridController } from './grid.controller';
+import { IGridColumnController } from '../../../../interface';
 
 /**
  * 表格列控制器
@@ -9,7 +10,9 @@ import { GridController } from './grid.controller';
  * @author: zhujiamin
  * @Date: 2022-09-01 18:25:20
  */
-export class GridColumnController<T extends IDEGridColumn = IDEGridColumn> {
+export class GridColumnController<T extends IDEGridColumn = IDEGridColumn>
+  implements IGridColumnController
+{
   /**
    * 表格列模型对象
    *

package/src/controller/control/grid/grid/grid.controller.ts

@@ -32,6 +32,8 @@ import {
   MDCtrlLoadParams,
   IGridRowState,
   IExportColumn,
+  IColumnState,
+  ISearchGroupData,
 } from '../../../../interface';
 import { calcDeCodeNameById } from '../../../../model';
 import { getGridColumnProvider } from '../../../../register';
@@ -962,6 +964,7 @@ export class GridController
           tempExportColumn.codeList = app.codeList.getCodeList(item.codeListId);
           tempExportColumn.codeListItems = await app.codeList.get(
             item.codeListId,
+            this.context,
           );
         }
         return tempExportColumn;
@@ -1195,4 +1198,36 @@ export class GridController
       convertColumnCaption(this.model.degridColumns);
     }
   }
+
+  /**
+   * 控制列显示
+   * @param {IColumnState} columnState
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-19 16:02:14
+   */
+  setColumnVisible(columnState: IColumnState): void {
+    columnState.hidden = !columnState.hidden;
+  }
+
+  /**
+   * 设置点击分组后回显相关参数
+   * @param {IData} data
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-21 10:54:45
+   */
+  setGroupParams(data: ISearchGroupData): void {
+    if (data.sort) {
+      this.state.sortQuery = data.sort;
+    } else {
+      this.state.sortQuery = '';
+    }
+    if (data.columnstates) {
+      this.state.columnStates = data.columnstates;
+    } else {
+      this.state.columnStates = [];
+      this.initColumnStates();
+    }
+  }
 }

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

@@ -69,16 +69,17 @@ export class GridService extends MDControlService<IDEGrid> {
    * @author lxm
    * @date 2022-09-15 21:09:34
    * @param {string} methodName
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params={}]
    * @returns {*}  {Promise<IHttpResponse<ControlVO>>}
    */
   async updateGridEditItem(
     methodName: string,
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     const entityService = await this.app.deService.getService(
+      context,
       this.model.appDataEntityId!,
     );
     let res = await entityService.exec(methodName, context, params);

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

@@ -16,12 +16,12 @@ export class KanbanService extends DataViewControlService<IDEKanban> {
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {ControlVO} data 数据
    * @returns {*}
    */
   async updateGroup(
-    context: IParams,
+    context: IContext,
     data: ControlVO,
   ): Promise<IHttpResponse<ControlVO>> {
     const updateAction =

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

@@ -22,7 +22,7 @@ export class MapService extends MDControlService<ISysMap> {
    * 加载所有地图项的数据
    * @author lxm
    * @date 2023-10-30 06:27:32
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params={}]
    * @return {*}  {Promise<IHttpResponse<IMapData[]>>}
    */

package/src/controller/control/report-panel/report-panel.service.ts

@@ -16,12 +16,12 @@ export class ReportPanelService<
   /**
    * 执行查询报表数据的方法
    *
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async fetch(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     this.dataEntity = await ibiz.hub.getAppDataEntity(

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 });
+    }
+  }
 }