@ibiz-template/runtime 0.1.35 → 0.1.37

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/controller/utils/value-rule/value-rule.ts

@@ -1,7 +1,14 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { RuntimeError } from '@ibiz-template/core';
-import { IDEFormItemVR, IDEGridEditItemVR } from '@ibiz/model-core';
-import { isNilOrEmpty } from 'qx-util';
+import {
+  IDEFormItemVR,
+  IDEGridEditItemVR,
+  IEditor,
+  INumberEditor,
+  ITextEditor,
+} from '@ibiz/model-core';
+import { isNilOrEmpty, isNumber } from 'qx-util';
+import { isNil } from 'ramda';
 import { ScriptFactory, verifyDeRules } from '../../../utils';
 
 /**
@@ -93,3 +100,91 @@ export function generateRules(
   });
   return rules;
 }
+
+/**
+ * 生成编辑器相关的值规则
+ * @author lxm
+ * @date 2023-10-18 03:36:39
+ * @export
+ * @param {IEditor} editor
+ * @return {*}  {IData[]}
+ */
+export function generateEditorRules(editor: IEditor): IData[] {
+  const rules: IData[] = [];
+  const { maxLength, minLength } = editor as ITextEditor;
+  const { maxValue, minValue } = editor as INumberEditor;
+
+  if (maxLength) {
+    rules.push({
+      validator: (
+        rule: IData,
+        value: IData,
+        callback: (params: Error[] | Error) => boolean,
+      ) => {
+        if (!isNil(value) && value.length > maxLength) {
+          callback(
+            new Error(
+              `内容长度必须小于等于${maxLength},当前长度为${value.length}`,
+            ),
+          );
+        } else {
+          return true;
+        }
+      },
+    });
+  }
+
+  if (minLength) {
+    rules.push({
+      validator: (
+        rule: IData,
+        value: IData,
+        callback: (params: Error[] | Error) => boolean,
+      ) => {
+        if (!isNil(value) && value.length < minLength) {
+          callback(
+            new Error(
+              `内容长度必须大于等于${minLength},当前长度为${value.length}`,
+            ),
+          );
+        } else {
+          return true;
+        }
+      },
+    });
+  }
+
+  if (!isNil(maxValue)) {
+    rules.push({
+      validator: (
+        rule: IData,
+        value: number,
+        callback: (params: Error[] | Error) => boolean,
+      ) => {
+        if (!isNil(value) && isNumber(value) && value > maxValue) {
+          callback(new Error(`值必须小于等于${maxValue}`));
+        } else {
+          return true;
+        }
+      },
+    });
+  }
+
+  if (!isNil(minValue)) {
+    rules.push({
+      validator: (
+        rule: IData,
+        value: number,
+        callback: (params: Error[] | Error) => boolean,
+      ) => {
+        if (!isNil(value) && isNumber(value) && value < minValue) {
+          callback(new Error(`值必须大于等于${minValue}`));
+        } else {
+          return true;
+        }
+      },
+    });
+  }
+
+  return rules;
+}

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-medit-view-panel.controller.ts

@@ -0,0 +1,17 @@
+import { IDEMultiEditViewPanel } from '@ibiz/model-core';
+import { IMEditViewPanelEvent } from '../../event';
+import { IMEditViewPanelState } from '../../state';
+import { IMDControlController } from './i-md-control.controller';
+
+/**
+ * 多编辑视图面板控制器
+ *
+ * @export
+ * @interface IMEditViewPanelController
+ * @extends {IMDControlController<IDEMultiEditViewPanel, IMEditViewPanelState, IMEditViewPanelEvent>}
+ */
+export interface IMEditViewPanelController<
+  T extends IDEMultiEditViewPanel = IDEMultiEditViewPanel,
+  S extends IMEditViewPanelState = IMEditViewPanelState,
+  E extends IMEditViewPanelEvent = IMEditViewPanelEvent,
+> extends IMDControlController<T, S, E> {}

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/controller/control/index.ts

@@ -33,3 +33,4 @@ export * from './i-context-menu.controller';
 export * from './i-kanban.controller';
 export * from './i-tree-grid.controller';
 export * from './i-tree-grid-ex.controller';
+export * from './i-medit-view-panel.controller';

package/src/interface/controller/event/control/i-medit-view-panel.event.ts

@@ -0,0 +1,9 @@
+import { IMDControlEvent } from './i-md-control.event';
+
+/**
+ * 多编辑视图面板部件事件
+ *
+ * @export
+ * @interface IMDControlEvent
+ */
+export type IMEditViewPanelEvent = IMDControlEvent;

package/src/interface/controller/event/control/index.ts

@@ -29,3 +29,4 @@ export * from './i-calendar-exp-bar.event';
 export * from './i-context-menu.event';
 export * from './i-tree-grid.event';
 export * from './i-tree-grid-ex.event';
+export * from './i-medit-view-panel.event';

package/src/interface/controller/event/view/i-medit-view9.event.ts

@@ -0,0 +1,10 @@
+import { IMDViewEvent } from './i-md-view.event';
+
+/**
+ * 多表单编辑视图事件
+ *
+ * @export
+ * @interface IMEditView9Event
+ * @extends {IMDViewEvent}
+ */
+export type IMEditView9Event = IMDViewEvent;

package/src/interface/controller/event/view/index.ts

@@ -39,3 +39,4 @@ export * from './i-pickup-md-view.event';
 export * from './i-form-pickup-data-view.event';
 export * from './i-tree-grid-view.event';
 export * from './i-tree-grid-ex-view.event';
+export * from './i-medit-view9.event';

package/src/interface/controller/state/control/i-medit-view-panel.state.ts

@@ -0,0 +1,36 @@
+import { ControlVO } from '../../../../service';
+import { IMDControlState } from './i-md-control.state';
+
+export interface IPanelUiItem {
+  // 唯一主键
+  id: string;
+  // 视图上下文
+  context: IData;
+  // 视图参数
+  params: IData;
+  // 该项数据
+  data: ControlVO;
+  // 主信息
+  srfmajortext: string;
+}
+
+/**
+ * 多编辑视图面板部件状态
+ *
+ * @export
+ * @interface IMEditViewPanelState
+ * @extends {IMDControlState}
+ */
+export interface IMEditViewPanelState extends IMDControlState {
+  /**
+   * 编辑视图面板部件UI数据集合
+   * @type {IPanelUiItem[]}
+   */
+  panelUiItems: IPanelUiItem[];
+
+  /**
+   * 当前激活分页（上分页时启用）
+   *
+   */
+  activeTab: string;
+}

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/interface/controller/state/control/index.ts

@@ -35,3 +35,4 @@ export * from './i-context-menu.state';
 export * from './i-kanban.state';
 export * from './i-tree-grid.state';
 export * from './i-tree-grid-ex.state';
+export * from './i-medit-view-panel.state';

package/src/interface/controller/state/view/i-medit-view9.state.ts

@@ -0,0 +1,10 @@
+import { IMDViewState } from './i-md-view.state';
+
+/**
+ * 多表单编辑视图UI状态
+ *
+ * @export
+ * @class IMEditView9State
+ * @extends {IMDViewState}
+ */
+export interface IMEditView9State extends IMDViewState {}

package/src/interface/controller/state/view/index.ts

@@ -40,3 +40,4 @@ export * from './i-kanban-view.state';
 export * from './i-form-pickup-data-view.state';
 export * from './i-tree-grid-view.state';
 export * from './i-tree-grid-ex-view.state';
+export * from './i-medit-view9.state';

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