@ibiz-template/runtime 0.1.35 → 0.1.36

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

@@ -3,12 +3,16 @@ import {
   IUIActionGroup,
   IUIActionGroupDetail,
 } from '@ibiz/model-core';
+import { RuntimeModelError } from '@ibiz-template/core';
+import { isNil } from 'ramda';
 import {
   IMobMDCtrlEvent,
   IMobMDCtrlController,
   IMobMdCtrlState,
   IMobMDCtrlRowState,
   MDCtrlLoadParams,
+  IMDControlGroupState,
+  CodeListItem,
 } from '../../../interface';
 import { MDCtrlService } from './md-ctrl.service';
 import { MobMDCtrlRowState } from './md-ctrl-row.state';
@@ -31,6 +35,16 @@ export class MDCtrlController
     this.state.mdctrlActiveMode = 1;
   }
 
+  /**
+   * 分组代码表项集合
+   *
+   * @author zk
+   * @date 2023-10-11 04:10:06
+   * @type {readonly}
+   * @memberof MDCtrlController
+   */
+  groupCodeListItems?: readonly CodeListItem[];
+
   protected async onCreated(): Promise<void> {
     await super.onCreated();
     this.service = new MDCtrlService(this.model);
@@ -86,7 +100,10 @@ export class MDCtrlController
     await this.load({ isInitialLoad: true });
   }
 
-  afterLoad(args: MDCtrlLoadParams, items: ControlVO[]): Promise<IData[]> {
+  async afterLoad(
+    args: MDCtrlLoadParams,
+    items: ControlVO[],
+  ): Promise<IData[]> {
     if (args.isInitialLoad) {
       this.state.rows = [];
     }
@@ -99,6 +116,8 @@ export class MDCtrlController
         }),
       );
     }
+    await this.initGroupCodeListItems();
+    await this.handleDataGroup();
     return super.afterLoad(args, items);
   }
 
@@ -108,7 +127,7 @@ export class MDCtrlController
    * @author zk
    * @date 2023-05-26 02:05:46
    * @param {IData[]} items
