@ibiz-template/runtime 0.6.18 → 0.7.1

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

@@ -1,5 +1,5 @@
 import { IAppDataEntity, ISearchBarFilter } from '@ibiz/model-core';
-import { IEditorContainerController, IEditorController, IEditorProvider, IFilterLeafNode } from '../../../interface';
+import { IEditorContainerController, IEditorController, IEditorProvider, IFilterNodeField } from '../../../interface';
 /** 不需要编辑器的OP */
 export declare const ExcludeOPs: string[];
 export interface ISearchFilterContainer {
@@ -23,6 +23,7 @@ export declare class SearchBarFilterController implements IEditorContainerContro
     unitName: string | undefined;
     valueFormat: string | undefined;
     dataType: number | undefined;
+    hidden: boolean | undefined;
     /**
      * 编辑器控制器
      *
@@ -38,6 +39,13 @@ export declare class SearchBarFilterController implements IEditorContainerContro
      * @date 2022-08-24 20:08:42
      */
     editorProvider?: IEditorProvider;
+    /**
+     * 唯一标识，作为第一个下拉的时候的唯一判断，默认是fieldName
+     * @author lxm
+     * @date 2024-04-10 02:10:00
+     * @type {string}
+     */
+    key: string;
     /**
      * 过滤的属性名称(有实体属性的是属性codeName小写，没有就是项名称)
      * @author lxm
@@ -66,6 +74,13 @@ export declare class SearchBarFilterController implements IEditorContainerContro
      * @type {boolean}
      */
     noEditor: boolean;
+    /**
+     * 控制器类型
+     * @author lxm
+     * @date 2024-04-10 01:41:40
+     * @type {('ITEMS' | 'SIMPLE_ITEMS' | 'FIELD')}
+     */
+    type: 'ITEMS' | 'SIMPLE_ITEMS' | 'FIELD';
     /**
      * 值项
      * @author lxm
@@ -86,10 +101,10 @@ export declare class SearchBarFilterController implements IEditorContainerContro
      * 计算要递给编辑器的参数
      * @author lxm
      * @date 2024-02-04 06:35:28
-     * @param {IFilterLeafNode} node
+     * @param {IFilterNodeField} node
      * @return {*}  {{ value: unknown; data: IData }}
      */
-    calcEditorProps(node: IFilterLeafNode): {
+    calcEditorProps(node: IFilterNodeField): {
         value: unknown;
         data: IData;
     };
@@ -97,10 +112,10 @@ export declare class SearchBarFilterController implements IEditorContainerContro
      * 编辑器值变更处理
      * @author lxm
      * @date 2024-02-04 06:42:04
-     * @param {IFilterLeafNode} node
+     * @param {IFilterNodeField} node
      * @param {unknown} value
      * @param {string} [name]
      */
-    onEditorChange(node: IFilterLeafNode, value: unknown, name?: string): void;
+    onEditorChange(node: IFilterNodeField, value: unknown, name?: string): void;
 }
 //# sourceMappingURL=search-bar-filter.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"search-bar-filter.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar-filter.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAK5B,gBAAgB;AAChB,eAAO,MAAM,UAAU,EAAE,MAAM,EAKrB,CAAC;AAIX,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,cAAc,CAAC;CAC/B;AAED;;;;;;;GAOG;AACH,qBAAa,yBAA0B,YAAW,0BAA0B;IAoEjE,KAAK,EAAE,gBAAgB;IACvB,aAAa,EAAE,cAAc;IAC7B,OAAO,EAAE,QAAQ;IACjB,MAAM,EAAE,OAAO;IAtExB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;gBAGQ,KAAK,EAAE,gBAAgB,EACvB,aAAa,EAAE,cAAc,EAC7B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO;IAqBxB;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B;;;;;;OAMG;IACH,eAAe,CAAC,IAAI,EAAE,eAAe,GAAG;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,KAAK,CAAA;KAAE;IAevE;;;;;;;OAOG;IACH,cAAc,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;CAO3E"}
+{"version":3,"file":"search-bar-filter.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar-filter.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,cAAc,EACd,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAM5B,gBAAgB;AAChB,eAAO,MAAM,UAAU,EAAE,MAAM,EAKrB,CAAC;AAIX,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,cAAc,CAAC;CAC/B;AAED;;;;;;;GAOG;AACH,qBAAa,yBAA0B,YAAW,0BAA0B;IAsFjE,KAAK,EAAE,gBAAgB;IACvB,aAAa,EAAE,cAAc;IAC7B,OAAO,EAAE,QAAQ;IACjB,MAAM,EAAE,OAAO;IAxFxB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;IAE5B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;OAKG;IACH,IAAI,EAAE,OAAO,GAAG,cAAc,GAAG,OAAO,CAAW;IAEnD;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;gBAGQ,KAAK,EAAE,gBAAgB,EACvB,aAAa,EAAE,cAAc,EAC7B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO;IAyBxB;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B;;;;;;OAMG;IACH,eAAe,CAAC,IAAI,EAAE,gBAAgB,GAAG;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,KAAK,CAAA;KAAE;IAexE;;;;;;;OAOG;IACH,cAAc,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;CAO5E"}

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

@@ -3,6 +3,7 @@ import { RuntimeModelError } from '@ibiz-template/core';
 import { findFieldById } from '../../../model';
 import { getEditorProvider } from '../../../register';
 import { ValueOP } from '../../../constant';
+import { isHiddenFilter } from './util';
 /** 不需要编辑器的OP */
 export const ExcludeOPs = [
     ValueOP.IS_NULL,
@@ -43,12 +44,22 @@ export class SearchBarFilterController {
          * @type {boolean}
          */
         this.noEditor = false;
+        /**
+         * 控制器类型
+         * @author lxm
+         * @date 2024-04-10 01:41:40
+         * @type {('ITEMS' | 'SIMPLE_ITEMS' | 'FIELD')}
+         */
+        this.type = 'FIELD';
+        // 设置是否是隐藏
+        this.hidden = isHiddenFilter(model);
         // 实体属性
         let field;
         if (model.appDEFieldId) {
             field = findFieldById(this.appDataEntity, model.appDEFieldId);
         }
         this.fieldName = field ? field.codeName.toLowerCase() : model.id;
+        this.key = this.fieldName;
         // 属性标题
         this.label = model.caption || (field === null || field === void 0 ? void 0 : field.logicName) || model.id;
         this.valueOP = (_a = model.defsearchMode) === null || _a === void 0 ? void 0 : _a.valueOP;
@@ -79,7 +90,7 @@ export class SearchBarFilterController {
      * 计算要递给编辑器的参数
      * @author lxm
      * @date 2024-02-04 06:35:28
-     * @param {IFilterLeafNode} node
+     * @param {IFilterNodeField} node
      * @return {*}  {{ value: unknown; data: IData }}
      */
     calcEditorProps(node) {
@@ -98,7 +109,7 @@ export class SearchBarFilterController {
      * 编辑器值变更处理
      * @author lxm
      * @date 2024-02-04 06:42:04
-     * @param {IFilterLeafNode} node
+     * @param {IFilterNodeField} node
      * @param {unknown} value
      * @param {string} [name]
      */

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

@@ -14,7 +14,7 @@ import { SearchBarService } from './search-bar.service';
  */
 export declare class SearchBarController extends ControlController<ISearchBar, ISearchBarState, ISearchBarEvent> implements ISearchBarController {
     /**
-     * 快速搜索占位符
+     * 快速搜索占位符（根据属性计算出来的快速搜索占位符）
      * @return {*}
      * @author: zhujiamin
      * @Date: 2023-08-11 14:13:10
@@ -157,7 +157,7 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
      * @date 2023-10-13 05:53:35
      * @return {*}  {IData}
      */
-    calcFilters(valueFormat?: boolean): IData[] | undefined;
+    calcFilters(): IData[] | undefined;
     /**
      * 初始化搜索栏分组项(获取后台分组清单并合并模型)
      * @return {*}
@@ -186,5 +186,18 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
      * @Date: 2023-12-21 10:29:24
      */
     handleGroupClick(groupItem: IBackendSearchBarGroup): Promise<void>;
+    /**
+     * 初始化高级搜索
+     * @author lxm
+     * @date 2024-04-11 11:44:10
+     * @protected
+     */
+    protected initAdvancedQuickSearch(): void;
+    /**
+     * 计算快速搜索占位符
+     * @author lxm
+     * @date 2024-04-11 05:36:52
+     */
+    calcQuickSearchPlaceHolder(): void;
 }
 //# sourceMappingURL=search-bar.controller.d.ts.map

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":"AACA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,sBAAsB,EACtB,eAAe,EAEhB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAYxD;;;;;;;;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,OAAO,EAAG,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACH,gBAAgB,EAAE,sBAAsB,GAAG,IAAI,CAAQ;IAEvD;;;;;OAKG;IACH,oBAAoB,UAA8C;IAElE;;;;;OAKG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,gBAAgB,EAAE,CAEzC;IAED;;;;OAIG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAGtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAcX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwCzC;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA2B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;;;OAOG;IACH,oBAAoB,CAClB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,yBAAyB,GAAG,SAAS;IAUxC;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IA4B1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IA6CrD;;;;;OAKG;IACH,WAAW,CAAC,WAAW,UAAO,GAAG,KAAK,EAAE,GAAG,SAAS;IA+CpD;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAoGlE;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IAWxB;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CA2CzE"}
+{"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,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,sBAAsB,EACtB,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAgBxD;;;;;;;;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,OAAO,EAAG,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACH,gBAAgB,EAAE,sBAAsB,GAAG,IAAI,CAAQ;IAEvD;;;;;OAKG;IACH,oBAAoB,UAA8C;IAElE;;;;;OAKG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,gBAAgB,EAAE,CAEzC;IAED;;;;OAIG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAGtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAkBX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwCzC;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA4B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;;;OAOG;IACH,oBAAoB,CAClB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,yBAAyB,GAAG,SAAS;IAUxC;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IAsC1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IA0DrD;;;;;OAKG;IACH,WAAW,IAAI,KAAK,EAAE,GAAG,SAAS;IAsBlC;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAoGlE;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IAWxB;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IA4CxE;;;;;OAKG;IACH,SAAS,CAAC,uBAAuB,IAAI,IAAI;IAsBzC;;;;OAIG;IACH,0BAA0B,IAAI,IAAI;CAenC"}

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

@@ -1,5 +1,5 @@
 import { mergeInLeft, recursiveIterate } from '@ibiz-template/core';
-import { clone, isNil } from 'ramda';
+import { clone } from 'ramda';
 import { isString } from 'lodash-es';
 import { convertNavData, ScriptFactory } from '../../../utils';
 import { ControlController } from '../../common';
@@ -7,8 +7,11 @@ import { SearchBarFilterController } from './search-bar-filter.controller';
 import { SearchBarService } from './search-bar.service';
 import { getEntitySchema } from '../../utils';
 import { calcFilterModelBySchema } from './entity-schema';
-import { calcSearchConds, getOriginFilterNodes, parseFilters, } from './use-searchcond';
 import { SearchBarFilterItemsController } from './search-bar-filter-items.controller';
+import { getOriginFilterNodes, calcSearchCondExs, SearchCondEx2filterNode, calcSearchConds, } from './interface-util';
+import { ItemsValueOPs, isSimpleItems } from './util';
+import { SearchBarFilterSimpleItemsController } from './search-bar-filter-simple-items.controller';
+import { findFieldById } from '../../../model';
 const ScriptValueRegex = /\$\{[^}]*\}/; // 匹配${xxx}格式字符串
 /**
  * 搜索栏控制器
@@ -23,7 +26,7 @@ export class SearchBarController extends ControlController {
     constructor() {
         super(...arguments);
         /**
-         * 快速搜索占位符
+         * 快速搜索占位符（根据属性计算出来的快速搜索占位符）
          * @return {*}
          * @author: zhujiamin
          * @Date: 2023-08-11 14:13:10
@@ -98,6 +101,10 @@ export class SearchBarController extends ControlController {
         this.state.selectedGroupItem = null;
         this.state.searchBarGroups = [];
         this.state.selectedSearchGroupItem = null;
+        this.state.advancedQuickSearch = false;
+        this.state.quickSearchItems = [];
+        this.state.quickSearchFieldNames = [];
+        this.state.quickSearchPlaceHolder = '';
         this.resetFilter();
         this.state.visible = !!(this.model.enableQuickSearch ||
             this.model.enableGroup ||
@@ -110,8 +117,8 @@ export class SearchBarController extends ControlController {
         if (appDataEntity) {
             this.appDataEntity = appDataEntity;
             this.calcQuickSearchPlaceholder();
+            this.initAdvancedQuickSearch();
         }
-        // 实例部件服务
         if (this.isBackendSearchGroup && this.view.model.codeName) {
             this.service = new SearchBarService(this.model, this.view.model.codeName.toLowerCase());
             await this.service.init(this.context);
@@ -182,6 +189,7 @@ export class SearchBarController extends ControlController {
             });
             if (placeHolders.length > 0) {
                 this.placeHolder = placeHolders.join('、');
+                this.state.quickSearchPlaceHolder = this.placeHolder;
             }
         }
     }
@@ -233,6 +241,11 @@ export class SearchBarController extends ControlController {
         // 快速搜索
         if (this.state.query) {
             params.query = this.state.query;
+            // 快速搜索高级
+            if (this.state.advancedQuickSearch &&
+                this.state.quickSearchFieldNames.length) {
+                params.queryconds = this.state.quickSearchFieldNames.map(name => `n_${name}_like`);
+            }
         }
         // 快速分组
         if (((_a = this.state.selectedGroupItem) === null || _a === void 0 ? void 0 : _a.data) &&
@@ -273,7 +286,11 @@ export class SearchBarController extends ControlController {
                 var _a;
                 // 整理exists或者NOTEXISTS的模型
                 if (((_a = item.defsearchMode) === null || _a === void 0 ? void 0 : _a.valueOP) &&
-                    ['EXISTS', 'NOTEXISTS'].includes(item.defsearchMode.valueOP)) {
+                    ItemsValueOPs.includes(item.defsearchMode.valueOP)) {
+                    if (isSimpleItems(item)) {
+                        this.filterControllers.push(new SearchBarFilterSimpleItemsController(item, this.appDataEntity, this.context, this.params));
+                        return;
+                    }
                     const key = `${item.appDEFieldId}_${item.defsearchMode.valueOP}`;
                     if (!itemsMap.has(key)) {
                         itemsMap.set(key, []);
@@ -281,6 +298,7 @@ export class SearchBarController extends ControlController {
                     itemsMap.get(key).push(item);
                     return;
                 }
+                // 常规的属性过滤项
                 const filterController = new SearchBarFilterController(item, this.appDataEntity, this.context, this.params);
                 this.filterControllers.push(filterController);
             });
@@ -300,33 +318,19 @@ export class SearchBarController extends ControlController {
      * @date 2023-10-13 05:53:35
      * @return {*}  {IData}
      */
-    calcFilters(valueFormat = true) {
+    calcFilters() {
         if (!this.enableFilter) {
             return;
         }
-        const searchconds = calcSearchConds(this.state.filterNodes);
-        if (valueFormat && searchconds) {
-            // 给多数据加载之前进行脚本值转换
-            recursiveIterate(searchconds[0], (node, parent) => {
-                if (node.condtype === 'DEFIELD' && !isNil(node.value)) {
-                    let controller = this.findFilterController(node.fieldname, node.condop);
-                    if (!controller && parent.condtype === 'ITEMS') {
-                        const itemC = this.findFilterController(parent.fieldname, parent.condop);
-                        controller = itemC.getSubFilterController(node.fieldname, node.condop);
-                    }
-                    if (controller) {
-                        if (controller.valueItem && node.valueItem) {
-                            node.value = node.valueItem;
-                            delete node.valueItem;
-                        }
-                        else if (ScriptValueRegex.test(node.value)) {
-                            // 脚本转换
-                            node.value = ScriptFactory.execSingleLine(`\`${node.value}\``, Object.assign({}, this.getEventArgs()));
-                        }
+        const searchconds = calcSearchConds(this.state.filterNodes, {
+            after: (node, cond) => {
+                if (node.nodeType === 'FIELD' && isString(node.value)) {
+                    if (ScriptValueRegex.test(node.value)) {
+                        cond.value = ScriptFactory.execSingleLine(`\`${node.value}\``, Object.assign({}, this.getEventArgs()));
                     }
                 }
-            }, { childrenFields: ['searchconds'] });
-        }
+            },
+        });
         return searchconds;
     }
     /**
@@ -443,7 +447,7 @@ export class SearchBarController extends ControlController {
      */
     async handleSave() {
         if (this.grid && this.state.selectedSearchGroupItem) {
-            const filters = this.calcFilters(false);
+            const filters = calcSearchCondExs(this.state.filterNodes);
             const saveParams = {
                 searchconds: filters,
                 sort: this.grid.state.sortQuery,
@@ -491,7 +495,7 @@ export class SearchBarController extends ControlController {
             groupItem.searchGroupData.searchconds &&
             groupItem.searchGroupData.searchconds.length > 0) {
             // 根据后台标准的searchconds计算出 前端回显的树形结构FilterNodes
-            const filterNodes = groupItem.searchGroupData.searchconds.map(item => parseFilters(item));
+            const filterNodes = groupItem.searchGroupData.searchconds.map(item => SearchCondEx2filterNode(item));
             this.state.filterNodes = filterNodes;
         }
         else {
@@ -499,7 +503,7 @@ export class SearchBarController extends ControlController {
         }
         // 把带有${}的条件禁用，不能修改
         recursiveIterate(this.state.filterNodes[0], (node) => {
-            if (node.leaf) {
+            if (node.nodeType === 'FIELD') {
                 if (node.field &&
                     node.valueOP &&
                     isString(node.value) &&
@@ -513,4 +517,50 @@ export class SearchBarController extends ControlController {
             await this.grid.load({ isInitialLoad: true });
         }
     }
+    /**
+     * 初始化高级搜索
+     * @author lxm
+     * @date 2024-04-11 11:44:10
+     * @protected
+     */
+    initAdvancedQuickSearch() {
+        var _a;
+        if (this.model.quickSearchMode === 2 &&
+            ((_a = this.model.searchBarQuickSearchs) === null || _a === void 0 ? void 0 : _a.length)) {
+            this.state.advancedQuickSearch = true;
+            this.state.quickSearchItems = [];
+            this.state.quickSearchFieldNames = [];
+            this.model.searchBarQuickSearchs.forEach(item => {
+                const filed = findFieldById(this.appDataEntity, item.appDEFieldId);
+                const fieldName = filed.codeName.toLowerCase();
+                this.state.quickSearchItems.push({
+                    fieldName,
+                    label: filed.logicName,
+                });
+                this.state.quickSearchFieldNames.push(fieldName);
+            });
+            this.calcQuickSearchPlaceHolder();
+        }
+    }
+    /**
+     * 计算快速搜索占位符
+     * @author lxm
+     * @date 2024-04-11 05:36:52
+     */
+    calcQuickSearchPlaceHolder() {
+        if (this.state.advancedQuickSearch) {
+            if (this.state.quickSearchFieldNames.length) {
+                const labels = [];
+                this.state.quickSearchItems.forEach(item => {
+                    if (this.state.quickSearchFieldNames.includes(item.fieldName)) {
+                        labels.push(item.label);
+                    }
+                });
+                this.state.quickSearchPlaceHolder = labels.join('、');
+            }
+            else {
+                this.state.quickSearchPlaceHolder = this.placeHolder;
+            }
+        }
+    }
 }

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

@@ -0,0 +1,35 @@
+import { ISearchBarFilter } from '@ibiz/model-core';
+export declare const ItemsValueOPs: string[];
+/**
+ * 是否是简单ITEMS模式
+ * @author lxm
+ * @date 2024-04-10 01:46:24
+ * @export
+ * @param {ISearchBarFilter} model
+ * @return {*}  {boolean}
+ */
+export declare function isSimpleItems(model: ISearchBarFilter): boolean;
+/**
+ * 是否是隐藏的过滤项
+ * @author lxm
+ * @date 2024-04-10 01:47:43
+ * @export
+ * @param {ISearchBarFilter} model
+ * @return {*}  {boolean}
+ */
+export declare function isHiddenFilter(model: ISearchBarFilter): boolean;
+/**
+ * 解析出子属性的字段名和操作符
+ * @example
+ * parseSubFieldInfo('N_ATTENTIONS_EXISTS__N_USER_ID_EQ') => { field: 'USER_ID', op: 'EQ' }
+ * @author lxm
+ * @date 2024-04-10 02:03:57
+ * @export
+ * @param {string} str
+ * @return {*}  {{ field: string; op: string }}
+ */
+export declare function parseSubFieldInfo(str: string): {
+    field: string;
+    op: string;
+};
+//# sourceMappingURL=util.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGpD,eAAO,MAAM,aAAa,EAAE,MAAM,EAGxB,CAAC;AAIX;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAE9D;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAE/D;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAI5E"}

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

@@ -0,0 +1,45 @@
+import { ValueOP } from '../../../constant';
+export const ItemsValueOPs = [
+    ValueOP.EXISTS,
+    ValueOP.NOT_EXISTS,
+];
+const SubFieldRegex = /^N_(.\w+)_(.\w+)$/; // N_USER_ID_EQ格式字符串中的USER_ID和EQ
+/**
+ * 是否是简单ITEMS模式
+ * @author lxm
+ * @date 2024-04-10 01:46:24
+ * @export
+ * @param {ISearchBarFilter} model
+ * @return {*}  {boolean}
+ */
+export function isSimpleItems(model) {
+    var _a;
+    return ((_a = model.userParam) === null || _a === void 0 ? void 0 : _a.ITEMTYPE) === 'SIMPLE';
+}
+/**
+ * 是否是隐藏的过滤项
+ * @author lxm
+ * @date 2024-04-10 01:47:43
+ * @export
+ * @param {ISearchBarFilter} model
+ * @return {*}  {boolean}
+ */
+export function isHiddenFilter(model) {
+    var _a;
+    return ((_a = model.userParam) === null || _a === void 0 ? void 0 : _a.ITEMTYPE) === 'HIDDEN';
+}
+/**
+ * 解析出子属性的字段名和操作符
+ * @example
+ * parseSubFieldInfo('N_ATTENTIONS_EXISTS__N_USER_ID_EQ') => { field: 'USER_ID', op: 'EQ' }
+ * @author lxm
+ * @date 2024-04-10 02:03:57
+ * @export
+ * @param {string} str
+ * @return {*}  {{ field: string; op: string }}
+ */
+export function parseSubFieldInfo(str) {
+    const subStr = str.split('__')[1];
+    const matches = subStr.match(SubFieldRegex);
+    return { field: matches[1], op: matches[2] };
+}

package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tab-exp-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EAEtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,CAC5E,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,aAAa,UAAQ;IAErB;;;;;OAKG;IACH,UAAU,UAAS;IAEnB;;;;;;;;OAQG;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAiBpB;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CACnB,GAAG,GAAE,eAA+C,EACpD,aAAa,UAAQ,GACpB,IAAI;IAQP;;;;;;;;OAQG;IACH,IAAI,uBAAuB,IAAI,eAAe,CAI7C;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtC;;;;;OAKG;IACH,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG;QAC5C,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IA6BD;;;;;;;;OAQG;IACI,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG,WAAW;IAYhE,OAAO,IAAI,IAAI;CAKhB"}
+{"version":3,"file":"tab-exp-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EAEtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,CAC5E,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,aAAa,UAAQ;IAErB;;;;;OAKG;IACH,UAAU,UAAS;IAEnB;;;;;;;;OAQG;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAiBpB;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CACnB,GAAG,GAAE,eAA+C,EACpD,aAAa,UAAQ,GACpB,IAAI;IASP;;;;;;;;OAQG;IACH,IAAI,uBAAuB,IAAI,eAAe,CAI7C;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtC;;;;;OAKG;IACH,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG;QAC5C,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IA6BD;;;;;;;;OAQG;IACI,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG,WAAW;IAYhE,OAAO,IAAI,IAAI;CAKhB"}

package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.js

@@ -167,6 +167,7 @@ export class TabExpPanelController extends ControlController {
             navViewMsg.isRoutePushed = true;
         }
         this.evt.emit('onNavViewChange', { navViewMsg });
+        this.evt.emit('onTabChange', { tab });
     }
     /**
      * 当前激活tab模型

package/out/interface/common/i-app-hub-service/i-app-hub-service.d.ts

@@ -185,5 +185,12 @@ export interface IAppHubService {
      * @date 2024-01-03 06:46:57
      */
     reset(): void;
+    /**
+     * 销毁基座
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:21
+     */
+    destroy(): void;
 }
 //# sourceMappingURL=i-app-hub-service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"i-app-hub-service.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-app-hub-service/i-app-hub-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IAEpC;;;;;;OAMG;IACH,WAAW,EAAE,cAAc,CAAC;IAE5B;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAC;IAEhC;;;;OAIG;IACH,MAAM,EAAE,iBAAiB,CAAC;IAE1B;;;;;OAKG;IACH,MAAM,EAAE,iBAAiB,CAAC;IAE1B;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAEjE;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;IAEvC;;;;;;;OAOG;IACH,qBAAqB,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAElE;;;;;;;;OAQG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEjE;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAEjC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEnD;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3C;;;;;;;;;OASG;IACH,WAAW,CACT,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,QAAQ,CAAC,CAAC;IAErB;;;;;;;;OAQG;IACH,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtE;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAElD;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW,CAAC;IAEjD;;;;;;OAMG;IACH,UAAU,IAAI,WAAW,EAAE,CAAC;IAE5B;;;;;;;;;OASG;IACH,eAAe,CACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC;IAE1B;;;;OAIG;IACH,KAAK,IAAI,IAAI,CAAC;CACf"}
+{"version":3,"file":"i-app-hub-service.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-app-hub-service/i-app-hub-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IAEpC;;;;;;OAMG;IACH,WAAW,EAAE,cAAc,CAAC;IAE5B;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAC;IAEhC;;;;OAIG;IACH,MAAM,EAAE,iBAAiB,CAAC;IAE1B;;;;;OAKG;IACH,MAAM,EAAE,iBAAiB,CAAC;IAE1B;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAEjE;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;IAEvC;;;;;;;OAOG;IACH,qBAAqB,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAElE;;;;;;;;OAQG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEjE;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAEjC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEnD;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3C;;;;;;;;;OASG;IACH,WAAW,CACT,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,QAAQ,CAAC,CAAC;IAErB;;;;;;;;OAQG;IACH,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtE;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAElD;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW,CAAC;IAEjD;;;;;;OAMG;IACH,UAAU,IAAI,WAAW,EAAE,CAAC;IAE5B;;;;;;;;;OASG;IACH,eAAe,CACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC;IAE1B;;;;OAIG;IACH,KAAK,IAAI,IAAI,CAAC;IAEd;;;;;OAKG;IACH,OAAO,IAAI,IAAI,CAAC;CACjB"}

package/out/interface/common/i-app-service/i-app-service.d.ts

@@ -126,5 +126,12 @@ export interface IAppService {
      * @return {*}  {Promise<void>}
      */
     initMqtt(): Promise<void>;
+    /**
+     * 销毁应用
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:12
+     */
+    destroy(): void;
 }
 //# sourceMappingURL=i-app-service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"i-app-service.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-app-service/i-app-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EACL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,UAAU,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C;;;;;;;GAOG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,cAAc,CAAC;IAErC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAElC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEnC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IAErC;;;;;;OAMG;IACH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhD;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAC;IAExC;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC;IAEnE;;;;;;;OAOG;IACH,SAAS,CACP,EAAE,EAAE,MAAM,EACV,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IAElC;;;;;;;OAOG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IAEnC;;;;;OAKG;IACH,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B"}
+{"version":3,"file":"i-app-service.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-app-service/i-app-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EACL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,UAAU,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C;;;;;;;GAOG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,cAAc,CAAC;IAErC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAElC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEnC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IAErC;;;;;;OAMG;IACH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhD;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAC;IAExC;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC;IAEnE;;;;;;;OAOG;IACH,SAAS,CACP,EAAE,EAAE,MAAM,EACV,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IAElC;;;;;;;OAOG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IAEnC;;;;;OAKG;IACH,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B;;;;;OAKG;IACH,OAAO,IAAI,IAAI,CAAC;CACjB"}

package/out/interface/controller/controller/control/i-app-menu.controller.d.ts

@@ -1,4 +1,4 @@
-import { IAppMenu } from '@ibiz/model-core';
+import { IAppMenu, IAppMenuItem } from '@ibiz/model-core';
 import { IAppMenuEvent } from '../../event';
 import { IAppMenuState } from '../../state';
 import { IControlController } from './i-control.controller';
@@ -11,5 +11,12 @@ import { IControlController } from './i-control.controller';
  * @extends {IControlController}
  */
 export interface IAppMenuController extends IControlController<IAppMenu, IAppMenuState, IAppMenuEvent> {
+    /**
+     * 所有菜单项
+     *
+     * @type {[]}
+     * @memberof IAppMenuController
+     */
+    allAppMenuItems: IAppMenuItem[];
 }
 //# sourceMappingURL=i-app-menu.controller.d.ts.map

package/out/interface/controller/controller/control/i-app-menu.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-app-menu.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-app-menu.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;GAOG;AACH,MAAM,WAAW,kBACf,SAAQ,kBAAkB,CAAC,QAAQ,EAAE,aAAa,EAAE,aAAa,CAAC;CAAG"}
+{"version":3,"file":"i-app-menu.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-app-menu.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;GAOG;AACH,MAAM,WAAW,kBACf,SAAQ,kBAAkB,CAAC,QAAQ,EAAE,aAAa,EAAE,aAAa,CAAC;IAClE;;;;;OAKG;IACH,eAAe,EAAE,YAAY,EAAE,CAAC;CACjC"}

package/out/interface/controller/event/argument/index.d.ts

@@ -11,4 +11,5 @@ export type { PanelItemEvent } from './panel-item.event';
 export type { FormDetailEvent } from './form-detail.event';
 export { FormDetailEventName } from './form-detail.event';
 export { PanelItemEventName } from './panel-item.event';
+export { TabChangeEvent } from './tab-change.event';
 //# sourceMappingURL=index.d.ts.map

package/out/interface/controller/event/argument/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/argument/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/argument/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC"}

package/out/interface/controller/event/argument/tab-change.event.d.ts

@@ -0,0 +1,13 @@
+import { IDETabViewPanel } from '@ibiz/model-core';
+import { EventBase } from './base.event';
+export interface TabChangeEvent extends EventBase {
+    /**
+     * 分页导航项
+     *
+     * @author tony001
+     * @date 2024-04-14 00:04:57
+     * @type {IDETabViewPanel}
+     */
+    tab: IDETabViewPanel;
+}
+//# sourceMappingURL=tab-change.event.d.ts.map

package/out/interface/controller/event/argument/tab-change.event.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tab-change.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/argument/tab-change.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,WAAW,cAAe,SAAQ,SAAS;IAC/C;;;;;;OAMG;IACH,GAAG,EAAE,eAAe,CAAC;CACtB"}

package/out/interface/controller/event/control/i-tab-exp-panel.event.d.ts

@@ -1,5 +1,5 @@
 import { PartialWithObject } from '@ibiz-template/core';
-import { NavViewChangeEvent, EventBase } from '../argument';
+import { NavViewChangeEvent, EventBase, TabChangeEvent } from '../argument';
 import { IControlEvent } from './i-control.event';
 /**
  * 分页导航面板
@@ -18,5 +18,19 @@ export interface ITabExpPanelEvent extends IControlEvent {
         event: NavViewChangeEvent;
         emitArgs: PartialWithObject<NavViewChangeEvent, EventBase>;
     };
+    /**
+     * Tab分页变化
+     *
+     * @author tony001
+     * @date 2024-04-14 00:04:49
+     * @type {{
+     *     event: TabChangeEvent;
+     *     emitArgs: { data: IData[] };
+     *   }}
+     */
+    onTabChange: {
+        event: TabChangeEvent;
+        emitArgs: PartialWithObject<TabChangeEvent, EventBase>;
+    };
 }
 //# sourceMappingURL=i-tab-exp-panel.event.d.ts.map

package/out/interface/controller/event/control/i-tab-exp-panel.event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-tab-exp-panel.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-tab-exp-panel.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,WAAW,iBAAkB,SAAQ,aAAa;IACtD;;;;OAIG;IACH,eAAe,EAAE;QACf,KAAK,EAAE,kBAAkB,CAAC;QAC1B,QAAQ,EAAE,iBAAiB,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;KAC5D,CAAC;CACH"}
+{"version":3,"file":"i-tab-exp-panel.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-tab-exp-panel.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,WAAW,iBAAkB,SAAQ,aAAa;IACtD;;;;OAIG;IACH,eAAe,EAAE;QACf,KAAK,EAAE,kBAAkB,CAAC;QAC1B,QAAQ,EAAE,iBAAiB,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;KAC5D,CAAC;IAEF;;;;;;;;;OASG;IACH,WAAW,EAAE;QACX,KAAK,EAAE,cAAc,CAAC;QACtB,QAAQ,EAAE,iBAAiB,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;KACxD,CAAC;CACH"}