@ibiz-template/runtime 0.6.18 → 0.7.0

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

@@ -1,5 +1,7 @@
 export * from './search-bar.controller';
 export { SearchBarFilterController } from './search-bar-filter.controller';
 export * from './entity-schema';
-export * from './use-searchcond';
+export * from './interface-util';
+export * from './util';
 export { SearchBarFilterItemsController } from './search-bar-filter-items.controller';
+export { SearchBarFilterSimpleItemsController } from './search-bar-filter-simple-items.controller';

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

@@ -0,0 +1,75 @@
+import { IFilterNode, ISearchCond, ISearchCondEx } from '../../../interface';
+/**
+ * 获取初始过滤项树节点数据集合
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2023-12-21 17:29:47
+ */
+export declare function getOriginFilterNodes(): IFilterNode[];
+/**
+ * 校验过滤项集合是否正确且至少有一个属性过滤项
+ * @author lxm
+ * @date 2024-04-09 03:02:00
+ * @export
+ * @param {IFilterNode[]} filterNodes
+ * @return {*}  {{
+ *   pass: boolean; 是否通过校验
+ * }}
+ */
+export declare function validateFilterNodes(filterNodes: IFilterNode[]): {
+    pass: boolean;
+};
+/** 后续执行回调函数 */
+export type AfterCallback = (filterNode: IFilterNode, searchCond: ISearchCond) => void;
+/**
+ * IFilterNode转换成ISearchCond接口
+ * @author lxm
+ * @date 2024-04-09 03:16:25
+ * @export
+ * @param {IFilterNode} filterNode
+ * @return {*}  {ISearchCond}
+ */
+export declare function filterNode2SearchCond(filterNode: IFilterNode, opts?: {
+    after: AfterCallback;
+}): ISearchCond;
+/**
+ * 转换IFilterNode[]到ISearchCond[]
+ * 如果filerNodes校验不通过，则返回undefined
+ * @author lxm
+ * @date 2024-04-09 03:48:21
+ * @export
+ * @param {IFilterNode[]} filterNodes
+ * @return {*}  {(ISearchCond[] | undefined)}
+ */
+export declare function calcSearchConds(filterNodes: IFilterNode[], opts?: {
+    after: AfterCallback;
+}): ISearchCond[] | undefined;
+/**
+ * ISearchCondEx转换成IFilterNode接口
+ * @author lxm
+ * @date 2024-04-09 03:26:08
+ * @export
+ * @param {ISearchCondEx} cond
+ * @return {*}  {IFilterNode}
+ */
+export declare function SearchCondEx2filterNode(cond: ISearchCondEx): IFilterNode;
+/**
+ * IFilterNode转换成ISearchCondEx接口
+ * @author lxm
+ * @date 2024-04-09 03:16:25
+ * @export
+ * @param {IFilterNode} filterNode
+ * @return {*}  {ISearchCondEx}
+ */
+export declare function filterNode2SearchCondEx(filterNode: IFilterNode): ISearchCondEx;
+/**
+ * 转换IFilterNode[]到ISearchCondEx[]
+ * 如果filerNodes校验不通过，则返回undefined
+ * @author lxm
+ * @date 2024-04-09 03:48:21
+ * @export
+ * @param {IFilterNode[]} filterNodes
+ * @return {*}  {(ISearchCondEx[] | undefined)}
+ */
+export declare function calcSearchCondExs(filterNodes: IFilterNode[]): ISearchCondEx[] | undefined;
+//# sourceMappingURL=interface-util.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"interface-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/interface-util.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EAIX,WAAW,EACX,aAAa,EAOd,MAAM,oBAAoB,CAAC;AAI5B;;;;;GAKG;AACH,wBAAgB,oBAAoB,IAAI,WAAW,EAAE,CAUpD;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,EAAE,GAAG;IAC/D,IAAI,EAAE,OAAO,CAAC;CACf,CA6BA;AAID,eAAe;AACf,MAAM,MAAM,aAAa,GAAG,CAC1B,UAAU,EAAE,WAAW,EACvB,UAAU,EAAE,WAAW,KACpB,IAAI,CAAC;AAEV;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,WAAW,EACvB,IAAI,CAAC,EAAE;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,GAC9B,WAAW,CAuDb;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,EAAE,EAC1B,IAAI,CAAC,EAAE;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,GAC9B,WAAW,EAAE,GAAG,SAAS,CAO3B;AAID;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,aAAa,GAAG,WAAW,CA8DxE;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,WAAW,GACtB,aAAa,CA0Df;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,WAAW,EAAE,GACzB,aAAa,EAAE,GAAG,SAAS,CAO7B"}

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

