@ibiz-template/runtime 0.5.0-beta.4 → 0.5.0-beta.5

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

@@ -1,7 +1,8 @@
 import { IAppMenu, IAppMenuItem } from '@ibiz/model-core';
-import { IAppMenuState, IAppMenuEvent, IAppMenuController, IAppService } from '../../../interface';
+import { IAppMenuState, IAppMenuEvent, IAppMenuController, IAppService, IAppMenuItemProvider } from '../../../interface';
 import { AppCounter } from '../../../service';
 import { ControlController } from '../../common';
+import { CTX } from '../../ctx';
 /**
  * 应用菜单控制器
  *
@@ -14,6 +15,22 @@ import { ControlController } from '../../common';
 export declare class AppMenuController extends ControlController<IAppMenu, IAppMenuState, IAppMenuEvent> implements IAppMenuController {
     app: IAppService;
     protected initState(): void;
+    /**
+     * 所有菜单项，平铺开
+     * @author lxm
+     * @date 2023-12-29 02:43:35
+     * @type {IAppMenuItem[]}
+     */
+    allAppMenuItems: IAppMenuItem[];
+    /**
+     * 菜单项适配器集合
+     * @author lxm
+     * @date 2023-07-19 04:14:50
+     * @type {{ [key: string]: IProvider }}
+     */
+    itemProviders: {
+        [key: string]: IAppMenuItemProvider;
+    };
     /**
      * 视图层级
      *
@@ -22,7 +39,16 @@ export declare class AppMenuController extends ControlController<IAppMenu, IAppM
      * @memberof AppMenuController
      */
     get routeDepth(): number | undefined;
+    constructor(model: IAppMenu, context: IContext, params: IParams, ctx: CTX);
     protected onCreated(): Promise<void>;
+    /**
+     * 初始化菜单项的适配器
+     * @author lxm
+     * @date 2023-12-29 02:50:20
+     * @protected
+     * @return {*}  {Promise<void>}
+     */
+    protected initAppMenuItemProviders(): Promise<void>;
     /**
      * 菜单项点击回调，触发对应的应用功能
      *
@@ -43,6 +69,13 @@ export declare class AppMenuController extends ControlController<IAppMenu, IAppM
         visible: boolean;
         permitted: boolean;
     };
+    /**
+     * 所有项平铺
+     * @author lxm
+     * @date 2023-12-29 02:42:39
+     * @protected
+     */
+    protected flattenAllItems(): void;
     /**
      * 所有项平铺
      * @return {*}

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

@@ -1 +1 @@
-{"version":3,"file":"app-menu.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/app-menu/app-menu.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,iBACX,SAAQ,iBAAiB,CAAC,QAAQ,EAAE,aAAa,EAAE,aAAa,CAChE,YAAW,kBAAkB;IAE7B,GAAG,EAAG,WAAW,CAAC;IAElB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;cAEe,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C;;;;;;;OAOG;IACG,eAAe,CACnB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,UAAU,EAClB,QAAQ,GAAE,OAAc,GACvB,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;;OAMG;IAEH,iBAAiB,CAAC,IAAI,EAAE,YAAY,GAAG;QACrC,OAAO,EAAE,OAAO,CAAC;QACjB,SAAS,EAAE,OAAO,CAAC;KACpB;IAwBD;;;;;OAKG;IACH,WAAW,IAAI,YAAY,EAAE;IAc7B;;;;;OAKG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAQzC;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAkB3C"}
+{"version":3,"file":"app-menu.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/app-menu/app-menu.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,WAAW,EACX,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAEhC;;;;;;;;GAQG;AACH,qBAAa,iBACX,SAAQ,iBAAiB,CAAC,QAAQ,EAAE,aAAa,EAAE,aAAa,CAChE,YAAW,kBAAkB;IAE7B,GAAG,EAAG,WAAW,CAAC;IAElB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;OAKG;IACH,eAAe,EAAG,YAAY,EAAE,CAAC;IAEjC;;;;;OAKG;IACH,aAAa,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAE5D;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;gBAEW,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG;cAKzD,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C;;;;;;OAMG;cACa,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;IAWzD;;;;;;;OAOG;IACG,eAAe,CACnB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,UAAU,EAClB,QAAQ,GAAE,OAAc,GACvB,OAAO,CAAC,IAAI,CAAC;IAwChB;;;;;;OAMG;IAEH,iBAAiB,CAAC,IAAI,EAAE,YAAY,GAAG;QACrC,OAAO,EAAE,OAAO,CAAC;QACjB,SAAS,EAAE,OAAO,CAAC;KACpB;IAwBD;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAcjC;;;;;OAKG;IACH,WAAW,IAAI,YAAY,EAAE;IAI7B;;;;;OAKG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAQzC;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAkB3C"}

package/out/controller/control/app-menu/app-menu.controller.js

@@ -1,6 +1,7 @@
 import { findRecursiveChild, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
 import { AppFuncCommand } from '../../../command';
 import { ControlController } from '../../common';
+import { getAppMenuItemProvider } from '../../../register';
 /**
  * 应用菜单控制器
  *
@@ -25,15 +26,42 @@ export class AppMenuController extends ControlController {
     get routeDepth() {
         return this.view.modal.routeDepth;
     }
+    constructor(model, context, params, ctx) {
+        super(model, context, params, ctx);
+        /**
+         * 菜单项适配器集合
+         * @author lxm
+         * @date 2023-07-19 04:14:50
+         * @type {{ [key: string]: IProvider }}
+         */
+        this.itemProviders = {};
+        this.flattenAllItems();
+    }
     async onCreated() {
         var _a;
         await super.onCreated();
         this.app = await ibiz.hub.getApp(this.context.srfappid);
+        await this.initAppMenuItemProviders();
         // 初始化菜单项状态
         (_a = this.model.appMenuItems) === null || _a === void 0 ? void 0 : _a.forEach(item => {
             this.initMenuItemState(item);
         });
     }
