@ibiz-template/runtime 0.1.35 → 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/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/service/service/entity/method/method.js

@@ -49,13 +49,13 @@ export class Method {
             let res = null;
             switch (requestMethod) {
                 case 'POST':
-                    res = await this.app.net.post(this.mergeRequestPath(path, methodName), notNilEmpty(data) ? data : params);
+                    res = await this.app.net.post(this.mergeRequestPath(path, methodName), notNilEmpty(data) ? data : params || {});
                     break;
                 case 'GET':
                     res = await this.app.net.get(this.mergeRequestPath(path, methodName), data || params);
                     break;
                 case 'PUT': {
-                    res = await this.app.net.put(this.mergeRequestPath(path, methodName), notNilEmpty(data) ? data : params);
+                    res = await this.app.net.put(this.mergeRequestPath(path, methodName), notNilEmpty(data) ? data : params || {});
                     break;
                 }
                 case 'DELETE':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.35",
+  "version": "0.1.36",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.34",
+    "@ibiz-template/core": "^0.1.36",
     "@ibiz/model-core": "^0.0.19",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "b2dfac469067544cc9a5e527cc7c4f581d603bc9"
+  "gitHead": "d19f35594e34c2e934ae10d094c47c92faa25a8f"
 }

package/src/constant/index.ts

@@ -3,4 +3,5 @@ export { ViewType } from './view-type';
 export { ViewMode } from './view-mode';
 export { SysUIActionTag } from './sys-uiaction-tag';
 export { ViewCallTag } from './view-call-tag';
+export { ValueOP } from './value-op';
 export * from './studio-event';

package/src/constant/value-op.ts

@@ -0,0 +1,82 @@
+/* eslint-disable no-shadow */
+/**
+ * 值操作
+ * @author lxm
+ * @date 2023-10-13 11:37:48
+ * @export
+ * @enum {number}
+ */
+export enum ValueOP {
+  /**
+   * 等于
+   */
+  'EQ' = 'EQ',
+  /**
+   * 不等于
+   */
+  'NOT_EQ' = 'NOTEQ',
+  /**
+   * 大于
+   */
+  'GT' = 'GT',
+  /**
+   * 大于等于
+   */
+  'GT_AND_EQ' = 'GTANDEQ',
+  /**
+   * 小于
+   */
+  'LT' = 'LT',
+  /**
+   * 小于等于
+   */
+  'LT_AND_EQ' = 'LTANDEQ',
+  /**
+   * 值为空
+   */
+  'IS_NULL' = 'ISNULL',
+  /**
+   * 值不为空
+   */
+  'IS_NOT_NULL' = 'ISNOTNULL',
+  /**
+   * 值在范围中
+   */
+  'IN' = 'IN',
+  /**
+   * 值不在范围中
+   */
+  'NOT_IN' = 'NOTIN',
+  /**
+   * 文本包含
+   */
+  'LIKE' = 'LIKE',
+  /**
+   * 文本左包含
+   */
+  'LIFT_LIKE' = 'LIFTLIKE',
+  /**
+   * 文本右包含
+   */
+  'RIGHT_LIKE' = 'RIGHT_LIKE',
+  /**
+   * 子数据（递归）
+   */
+  'CHILD_OF' = 'CHILDOF',
+  /**
+   * 自定义文本包含
+   */
+  'USER_LIKE' = 'USERLIKE',
+  /**
+   * 位与操作（BitAnd）(仅限整数形）
+   */
+  'BIT_AND' = 'BITAND',
+  /**
+   * 存在引用数据
+   */
+  'EXISTS' = 'EXISTS',
+  /**
+   * 不存在引用数据
+   */
+  'NOT_EXISTS' = 'NOTEXISTS',
+}

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

@@ -82,14 +82,22 @@ export class SearchFormController
   }
 
   /**
-   * 获取搜索表单的视图过滤参数
+   * 获取搜索表单的过滤参数
    *
    * @author lxm
    * @date 2022-09-22 17:09:21
    * @returns {*}  {IParams}
    */
-  getParams(): IParams {
-    return { ...this.data.getOrigin() };
+  getFilterParams(): IParams {
+    const filterParams: IParams = {};
+    Object.keys(this.state.data).forEach(key => {
+      const value = this.state.data[key];
+      // 排除空值
+      if (value !== null && value !== undefined && value !== '') {
+        filterParams[key] = value;
+      }
+    });
+    return filterParams;
   }
 
   /**