@ibiz-template/runtime 0.6.17 → 0.7.0

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.js

@@ -1,5 +1,8 @@
 import { BitMask } from '@ibiz-template/core';
 import { FormDetailController } from '../form-detail';
+import { FormMDCtrlState } from './form-mdctrl.state';
+import { ButtonContainerState, UIActionButtonState } from '../../../../utils';
+import { UIActionUtil } from '../../../../../ui-action';
 /**
  * 表单多数据部件控制器
  *
@@ -10,6 +13,10 @@ import { FormDetailController } from '../form-detail';
  * @extends {FormDetailController<IDEFormMDCtrl>}
  */
 export class FormMDCtrlController extends FormDetailController {
+    createState() {
+        var _a;
+        return new FormMDCtrlState((_a = this.parent) === null || _a === void 0 ? void 0 : _a.state);
+    }
     /**
      * 名称
      * @author lxm
@@ -86,6 +93,62 @@ export class FormMDCtrlController extends FormDetailController {
             await this.form.updateFormItem(this.model.deformItemUpdateId);
         }
     }
+    async formStateNotify(state) {
+        super.formStateNotify(state);
+        // 只在加载后台数据之后，更新界面行为组状态
+        if (this.state.actionGroupState) {
+            const deData = this.data.getOrigin ? this.data.getOrigin() : this.data;
+            this.state.actionGroupState.update(this.form.context, deData);
+        }
+    }
+    /**
+     * 初始化
+     *
+     * @author zk
+     * @date 2023-07-25 10:07:11
+     * @return {*}  {Promise<void>}
+     * @memberof FormMDCtrlController
+     */
+    async onInit() {
+        super.onInit();
+        await this.initActionStates();
+    }
+    async initActionStates() {
+        var _a;
+        // 操作列按钮状态控制
+        const { uiactionGroup } = this.model;
+        if (!((_a = uiactionGroup === null || uiactionGroup === void 0 ? void 0 : uiactionGroup.uiactionGroupDetails) === null || _a === void 0 ? void 0 : _a.length)) {
+            return;
+        }
+        const containerState = new ButtonContainerState();
+        uiactionGroup.uiactionGroupDetails.forEach(detail => {
+            const actionid = detail.uiactionId;
+            if (actionid) {
+                const buttonState = new UIActionButtonState(detail.id, this.form.context.srfappid, actionid);
+                containerState.addState(detail.id, buttonState);
+            }
+        });
+        await containerState.update(this.form.context);
+        this.state.actionGroupState = containerState;
+    }
+    /**
+     * 触发操作列点击事件
+     *
+     * @author lxm
+     * @date 2022-09-07 22:09:46
+     * @param {IPSUIActionGroupDetail} detail
+     * @param {MouseEvent} event
+     */
+    async onActionClick(detail, event) {
+        const actionId = detail.uiactionId;
+        await UIActionUtil.execAndResolved(actionId, {
+            context: this.context,
+            params: this.params,
+            data: [this.data],
+            view: this.form.view,
+            event,
+        }, detail.appId);
+    }
     /**
      * 刷新
      * @author lxm

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.state.d.ts

@@ -0,0 +1,12 @@
+import { IButtonContainerState } from '../../../../../interface';
+import { FormDetailState } from '../form-detail';
+export declare class FormMDCtrlState extends FormDetailState {
+    /**
+     * 界面行为组状态
+     *
+     * @type {(IButtonContainerState | null)}
+     * @memberof PortletPartState
+     */
+    actionGroupState: IButtonContainerState | null;
+}
+//# sourceMappingURL=form-mdctrl.state.d.ts.map

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-mdctrl.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,qBAAa,eAAgB,SAAQ,eAAe;IAClD;;;;;OAKG;IACH,gBAAgB,EAAE,qBAAqB,GAAG,IAAI,CAAQ;CACvD"}

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.state.js

@@ -0,0 +1,13 @@
+import { FormDetailState } from '../form-detail';
+export class FormMDCtrlState extends FormDetailState {
+    constructor() {
+        super(...arguments);
+        /**
+         * 界面行为组状态
+         *
+         * @type {(IButtonContainerState | null)}
+         * @memberof PortletPartState
+         */
+        this.actionGroupState = null;
+    }
+}

package/out/controller/control/grid/grid/grid.controller.d.ts

@@ -479,5 +479,19 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @Date: 2024-01-05 13:45:36
      */
     saveColumnStates(): void;
+    /**
+     * 执行对应部件行为消息提示
+     * @author zzq
+     * @date 2024-04-03 15:51:21
+     * @param {string} tag
+     * @param {({ default?: string; data?: IData | IData[]; error?: Error; rowState?: IGridRowState })} [opts]
+     * @return {*}  {void}
+     */
+    actionNotification(tag: string, opts?: {
+        default?: string;
+        data?: IData | IData[];
+        error?: Error;
+        rowState?: IGridRowState;
+    }): void;
 }
 //# sourceMappingURL=grid.controller.d.ts.map

package/out/controller/control/grid/grid/grid.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/grid/grid/grid.controller.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import { awaitTimeout, debounceAndAsyncMerge, mergeDefaultInLeft, recursiveIterate, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
+import { awaitTimeout, debounceAndAsyncMerge, EntityError, mergeDefaultInLeft, recursiveIterate, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
 import { clone } from 'ramda';
 import dayjs from 'dayjs';
 import { GridRowState } from './grid-row.state';
@@ -546,6 +546,7 @@ export class GridController extends MDControlController {
             this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}ERROR`, {
                 error: error,
                 data: rowState.data,
+                rowState,
             });
             throw error;
         }
@@ -1173,4 +1174,22 @@ export class GridController extends MDControlController {
         }
         localStorage.setItem(`${this.view.model.id}.${this.model.name}.columnStates`, JSON.stringify(storageColumnStates));
     }
+    /**
+     * 执行对应部件行为消息提示
+     * @author zzq
+     * @date 2024-04-03 15:51:21
+     * @param {string} tag
+     * @param {({ default?: string; data?: IData | IData[]; error?: Error; rowState?: IGridRowState })} [opts]
+     * @return {*}  {void}
+     */
+    actionNotification(tag, opts) {
+        if ((opts === null || opts === void 0 ? void 0 : opts.error) && (opts === null || opts === void 0 ? void 0 : opts.rowState) && opts.error instanceof EntityError) {
+            const { details } = opts.error;
+            const { errors } = opts.rowState;
+            details.forEach(detail => {
+                errors[detail.name] = detail.errorInfo;
+            });
+        }
+        super.actionNotification(tag, Object.assign({}, (opts || {})));
+    }
 }

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

@@ -1,6 +1,8 @@
 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';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,QAAQ,CAAC;AACvB,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AACtF,OAAO,EAAE,oCAAoC,EAAE,MAAM,6CAA6C,CAAC"}

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);
     }
     /**
      * 获取子搜索栏控制器