-   * @memberof ListController
+   * @memberof MDCtrlController
    */
   setData(items: IData[]): void {
     const rows = items.map(item => {
@@ -124,7 +143,7 @@ export class MDCtrlController
    * @author zk
    * @date 2023-05-26 02:05:35
    * @return {*}  {IData[]}
-   * @memberof ListController
+   * @memberof MDCtrlController
    */
   getAllData(): IData[] {
     return this.state.rows.map(row => row.data);
@@ -196,4 +215,118 @@ export class MDCtrlController
     containerState.update(row.data.getOrigin());
     row.uaColStates[group.id!] = containerState;
   }
+
+  /**
+   * 处理数据分组
+   *
+   * @memberof MDCtrlController
+   */
+  protected async handleDataGroup(): Promise<void> {
+    const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
+    if (enableGroup && groupMode) {
+      if (!groupAppDEFieldId) {
+        throw new RuntimeModelError(this.model, '分组属性没有配置');
+      }
+      if (groupMode === 'AUTO') {
+        this.handleAutoGroup();
+      } else if (groupMode === 'CODELIST') {
+        await this.handleCodeListGroup();
+      }
+    }
+  }
+
+  /**
+   * 处理自动分组
+   *
+   * @memberof MDCtrlController
+   */
+  protected handleAutoGroup(): void {
+    const { groupAppDEFieldId } = this.model;
+    if (groupAppDEFieldId) {
+      const { items } = this.state;
+      const groupMap: Map<string, MobMDCtrlRowState[]> = new Map();
+      items.forEach((item: IData) => {
+        const groupVal = item[groupAppDEFieldId];
+        if (isNil(groupVal)) {
+          // 分组无值的不显示
+          return;
+        }
+
+        if (!groupMap.has(groupVal)) {
+          groupMap.set(groupVal, []);
+        }
+        groupMap
+          .get(groupVal)!
+          .push(new MobMDCtrlRowState(item as ControlVO, this));
+      });
+      const groups: IMDControlGroupState[] = [];
+      groupMap.forEach((value: IData[], key: string) => {
+        groups.push({
+          caption: key,
+          key,
+          children: [...value],
+        });
+      });
+      this.state.groups = groups;
+    }
+  }
+
+  /**
+   * 加载并初始化分组代码表项集合
+   * @author lxm
+   * @date 2023-08-29 05:11:39
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  protected async initGroupCodeListItems(): Promise<void> {
+    const { groupCodeListId } = this.model;
+    if (!groupCodeListId) {
+      return;
+    }
+    const app = ibiz.hub.getApp(this.context.srfappid);
+    this.groupCodeListItems = await app.codeList.get(
+      groupCodeListId,
+      this.context,
+      this.params,
+    );
+  }
+
+  /**
+   * 处理代码表分组
+   *
+   * @memberof MDCtrlController
+   */
+  protected async handleCodeListGroup(): Promise<void> {
+    const { groupAppDEFieldId, groupCodeListId } = this.model;
+    if (!groupCodeListId) {
+      throw new RuntimeModelError(this.model, '分组代码表没有配置');
+    }
+    const { items } = this.state;
+    const groupMap: Map<string | number, MobMDCtrlRowState[]> = new Map();
+    this.groupCodeListItems!.forEach(item => {
+      groupMap.set(item.value, []);
+    });
+    items.forEach((item: IData) => {
+      const groupVal = item[groupAppDEFieldId!];
+      const groupArr = groupMap.get(groupVal);
+      if (groupArr) {
+        groupArr.push(new MobMDCtrlRowState(item as ControlVO, this));
+      }
+      // 不在代码表里数据忽略
+    });
+
+    const groups: IMDControlGroupState[] = [];
+    groupMap.forEach((arr, key) => {
+      // 标题
+      const codeListItem = this.groupCodeListItems!.find(
+        item => item.value === key,
+      )!;
+      groups.push({
+        caption: codeListItem.text,
+        key: codeListItem.value,
+        children: arr,
+      });
+    });
+    this.state.groups = groups;
+  }
 }

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

@@ -0,0 +1,112 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { IAppDEField, ISearchBarFilter } from '@ibiz/model-core';
+import {
+  IEditorContainerController,
+  IEditorController,
+  IEditorProvider,
+} from '../../../interface';
+import { findFieldById } from '../../../model';
+import { getEditorProvider } from '../../../register';
+import { SearchBarController } from './search-bar.controller';
+
+/**
+ * 搜索栏过滤项控制器
+ * @author lxm
+ * @date 2023-10-12 05:49:19
+ * @export
+ * @class SearchBarFilterController
+ * @implements {IEditorContainerController}
+ */
+export class SearchBarFilterController implements IEditorContainerController {
+  unitName: string | undefined;
+
+  valueFormat: string | undefined;
+
+  get context(): IContext {
+    return this.searchBar.context;
+  }
+
+  get params(): IParams {
+    return this.searchBar.params;
+  }
+
+  dataType: number | undefined;
+
+  /**
+   * 编辑器控制器
+   *
+   * @author lxm
+   * @date 2022-08-24 20:08:42
+   * @type {IEditorController}
+   */
+  editor?: IEditorController;
+
+  /**
+   * 编辑器适配器
+   *
+   * @author lxm
+   * @date 2022-08-24 20:08:42
+   */
+  editorProvider?: IEditorProvider;
+
+  /**
+   * 过滤的属性名称(有实体属性的是属性codeName小写，没有就是项名称)
+   * @author lxm
+   * @date 2023-10-13 02:51:39
+   * @type {string}
+   */
+  fieldName: string;
+
+  /**
+   * 属性显示的标题
+   * @author lxm
+   * @date 2023-10-13 03:02:42
+   * @type {string}
+   */
+  label: string;
+
+  /**
+   * 配置的属性搜索模式对应的值操作
+   * @author lxm
+   * @date 2023-10-13 03:22:10
+   * @type {string}
+   */
+  valueOP?: string;
+
+  constructor(
+    public model: ISearchBarFilter,
+    public searchBar: SearchBarController,
+  ) {
+    // 实体属性
+    let field: IAppDEField | undefined;
+    if (model.appDEFieldId) {
+      field = findFieldById(searchBar.appDataEntity, model.appDEFieldId)!;
+    }
+    this.fieldName = field ? field.codeName!.toLowerCase() : model.id!;
+
+    // 属性标题
+    this.label = model.caption || field?.logicName || model.id!;
+
+    this.valueOP = model.defsearchMode?.valueOP;
+  }
+
+  /**
+   * 初始化
+   * @author lxm
+   * @date 2023-10-12 05:47:19
+   * @return {*}  {Promise<void>}
+   */
+  async init(): Promise<void> {
+    if (!this.model.editor) {
+      throw new RuntimeModelError(this.model, '缺少编辑器模型');
+    }
+
+    this.editorProvider = await getEditorProvider(this.model.editor);
+    if (this.editorProvider) {
+      this.editor = await this.editorProvider.createController(
+        this.model.editor,
+        this,
+      );
+    }
+  }
+}

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

@@ -1,10 +1,14 @@
-import { ISearchBar } from '@ibiz/model-core';
+import { recursiveIterate } from '@ibiz-template/core';
+import { IAppDataEntity, ISearchBar } from '@ibiz/model-core';
+import { isNil } from 'ramda';
 import {
   ISearchBarState,
   ISearchBarEvent,
   ISearchBarController,
+  IFilterNode,
 } from '../../../interface';
 import { ControlController } from '../../common';
+import { SearchBarFilterController } from './search-bar-filter.controller';
 
 /**
  * 搜索栏控制器
@@ -20,13 +24,29 @@ export class SearchBarController
   implements ISearchBarController
 {
   /**
-   * 占位符
+   * 快速搜索占位符
    * @return {*}
    * @author: zhujiamin
    * @Date: 2023-08-11 14:13:10
    */
   placeHolder = '';
 
+  /**
+   * 过滤项控制器集合
+   * @author lxm
+   * @date 2023-10-13 03:31:26
+   * @type {SearchBarFilterController[]}
+   */
+  filterControllers: SearchBarFilterController[] = [];
+
+  /**
+   * 实体模型
+   * @author lxm
+   * @date 2023-10-13 02:49:59
+   * @type {IAppDataEntity}
+   */
+  appDataEntity!: IAppDataEntity;
+
   protected initState(): void {
     super.initState();
     this.state.query = '';
@@ -36,6 +56,9 @@ export class SearchBarController
       this.model.enableGroup ||
       this.model.enableFilter
     );
+    if (this.model.enableFilter) {
+      this.resetFilter();
+    }
   }
 
   protected async onCreated(): Promise<void> {
@@ -45,19 +68,38 @@ export class SearchBarController
       this.context.srfappid,
     )!;
     if (appDataEntity) {
-      const searchFields = appDataEntity.appDEFields?.filter(field => {
-        return field.enableQuickSearch;
-      });
+      this.appDataEntity = appDataEntity;
+      this.calcQuickSearchPlaceholder();
+    }
+
+    await this.initSearchBarFilters();
+  }
+
+  /**
+   * 计算快速搜索的占位
+   * @author lxm
+   * @date 2023-10-16 03:49:47
+   * @protected
+   * @return {*}  {void}
+   */
+  protected calcQuickSearchPlaceholder(): void {
+    if (!this.appDataEntity) {
+      return;
+    }
+    const searchFields = this.appDataEntity.appDEFields!.filter(field => {
+      return field.enableQuickSearch;
+    });
+    if (searchFields.length) {
       const placeHolders: string[] = [];
-      searchFields?.forEach(searchField => {
-        if (searchField?.lnlanguageRes && searchField.lnlanguageRes.lanResTag) {
+      searchFields.forEach(searchField => {
+        if (searchField.lnlanguageRes && searchField.lnlanguageRes.lanResTag) {
           placeHolders.push(
             ibiz.i18n.t(
               searchField.lnlanguageRes.lanResTag,
               searchField.logicName,
             ),
           );
-        } else if (searchField?.logicName) {
+        } else if (searchField.logicName) {
           placeHolders.push(searchField.logicName);
         }
       });
@@ -84,7 +126,121 @@ export class SearchBarController
    * @author: zhujiamin
    * @Date: 2023-06-01 18:08:18
    */
-  handleSearch(): void {
+  onSearch(): void {
     this.evt.emit('onSearch', undefined);
   }
+
+  /**
+   * 获取搜索栏的过滤参数（包括快速搜索，快速分组和过滤器的参数）
+   * @author lxm
+   * @date 2023-10-16 03:54:07
+   * @return {*}  {IParams}
+   */
+  getFilterParams(): IParams {
+    const params: IParams = {};
+    // 快速搜索
+    if (this.state.query) {
+      params.query = this.state.query;
+    }
+    // 快速分组
+    if (this.state.selectedGroupItem?.data) {
+      // eslint-disable-next-line no-new-func
+      const func = new Function(
+        `return (${this.state.selectedGroupItem.data});`,
+      );
+      const addParams = func() as IData;
+      Object.assign(params, addParams);
+    }
+
+    // 搜索过滤器
+    const filters = this.calcFilters();
+    if (filters) {
+      params.filters = filters;
+    }
+    return params;
+  }
+
+  /**
+   * 重置过滤器
+   * @author lxm
+   * @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 }],
+      },
+    ];
+  }
+
+  /**
+   * 初始化过滤项控制器
+   * @author lxm
+   * @date 2023-10-13 03:33:17
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  protected async initSearchBarFilters(): Promise<void> {
+    if (this.model.searchBarFilters?.length) {
+      this.model.searchBarFilters.forEach(item => {
+        const filterController = new SearchBarFilterController(item, this);
+        this.filterControllers.push(filterController);
+      });
+      await Promise.all(
+        this.filterControllers.map(controller => controller.init()),
+      );
+    }
+  }
+
+  /**
+   * 计算过滤项参数
+   * @author lxm
+   * @date 2023-10-13 05:53:35
+   * @return {*}  {IData}
+   */
+  calcFilters(): IData | undefined {
+    if (!this.model.enableFilter) {
+      return;
+    }
+    let hasFilter = false; // 是否有过滤项
+    let hasError = false; // 是否有过滤项格式不正确
+    recursiveIterate(this.state.filterNodes[0], (node: IFilterNode) => {
+      if (node.leaf) {
+        if (node.field && node.valueOP && !isNil(node.value)) {
+          hasFilter = true;
+        } else {
+          // 如果过滤项不给
+          hasError = true;
+        }
+      }
+    });
+    if (hasFilter && !hasError) {
+      const filter = this.formatFilters(this.state.filterNodes[0]);
+      return filter;
+    }
+  }
+
+  /**
+   * 格式化过滤项
+   * @author lxm
+   * @date 2023-10-16 03:45:41
+   * @param {IFilterNode} node
+   * @return {*}  {IData}
+   */
+  formatFilters(node: IFilterNode): IData {
+    if (!node.leaf) {
+      return {
+        [`$${node.logicType.toLowerCase()}`]: node.children.map(item =>
+          this.formatFilters(item),
+        ),
+      };
+    }
+    return {
+      [`${node.field}`]: {
+        [`$${node.valueOP!.toLowerCase()}`]: node.value,
+      },
+    };
+  }
 }

package/src/engine/md-view.engine.ts

@@ -334,36 +334,11 @@ export class MDViewEngine extends ViewEngineBase {
     const params: IParams = {};
     // 有搜索表单的整合相关参数
     if (this.searchForm) {
-      const addParams = this.searchForm.getData()[0];
-      const filteredParams = Object.entries(addParams).reduce(
-        (result: IData, [key, value]) => {
-          if (value !== null && value !== undefined && value !== '') {
-            result[key] = value;
-          }
-          return result;
-        },
-        {},
-      );
-      Object.assign(params, filteredParams);
+      Object.assign(params, this.searchForm.getFilterParams());
     }
     // 有搜索栏的整合相关参数
     if (this.searchBar) {
-      // 快速搜索
-      if (this.searchBar.state.query) {
-        const addParams = {
-          query: this.searchBar.state.query,
-        };
-        Object.assign(params, addParams);
-      }
-      // 快速分组
-      if (this.searchBar.state.selectedGroupItem?.data) {
-        // eslint-disable-next-line no-new-func
-        const func = new Function(
-          `return (${this.searchBar.state.selectedGroupItem.data});`,
-        );
-        const addParams = func() as IData;
-        Object.assign(params, addParams);
-      }
+      Object.assign(params, this.searchBar.getFilterParams());
     }
     return params;
   }

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

@@ -12,4 +12,13 @@ import { IControlController } from './i-control.controller';
  * @extends {IControlController}
  */
 export interface ISearchBarController
-  extends IControlController<ISearchBar, ISearchBarState, ISearchBarEvent> {}
+  extends IControlController<ISearchBar, ISearchBarState, ISearchBarEvent> {
+  /**
+   * 获取搜索栏的过滤参数
+   *
+   * @author lxm
+   * @date 2022-09-22 17:09:21
+   * @returns {*}  {IParams}
+   */
+  getFilterParams(): IParams;
+}

package/src/interface/controller/controller/control/i-search-form.controller.ts

@@ -22,13 +22,13 @@ export interface ISearchFormController
   load(): Promise<IData>;
 
   /**
-   * 获取搜索表单的视图过滤参数
+   * 获取搜索表单的过滤参数
    *
    * @author lxm
    * @date 2022-09-22 17:09:21
    * @returns {*}  {IParams}
    */
-  getParams(): IParams;
+  getFilterParams(): IParams;
 
   /**
    * 执行搜索行为

package/src/interface/controller/state/control/i-search-bar.state.ts

@@ -1,6 +1,84 @@
 import { ISearchBarGroup } from '@ibiz/model-core';
 import { IControlState } from './i-control.state';
 
+export interface IFilterBranchNode {
+  /**
+   * 是否是叶子节点
+   * @author lxm
+   * @date 2023-10-12 05:14:28
+   * @type {boolean}
+   */
+  leaf: false;
+
+  /**
+   * 父节点的逻辑类型
+   * @author lxm
+   * @date 2023-10-12 05:21:18
+   * @type {('AND' | 'OR')}
+   */
+  logicType: 'AND' | 'OR';
+
+  /**
+   * 过滤项值
+   * @author lxm
+   * @date 2023-10-12 05:16:52
+   * @type {unknown}
+   */
+  value?: unknown;
+
+  /**
+   * 值操作类型
+   * @author lxm
+   * @date 2023-10-12 05:27:07
+   * @type {string}
+   */
+  valueOP?: string;
+
+  /**
+   * 子节点数据集合
+   * @author lxm
+   * @date 2023-10-12 05:18:19
+   * @type {IFilterTreeNode[]}
+   */
+  children: IFilterNode[];
+}
+
+export interface IFilterLeafNode {
+  /**
+   * 是否是叶子节点
+   * @author lxm
+   * @date 2023-10-12 05:14:28
+   * @type {boolean}
+   */
+  leaf: true;
+
+  /**
+   * 实体属性名称
+   * @author lxm
+   * @date 2023-10-13 02:35:42
+   * @type {string}
+   */
+  field: string | null;
+
+  /**
+   * 过滤项值
+   * @author lxm
+   * @date 2023-10-12 05:16:52
+   * @type {unknown}
+   */
+  value: unknown | null;
+
+  /**
+   * 值操作类型
+   * @author lxm
+   * @date 2023-10-12 05:27:07
+   * @type {string}
+   */
+  valueOP: string | null;
+}
+
+export type IFilterNode = IFilterBranchNode | IFilterLeafNode;
+
 export interface ISearchBarState extends IControlState {
   /**
    * 快速搜索字符串
@@ -25,4 +103,12 @@ export interface ISearchBarState extends IControlState {
    * @type {boolean}
    */
   selectedGroupItem: ISearchBarGroup | null;
+
+  /**
+   * 过滤项树节点数据集合
+   * @author lxm
+   * @date 2023-10-12 05:16:12
+   * @type {IFilterNode[]}
+   */
+  filterNodes: IFilterNode[];
 }

package/src/service/service/entity/method/method.ts

@@ -111,7 +111,7 @@ export abstract class Method {
         case 'POST':
           res = await this.app.net.post(
             this.mergeRequestPath(path, methodName),
-            notNilEmpty(data) ? data! : params!,
+            notNilEmpty(data) ? data! : params || {},
           );
           break;
         case 'GET':
@@ -123,7 +123,7 @@ export abstract class Method {
         case 'PUT': {
           res = await this.app.net.put(
             this.mergeRequestPath(path, methodName),
-            notNilEmpty(data) ? data! : params!,
+            notNilEmpty(data) ? data! : params || {},
           );
           break;
         }