@@ -0,0 +1,274 @@
+import { recursiveIterate } from '@ibiz-template/core';
+import { isNil } from 'ramda';
+// ! FilterNode接口处理
+/**
+ * 获取初始过滤项树节点数据集合
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2023-12-21 17:29:47
+ */
+export function getOriginFilterNodes() {
+    return [
+        {
+            nodeType: 'GROUP',
+            logicType: 'AND',
+            children: [
+                { nodeType: 'FIELD', field: null, valueOP: null, value: null },
+            ],
+        },
+    ];
+}
+/**
+ * 校验过滤项集合是否正确且至少有一个属性过滤项
+ * @author lxm
+ * @date 2024-04-09 03:02:00
+ * @export
+ * @param {IFilterNode[]} filterNodes
+ * @return {*}  {{
+ *   pass: boolean; 是否通过校验
+ * }}
+ */
+export function validateFilterNodes(filterNodes) {
+    const result = { pass: false };
+    let hasFilter = false; // 是否有属性 过滤项
+    let hasError = false; // 是否有属性过滤项格式不正确
+    recursiveIterate(filterNodes[0], (node) => {
+        // 如果已经有过滤项格式不正确，则跳过
+        if (hasError) {
+            return;
+        }
+        if (node.nodeType === 'FIELD') {
+            hasFilter = true;
+            // 如果有属性过滤项缺少必须得属性则有错误
+            hasError = !node.field || !node.valueOP || isNil(node.value);
+        }
+        else if (node.nodeType === 'ITEMS') {
+            // ITEMS必须要有属性和操作符并
+            hasError = !node.field || !node.valueOP;
+        }
+        else {
+            // 分组节点必须要有逻辑类型
+            hasError = !node.logicType;
+        }
+    });
+    // 有属性过滤项，且没有报错的时候
+    if (hasFilter && !hasError) {
+        result.pass = true;
+    }
+    return result;
+}
+/**
+ * IFilterNode转换成ISearchCond接口
+ * @author lxm
+ * @date 2024-04-09 03:16:25
+ * @export
+ * @param {IFilterNode} filterNode
+ * @return {*}  {ISearchCond}
+ */
+export function filterNode2SearchCond(filterNode, opts) {
+    let result;
+    if (filterNode.nodeType === 'GROUP') {
+        // 分组
+        const temp = {
+            condop: filterNode.logicType,
+            condtype: 'GROUP',
+        };
+        if (filterNode.children.length > 0) {
+            temp.searchconds = filterNode.children.map(item => filterNode2SearchCond(item, opts));
+        }
+        result = temp;
+        // 是否取反
+        if (filterNode.notMode) {
+            temp.notmode = filterNode.notMode;
+        }
+    }
+    else if (filterNode.nodeType === 'FIELD') {
+        // 属性
+        const temp = {
+            condtype: 'DEFIELD',
+            fieldname: filterNode.field,
+            value: filterNode.value,
+            condop: filterNode.valueOP,
+        };
+        // 值项
+        if (filterNode.valueItem) {
+            temp.value = filterNode.valueItem;
+        }
+        result = temp;
+    }
+    else {
+        // ITEMS
+        const temp = {
+            condop: filterNode.valueOP,
+            fieldname: filterNode.field,
+            condtype: 'ITEMS',
+        };
+        if (filterNode.children.length > 0) {
+            temp.searchconds = filterNode.children.map(item => filterNode2SearchCond(item, opts));
+        }
+        result = temp;
+    }
+    // 执行额外后续处理
+    if (opts === null || opts === void 0 ? void 0 : opts.after) {
+        opts.after(filterNode, result);
+    }
+    return result;
+}
+/**
+ * 转换IFilterNode[]到ISearchCond[]
+ * 如果filerNodes校验不通过，则返回undefined
+ * @author lxm
+ * @date 2024-04-09 03:48:21
+ * @export
+ * @param {IFilterNode[]} filterNodes
+ * @return {*}  {(ISearchCond[] | undefined)}
+ */
+export function calcSearchConds(filterNodes, opts) {
+    const { pass } = validateFilterNodes(filterNodes);
+    if (!pass) {
+        return;
+    }
+    const result = filterNodes.map(node => filterNode2SearchCond(node, opts));
+    return result;
+}
+// ! ISearchCondEx接口处理
+/**
+ * ISearchCondEx转换成IFilterNode接口
+ * @author lxm
+ * @date 2024-04-09 03:26:08
+ * @export
+ * @param {ISearchCondEx} cond
+ * @return {*}  {IFilterNode}
+ */
+export function SearchCondEx2filterNode(cond) {
+    var _a, _b;
+    let result;
+    if (cond.condtype === 'GROUP') {
+        // 分组
+        const temp = {
+            logicType: cond.condop,
+            nodeType: 'GROUP',
+            children: [],
+        };
+        if ((_a = cond.searchconds) === null || _a === void 0 ? void 0 : _a.length) {
+            temp.children = cond.searchconds.map(item => SearchCondEx2filterNode(item));
+        }
+        result = temp;
+        // 是否取反
+        if (cond.notmode) {
+            temp.notMode = cond.notmode;
+        }
+    }
+    else if (cond.condtype === 'DEFIELD') {
+        // 属性
+        const temp = {
+            nodeType: 'FIELD',
+            field: cond.fieldname,
+            value: cond.value,
+            valueOP: cond.condop,
+        };
+        // 值项
+        if (cond.valueItem) {
+            temp.valueItem = cond.valueItem;
+        }
+        result = temp;
+    }
+    else {
+        // ITEMS
+        const temp = {
+            nodeType: 'ITEMS',
+            field: cond.fieldname,
+            valueOP: cond.condop,
+            children: [],
+        };
+        if ((_b = cond.searchconds) === null || _b === void 0 ? void 0 : _b.length) {
+            temp.children = cond.searchconds.map(item => SearchCondEx2filterNode(item));
+        }
+        if (cond.simple) {
+            temp.simple = cond.simple;
+        }
+        result = temp;
+    }
+    // 通用处理
+    if (cond.hidden === true) {
+        result.hidden = true;
+    }
+    return result;
+}
+/**
+ * IFilterNode转换成ISearchCondEx接口
+ * @author lxm
+ * @date 2024-04-09 03:16:25
+ * @export
+ * @param {IFilterNode} filterNode
+ * @return {*}  {ISearchCondEx}
+ */
+export function filterNode2SearchCondEx(filterNode) {
+    let result;
+    if (filterNode.nodeType === 'GROUP') {
+        // 分组
+        const temp = {
+            condop: filterNode.logicType,
+            condtype: 'GROUP',
+        };
+        if (filterNode.children.length > 0) {
+            temp.searchconds = filterNode.children.map(item => filterNode2SearchCondEx(item));
+        }
+        result = temp;
+        // 是否取反
+        if (filterNode.notMode) {
+            temp.notmode = filterNode.notMode;
+        }
+    }
+    else if (filterNode.nodeType === 'FIELD') {
+        // 属性
+        const temp = {
+            condtype: 'DEFIELD',
+            fieldname: filterNode.field,
+            value: filterNode.value,
+            condop: filterNode.valueOP,
+        };
+        // 值项
+        if (filterNode.valueItem) {
+            temp.valueItem = filterNode.valueItem;
+        }
+        result = temp;
+    }
+    else {
+        // ITEMS
+        const temp = {
+            condop: filterNode.valueOP,
+            fieldname: filterNode.field,
+            condtype: 'ITEMS',
+        };
+        if (filterNode.children.length > 0) {
+            temp.searchconds = filterNode.children.map(item => filterNode2SearchCondEx(item));
+        }
+        if (filterNode.simple) {
+            temp.simple = filterNode.simple;
+        }
+        result = temp;
+    }
+    // 通用处理
+    if (filterNode.hidden === true) {
+        result.hidden = true;
+    }
+    return result;
+}
+/**
+ * 转换IFilterNode[]到ISearchCondEx[]
+ * 如果filerNodes校验不通过，则返回undefined
+ * @author lxm
+ * @date 2024-04-09 03:48:21
+ * @export
+ * @param {IFilterNode[]} filterNodes
+ * @return {*}  {(ISearchCondEx[] | undefined)}
+ */
+export function calcSearchCondExs(filterNodes) {
+    const { pass } = validateFilterNodes(filterNodes);
+    if (!pass) {
+        return;
+    }
+    const result = filterNodes.map(filterNode2SearchCondEx);
+    return result;
+}

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

