@ibiz-template/runtime 0.1.34 → 0.1.36

package/out/controller/control/search-bar/search-bar.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;OAKG;IACH,WAAW,SAAM;IAEjB,SAAS,CAAC,SAAS,IAAI,IAAI;cAWX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA6B1C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,YAAY,IAAI,IAAI;CAGrB"}
+{"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;OAKG;IACH,WAAW,SAAM;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,yBAAyB,EAAE,CAAM;IAEpD;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAcX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA2B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IAwB1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAUnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrD;;;;;OAKG;IACH,WAAW,IAAI,KAAK,GAAG,SAAS;IAsBhC;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK;CAcxC"}

package/out/controller/control/search-bar/search-bar.controller.js

@@ -1,4 +1,7 @@
+import { recursiveIterate } from '@ibiz-template/core';
+import { isNil } from 'ramda';
 import { ControlController } from '../../common';
+import { SearchBarFilterController } from './search-bar-filter.controller';
 /**
  * 搜索栏控制器
  *
@@ -12,12 +15,19 @@ export class SearchBarController extends ControlController {
     constructor() {
         super(...arguments);
         /**
-         * 占位符
+         * 快速搜索占位符
          * @return {*}
          * @author: zhujiamin
          * @Date: 2023-08-11 14:13:10
          */
         this.placeHolder = '';
