@ibiz-template/runtime 0.5.0 → 0.5.1-beta.2

package/out/service/vo/tree-node-data/tree-data-set-node-data.js

@@ -16,18 +16,18 @@ export class TreeDataSetNodeData extends TreeNodeData {
         var _a;
         super(model, parentNodeData, opts);
         const { data } = opts;
-        this.deData = data;
-        this.text = model.textAppDEFieldId
+        this._deData = data;
+        this._text = model.textAppDEFieldId
             ? data[model.textAppDEFieldId]
             : data.srfmajortext;
-        this.value = model.idAppDEFieldId
+        this._value = model.idAppDEFieldId
             ? data[model.idAppDEFieldId]
             : data.srfkey;
         // id小写
         const selfId = `${model.id}@${data.srfkey}`.toLowerCase();
-        Object.defineProperty(this, 'id', {
+        Object.defineProperty(this, '_id', {
             get() {
-                return this.parent ? `${this.parent.id}:${selfId}` : selfId;
+                return this._parent ? `${this._parent._id}:${selfId}` : selfId;
             },
             enumerable: true,
             configurable: true,
@@ -35,37 +35,37 @@ export class TreeDataSetNodeData extends TreeNodeData {
         // 实体节点额外添加上自己的实体上下文
         if (model.appDataEntityId) {
             const deName = calcDeCodeNameById(model.appDataEntityId);
-            this.context = Object.assign(this.context || {}, {
+            this._context = Object.assign(this._context || {}, {
                 [deName]: data.srfkey,
             });
         }
-        this.srfkey = this.deData.srfkey;
-        this.srfmajortext = this.deData.srfmajortext;
-        this.icon = this.calcIcon(model);
-        this.textHtml = this.calcTextHtml(model);
+        this._icon = this.calcIcon(model);
+        this._textHtml = this.calcTextHtml(model);
         // 识别叶子节点标识属性，根据后台数据赋值leaf
         if (model.leafFlagAppDEFieldId) {
-            this.leaf = fieldValueToBoolean(data[model.leafFlagAppDEFieldId]);
+            this._leaf = fieldValueToBoolean(data[model.leafFlagAppDEFieldId]);
         }
         /** 数据项映射 */
-        const dataItemkeyMap = new Map();
+        const dataItemKeyMap = new Map();
+        dataItemKeyMap.set('srfkey', 'srfkey');
+        dataItemKeyMap.set('srfmajortext', 'srfmajortext');
         const dataItemDefaults = {};
         (_a = model.detreeNodeDataItems) === null || _a === void 0 ? void 0 : _a.forEach(dataItem => {
             const uiKey = dataItem.id.toLowerCase();
             // 后台实体属性
             const deFieldKey = dataItem.appDEFieldId.toLowerCase();
-            dataItemkeyMap.set(uiKey, deFieldKey);
+            dataItemKeyMap.set(uiKey, deFieldKey);
             if (dataItem.defaultValue) {
                 dataItemDefaults[uiKey] = dataItem.defaultValue;
             }
         });
         return new Proxy(this, {
             set(target, p, value) {
-                if (Object.prototype.hasOwnProperty.call(target.deData, p)) {
-                    target.deData[p] = value;
+                if (Object.prototype.hasOwnProperty.call(target._deData, p)) {
+                    target._deData[p] = value;
                 }
-                else if (dataItemkeyMap.has(p)) {
-                    target.deData[dataItemkeyMap.get(p)] = value;
+                else if (dataItemKeyMap.has(p)) {
+                    target._deData[dataItemKeyMap.get(p)] = value;
                 }
                 else {
                     target[p] = value;
@@ -76,11 +76,11 @@ export class TreeDataSetNodeData extends TreeNodeData {
                 if (target[p] !== undefined) {
                     return target[p];
                 }
-                if (dataItemkeyMap.has(p)) {
-                    return target.deData[dataItemkeyMap.get(p)] || dataItemDefaults[p];
+                if (dataItemKeyMap.has(p)) {
+                    return target._deData[dataItemKeyMap.get(p)] || dataItemDefaults[p];
                 }
-                if (target.deData[p] !== undefined) {
-                    return target.deData[p];
+                if (target._deData[p] !== undefined) {
+                    return target._deData[p];
                 }
             },
             ownKeys(target) {
@@ -88,8 +88,8 @@ export class TreeDataSetNodeData extends TreeNodeData {
                 const allKeys = [
                     ...new Set([
                         ...Object.keys(target),
-                        ...dataItemkeyMap.keys(),
-                        ...Object.keys(target.deData),
+                        ...dataItemKeyMap.keys(),
+                        ...Object.keys(target._deData),
                     ]),
                 ];
                 updateKeyDefine(target, allKeys);
@@ -100,11 +100,11 @@ export class TreeDataSetNodeData extends TreeNodeData {
     calcIcon(model) {
         const icon = super.calcIcon(model) || {};
         const { iconAppDEFieldId, detreeNodeDataItems } = model;
-        if (iconAppDEFieldId && this.deData[iconAppDEFieldId]) {
-            icon.imagePath = this.deData[iconAppDEFieldId];
+        if (iconAppDEFieldId && this._deData[iconAppDEFieldId]) {
+            icon.imagePath = this._deData[iconAppDEFieldId];
         }
         if (icon) {
-            this.icon = icon;
+            this._icon = icon;
         }
         const iconDataItem = detreeNodeDataItems === null || detreeNodeDataItems === void 0 ? void 0 : detreeNodeDataItems.find(item => item.id === 'icon');
         if (iconDataItem) {
@@ -122,7 +122,7 @@ export class TreeDataSetNodeData extends TreeNodeData {
      */
     calcDataItemScript(dataItem) {
         if (dataItem.customCode && dataItem.scriptCode) {
-            return ScriptFactory.execScriptFn({ data: this.deData }, dataItem.scriptCode, {
+            return ScriptFactory.execScriptFn({ data: this._deData }, dataItem.scriptCode, {
                 isAsync: false,
             });
         }

package/out/service/vo/tree-node-data/tree-node-data.d.ts

@@ -10,21 +10,20 @@ import { IIcon, ITreeNodeData } from '../../../interface';
 export declare abstract class TreeNodeData implements ITreeNodeData {
     _uuid: string;
     _nodeType: string;
-    id: string;
-    value?: string | undefined;
-    text: string;
-    children?: ITreeNodeData[] | undefined;
-    deData?: IData | undefined;
+    _id: string;
+    _value?: string | undefined;
+    _text: string;
+    _children?: ITreeNodeData[] | undefined;
+    _deData?: IData | undefined;
     srfkey?: string | undefined;
     srfmajortext?: string | undefined;
-    nodeId: string;
-    leaf: boolean;
-    context?: IParams;
-    params?: IParams;
-    parent?: ITreeNodeData;
-    icon?: IIcon;
-    textHtml?: string;
-    [key: string | symbol]: any;
+    _nodeId: string;
+    _leaf: boolean;
+    _context?: IParams;
+    _params?: IParams;
+    _parent?: ITreeNodeData;
+    _icon?: IIcon;
+    _textHtml?: string;
     constructor(model: IDETreeNode, parentNodeData: ITreeNodeData | undefined, opts: {
         leaf: boolean;
         navContext?: IParams;

package/out/service/vo/tree-node-data/tree-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;;;;GAMG;AACH,8BAAsB,YAAa,YAAW,aAAa;IACzD,KAAK,EAAE,MAAM,CAAgB;IAE7B,SAAS,EAAE,MAAM,CAAC;IAElB,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE3B,IAAI,EAAG,MAAM,CAAC;IAEd,QAAQ,CAAC,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAEvC,MAAM,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAE3B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAElC,MAAM,EAAE,MAAM,CAAC;IAEf,IAAI,EAAE,OAAO,CAAS;IAEtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,MAAM,CAAC,EAAE,aAAa,CAAC;IAEvB,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAGlB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;gBAG1B,KAAK,EAAE,WAAW,EAClB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE;IAuBpE;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,GAAG,SAAS;CAa1D"}
+{"version":3,"file":"tree-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;;;;GAMG;AACH,8BAAsB,YAAa,YAAW,aAAa;IACzD,KAAK,EAAE,MAAM,CAAgB;IAE7B,SAAS,EAAE,MAAM,CAAC;IAElB,GAAG,EAAG,MAAM,CAAC;IAEb,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,KAAK,EAAG,MAAM,CAAC;IAEf,SAAS,CAAC,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAExC,OAAO,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAE5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,KAAK,EAAE,OAAO,CAAS;IAEvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd,SAAS,CAAC,EAAE,MAAM,CAAC;gBAGjB,KAAK,EAAE,WAAW,EAClB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE;IAuBpE;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,GAAG,SAAS;CAa1D"}

package/out/service/vo/tree-node-data/tree-node-data.js

@@ -9,22 +9,22 @@ import { createUUID } from 'qx-util';
 export class TreeNodeData {
     constructor(model, parentNodeData, opts) {
         this._uuid = createUUID();
-        this.leaf = false;
-        this.leaf = opts.leaf === true;
-        this.parent = parentNodeData;
+        this._leaf = false;
+        this._leaf = opts.leaf === true;
+        this._parent = parentNodeData;
         this._nodeType = model.treeNodeType;
         // 所有节点都要继承父的上下文，如果父存在则复制父的资源上下文，否则返回空对象。
-        if (this.parent) {
-            this.context = Object.assign({}, this.parent.context);
+        if (this._parent) {
+            this._context = Object.assign({}, this._parent._context);
         }
         // 附加导航上下文和视图参数
         if (opts.navContext) {
-            this.context = Object.assign(this.context || {}, opts.navContext);
+            this._context = Object.assign(this._context || {}, opts.navContext);
         }
         if (opts.navParams) {
-            this.params = Object.assign({}, opts.navParams);
+            this._params = Object.assign({}, opts.navParams);
         }
-        this.nodeId = model.id;
+        this._nodeId = model.id;
     }
     /**
      * 计算节点图标

package/out/service/vo/tree-node-data/tree-static-node-data.d.ts

@@ -10,10 +10,10 @@ import { TreeNodeData } from './tree-node-data';
  * @implements {ITreeNodeData}
  */
 export declare class TreeStaticNodeData extends TreeNodeData implements ITreeNodeData {
-    text: string;
-    id: string;
-    value?: string;
-    deData?: IData;
+    _text: string;
+    _id: string;
+    _value?: string;
+    _deData?: IData;
     constructor(model: IDETreeStaticNode, parentNodeData: ITreeNodeData | undefined, opts: {
         parentValueLevel?: number;
         leaf: boolean;

package/out/service/vo/tree-node-data/tree-static-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-static-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-static-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,YAAa,YAAW,aAAa;IAC3E,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,KAAK,CAAC;gBAGb,KAAK,EAAE,iBAAiB,EACxB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;CAsCrD"}
+{"version":3,"file":"tree-static-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-static-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,YAAa,YAAW,aAAa;IAC3E,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAG,MAAM,CAAC;IAEb,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,OAAO,CAAC,EAAE,KAAK,CAAC;gBAGd,KAAK,EAAE,iBAAiB,EACxB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;CAuCrD"}

package/out/service/vo/tree-node-data/tree-static-node-data.js

@@ -15,30 +15,30 @@ export class TreeStaticNodeData extends TreeNodeData {
         const nodeValue = model.nodeValue === 'root' ? undefined : model.nodeValue;
         // id小写
         const selfId = `${model.id}`.toLowerCase();
-        Object.defineProperty(this, 'id', {
+        Object.defineProperty(this, '_id', {
             get() {
-                return this.parent ? `${this.parent.id}:${selfId}` : selfId;
+                return this._parent ? `${this._parent._id}:${selfId}` : selfId;
             },
             enumerable: true,
             configurable: true,
         });
-        this.text = model.text;
-        this.value = nodeValue;
+        this._text = model.text;
+        this._value = nodeValue;
         // 静态节点数据去对应级别的父节点数据
         if (parentNodeData && opts.parentValueLevel) {
             // 根据父值级别查找父数据
             let parent = parentNodeData;
             for (let index = 1; index < opts.parentValueLevel; index++) {
-                parent = parent === null || parent === void 0 ? void 0 : parent.parent;
+                parent = parent === null || parent === void 0 ? void 0 : parent._parent;
             }
-            if (parent === null || parent === void 0 ? void 0 : parent.deData) {
-                this.deData = parent.deData;
+            if (parent === null || parent === void 0 ? void 0 : parent._deData) {
+                this._deData = parent._deData;
             }
             // 静态节点值不存在时，取父数据的值
-            this.value = nodeValue || (parent === null || parent === void 0 ? void 0 : parent.value);
+            this._value = nodeValue || (parent === null || parent === void 0 ? void 0 : parent._value);
         }
-        this.srfkey = ((_a = this.deData) === null || _a === void 0 ? void 0 : _a.srfkey) || this.value;
-        this.srfmajortext = ((_b = this.deData) === null || _b === void 0 ? void 0 : _b.srfmajortext) || this.text;
-        this.icon = this.calcIcon(model);
+        this.srfkey = ((_a = this._deData) === null || _a === void 0 ? void 0 : _a.srfkey) || this._value;
+        this.srfmajortext = ((_b = this._deData) === null || _b === void 0 ? void 0 : _b.srfmajortext) || this._text;
+        this._icon = this.calcIcon(model);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.5.0",
+  "version": "0.5.1-beta.2",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,8 +29,8 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.5.0",
-    "@ibiz/model-core": "^0.1.0",
+    "@ibiz-template/core": "^0.5.1-beta.2",
+    "@ibiz/model-core": "^0.1.1",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
     "@types/systemjs": "^6.13.5",
@@ -47,7 +47,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.5.0-beta.0",
-    "@ibiz/model-core": "^0.1.0",
+    "@ibiz/model-core": "^0.1.1",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "84126d4a93b6641962d688ef6d92fce3bea7c2d1"
+  "gitHead": "322c526eb9b9e20e44714164911542d0851ebfa1"
 }

package/src/constant/view-type.ts

@@ -827,4 +827,9 @@ export enum ViewType {
    * 实体向导视图
    */
   DE_WIZARD_VIEW = 'DEWIZARDVIEW',
+
+  /**
+   * 实体向导视图
+   */
+  DE_SUB_APP_REF_VIEW = 'DESUBAPPREFVIEW',
 }

package/src/controller/control/exp-bar/tree-exp-bar.controller.ts

@@ -53,7 +53,7 @@ export class TreeExpBarController
    * @date 2023-07-10 03:07:11
    * @memberof TreeExpBarController
    */
-  navKeyName = 'id' as const;
+  navKeyName = '_id' as const;
 
   /**
    * 有导航视图的节点模型标识集合
@@ -88,7 +88,6 @@ export class TreeExpBarController
    *
    * @author zk
    * @date 2023-05-29 03:05:36
-   * @param {IData} data
    * @memberof ExpBarControlController
    */
   xDataActive(event: ITreeEvent['onActive']['event']): void {
@@ -111,11 +110,11 @@ export class TreeExpBarController
     context: IContext,
     params: IParams,
   ): INavViewMsg {
-    const nodeId = node.id;
-    const deData = node.deData || node;
-    const nodeModel = this.getNodeModel(node.nodeId);
+    const nodeId = node._id;
+    const deData = node._deData || node;
+    const nodeModel = this.getNodeModel(node._nodeId);
     if (!nodeModel) {
-      throw new RuntimeError(`找不到${node.nodeId}的节点模型`);
+      throw new RuntimeError(`找不到${node._nodeId}的节点模型`);
     }
     const result = this.prepareParams(nodeModel, deData, context, params);
     result.context.currentSrfNav = nodeId;
@@ -142,7 +141,7 @@ export class TreeExpBarController
         return true;
       }
       // 需要导航视图的时候，返回第一个配置了导航视图的节点数据
-      return this.navNodeModelIds.includes(node.nodeId);
+      return this.navNodeModelIds.includes(node._nodeId);
     });
     if (!data) {
       return;

package/src/controller/control/gantt/gantt.controller.ts

@@ -109,7 +109,7 @@ export class GanttController
     data: IData,
     isTransformData: boolean = false,
   ): Promise<void> {
-    const key = nodeData.srfkey ? 'srfkey' : 'id';
+    const key = nodeData.srfkey ? 'srfkey' : '_id';
     const currentNode = this.state.items.find(
       item => item[key] === nodeData[key],
     );
@@ -117,7 +117,7 @@ export class GanttController
       ibiz.log.error('找不到对应的动态实体树节点数据', nodeData);
       return;
     }
-    const nodeModel = this.getNodeModel(currentNode.nodeId);
+    const nodeModel = this.getNodeModel(currentNode._nodeId);
     if (nodeModel) {
       const newData = isTransformData
         ? this.transformNodeDataItem(nodeModel, data)

package/src/controller/control/gantt/gantt.service.ts

@@ -78,7 +78,7 @@ export class GanttService extends TreeService {
     } else {
       // 有父节点的计算节点关系查询对应节点数据并合并
       const childNodeRSs = getChildNodeRSs(this.model, {
-        parentId: parentNodeData.nodeId,
+        parentId: parentNodeData._nodeId,
         hasQuery,
       });
 
@@ -185,7 +185,7 @@ export class GanttService extends TreeService {
               childNode,
               opts,
             );
-            childNode.children = subChildrenNodes;
+            childNode._children = subChildrenNodes;
           }
         }),
       );

package/src/controller/control/search-bar/entity-schema.ts

@@ -1,8 +1,15 @@
-import { IEditor, ISearchBarFilter } from '@ibiz/model-core';
+import { IDropDownList, IEditor, ISearchBarFilter } from '@ibiz/model-core';
 import { ValueOP } from '../../../constant';
 import { SearchBarController } from './search-bar.controller';
 import { ExcludeOPs } from './search-bar-filter.controller';
 
+type ISchemaField = {
+  type: string;
+  key: string;
+  description: string;
+  enumSource?: string;
+};
+
 const appId = '';
 
 /** 数据类型映射操作符号 */
@@ -91,6 +98,21 @@ function initDefaultEditor(): void {
 
 initDefaultEditor();
 
+function getEditor(field: ISchemaField, op: string): IEditor {
+  if (field.enumSource) {
+    return {
+      appId,
+      editorType: 'DROPDOWNLIST',
+      singleSelect: true,
+      valueType: 'SIMPLE',
+      appCodeListId: field.enumSource,
+      id: `${field.key}_${op}`,
+    } as IDropDownList;
+  }
+  const editorModel = EditorsMap[`${field.type}_${op}`];
+  return editorModel;
+}
+
 /**
  * 根据json模型计算出过滤项模型
  * @author lxm
@@ -100,10 +122,10 @@ initDefaultEditor();
  * @param {SearchBarController} c
  * @return {*}  {ISearchBarFilter[]}
  */
-export function calcFilterModelBySchema(
+export async function calcFilterModelBySchema(
   json: IData,
   c: SearchBarController,
-): ISearchBarFilter[] {
+): Promise<ISearchBarFilter[]> {
   if (!json.properties) {
     return [];
   }
@@ -112,11 +134,7 @@ export function calcFilterModelBySchema(
     return [];
   }
 
-  const addFields: {
-    key: string;
-    description: string;
-    type: string;
-  }[] = [];
+  const addFields: ISchemaField[] = [];
 
   Object.keys(properties).forEach((key: string) => {
     let type: string;
@@ -141,12 +159,17 @@ export function calcFilterModelBySchema(
       key,
       description: properties[key].description,
       type,
+      enumSource: properties[key].enumSource,
     });
   });
 
   // 属性codeName对应的属性id
   const codeNameToId: { [p: string]: string } = {};
-  c.appDataEntity.appDEFields?.forEach(field => {
+  const dataEntity = await ibiz.hub.getAppDataEntity(
+    c.model.appDataEntityId!,
+    c.model.appId,
+  );
+  dataEntity.appDEFields?.forEach(field => {
     codeNameToId[field.codeName!.toLowerCase()] = field.id!;
   });
 
@@ -159,18 +182,18 @@ export function calcFilterModelBySchema(
       return;
     }
     ops.forEach(op => {
-      const editorModel = EditorsMap[`${item.type}_${op}`];
-      addSearchBarFilters.push({
-        appId,
-        appDEFieldId: codeNameToId[item.key],
-        id: item.key,
-        caption: item.description,
-        defsearchMode: {
+      if (item)
+        addSearchBarFilters.push({
           appId,
-          valueOP: op,
-        },
-        editor: editorModel,
-      });
+          appDEFieldId: codeNameToId[item.key],
+          id: item.key,
+          caption: item.description,
+          defsearchMode: {
+            appId,
+            valueOP: op,
+          },
+          editor: getEditor(item, op),
+        });
     });
   });
 

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

@@ -4,7 +4,7 @@ import {
   recursiveIterate,
 } from '@ibiz-template/core';
 import { IAppDataEntity, ISearchBar, ISearchBarFilter } from '@ibiz/model-core';
-import { isNil } from 'ramda';
+import { clone, isNil } from 'ramda';
 import {
   ISearchBarState,
   ISearchBarEvent,
@@ -79,7 +79,9 @@ export class SearchBarController
    * @date 2023-12-29 04:15:34
    * @type {boolean}
    */
-  enableFilter: boolean = this.model.enableFilter === true;
+  get enableFilter(): boolean {
+    return this.model.enableFilter === true;
+  }
 
   /**
    * 最终使用的searchBarFilters
@@ -87,7 +89,16 @@ export class SearchBarController
    * @date 2023-12-29 06:55:13
    * @type {ISearchBarFilter[]}
    */
-  searchBarFilters!: ISearchBarFilter[];
+  get searchBarFilters(): ISearchBarFilter[] {
+    return this.model.searchBarFilters || [];
+  }
+
+  /**
+   * 是否启用根据实体的JSON Schema生成过滤项
+   * @author lxm
+   * @date 2024-01-05 10:10:37
+   */
+  addSchemaFilters = false;
 
   /**
    * 表格控制器
@@ -113,16 +124,6 @@ export class SearchBarController
     this.state.selectedGroupItem = null;
     this.state.searchBarGroups = [];
     this.state.selectedSearchGroupItem = null;
-    this.initFilterState();
-  }
-
-  /**
-   * 初始化Filter相关的属性
-   * @author lxm
-   * @date 2023-12-29 04:18:02
-   * @protected
-   */
-  protected initFilterState(): void {
     this.resetFilter();
     this.state.visible = !!(
       this.model.enableQuickSearch ||
@@ -132,6 +133,8 @@ export class SearchBarController
   }
 
   protected async onCreated(): Promise<void> {
+    await this.initByEntitySchema();
+
     await super.onCreated();
 
     const appDataEntity = await ibiz.hub.getAppDataEntity(
@@ -149,7 +152,6 @@ export class SearchBarController
       await this.service.init(this.context);
     }
 
-    await this.initByEntitySchema();
     await this.initSearchBarFilters();
     await this.initSearBarGroups();
   }
@@ -161,12 +163,17 @@ export class SearchBarController
    * @return {*}  {Promise<void>}
    */
   async initByEntitySchema(): Promise<void> {
-    this.enableFilter = true;
-    const json = await getEntitySchema(this.appDataEntity.id!, this.context);
+    if (!this.addSchemaFilters) {
+      return;
+    }
+    const json = await getEntitySchema(
+      this.model.appDataEntityId!,
+      this.context,
+    );
     if (!json) {
       return;
     }
-    const addSearchBarFilters = calcFilterModelBySchema(json, this);
+    const addSearchBarFilters = await calcFilterModelBySchema(json, this);
 
     const mergeFilters: ISearchBarFilter[] = [];
     this.model.searchBarFilters?.forEach(filter => {
@@ -182,9 +189,13 @@ export class SearchBarController
       }
     });
 
-    addSearchBarFilters.push(...mergeFilters);
-
-    this.searchBarFilters = addSearchBarFilters;
+    // 如果有根据json计算出的过滤项，则要重置相关state参数
+    if (addSearchBarFilters.length > 0) {
+      // 修改模型之前拷贝一份，避免污染原始数据
+      (this as IData).model = clone(this.model);
+      this.model.searchBarFilters = addSearchBarFilters.concat(...mergeFilters);
+      this.model.enableFilter = true;
+    }
   }
 
   /**
@@ -311,7 +322,7 @@ export class SearchBarController
    * @return {*}  {IData}
    */
   calcFilters(): IData[] | undefined {
-    if (!this.model.enableFilter) {
+    if (!this.enableFilter) {
       return;
     }
     let hasFilter = false; // 是否有过滤项