@@ -1,11 +1,10 @@
 import { IAppDataEntity, ISearchBarFilter } from '@ibiz/model-core';
 import { SearchBarFilterController } from './search-bar-filter.controller';
-/** 不需要编辑器的OP */
-export declare const ExcludeOPs: string[];
 type FieldInfo = {
     name: string;
     label: string;
     valueOPs: string[];
+    fieldName: string;
 };
 /**
  * 搜索栏过滤项ITEMS控制器

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

@@ -1 +1 @@
-{"version":3,"file":"search-bar-filter-items.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar-filter-items.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAIpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,gBAAgB;AAChB,eAAO,MAAM,UAAU,EAAE,MAAM,EAGrB,CAAC;AAIX,KAAK,SAAS,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,8BAA+B,SAAQ,yBAAyB;IA2BzE,SAAS,CAAC,YAAY,EAAE,gBAAgB,EAAE;IA1B5C;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;OAKG;IACH,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAa;gBAGhE,YAAY,EAAE,gBAAgB,EAAE,EAC1C,aAAa,EAAE,cAAc,EAC7B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO;IAKjB;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM;IAIpD;;;;;;OAMG;cACa,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB/C;;;;;;OAMG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA6CxC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B;;;;;;;OAOG;IACH,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,yBAAyB;CAG7E"}
+{"version":3,"file":"search-bar-filter-items.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar-filter-items.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAI3E,KAAK,SAAS,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,8BAA+B,SAAQ,yBAAyB;IA2BzE,SAAS,CAAC,YAAY,EAAE,gBAAgB,EAAE;IA1B5C;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;OAKG;IACH,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAa;gBAGhE,YAAY,EAAE,gBAAgB,EAAE,EAC1C,aAAa,EAAE,cAAc,EAC7B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO;IAMjB;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM;IAIpD;;;;;;OAMG;cACa,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB/C;;;;;;OAMG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAoDxC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ3B;;;;;;;OAOG;IACH,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,yBAAyB;CAG7E"}

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

@@ -1,13 +1,7 @@
 /* eslint-disable no-template-curly-in-string */
 import { RuntimeError } from '@ibiz-template/core';
 import { clone } from 'ramda';