+        /**
+         * 过滤项控制器集合
+         * @author lxm
+         * @date 2023-10-13 03:31:26
+         * @type {SearchBarFilterController[]}
+         */
+        this.filterControllers = [];
     }
     initState() {
         super.initState();
@@ -26,21 +36,40 @@ export class SearchBarController extends ControlController {
         this.state.visible = !!(this.model.enableQuickSearch ||
             this.model.enableGroup ||
             this.model.enableFilter);
+        if (this.model.enableFilter) {
+            this.resetFilter();
+        }
     }
     async onCreated() {
-        var _a;
         await super.onCreated();
         const appDataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId, this.context.srfappid);
         if (appDataEntity) {
-            const searchFields = (_a = appDataEntity.appDEFields) === null || _a === void 0 ? void 0 : _a.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}
+     */
+    calcQuickSearchPlaceholder() {
+        if (!this.appDataEntity) {
+            return;
+        }
+        const searchFields = this.appDataEntity.appDEFields.filter(field => {
+            return field.enableQuickSearch;
+        });
+        if (searchFields.length) {
             const placeHolders = [];
-            searchFields === null || searchFields === void 0 ? void 0 : searchFields.forEach(searchField => {
-                if ((searchField === null || searchField === void 0 ? void 0 : 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 === null || searchField === void 0 ? void 0 : searchField.logicName) {
+                else if (searchField.logicName) {
                     placeHolders.push(searchField.logicName);
                 }
             });
@@ -65,7 +94,112 @@ export class SearchBarController extends ControlController {
      * @author: zhujiamin
      * @Date: 2023-06-01 18:08:18
      */
-    handleSearch() {
+    onSearch() {
         this.evt.emit('onSearch', undefined);
     }
+    /**
+     * 获取搜索栏的过滤参数（包括快速搜索，快速分组和过滤器的参数）
+     * @author lxm
+     * @date 2023-10-16 03:54:07
+     * @return {*}  {IParams}
+     */
+    getFilterParams() {
+        var _a;
+        const params = {};
+        // 快速搜索
+        if (this.state.query) {
+            params.query = this.state.query;
+        }
+        // 快速分组
+        if ((_a = this.state.selectedGroupItem) === null || _a === void 0 ? void 0 : _a.data) {
+            // eslint-disable-next-line no-new-func
+            const func = new Function(`return (${this.state.selectedGroupItem.data});`);
+            const addParams = func();
+            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() {
+        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>}
+     */
+    async initSearchBarFilters() {
+        var _a;
+        if ((_a = this.model.searchBarFilters) === null || _a === void 0 ? void 0 : _a.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() {
+        if (!this.model.enableFilter) {
+            return;
+        }
+        let hasFilter = false; // 是否有过滤项
+        let hasError = false; // 是否有过滤项格式不正确
+        recursiveIterate(this.state.filterNodes[0], (node) => {
+            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) {
+        if (!node.leaf) {
+            return {
+                [`$${node.logicType.toLowerCase()}`]: node.children.map(item => this.formatFilters(item)),
+            };
+        }
+        return {
+            [`${node.field}`]: {
+                [`$${node.valueOP.toLowerCase()}`]: node.value,
+            },
+        };
+    }
 }

package/out/de-logic/de-logic-context.d.ts

@@ -9,9 +9,6 @@ import { DELogicParam } from './de-logic-param/de-logic-param';
  */
 export declare class DELogicContext {
     private deLogicParams;
-    context: IParams;
-    data: IData;
-    viewParams: IParams;
     /**
      * 上一次返回值
      * @author lxm
@@ -19,6 +16,29 @@ export declare class DELogicContext {
      * @type {unknown}
      */
     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;
+    /**
+     * 数据
+     */
+    get data(): IData;
+    /**
+     * 视图参数
+     */
+    get viewParam(): IParams;
     /**
      * Creates an instance of DELogicContext.
      * @author lxm
@@ -26,9 +46,9 @@ export declare class DELogicContext {
      * @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
      * @param {IParams} context 上下文
      * @param {IData} data 数据对象
-     * @param {IParams} viewParams 视图参数
+     * @param {IParams} params 视图参数
      */
-    constructor(deLogicParams: Map<string, DELogicParam>, context: IParams, data: IData, viewParams: IParams);
+    constructor(deLogicParams: Map<string, DELogicParam>, context: IParams, data: IData, params: IParams);
     /**
      * 重置实体逻辑参数
      * @author lxm

package/out/de-logic/de-logic-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-logic-context.d.ts","sourceRoot":"","sources":["../../src/de-logic/de-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;IAmBvB,OAAO,CAAC,aAAa;IACd,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,KAAK;IACX,UAAU,EAAE,OAAO;IArB5B;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;;;;OAQG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,UAAU,EAAE,OAAO;IAG5B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;OAKG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;OAMG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}
+{"version":3,"file":"de-logic-context.d.ts","sourceRoot":"","sources":["../../src/de-logic/de-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;IAsDvB,OAAO,CAAC,aAAa;IArDvB;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,KAAK,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC;IAE/D;;OAEG;IACH,IAAI,OAAO,IAAI,OAAO,CAKrB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAKvB;IAED;;;;;;;;OAQG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EAChD,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO;IAKjB;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;OAKG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;OAMG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}

package/out/de-logic/de-logic-context.js

@@ -7,6 +7,30 @@
  * @class DELogicContext
  */
 export class DELogicContext {
+    /**
+     * 上下文
+     */
+    get context() {
+        if (Object.prototype.hasOwnProperty.call(this.params, 'context')) {
+            return this.params.context;
+        }
+        return this.parameters.context;
+    }
+    /**
+     * 数据
+     */
+    get data() {
+        return this.parameters.data;
+    }
+    /**
+     * 视图参数
+     */
+    get viewParam() {
+        if (Object.prototype.hasOwnProperty.call(this.params, 'viewParam')) {
+            return this.params.viewParam;
+        }
+        return this.parameters.params;
+    }
     /**
      * Creates an instance of DELogicContext.
      * @author lxm
@@ -14,13 +38,10 @@ export class DELogicContext {
      * @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
      * @param {IParams} context 上下文
      * @param {IData} data 数据对象
-     * @param {IParams} viewParams 视图参数
+     * @param {IParams} params 视图参数
      */
-    constructor(deLogicParams, context, data, viewParams) {
+    constructor(deLogicParams, context, data, params) {
         this.deLogicParams = deLogicParams;
-        this.context = context;
-        this.data = data;
-        this.viewParams = viewParams;
         /**
          * 实体逻辑参数
          *
@@ -55,6 +76,7 @@ export class DELogicContext {
          * @type {string}
          */
         this.defaultParamName = 'Default';
+        this.parameters = { context, data, params };
     }
     /**
      * 重置实体逻辑参数

package/out/de-logic/de-logic-node/data-set-node/data-set-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-set-node.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-node/data-set-node/data-set-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,WAAW;IAClC,KAAK,EAAE,iBAAiB,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAoB/C"}
+{"version":3,"file":"data-set-node.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-node/data-set-node/data-set-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,WAAW;IAClC,KAAK,EAAE,iBAAiB,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAmB/C"}

package/out/de-logic/de-logic-node/data-set-node/data-set-node.js

@@ -11,9 +11,9 @@ import { DELogicNode } from '../de-logic-node';
 export class DataSetNode extends DELogicNode {
     async exec(ctx) {
         const { dstAppDEDataSetId, dstAppDataEntityId, 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);
+        const res = await app.deService.exec(dstAppDataEntityId, dstAppDEDataSetId, ctx.context, queryParams);
         if (res.ok) {
             ctx.params[retDELogicParamId] = res.data;
         }

package/out/de-logic/de-logic-node/de-action-node/de-action-node.js

@@ -20,7 +20,7 @@ export class DEActionNode extends DELogicNode {
         }
         const requestData = ctx.params[dstDELogicParamId];
         const app = ibiz.hub.getApp(ctx.context.srfappid);
-        const res = await app.deService.exec(dstAppDataEntityId, dstAppDEActionId, ctx.context, requestData, ctx.viewParams);
+        const res = await app.deService.exec(dstAppDataEntityId, dstAppDEActionId, ctx.context, requestData, ctx.viewParam);
         if (res.ok) {
             ctx.params[retDELogicParamId] = res.data;
         }

package/out/de-logic/de-logic-param/de-logic-param.js

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

package/out/de-logic/utils/handle-src-val.js

@@ -37,13 +37,13 @@ export function handleSrcVal(ctx, srcValParams) {
             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/out/engine/md-view.engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsDhC;;;;;;;OAOG;cACa,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAwCrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BjB;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BjB;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAsCpC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}
+{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsDhC;;;;;;;OAOG;cACa,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAwCrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BjB;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BjB;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAapC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}

package/out/engine/md-view.engine.js

@@ -272,35 +272,14 @@ export class MDViewEngine extends ViewEngineBase {
      * @return {*}  {IParams}
      */
     getSearchParams() {
-        var _a;
         const params = {};
         // 有搜索表单的整合相关参数
         if (this.searchForm) {
-            const addParams = this.searchForm.getData()[0];
-            const filteredParams = Object.entries(addParams).reduce((result, [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 ((_a = this.searchBar.state.selectedGroupItem) === null || _a === void 0 ? void 0 : _a.data) {
-                // eslint-disable-next-line no-new-func
-                const func = new Function(`return (${this.searchBar.state.selectedGroupItem.data});`);
-                const addParams = func();
-                Object.assign(params, addParams);
-            }
+            Object.assign(params, this.searchBar.getFilterParams());
         }
         return params;
     }

package/out/interface/controller/controller/control/i-search-bar.controller.d.ts

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

package/out/interface/controller/controller/control/i-search-bar.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-search-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;GAOG;AACH,MAAM,WAAW,oBACf,SAAQ,kBAAkB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CAAC;CAAG"}
+{"version":3,"file":"i-search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-search-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;GAOG;AACH,MAAM,WAAW,oBACf,SAAQ,kBAAkB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CAAC;IACxE;;;;;;OAMG;IACH,eAAe,IAAI,OAAO,CAAC;CAC5B"}

package/out/interface/controller/controller/control/i-search-form.controller.d.ts

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

package/out/interface/controller/controller/control/i-search-form.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-search-form.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;GAOG;AACH,MAAM,WAAW,qBACf,SAAQ,eAAe,CAAC,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,CAAC;IAC1E;;;;;OAKG;IACH,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC;IAEvB;;;;;;OAMG;IACH,SAAS,IAAI,OAAO,CAAC;IAErB;;;;;OAKG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAExB;;;;;OAKG;IACH,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAErC;;;;;OAKG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB"}
+{"version":3,"file":"i-search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-search-form.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;GAOG;AACH,MAAM,WAAW,qBACf,SAAQ,eAAe,CAAC,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,CAAC;IAC1E;;;;;OAKG;IACH,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC;IAEvB;;;;;;OAMG;IACH,eAAe,IAAI,OAAO,CAAC;IAE3B;;;;;OAKG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAExB;;;;;OAKG;IACH,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAErC;;;;;OAKG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB"}

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

@@ -1,5 +1,73 @@
 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 {
     /**
      * 快速搜索字符串
@@ -22,5 +90,12 @@ export interface ISearchBarState extends IControlState {
      * @type {boolean}
      */
     selectedGroupItem: ISearchBarGroup | null;
+    /**
+     * 过滤项树节点数据集合
+     * @author lxm
+     * @date 2023-10-12 05:16:12
+     * @type {IFilterNode[]}
+     */
+    filterNodes: IFilterNode[];
 }
 //# sourceMappingURL=i-search-bar.state.d.ts.map

package/out/interface/controller/state/control/i-search-bar.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-search-bar.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-search-bar.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,eAAe,GAAG,IAAI,CAAC;CAC3C"}
+{"version":3,"file":"i-search-bar.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-search-bar.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,IAAI,EAAE,KAAK,CAAC;IAEZ;;;;;OAKG;IACH,SAAS,EAAE,KAAK,GAAG,IAAI,CAAC;IAExB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,WAAW,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,IAAI,EAAE,IAAI,CAAC;IAEX;;;;;OAKG;IACH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;OAKG;IACH,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IAEtB;;;;;OAKG;IACH,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,MAAM,MAAM,WAAW,GAAG,iBAAiB,GAAG,eAAe,CAAC;AAE9D,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,eAAe,GAAG,IAAI,CAAC;IAE1C;;;;;OAKG;IACH,WAAW,EAAE,WAAW,EAAE,CAAC;CAC5B"}

package/out/interface/service/service/i-app-de.service.d.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';
@@ -73,12 +73,12 @@ 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, context: IParams, params?: IParams, data?: IData): Promise<void>;
+    aiChatSse(onmessage: (data: IPortalAsyncAction) => void, context: IParams, params?: IParams, data?: IData): Promise<void>;
 }
 //# sourceMappingURL=i-app-de.service.d.ts.map

package/out/interface/service/service/i-app-de.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-app-de.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-app-de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,cAAc,CAAC;IAErC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,gBAAgB,CAAC;IAE9B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAE5B;;;;;;;;;;OAUG;IACH,IAAI,CACF,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC;IAE1B;;;;;;;;;;OAUG;IACH,MAAM,CACJ,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC;IAE1B;;;;;;;;;;OAUG;IACH,SAAS,CACP,SAAS,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,EAClC,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB"}
+{"version":3,"file":"i-app-de.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-app-de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,cAAc,CAAC;IAErC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,gBAAgB,CAAC;IAE9B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAE5B;;;;;;;;;;OAUG;IACH,IAAI,CACF,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC;IAE1B;;;;;;;;;;OAUG;IACH,MAAM,CACJ,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC;IAE1B;;;;;;;;;;OAUG;IACH,SAAS,CACP,SAAS,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,EAC7C,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB"}

package/out/service/service/entity/de.service.d.ts

@@ -1,5 +1,5 @@
 import { IAppDataEntity } from '@ibiz/model-core';
-import { IHttpResponse } from '@ibiz-template/core';
+import { IHttpResponse, IPortalAsyncAction } from '@ibiz-template/core';
 import { DECache } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
 import { Method } from './method/method';
@@ -104,13 +104,14 @@ export declare 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, context: IParams, params?: IParams, data?: IData): Promise<void>;
+    aiChatSse(onmessage: (data: IPortalAsyncAction) => void, context: IParams, params?: IParams, data?: IData): Promise<void>;
     /**
      * 计算请求路径
      *

package/out/service/service/entity/de.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,aAAa,EAA4B,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAe,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,aAAa;IAsDjC,SAAS,CAAC,KAAK,EAAE,cAAc;IArD3C;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAEpC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE9D;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAiB;IAExC;;;;;;OAMG;gBACmB,KAAK,EAAE,cAAc;IAU3C;;;;;;;;;OASG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,GAAE,OAAe,GAAG,MAAM;IA6BhE;;;;;;;;;;OAUG;IACH,IAAI,CACF,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;IAQzB;;;;;;;;;;OAUG;IACH,MAAM,CACJ,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,EACd,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC;IAQzB;;;;;;;;;OASG;IACH,SAAS,CACP,SAAS,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,EAClC,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,IAAI,CAAC;IA0BhB;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;CAQhD"}
+{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EACL,aAAa,EACb,kBAAkB,EAGnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAe,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,aAAa;IAsDjC,SAAS,CAAC,KAAK,EAAE,cAAc;IArD3C;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAEpC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE9D;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAiB;IAExC;;;;;;OAMG;gBACmB,KAAK,EAAE,cAAc;IAU3C;;;;;;;;;OASG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,GAAE,OAAe,GAAG,MAAM;IA6BhE;;;;;;;;;;OAUG;IACH,IAAI,CACF,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;IAQzB;;;;;;;;;;OAUG;IACH,MAAM,CACJ,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,EACd,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC;IAQzB;;;;;;;;;;OAUG;IACH,SAAS,CACP,SAAS,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,EAC7C,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;CAQhD"}

package/out/service/service/entity/de.service.js

@@ -1,4 +1,4 @@
-import { ModelError, RuntimeError } from '@ibiz-template/core';
+import { ModelError, RuntimeError, } from '@ibiz-template/core';
 import { DECache, calcResPath } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
 import { FileService } from '../file/file.service';
@@ -122,10 +122,11 @@ export class DEService {
      * 实体级别 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, context, params = {}, data = {}) {
@@ -137,8 +138,11 @@ export class DEService {
                     'Content-Type': 'application/json',
                 },
                 body: JSON.stringify(data),
-                onmessage: (e) => {
-                    onmessage(e);
+                onmessage: e => {
+                    if (e.data) {
+                        const json = JSON.parse(e.data);
+                        onmessage(json);
+                    }
                 },
                 onclose: () => {
                     resolve();