@ibiz-template/runtime 0.1.34 → 0.1.36

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/de-logic/de-logic-context.ts

@@ -17,6 +17,41 @@ export class DELogicContext {
    */
   lastReturn: unknown;
 
+  /**
+   * 实体逻辑执行参数
+   * @author lxm
+   * @date 2023-10-16 02:22:31
+   * @type {{ context: IParams; data: IData; params: IParams }}
+   */
+  parameters: { context: IParams; data: IData; params: IParams };
+
+  /**
+   * 上下文
+   */
+  get context(): IParams {
+    if (Object.prototype.hasOwnProperty.call(this.params, 'context')) {
+      return this.params.context;
+    }
+    return this.parameters.context;
+  }
+
+  /**
+   * 数据
+   */
+  get data(): IData {
+    return this.parameters.data;
+  }
+
+  /**
+   * 视图参数
+   */
+  get viewParam(): IParams {
+    if (Object.prototype.hasOwnProperty.call(this.params, 'viewParam')) {
+      return this.params.viewParam;
+    }
+    return this.parameters.params;
+  }
+
   /**
    * Creates an instance of DELogicContext.
    * @author lxm
@@ -24,14 +59,16 @@ export class DELogicContext {
    * @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
    * @param {IParams} context 上下文
    * @param {IData} data 数据对象
-   * @param {IParams} viewParams 视图参数
+   * @param {IParams} params 视图参数
    */
   constructor(
     private deLogicParams: Map<string, DELogicParam>,
-    public context: IParams,
-    public data: IData,
-    public viewParams: IParams,
-  ) {}
+    context: IParams,
+    data: IData,
+    params: IParams,
+  ) {
+    this.parameters = { context, data, params };
+  }
 
   /**
    * 重置实体逻辑参数

package/src/de-logic/de-logic-node/data-set-node/data-set-node.ts

@@ -21,14 +21,13 @@ export class DataSetNode extends DELogicNode {
       dstDELogicParamId,
       retDELogicParamId,
     } = this.model;
-    const requestData = ctx.params[dstDELogicParamId!];
+    const queryParams = ctx.params[dstDELogicParamId!];
     const app = ibiz.hub.getApp(ctx.context.srfappid);
     const res = await app.deService.exec(
       dstAppDataEntityId!,
       dstAppDEDataSetId!,
       ctx.context,
-      requestData,
-      ctx.viewParams,
+      queryParams,
     );
     if (res.ok) {
       ctx.params[retDELogicParamId!] = res.data;

package/src/de-logic/de-logic-node/de-action-node/de-action-node.ts

@@ -35,7 +35,7 @@ export class DEActionNode extends DELogicNode {
       dstAppDEActionId!,
       ctx.context,
       requestData,
-      ctx.viewParams,
+      ctx.viewParam,
     );
     if (res.ok) {
       ctx.params[retDELogicParamId!] = res.data;

package/src/de-logic/de-logic-param/de-logic-param.ts

@@ -52,7 +52,7 @@ export class DELogicParam {
       ctx.initLastReturnParam(tag);
     } else if (m.appContextParam) {
       // 应用上下文
-      ctx.params[tag] = ctx.context;
+      ctx.params[tag] = ctx.parameters.context;
     } else if (m.simpleListParam) {
       // 简单数据列表
       ctx.params[tag] = [];

package/src/de-logic/utils/handle-src-val.ts

@@ -62,13 +62,13 @@ export function handleSrcVal(
       return ibiz.util.rawValue.format(srcValue);
     case 'WEBCONTEXT': // 网页请求上下文
     case 'VIEWPARAM': // 视图参数
-      value = ctx.viewParams;
+      value = ctx.parameters.params;
       break;
     case 'APPLICATION': // 系统全局对象
     case 'SESSION': // 用户全局对象
     case 'APPDATA': // 应用上下文
     case 'DATACONTEXT': // 数据上下文
-      value = ctx.context;
+      value = ctx.parameters.context;
       break;
     // 当前环境参数
     case 'ENVPARAM':

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/interface/service/service/i-app-de.service.ts

@@ -1,4 +1,4 @@
-import { IHttpResponse } from '@ibiz-template/core';
+import { IHttpResponse, IPortalAsyncAction } from '@ibiz-template/core';
 import { DECache } from '../../../service/utils';
 import { IFileService } from './i-file.service';
 import { IWorkFlowService } from './i-wf.service';
@@ -90,14 +90,14 @@ export interface IAppDEService {
    *
    * @author chitanda
    * @date 2023-10-12 16:10:03
-   * @param {(data: unknown) => void} onmessage
+   * @param {(data: IPortalAsyncAction) => void} onmessage
    * @param {IParams} context
    * @param {IParams} [params]
    * @param {IData} [data]
    * @return {*}  {Promise<void>}
    */
   aiChatSse(
-    onmessage: (data: unknown) => void,
+    onmessage: (data: IPortalAsyncAction) => void,
     context: IParams,
     params?: IParams,
     data?: IData,

package/src/service/service/entity/de.service.ts

@@ -1,5 +1,10 @@
 import { IAppDEMethod, IAppDataEntity } from '@ibiz/model-core';
-import { IHttpResponse, ModelError, RuntimeError } from '@ibiz-template/core';
+import {
+  IHttpResponse,
+  IPortalAsyncAction,
+  ModelError,
+  RuntimeError,
+} from '@ibiz-template/core';
 import { DECache, calcResPath } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
 import { Method } from './method/method';
@@ -174,14 +179,15 @@ export class DEService implements IAppDEService {
    * 实体级别 AI 聊天会话
    *
    * @author chitanda
-   * @date 2023-10-12 11:10:00
+   * @date 2023-10-16 16:10:16
+   * @param {(data: IPortalAsyncAction) => void} onmessage
    * @param {IParams} context
    * @param {IParams} [params={}]
-   * @param {FetchEventSourceInit} [options={}]
+   * @param {IData} [data={}]
    * @return {*}  {Promise<void>}
    */
   aiChatSse(
-    onmessage: (data: unknown) => void,
+    onmessage: (data: IPortalAsyncAction) => void,
     context: IParams,
     params: IParams = {},
     data: IData = {},
@@ -197,8 +203,11 @@ export class DEService implements IAppDEService {
             'Content-Type': 'application/json',
           },
           body: JSON.stringify(data),
-          onmessage: (e: unknown) => {
-            onmessage(e);
+          onmessage: e => {
+            if (e.data) {
+              const json = JSON.parse(e.data);
+              onmessage(json as IPortalAsyncAction);
+            }
           },
           onclose: () => {
             resolve();

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

package/src/ui-logic/ui-logic-context.ts

@@ -22,6 +22,9 @@ export class UILogicContext {
    * 上下文
    */
   get context(): IContext {
+    if (Object.prototype.hasOwnProperty.call(this.params, 'context')) {
+      return this.params.context;
+    }
     return this.parameters.context;
   }
 
@@ -35,20 +38,13 @@ export class UILogicContext {
   /**
    * 视图参数
    */
-  get viewParams(): IParams {
+  get viewParam(): IParams {
+    if (Object.prototype.hasOwnProperty.call(this.params, 'viewParam')) {
+      return this.params.viewParam;
+    }
     return this.parameters.params;
   }
 
-  /**
-   * Creates an instance of DELogicContext.
-   * @author lxm
-   * @date 2023-03-24 09:15:14
-   * @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
-   * @param {IParams} context 上下文
-   * @param {IData} data 数据对象
-   * @param {IParams} viewParams 视图参数
-   * @param {IParams} [opt] 额外参数
-   */
   /**
    * Creates an instance of UILogicContext.
    * @author lxm

package/src/ui-logic/ui-logic-node/data-set-node/data-set-node.ts

@@ -1,3 +1,4 @@
+import { RuntimeModelError } from '@ibiz-template/core';
 import { IDEUIDEDataSetLogic } from '@ibiz/model-core';
 import { UILogicContext } from '../../ui-logic-context';
 import { UILogicNode } from '../ui-logic-node';
@@ -21,14 +22,16 @@ export class DataSetNode extends UILogicNode {
       dstDEUILogicParamId,
       retDEUILogicParamId,
     } = this.model;
-    const requestData = ctx.params[dstDEUILogicParamId!];
+    if (!dstDEUILogicParamId) {
+      throw new RuntimeModelError(this.model, '缺少配置过滤参数');
+    }
+    const queryParams = ctx.params[dstDEUILogicParamId!];
     const app = ibiz.hub.getApp(ctx.context.srfappid);
     const res = await app.deService.exec(
       dstAppDataEntityId!,
       dstAppDEDataSetId!,
       ctx.context,
-      requestData,
-      ctx.viewParams,
+      queryParams,
     );
     if (res.ok) {
       ctx.params[retDEUILogicParamId!] = res.data;

package/src/ui-logic/ui-logic-node/de-action-node/de-action-node.ts

@@ -35,7 +35,7 @@ export class DEActionNode extends UILogicNode {
       dstAppDEActionId!,
       ctx.context,
       requestData,
-      ctx.viewParams,
+      ctx.viewParam,
     );
     if (res.ok) {
       ctx.params[retDEUILogicParamId!] = res.data;

package/src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts

@@ -34,6 +34,8 @@ export class DEUIActionNode extends UILogicNode {
 
     await UIActionUtil.execAndResolved(dstAppDEUIActionId!, {
       ...parameters,
+      context: ctx.context,
+      params: ctx.viewParam,
       data: actionData,
     });
   }