-import { ValueOP } from '../../../constant';
 import { SearchBarFilterController } from './search-bar-filter.controller';
-/** 不需要编辑器的OP */
-export const ExcludeOPs = [
-    ValueOP.IS_NULL,
-    ValueOP.IS_NOT_NULL,
-];
 const SubFieldRegex = /^N_(.\w+)_(.\w+)$/; // N_USER_ID_EQ格式字符串中的USER_ID和EQ
 /**
  * 搜索栏过滤项ITEMS控制器
@@ -36,6 +30,7 @@ export class SearchBarFilterItemsController extends SearchBarFilterController {
          * @type {Map<string, SearchBarFilterController>}
          */
         this.subFilterCMap = new Map();
+        this.type = 'ITEMS';
     }
     /**
      * 计算标识
@@ -93,18 +88,25 @@ export class SearchBarFilterItemsController extends SearchBarFilterController {
             const matches = subStr.match(SubFieldRegex);
             const subField = matches[1];
             const subOP = matches[2];
+            // 修改子项的模型,创建控制器
+            const cloneItem = clone(item);
+            cloneItem.defsearchMode.valueOP = subOP;
+            cloneItem.id = subField;
+            const filterC = new SearchBarFilterController(cloneItem, this.appDataEntity, this.context, this.params);
+            this.subFilterCMap.set(this.calcKey(subField, subOP), filterC);
+            // 隐藏的直接不设置
+            if (filterC.hidden) {
+                return;
+            }
             if (!fieldMap.has(subField)) {
                 fieldMap.set(subField, {
                     name: subField,
                     label: '',
                     valueOPs: [],
+                    fieldName: subField,
                 });
             }
             fieldMap.get(subField).valueOPs.push(subOP);
-            // 修改子项的模型
-            const cloneItem = clone(item);
-            cloneItem.defsearchMode.valueOP = subOP;
-            this.subFilterCMap.set(this.calcKey(subField, subOP), new SearchBarFilterController(cloneItem, this.appDataEntity, this.context, this.params));
         });
         (_a = this.minorAppDE.appDEFields) === null || _a === void 0 ? void 0 : _a.forEach(item => {
             const codeName = item.codeName.toUpperCase();
@@ -119,6 +121,7 @@ export class SearchBarFilterItemsController extends SearchBarFilterController {
     async init() {
         await this.initMinorAppDE();
         await this.initAllFields();
+        this.hidden = Array.from(this.subFilterCMap.values()).every(item => item.hidden);
     }
     /**
      * 获取子搜索栏控制器

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

@@ -0,0 +1,37 @@
+import { IAppDataEntity, ISearchBarFilter } from '@ibiz/model-core';
+import { SearchBarFilterController } from './search-bar-filter.controller';
+import { IFilterNode } from '../../../interface';
+/**
+ * 搜索栏过滤项ITEMS控制器
+ * @author lxm
+ * @date 2023-10-12 05:49:19
+ * @export
+ * @class SearchBarFilterController
+ * @implements {IEditorContainerController}
+ */
+export declare class SearchBarFilterSimpleItemsController extends SearchBarFilterController {
+    /**
+     * 过滤的属性名称(有实体属性的是属性codeName小写，没有就是项名称)
+     * @author lxm
+     * @date 2023-10-13 02:51:39
+     * @type {string}
+     */
+    subFieldName: string;
+    /**
+     * 配置的属性搜索模式对应的值操作
+     * @author lxm
+     * @date 2023-10-13 03:22:10
+     * @type {string}
+     */
+    subValueOP: string;
+    constructor(filterModel: ISearchBarFilter, appDataEntity: IAppDataEntity, context: IContext, params: IParams);
+    /**
+     * 简单模式下添加节点逻辑
+     * @author lxm
+     * @date 2024-04-07 05:44:47
+     * @param {IFilterNodeField} node
+     * @return {*}  {void}
+     */
+    addSimpleFilterNode(node: IFilterNode): void;
+}
+//# sourceMappingURL=search-bar-filter-simple-items.controller.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"search-bar-filter-simple-items.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar-filter-simple-items.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAoB,MAAM,oBAAoB,CAAC;AAGnE;;;;;;;GAOG;AACH,qBAAa,oCAAqC,SAAQ,yBAAyB;IACjF;;;;;OAKG;IACH,YAAY,EAAG,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,UAAU,EAAG,MAAM,CAAC;gBAGlB,WAAW,EAAE,gBAAgB,EAC7B,aAAa,EAAE,cAAc,EAC7B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO;IAYjB;;;;;;OAMG;IACH,mBAAmB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;CAgB7C"}

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