+    /**
+     * 初始化菜单项的适配器
+     * @author lxm
+     * @date 2023-12-29 02:50:20
+     * @protected
+     * @return {*}  {Promise<void>}
+     */
+    async initAppMenuItemProviders() {
+        await Promise.all(this.allAppMenuItems.map(async (item) => {
+            const provider = await getAppMenuItemProvider(item);
+            if (provider) {
+                this.itemProviders[item.id] = provider;
+            }
+        }));
+    }
     /**
      * 菜单项点击回调，触发对应的应用功能
      *
@@ -54,6 +82,11 @@ export class AppMenuController extends ControlController {
             eventArg: id,
             event,
         });
+        // 如果有适配器，走适配器的点击处理
+        const provider = this.itemProviders[id];
+        if (provider && provider.onClick) {
+            return provider.onClick(menuItem, event, this);
+        }
         if (!menuItem.appFuncId) {
             throw new RuntimeModelError(menuItem, '没有配置应用功能');
         }
@@ -101,11 +134,11 @@ export class AppMenuController extends ControlController {
     }
     /**
      * 所有项平铺
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2022-09-09 16:48:21
+     * @author lxm
+     * @date 2023-12-29 02:42:39
+     * @protected
      */
-    getAllItems() {
+    flattenAllItems() {
         const result = [];
         const flattenMenus = (menuItems) => {
             menuItems.forEach(item => {
@@ -116,7 +149,16 @@ export class AppMenuController extends ControlController {
             });
         };
         flattenMenus(this.model.appMenuItems);
-        return result;
+        this.allAppMenuItems = result;
+    }
+    /**
+     * 所有项平铺
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2022-09-09 16:48:21
+     */
+    getAllItems() {
+        return this.allAppMenuItems;
     }
     /**
      * 根据id去视图控制器里取得计数器对象

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

@@ -1 +1 @@
-{"version":3,"file":"gantt.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/gantt/gantt.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,cAAc,EACd,WAAW,EACX,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD;;;;;;;;;GASG;AACH,qBAAa,eACX,SAAQ,oBAAoB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC/D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B;;;;;;OAMG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;;OAMG;IACH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI;IAExC;;;;;;OAMG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5C;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAIvC;;;;;;OAMG;IACH,qBAAqB,CAAC,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,GAAG,KAAK;IAgBjE;;;;;;;;OAQG;IACG,cAAc,CAClB,QAAQ,EAAE,cAAc,GAAG,KAAK,EAChC,IAAI,EAAE,KAAK,EACX,eAAe,GAAE,OAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;CA+BjB"}
+{"version":3,"file":"gantt.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/gantt/gantt.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,cAAc,EACd,WAAW,EACX,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAGvD;;;;;;;;;GASG;AACH,qBAAa,eACX,SAAQ,oBAAoB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC/D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B;;;;;;OAMG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;OAMG;IACH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI;IAExC;;;;;;OAMG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5C;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAIvC;;;;;;OAMG;IACH,qBAAqB,CAAC,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,GAAG,KAAK;IAgBjE;;;;;;;;OAQG;IACG,cAAc,CAClB,QAAQ,EAAE,cAAc,GAAG,KAAK,EAChC,IAAI,EAAE,KAAK,EACX,eAAe,GAAE,OAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;CA+BjB"}

package/out/controller/control/gantt/gantt.controller.js

@@ -1,5 +1,6 @@
 import { GanttService } from './gantt.service';
 import { TreeGridExController } from '../tree-grid-ex';
+import { calcDeCodeNameById } from '../../../model';
 /**
  * 甘特图控制器
  *
@@ -20,7 +21,6 @@ export class GanttController extends TreeGridExController {
      */
     initState() {
         super.initState();
-        this.state.rootNodes = [];
         this.state.ganttStyle = {};
     }
     /**
@@ -94,9 +94,9 @@ export class GanttController extends TreeGridExController {
                 ? this.transformNodeDataItem(nodeModel, data)
                 : data;
             if (Object.keys(newData).length > 0) {
-                const [, entityCodename] = nodeModel.appDataEntityId.split('.');
+                const deName = calcDeCodeNameById(nodeModel.appDataEntityId);
                 const tempContext = Object.assign(this.context.clone(), {
-                    [entityCodename]: currentNode.srfkey,
+                    [deName]: currentNode.srfkey,
                 });
                 const response = await this.service.execDeService(nodeModel.appDataEntityId, 'update', tempContext, newData);
                 if (response.status === 200) {

package/out/controller/control/grid/grid/entity-schema.d.ts

@@ -0,0 +1,16 @@
+import { IDEGridDataItem, IDEGridFieldColumn } from '@ibiz/model-core';
+import { GridController } from './grid.controller';
+/**
+ * 根据json模型计算出表格列模型
+ * @author lxm
+ * @date 2024-01-02 10:27:40
+ * @export
+ * @param {IData} json
+ * @param {SearchBarController} c
+ * @return {*}  {ISearchBarFilter[]}
+ */
+export declare function calcColumnModelBySchema(json: IData, c: GridController): Promise<{
+    degridColumns: IDEGridFieldColumn[];
+    degridDataItems: IDEGridDataItem[];
+} | undefined>;
+//# sourceMappingURL=entity-schema.d.ts.map

package/out/controller/control/grid/grid/entity-schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity-schema.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/entity-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AASnD;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,KAAK,EACX,CAAC,EAAE,cAAc,GAChB,OAAO,CACN;IAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;IAAC,eAAe,EAAE,eAAe,EAAE,CAAA;CAAE,GAC3E,SAAS,CACZ,CA+EA"}

package/out/controller/control/grid/grid/entity-schema.js

@@ -0,0 +1,81 @@
+const TypeToDataType = {
+    string: 25,
+    number: 6,
+    integer: 9,
+    date: 5,
+};
+/**
+ * 根据json模型计算出表格列模型
+ * @author lxm
+ * @date 2024-01-02 10:27:40
+ * @export
+ * @param {IData} json
+ * @param {SearchBarController} c
+ * @return {*}  {ISearchBarFilter[]}
+ */
+export async function calcColumnModelBySchema(json, c) {
+    var _a;
+    if (!json.properties) {
+        return;
+    }
+    const { properties } = json;
+    if (!(Object.keys(properties).length > 0)) {
+        return;
+    }
+    const addFields = [];
+    Object.keys(properties).forEach((key) => {
+        let type;
+        switch (properties[key].type) {
+            case 'string':
+                type = 'string';
+                if (properties[key].format === 'date-time') {
+                    type = 'date';
+                }
+                break;
+            case 'integer':
+                type = 'integer';
+                break;
+            case 'number':
+                type = 'number';
+                break;
+            default:
+                ibiz.log.error(`未支持的类型${properties[key].type}`);
+                return;
+        }
+        addFields.push({
+            key,
+            description: properties[key].description,
+            type,
+        });
+    });
+    // 属性codeName对应的属性id
+    const codeNameToId = {};
+    const dataEntity = await ibiz.hub.getAppDataEntity(c.model.appDataEntityId, c.model.appId);
+    (_a = dataEntity.appDEFields) === null || _a === void 0 ? void 0 : _a.forEach(field => {
+        codeNameToId[field.codeName.toLowerCase()] = field.id;
+    });
+    const addColumns = [];
+    const addDataItems = [];
+    addFields.forEach(item => {
+        addColumns.push({
+            appId: c.model.appId,
+            appDEFieldId: codeNameToId[item.key],
+            id: item.key,
+            codeName: item.key,
+            columnType: 'DEFGRIDCOLUMN',
+            width: 150,
+            widthUnit: 'PX',
+            valueType: 'SIMPLE',
+            caption: item.description,
+            dataItemName: item.key,
+        });
+        addDataItems.push({
+            appId: c.model.appId,
+            appDEFieldId: codeNameToId[item.key],
+            id: item.key,
+            valueType: 'SIMPLE',
+            dataType: TypeToDataType[item.type],
+        });
+    });
+    return { degridColumns: addColumns, degridDataItems: addDataItems };
+}

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

@@ -40,6 +40,13 @@ export declare class GridController extends MDControlController<IDEGrid, IGridSt
      * @type {boolean}
      */
     isMultistageHeader: boolean;
+    /**
+     * 是否添加jsonschema里定义的表格列
+     * @author lxm
+     * @date 2024-01-02 05:27:16
+     * @type {boolean}
+     */
+    addSchemaColumn: boolean;
     /**
      * 所有表格列控制器集合
      *
@@ -159,6 +166,13 @@ export declare class GridController extends MDControlController<IDEGrid, IGridSt
      * @returns {*}  {Promise<void>}
      */
     protected onCreated(): Promise<void>;
+    /**
+     * 根据jsonschema初始化自定义表格列
+     * @author lxm
+     * @date 2024-01-02 04:41:23
+     * @return {*}  {Promise<void>}
+     */
+    initByEntitySchema(): Promise<void>;
     /**
      * 初始化表格分组
      * @author lxm

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":"AAUA,OAAO,EACL,OAAO,EAEP,aAAa,EACb,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,YAAY,EACZ,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAS,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAE1B;;;;;;OAMG;IACK,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,iBAAiB,EAAE,OAAO,CAAS;IAEnC;;;;;OAKG;IACH,kBAAkB,EAAE,OAAO,CAAS;IAEpC;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEtD;;;;;;OAMG;IACH,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAA;KAAE,CAAM;IAEhE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAM;IAE1D;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,6BAA6B,CAAA;KAAE,CAAM;IAEnE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;IAE7C;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,CAAQ;IAExB;;;;;OAKG;IACH,UAAU,EAAE,aAAa,GAAG,SAAS,CAAC;IAEtC;;;;;OAKG;IACH,gBAAgB,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAE9C;;;;;OAKG;IACH,IAAI,kBAAkB,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAE7D;IAED;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,UAAU,CAEtC;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAW3B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB1C;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiDpC,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC;IAqCvB;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAmC7C;;;;;;OAMG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB9C;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAS7C;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAmB9B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAkD7B;;;;;;;OAOG;IACG,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDpC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAe9B;;;;;;OAMG;cACa,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC3E;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAkBlC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAiBjC;;;;;;OAMG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhD;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,IAAI,CAAC;IAyBhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI;IAOhE;;;;;;;OAOG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAS7C,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC;;;;;;OAMG;IACG,aAAa,CACjB,GAAG,EAAE,YAAY,EACjB,QAAQ,CAAC,EAAE,OAAO,EAClB,MAAM,GAAE,OAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAoDhB;;;;;OAKG;IACH,YAAY,IAAI;QACd,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;IAOD;;;;;;;OAOG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAQvD;;;;;;;OAOG;IACG,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8C5E;;;;;;;;OAQG;IACG,QAAQ,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAe5D;;;;;OAKG;IACG,oBAAoB,CACxB,UAAU,EAAE,aAAa,GACxB,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;IAsBvC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,KAAK,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiH5E;;;;;;;;OAQG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,KAAK;IAsBvD;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM;IAQtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,SAAS;IAKpD;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAU5C;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAsB1C;;;;;;OAMG;IACH,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,IAAI;IAIjD;;;;;;OAMG;IACH,cAAc,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;CAa7C"}
+{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,OAAO,EAEP,aAAa,EACb,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,YAAY,EACZ,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAS,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAUpD;;;;;;;;GAQG;AACH,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAE1B;;;;;;OAMG;IACK,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,iBAAiB,EAAE,OAAO,CAAS;IAEnC;;;;;OAKG;IACH,kBAAkB,EAAE,OAAO,CAAS;IAEpC;;;;;OAKG;IACH,eAAe,EAAE,OAAO,CAAS;IAEjC;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEtD;;;;;;OAMG;IACH,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAA;KAAE,CAAM;IAEhE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAM;IAE1D;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,6BAA6B,CAAA;KAAE,CAAM;IAEnE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;IAE7C;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,CAAQ;IAExB;;;;;OAKG;IACH,UAAU,EAAE,aAAa,GAAG,SAAS,CAAC;IAEtC;;;;;OAKG;IACH,gBAAgB,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAE9C;;;;;OAKG;IACH,IAAI,kBAAkB,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAE7D;IAED;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,UAAU,CAEtC;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAW3B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkCzC;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiDpC,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC;IAqCvB;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAmC7C;;;;;;OAMG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB9C;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAS7C;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAmB9B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAkD7B;;;;;;;OAOG;IACG,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDpC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAe9B;;;;;;OAMG;cACa,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC3E;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAkBlC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAiBjC;;;;;;OAMG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhD;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,IAAI,CAAC;IAyBhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI;IAOhE;;;;;;;OAOG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAS7C,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC;;;;;;OAMG;IACG,aAAa,CACjB,GAAG,EAAE,YAAY,EACjB,QAAQ,CAAC,EAAE,OAAO,EAClB,MAAM,GAAE,OAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAoDhB;;;;;OAKG;IACH,YAAY,IAAI;QACd,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;IAOD;;;;;;;OAOG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAQvD;;;;;;;OAOG;IACG,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8C5E;;;;;;;;OAQG;IACG,QAAQ,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAe5D;;;;;OAKG;IACG,oBAAoB,CACxB,UAAU,EAAE,aAAa,GACxB,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;IAsBvC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,KAAK,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiH5E;;;;;;;;OAQG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,KAAK;IAsBvD;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM;IAQtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,SAAS;IAKpD;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAU5C;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAsB1C;;;;;;OAMG;IACH,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,IAAI;IAIjD;;;;;;OAMG;IACH,cAAc,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;CAa7C"}

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

@@ -8,8 +8,9 @@ import { getGridColumnProvider } from '../../../../register';
 import { Srfuf } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
-import { exportData, getDefaultValue, isValueChange } from '../../../utils';
+import { exportData, getDefaultValue, getEntitySchema, isValueChange, } from '../../../utils';
 import { handleAllSettled, ScriptFactory } from '../../../../utils';
+import { calcColumnModelBySchema } from './entity-schema';
 /**
  * 表格控制器
  *
@@ -36,6 +37,13 @@ export class GridController extends MDControlController {
          * @type {boolean}
          */
         this.isMultistageHeader = false;
+        /**
+         * 是否添加jsonschema里定义的表格列
+         * @author lxm
+         * @date 2024-01-02 05:27:16
+         * @type {boolean}
+         */
+        this.addSchemaColumn = false;
         /**
          * 所有表格列控制器集合
          *
@@ -143,6 +151,7 @@ export class GridController extends MDControlController {
      * @returns {*}  {Promise<void>}
      */
     async onCreated() {
+        await this.initByEntitySchema();
         await super.onCreated();
         this.service = new GridService(this.model);
         await this.service.init(this.context);
@@ -155,6 +164,39 @@ export class GridController extends MDControlController {
         // 初始化表格分组
         await this.initGroup();
     }
+    /**
+     * 根据jsonschema初始化自定义表格列
+     * @author lxm
+     * @date 2024-01-02 04:41:23
+     * @return {*}  {Promise<void>}
+     */
+    async initByEntitySchema() {
+        if (!this.addSchemaColumn) {
+            return;
+        }
+        const json = await getEntitySchema(this.model.appDataEntityId, this.context);
+        if (!json) {
+            return;
+        }
+        const result = await calcColumnModelBySchema(json, this);
+        if (result && result.degridColumns.length > 0) {
+            const { degridColumns, degridDataItems } = result;
+            // 修改模型之前拷贝一份，避免污染原始数据
+            this.model = clone(this.model);
+            this.model.degridColumns = [
+                ...(this.model.degridColumns || []).filter(item => {
+                    return degridColumns.findIndex(x => x.id === item.id) === -1;
+                }),
+                ...degridColumns,
+            ];
+            this.model.degridDataItems = [
+                ...(this.model.degridDataItems || []).filter(item => {
+                    return degridDataItems.findIndex(x => x.id === item.id) === -1;
+                }),
+                ...degridDataItems,
+            ];
+        }
+    }
     /**
      * 初始化表格分组
      * @author lxm

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

@@ -29,7 +29,7 @@ export class GridService extends MDControlService {
                 // 后台实体属性
                 if (deField) {
                     const deFieldKey = deField.toLowerCase();
-                    const dataItem = dataItems.find(item => item.appDEFieldId === deField);
+                    const dataItem = dataItems.find(item => item.id === column.dataItemName);
                     if (dataItem) {
                         mapField = new UIMapField(uiKey, deFieldKey, {
                             isOriginField: true,

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.js

@@ -200,7 +200,7 @@ export class GridFieldColumnController extends GridColumnController {
     calcFieldAgg(items) {
         const { aggField, aggMode, aggValueFormat, unitName } = this.model;
         // 无聚合配置的列，返回undefined
-        if (aggMode === 'NONE') {
+        if (isNil(aggMode) || aggMode === 'NONE') {
             return;
         }
         const fieldName = aggField || this.model.id;

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

@@ -0,0 +1,13 @@
+import { ISearchBarFilter } from '@ibiz/model-core';
+import { SearchBarController } from './search-bar.controller';
+/**
+ * 根据json模型计算出过滤项模型
+ * @author lxm
+ * @date 2024-01-02 10:27:40
+ * @export
+ * @param {IData} json
+ * @param {SearchBarController} c
+ * @return {*}  {ISearchBarFilter[]}
+ */
+export declare function calcFilterModelBySchema(json: IData, c: SearchBarController): ISearchBarFilter[];
+//# sourceMappingURL=entity-schema.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"entity-schema.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/entity-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AA2F9D;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,KAAK,EACX,CAAC,EAAE,mBAAmB,GACrB,gBAAgB,EAAE,CAwEpB"}

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

@@ -0,0 +1,151 @@
+import { ValueOP } from '../../../constant';
+import { ExcludeOPs } from './search-bar-filter.controller';
+const appId = '';
+/** 数据类型映射操作符号 */
+const typeToOPs = {
+    string: [
+        ValueOP.EQ,
+        ValueOP.NOT_EQ,
+        ValueOP.IS_NULL,
+        ValueOP.IS_NOT_NULL,
+        ValueOP.USER_LIKE,
+        ValueOP.LIKE,
+        ValueOP.LIFT_LIKE,
+        ValueOP.RIGHT_LIKE,
+    ],
+    number: [
+        ValueOP.EQ,
+        ValueOP.GT,
+        ValueOP.GT_AND_EQ,
+        ValueOP.LT,
+        ValueOP.LT_AND_EQ,
+        ValueOP.NOT_EQ,
+        ValueOP.IS_NULL,
+        ValueOP.IS_NOT_NULL,
+        ValueOP.IN,
+        ValueOP.NOT_IN,
+    ],
+    date: [
+        ValueOP.EQ,
+        ValueOP.GT,
+        ValueOP.GT_AND_EQ,
+        ValueOP.LT,
+        ValueOP.LT_AND_EQ,
+        ValueOP.NOT_EQ,
+        ValueOP.IS_NULL,
+        ValueOP.IS_NOT_NULL,
+        ValueOP.IN,
+        ValueOP.NOT_IN,
+    ],
+};
+/** 数据类型和操作符映射的编辑器模型 */
+const EditorsMap = {};
+/**
+ * 初始化默认映射的编辑器模型
+ * @author lxm
+ * @date 2024-01-02 10:32:05
+ * @param {string} type
+ * @param {string} op
+ * @return {*}  {IEditor}
+ */
+function initDefaultEditor() {
+    Object.keys(typeToOPs).forEach(type => {
+        const allowOPs = typeToOPs[type];
+        allowOPs.forEach(op => {
+            if (ExcludeOPs.includes(op)) {
+                return;
+            }
+            const key = `${type}_${op}`;
+            if (EditorsMap[key]) {
+                return;
+            }
+            if (type === 'date' && ![ValueOP.IN, ValueOP.NOT_IN].includes(op)) {
+                EditorsMap[key] = {
+                    appId,
+                    editorType: 'DATEPICKER',
+                    id: key,
+                };
+            }
+            else {
+                // 都可以给字符串类型
+                EditorsMap[key] = {
+                    appId,
+                    editorType: 'TEXTBOX',
+                    id: key,
+                };
+            }
+        });
+    });
+}
+initDefaultEditor();
+/**
+ * 根据json模型计算出过滤项模型
+ * @author lxm
+ * @date 2024-01-02 10:27:40
+ * @export
+ * @param {IData} json
+ * @param {SearchBarController} c
+ * @return {*}  {ISearchBarFilter[]}
+ */
+export function calcFilterModelBySchema(json, c) {
+    var _a;
+    if (!json.properties) {
+        return [];
+    }
+    const { properties } = json;
+    if (!(Object.keys(properties).length > 0)) {
+        return [];
+    }
+    const addFields = [];
+    Object.keys(properties).forEach((key) => {
+        let type;
+        switch (properties[key].type) {
+            case 'string':
+                type = 'string';
+                if (properties[key].format === 'date-time') {
+                    type = 'date';
+                }
+                break;
+            case 'integer':
+            case 'number':
+                type = 'number';
+                break;
+            default:
+                ibiz.log.error(`未支持的类型${properties[key].type}`);
+                return;
+        }
+        addFields.push({
+            key,
+            description: properties[key].description,
+            type,
+        });
+    });
+    // 属性codeName对应的属性id
+    const codeNameToId = {};
+    (_a = c.appDataEntity.appDEFields) === null || _a === void 0 ? void 0 : _a.forEach(field => {
+        codeNameToId[field.codeName.toLowerCase()] = field.id;
+    });
+    const addSearchBarFilters = [];
+    addFields.forEach(item => {
+        const ops = typeToOPs[item.type];
+        if (!ops) {
+            ibiz.log.error('未支持的类型', item.type);
+            return;
+        }
+        ops.forEach(op => {
+            const editorModel = EditorsMap[`${item.type}_${op}`];
+            addSearchBarFilters.push({
+                appId,
+                appDEFieldId: codeNameToId[item.key],
+                id: item.key,
+                caption: item.description,
+                defsearchMode: {
+                    appId,
+                    valueOP: op,
+                },
+                editor: editorModel,
+            });
+        });
+    });
+    return addSearchBarFilters;
+}

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

@@ -1,6 +1,8 @@
 import { ISearchBarFilter } from '@ibiz/model-core';
 import { IEditorContainerController, IEditorController, IEditorProvider } from '../../../interface';
 import { SearchBarController } from './search-bar.controller';
+/** 不需要编辑器的OP */
+export declare const ExcludeOPs: string[];
 /**
  * 搜索栏过滤项控制器
  * @author lxm
@@ -53,6 +55,13 @@ export declare class SearchBarFilterController implements IEditorContainerContro
      * @type {string}
      */
     valueOP?: string;
+    /**
+     * 不需要编辑器
+     * @author lxm
+     * @date 2024-01-02 11:08:45
+     * @type {boolean}
+     */
+    noEditor: boolean;
     constructor(model: ISearchBarFilter, searchBar: SearchBarController);
     /**
      * 初始化

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":"AACA,OAAO,EAAe,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D;;;;;;;GAOG;AACH,qBAAa,yBAA0B,YAAW,0BAA0B;IAyDjE,KAAK,EAAE,gBAAgB;IACvB,SAAS,EAAE,mBAAmB;IAzDvC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,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;gBAGR,KAAK,EAAE,gBAAgB,EACvB,SAAS,EAAE,mBAAmB;IAevC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAa5B"}
+{"version":3,"file":"search-bar-filter.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar-filter.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAG9D,gBAAgB;AAChB,eAAO,MAAM,UAAU,EAAE,MAAM,EAGrB,CAAC;AAEX;;;;;;;GAOG;AACH,qBAAa,yBAA0B,YAAW,0BAA0B;IAiEjE,KAAK,EAAE,gBAAgB;IACvB,SAAS,EAAE,mBAAmB;IAjEvC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,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;gBAGjB,KAAK,EAAE,gBAAgB,EACvB,SAAS,EAAE,mBAAmB;IAqBvC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAe5B"}