@@ -0,0 +1,47 @@
+/* eslint-disable prefer-destructuring */
+/* eslint-disable no-template-curly-in-string */
+import { SearchBarFilterController } from './search-bar-filter.controller';
+import { parseSubFieldInfo } from './util';
+/**
+ * 搜索栏过滤项ITEMS控制器
+ * @author lxm
+ * @date 2023-10-12 05:49:19
+ * @export
+ * @class SearchBarFilterController
+ * @implements {IEditorContainerController}
+ */
+export class SearchBarFilterSimpleItemsController extends SearchBarFilterController {
+    constructor(filterModel, appDataEntity, context, params) {
+        super(filterModel, appDataEntity, context, params);
+        this.noEditor = false;
+        // simple每个都是唯一的
+        this.key = this.model.id;
+        this.type = 'SIMPLE_ITEMS';
+        const info = parseSubFieldInfo(filterModel.defsearchMode.codeName);
+        this.subFieldName = info.field;
+        this.subValueOP = info.op;
+    }
+    /**
+     * 简单模式下添加节点逻辑
+     * @author lxm
+     * @date 2024-04-07 05:44:47
+     * @param {IFilterNodeField} node
+     * @return {*}  {void}
+     */
+    addSimpleFilterNode(node) {
+        Object.assign(node, {
+            simple: true,
+            field: this.fieldName,
+            nodeType: 'ITEMS',
+            valueOP: this.valueOP,
+            children: [
+                {
+                    nodeType: 'FIELD',
+                    field: this.subFieldName,
+                    valueOP: this.subValueOP,
+                    value: null,
+                },
+            ],
+        });
+    }
+}

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]
      */