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

package/dist/index.esm.js

@@ -776,8 +776,8 @@ function parseUserParams(userParams) {
   }
   return { navigateContexts, navigateParams, other };
 }
-function getPFPlugin(id, appId) {
-  const app = ibiz.hub.getApp(appId);
+function getPFPlugin(id, appId2) {
+  const app = ibiz.hub.getApp(appId2);
   if (!app) {
     throw new RuntimeModelError2(app, "\u672A\u627E\u5230\u5E94\u7528");
   }
@@ -997,8 +997,8 @@ function findFieldById(entity, fieldId) {
 }
 
 // src/model/ui-action/ui-action.ts
-async function getUIActionById(id, appId) {
-  const app = ibiz.hub.getApp(appId);
+async function getUIActionById(id, appId2) {
+  const app = ibiz.hub.getApp(appId2);
   return app.getUIAction(id);
 }
 
@@ -1145,6 +1145,16 @@ async function openRedirectView(appView, context, params = {}, opts = {}) {
   );
 }
 async function toLocalOpenWFRedirectView(context, linkUrl, opts = {}) {
+  const toView = await getLocalOpenWFRedirectView(context, linkUrl, opts);
+  await ibiz.commands.execute(
+    OpenAppViewCommand.TAG,
+    toView.viewId,
+    toView.context,
+    toView.params,
+    toView.opts
+  );
+}
+async function getLocalOpenWFRedirectView(context, linkUrl, opts = {}) {
   const i = linkUrl.lastIndexOf("?");
   const queryStr = decodeURIComponent(
     linkUrl.substring(i + 1, linkUrl.length)
@@ -1214,7 +1224,7 @@ async function getDERedirectToView(appView, context, params = {}, opts = {}) {
           return { type: "url", url: linkUrl };
         }
         if (linkUrl.startsWith("appredirectview?")) {
-          const toView = await toLocalOpenWFRedirectView(
+          const toView = await getLocalOpenWFRedirectView(
             context,
             linkUrl,
             opts
@@ -3371,9 +3381,9 @@ var PSDEDQCondEngine = _PSDEDQCondEngine;
 import { RuntimeError as RuntimeError6 } from "@ibiz-template/core";
 
 // src/register/helper/common-register.ts
-async function getPluginRegisterKey(pluginId, appId) {
+async function getPluginRegisterKey(pluginId, appId2) {
   var _a;
-  const app = ibiz.hub.getApp(appId);
+  const app = ibiz.hub.getApp(appId2);
   const plugin = (_a = app.model.appPFPluginRefs) == null ? void 0 : _a.find(
     (item) => item.pluginCode.toLowerCase() === pluginId
   );
@@ -3397,9 +3407,9 @@ function getProvider(key) {
 }
 async function getAppCounterProvider(model) {
   let provider;
-  const { codeName, counterType, sysPFPluginId, appId } = model;
+  const { codeName, counterType, sysPFPluginId, appId: appId2 } = model;
   if (sysPFPluginId) {
-    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
     if (pluginKey) {
       provider = getProvider(pluginKey);
     }
@@ -3437,9 +3447,9 @@ function getProvider2(key) {
 }
 async function getControlProvider(model) {
   let provider;
-  const { controlType, controlStyle, sysPFPluginId, appId } = model;
+  const { controlType, controlStyle, sysPFPluginId, appId: appId2 } = model;
   if (sysPFPluginId) {
-    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
     if (pluginKey) {
       provider = getProvider2(pluginKey);
     }
@@ -3486,9 +3496,9 @@ function getProvider3(key) {
 }
 async function getEditorProvider(model) {
   let provider;
-  const { editorType, editorStyle, predefinedType, sysPFPluginId, appId } = model;
+  const { editorType, editorStyle, predefinedType, sysPFPluginId, appId: appId2 } = model;
   if (sysPFPluginId) {
-    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
     if (pluginKey) {
       provider = getProvider3(pluginKey);
     }
@@ -3545,9 +3555,9 @@ function getProvider4(key) {
 }
 async function getFormDetailProvider(model) {
   let provider;
-  const { detailType, sysPFPluginId, appId } = model;
+  const { detailType, sysPFPluginId, appId: appId2 } = model;
   if (sysPFPluginId) {
-    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
     if (pluginKey) {
       provider = getProvider4(pluginKey);
     }
@@ -3577,9 +3587,9 @@ function getProvider5(key) {
 }
 async function getGridColumnProvider(model) {
   let provider;
-  const { columnType, enableRowEdit, sysPFPluginId, appId } = model;
+  const { columnType, enableRowEdit, sysPFPluginId, appId: appId2 } = model;
   if (sysPFPluginId) {
-    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
     if (pluginKey) {
       provider = getProvider5(pluginKey);
     }
@@ -3614,9 +3624,9 @@ function getProvider6(key) {
 async function getPanelItemProvider(model) {
   var _a;
   let provider;
-  const { itemType, sysPFPluginId, appId } = model;
+  const { itemType, sysPFPluginId, appId: appId2 } = model;
   if (sysPFPluginId) {
-    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
     if (pluginKey) {
       provider = getProvider6(pluginKey);
     }
@@ -3680,9 +3690,9 @@ function getProvider7(key) {
 }
 async function getPortletProvider(model) {
   let provider;
-  const { portletType, sysPFPluginId, appId } = model;
+  const { portletType, sysPFPluginId, appId: appId2 } = model;
   if (sysPFPluginId) {
-    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
     if (pluginKey) {
       provider = getProvider7(pluginKey);
     }
@@ -3713,9 +3723,9 @@ function getProvider8(key) {
 }
 async function getUIActionProvider(model) {
   let provider;
-  const { uiactionMode, sysPFPluginId, appId, uiactionTag } = model;
+  const { uiactionMode, sysPFPluginId, appId: appId2, uiactionTag } = model;
   if (sysPFPluginId) {
-    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
     if (pluginKey) {
       provider = getProvider8(pluginKey);
     }
@@ -3745,8 +3755,8 @@ function registerUILogicNodeProvider(key, callback) {
 }
 async function getUILogicNodeProvider(model) {
   let provider;
-  const { sysPFPluginId, appId } = model;
-  const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+  const { sysPFPluginId, appId: appId2 } = model;
+  const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
   if (pluginKey) {
     provider = ibiz.register.get(
       "".concat(UILOGINNODE_PROVIDER_PREFIX, "_").concat(pluginKey)
@@ -3770,9 +3780,9 @@ function getProvider9(key) {
 }
 async function getViewProvider(model) {
   let provider;
-  const { viewType, viewStyle, sysPFPluginId, appId } = model;
+  const { viewType, viewStyle, sysPFPluginId, appId: appId2 } = model;
   if (sysPFPluginId) {
-    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
     if (pluginKey) {
       provider = getProvider9(pluginKey);
     }
@@ -3932,9 +3942,9 @@ function getProvider12(key) {
 }
 async function getDEMethodProvider(model) {
   let provider;
-  const { methodType, sysPFPluginId, appId } = model;
+  const { methodType, sysPFPluginId, appId: appId2 } = model;
   if (sysPFPluginId) {
-    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
     if (pluginKey) {
       provider = getProvider12(pluginKey);
     }
@@ -3967,9 +3977,9 @@ function getProvider13(key) {
 }
 async function getTreeGridExColumnProvider(model) {
   let provider;
-  const { columnType, appId, renderSysPFPluginId } = model;
+  const { columnType, appId: appId2, renderSysPFPluginId } = model;
   if (renderSysPFPluginId) {
-    const pluginKey = await getPluginRegisterKey(renderSysPFPluginId, appId);
+    const pluginKey = await getPluginRegisterKey(renderSysPFPluginId, appId2);
     if (pluginKey) {
       provider = getProvider13(pluginKey);
     }
@@ -3987,6 +3997,38 @@ async function getTreeGridExColumnProvider(model) {
   }
 }
 
+// src/register/helper/app-menu-item-register.ts
+var APPMENUITEM_PROVIDER_PREFIX = "APPMENUITEM";
+function registerAppMenuItemProvider(key, callback) {
+  ibiz.register.register("".concat(APPMENUITEM_PROVIDER_PREFIX, "_").concat(key), callback);
+}
+function getProvider14(key) {
+  return ibiz.register.get(
+    "".concat(APPMENUITEM_PROVIDER_PREFIX, "_").concat(key)
+  );
+}
+async function getAppMenuItemProvider(model) {
+  let provider;
+  const { sysPFPluginId, appId: appId2, itemType } = model;
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
+    if (pluginKey) {
+      provider = getProvider14(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error("\u627E\u4E0D\u5230\u5E94\u7528\u83DC\u5355\u9879\u63D2\u4EF6".concat(pluginKey, "\u5BF9\u5E94\u7684\u9002\u914D\u5668"));
+    } else {
+      return provider;
+    }
+  }
+  provider = getProvider14(itemType);
+  if (!provider) {
+    ibiz.log.error("\u627E\u4E0D\u5230\u5E94\u7528\u83DC\u5355\u9879\u7C7B\u578B".concat(itemType, "\u5BF9\u5E94\u7684\u9002\u914D\u5668"));
+  } else {
+    return provider;
+  }
+}
+
 // src/service/utils/app-counter/app-counter.ts
 import { IBizContext, RuntimeError as RuntimeError12 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty5, QXEvent } from "qx-util";
@@ -4941,9 +4983,6 @@ var DECache = class {
    * @date 2023-12-22 13:12:17
    */
   clear() {
-    this.cacheMap.forEach((item) => {
-      item.destroy();
-    });
     this.cacheMap.clear();
   }
   /**
@@ -5291,11 +5330,11 @@ var ConfigService = class {
    * @param {string} folder 定义文件夹
    * @param {string} tag 存储标识
    */
-  constructor(appId, folder, tag) {
-    this.appId = appId;
+  constructor(appId2, folder, tag) {
+    this.appId = appId2;
     this.folder = folder;
     this.tag = tag;
-    this.app = ibiz.hub.getApp(appId);
+    this.app = ibiz.hub.getApp(appId2);
   }
   /**
    * 保存配置
@@ -5755,7 +5794,7 @@ var FileService = class {
 
 // src/service/app-data-entity/app-data-entity.ts
 import { clone as clone5, isNil as isNil7 } from "ramda";
-import { DataTypes, HistoryList } from "@ibiz-template/core";
+import { DataTypes } from "@ibiz-template/core";
 import { createUUID as createUUID3 } from "qx-util";
 
 // src/service/constant/srfuf.ts
@@ -5779,9 +5818,6 @@ var AppDataEntity = class _AppDataEntity {
    * @param {(IData | AppDataEntity)} [data={}]
    */
   constructor(entity, data = {}) {
-    let history = new HistoryList(
-      data instanceof _AppDataEntity ? clone5(data._data) : clone5(data)
-    );
     Object.defineProperty(this, "_entity", {
       enumerable: false,
       configurable: true,
@@ -5790,19 +5826,7 @@ var AppDataEntity = class _AppDataEntity {
     Object.defineProperty(this, "_data", {
       enumerable: false,
       configurable: true,
-      get() {
-        return history.data;
-      }
-    });
-    Object.defineProperty(this, "history", {
-      enumerable: false,
-      configurable: true,
-      set(v) {
-        history = v;
-      },
-      get() {
-        return history;
-      }
+      value: data instanceof _AppDataEntity ? clone5(data._data) : clone5(data)
     });
     Object.defineProperty(this, "srfdeid", {
       get() {
@@ -5875,18 +5899,17 @@ var AppDataEntity = class _AppDataEntity {
    */
   defineProperties() {
     var _a;
-    const self = this;
-    const { convertVal } = this;
+    const { _data, convertVal } = this;
     const properties = {};
-    const keys = Object.keys(this._data);
+    const keys = Object.keys(_data);
     keys.forEach((key) => {
       properties[key] = {
         enumerable: true,
         set(val) {
-          self._data[key] = val;
+          _data[key] = val;
         },
         get() {
-          return self._data[key];
+          return _data[key];
         }
       };
     });
@@ -5895,13 +5918,13 @@ var AppDataEntity = class _AppDataEntity {
       properties[key] = {
         enumerable: true,
         set(val) {
-          self._data[key] = convertVal(val, field.stdDataType);
+          _data[key] = convertVal(val, field.stdDataType);
         },
         get() {
-          return self._data[key];
+          return _data[key];
         }
       };
-      self._data[key] = convertVal(self._data[key], field.stdDataType);
+      _data[key] = convertVal(_data[key], field.stdDataType);
     });
     Object.defineProperties(this, properties);
   }
@@ -5913,9 +5936,8 @@ var AppDataEntity = class _AppDataEntity {
    * @return {*}  {AppDataEntity}
    */
   clone() {
-    const entity = new _AppDataEntity(this._entity);
+    const entity = new _AppDataEntity(this._entity, this._data);
     entity.srfkey = this.srfkey;
-    entity.history = clone5(this.history);
     return entity;
   }
   /**
@@ -5938,23 +5960,9 @@ var AppDataEntity = class _AppDataEntity {
         delete _data[key];
       }
     });
-    this.history.assign(_data);
+    Object.assign(this._data, _data);
     return this;
   }
-  /**
-   * 实体对象销毁
-   *
-   * @author chitanda
-   * @date 2023-12-28 21:12:24
-   */
-  destroy() {
-    this.history.destroy();
-    Object.defineProperty(this, "_entity", {
-      enumerable: false,
-      configurable: true,
-      value: null
-    });
-  }
   /**
    * 根据属性的数据类型转换值
    * @author lxm
@@ -8506,8 +8514,8 @@ var DELogic = class {
 
 // src/de-logic/index.ts
 var deLogicMap = /* @__PURE__ */ new Map();
-async function findDeLogic(deDELogicId, dataEntityId, appId) {
-  const appDataEntity = await ibiz.hub.getAppDataEntity(dataEntityId, appId);
+async function findDeLogic(deDELogicId, dataEntityId, appId2) {
+  const appDataEntity = await ibiz.hub.getAppDataEntity(dataEntityId, appId2);
   return findDELogic(deDELogicId, appDataEntity);
 }
 async function execDELogic(deDELogic, context, data = {}, params = {}) {
@@ -8781,10 +8789,15 @@ var DEActionMethod = class extends Method {
       let resultData;
       if (isArray6(addData)) {
         resultData = await Promise.all(
-          addData.map((item) => this.service.local.add(context, item))
+          addData.map(
+            (item) => this.service.local.add(context, this.attach(context, item))
+          )
         );
       } else {
-        resultData = await this.service.local.add(context, addData);
+        resultData = await this.service.local.add(
+          context,
+          this.attach(context, addData)
+        );
       }
       return new HttpResponse3(resultData);
     } catch (err) {
@@ -8852,10 +8865,15 @@ var DEActionMethod = class extends Method {
       let resultData;
       if (isArray6(updateData)) {
         resultData = await Promise.all(
-          updateData.map((item) => this.service.local.update(context, item))
+          updateData.map(
+            (item) => this.service.local.update(context, this.attach(context, item))
+          )
         );
       } else {
-        resultData = await this.service.local.update(context, updateData);
+        resultData = await this.service.local.update(
+          context,
+          this.attach(context, updateData)
+        );
       }
       if (resultData) {
         return new HttpResponse3(resultData);
@@ -8901,6 +8919,33 @@ var DEActionMethod = class extends Method {
   async removeBatchTemp(_context, _params) {
     return new HttpResponse3(true);
   }
+  /**
+   * 在新建、更新时，根据界面域下的关系，自动填充相关父属性
+   *
+   * @author chitanda
+   * @date 2024-01-02 15:01:30
+   * @protected
+   * @param {IContext} context
+   * @param {IDataEntity} data
+   * @return {*}  {IDataEntity}
+   */
+  attach(context, data) {
+    const sandboxId = context.srfsessionid;
+    const uiDomain = ibiz.uiDomainManager.get(sandboxId);
+    const configs = uiDomain.getDERConfig(this.entity.id);
+    if (configs.length > 0) {
+      configs.forEach((config) => {
+        const { majorDECodeName, pickupDEFName } = config;
+        const majorLowerCodeName = majorDECodeName.toLowerCase();
+        const pickupLowerDEFName = pickupDEFName.toLowerCase();
+        const majorkey = context[majorLowerCodeName];
+        if (majorkey) {
+          data[pickupLowerDEFName] = majorkey;
+        }
+      });
+    }
+    return data;
+  }
 };
 
 // src/service/service/entity/method/provider/de-action-de-method.provider.ts
@@ -9752,10 +9797,10 @@ var MqttService = class {
    * @param {string} token
    * @param {string} appId
    */
-  constructor(mqttTopic, token, appId) {
+  constructor(mqttTopic, token, appId2) {
     this.mqttTopic = mqttTopic;
     this.token = token;
-    this.appId = appId;
+    this.appId = appId2;
     /**
      * 接受消息通知
      *
@@ -9876,7 +9921,7 @@ var _DEServiceUtil = class _DEServiceUtil {
    * @return {*}  {Promise<IAppDEService>}
    */
   async getService(context, id) {
-    const sandboxId = context.srfsessionid;
+    const sandboxId = context.srfsessionid || "applocation";
     if (!this.cache.has(sandboxId)) {
       this.cache.set(sandboxId, /* @__PURE__ */ new Map());
     }
@@ -10859,7 +10904,7 @@ var ActivityCounter = class extends Counter {
 
 // src/controller/utils/button-state/ui-action-button.state.ts
 var UIActionButtonState = class {
-  constructor(name, appId, uiActionId) {
+  constructor(name, appId2, uiActionId) {
     this.disabled = false;
     this.visible = true;
     this.loading = false;
@@ -10895,7 +10940,7 @@ var UIActionButtonState = class {
     this.isInit = false;
     this.name = name;
     this.uiActionId = uiActionId;
-    this.appId = appId;
+    this.appId = appId2;
   }
   /**
    * 初始化，没有界面行为id就是普通的buttonState
@@ -11485,6 +11530,15 @@ async function exportData(header, data, fileName) {
   }
 }
 
+// src/controller/utils/jsonschema/entity.ts
+async function getEntitySchema(entityId, context) {
+  const app = ibiz.hub.getApp(context.srfappid);
+  const entity = await ibiz.hub.getAppDataEntity(entityId, context.srfappid);
+  const url = "/jsonschema/".concat(entity.name);
+  const res = await app.net.get(url);
+  return res.data;
+}
+
 // src/controller/common/base.controller.ts
 var SELF_KEY = "__self";
 var BaseController = class {
@@ -13271,6 +13325,17 @@ import {
   RuntimeModelError as RuntimeModelError24
 } from "@ibiz-template/core";
 var AppMenuController = class extends ControlController {
+  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();
+  }
   initState() {
     super.initState();
     this.state.menuItemsState = {};
@@ -13289,10 +13354,28 @@ var AppMenuController = class extends ControlController {
     var _a;
     await super.onCreated();
     this.app = await ibiz.hub.getApp(this.context.srfappid);
+    await this.initAppMenuItemProviders();
     (_a = this.model.appMenuItems) == null ? 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;
+        }
+      })
+    );
+  }
   /**
    * 菜单项点击回调，触发对应的应用功能
    *
@@ -13313,6 +13396,10 @@ var AppMenuController = class 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 RuntimeModelError24(menuItem, "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD");
     }
@@ -13363,11 +13450,11 @@ var AppMenuController = class 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) => {
@@ -13378,7 +13465,16 @@ var AppMenuController = class 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去视图控制器里取得计数器对象
@@ -16279,8 +16375,8 @@ var UIActionUtil = class {
    * @param {IUILogicParams} params 界面行为参数
    * @return {*}  {Promise<IUIActionResult>}
    */
-  static async exec(actionId, params, appId) {
-    const action = await getUIActionById(actionId, appId);
+  static async exec(actionId, params, appId2) {
+    const action = await getUIActionById(actionId, appId2);
     if (!action) {
       throw new RuntimeError45("\u6CA1\u627E\u5230".concat(actionId, "\u7684\u754C\u9762\u884C\u4E3A\u6A21\u578B"));
     }
@@ -16301,9 +16397,9 @@ var UIActionUtil = class {
    * @param {string} actionId 界面行为id
    * @param {IUILogicParams} params 界面行为参数
    */
-  static async execAndResolved(actionId, params, appId) {
+  static async execAndResolved(actionId, params, appId2) {
     var _a, _b;
-    const result = await this.exec(actionId, params, appId);
+    const result = await this.exec(actionId, params, appId2);
     if (result.closeView) {
       params.view.modal.ignoreDismissCheck = true;
       params.view.closeView({ ok: true });
@@ -16443,10 +16539,10 @@ var UIActionProviderBase = class {
    * @param {(IData | undefined)} [opts]
    * @returns {*}  {Promise<void>}
    */
-  async doNextAction(action, params, appId) {
+  async doNextAction(action, params, appId2) {
     const nextActionId = action.nextId;
     if (nextActionId) {
-      return UIActionUtil.exec(nextActionId, params, appId);
+      return UIActionUtil.exec(nextActionId, params, appId2);
     }
   }
   /**
@@ -22120,7 +22216,7 @@ var GridService = class extends MDControlService {
         if (deField) {
           const deFieldKey = deField.toLowerCase();
           const dataItem = dataItems.find(
-            (item) => item.appDEFieldId === deField
+            (item) => item.id === column.dataItemName
           );
           if (dataItem) {
             mapField = new UIMapField(uiKey, deFieldKey, {
@@ -22161,6 +22257,82 @@ var GridService = class extends MDControlService {
   }
 };
 
+// src/controller/control/grid/grid/entity-schema.ts
+var TypeToDataType = {
+  string: 25,
+  number: 6,
+  integer: 9,
+  date: 5
+};
+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("\u672A\u652F\u6301\u7684\u7C7B\u578B".concat(properties[key].type));
+        return;
+    }
+    addFields.push({
+      key,
+      description: properties[key].description,
+      type
+    });
+  });
+  const codeNameToId = {};
+  const dataEntity = await ibiz.hub.getAppDataEntity(
+    c.model.appDataEntityId,
+    c.model.appId
+  );
+  (_a = dataEntity.appDEFields) == null ? 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 };
+}
+
 // src/controller/control/grid/grid/grid.controller.ts
 var GridController = class extends MDControlController {
   constructor() {
@@ -22179,6 +22351,13 @@ var GridController = class extends MDControlController {
      * @type {boolean}
      */
     this.isMultistageHeader = false;
+    /**
+     * 是否添加jsonschema里定义的表格列
+     * @author lxm
+     * @date 2024-01-02 05:27:16
+     * @type {boolean}
+     */
+    this.addSchemaColumn = false;
     /**
      * 所有表格列控制器集合
      *
@@ -22286,6 +22465,7 @@ var GridController = class 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);
@@ -22300,6 +22480,41 @@ var GridController = class 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 = clone22(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
@@ -23354,7 +23569,7 @@ var GridFieldColumnController = class extends GridColumnController {
    */
   calcFieldAgg(items) {
     const { aggField, aggMode, aggValueFormat, unitName } = this.model;
-    if (aggMode === "NONE") {
+    if (isNil22(aggMode) || aggMode === "NONE") {
       return;
     }
     const fieldName = aggField || this.model.id;
@@ -24684,10 +24899,21 @@ import { isNil as isNil23 } from "ramda";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
 import { RuntimeModelError as RuntimeModelError60 } from "@ibiz-template/core";
+var ExcludeOPs = [
+  "ISNULL" /* IS_NULL */,
+  "ISNOTNULL" /* IS_NOT_NULL */
+];
 var SearchBarFilterController = class {
   constructor(model, searchBar) {
     this.model = model;
     this.searchBar = searchBar;
+    /**
+     * 不需要编辑器
+     * @author lxm
+     * @date 2024-01-02 11:08:45
+     * @type {boolean}
+     */
+    this.noEditor = false;
     var _a;
     let field;
     if (model.appDEFieldId) {
@@ -24696,6 +24922,7 @@ var SearchBarFilterController = class {
     this.fieldName = field ? field.codeName.toLowerCase() : model.id;
     this.label = model.caption || (field == null ? void 0 : field.logicName) || model.id;
     this.valueOP = (_a = model.defsearchMode) == null ? void 0 : _a.valueOP;
+    this.noEditor = this.valueOP ? ExcludeOPs.includes(this.valueOP) : !this.model.editor;
   }
   get context() {
     return this.searchBar.context;
@@ -24710,15 +24937,17 @@ var SearchBarFilterController = class {
    * @return {*}  {Promise<void>}
    */
   async init() {
-    if (!this.model.editor) {
-      throw new RuntimeModelError60(this.model, "\u7F3A\u5C11\u7F16\u8F91\u5668\u6A21\u578B");
-    }
-    this.editorProvider = await getEditorProvider(this.model.editor);
-    if (this.editorProvider) {
-      this.editor = await this.editorProvider.createController(
-        this.model.editor,
-        this
-      );
+    if (!this.noEditor) {
+      if (!this.model.editor) {
+        throw new RuntimeModelError60(this.model, "\u7F3A\u5C11\u7F16\u8F91\u5668\u6A21\u578B");
+      }
+      this.editorProvider = await getEditorProvider(this.model.editor);
+      if (this.editorProvider) {
+        this.editor = await this.editorProvider.createController(
+          this.model.editor,
+          this
+        );
+      }
     }
   }
 };
@@ -24897,6 +25126,135 @@ var SearchBarService = class {
   }
 };
 
+// src/controller/control/search-bar/entity-schema.ts
+var appId = "";
+var typeToOPs = {
+  string: [
+    "EQ" /* EQ */,
+    "NOTEQ" /* NOT_EQ */,
+    "ISNULL" /* IS_NULL */,
+    "ISNOTNULL" /* IS_NOT_NULL */,
+    "USERLIKE" /* USER_LIKE */,
+    "LIKE" /* LIKE */,
+    "LIFTLIKE" /* LIFT_LIKE */,
+    "RIGHT_LIKE" /* RIGHT_LIKE */
+  ],
+  number: [
+    "EQ" /* EQ */,
+    "GT" /* GT */,
+    "GTANDEQ" /* GT_AND_EQ */,
+    "LT" /* LT */,
+    "LTANDEQ" /* LT_AND_EQ */,
+    "NOTEQ" /* NOT_EQ */,
+    "ISNULL" /* IS_NULL */,
+    "ISNOTNULL" /* IS_NOT_NULL */,
+    "IN" /* IN */,
+    "NOTIN" /* NOT_IN */
+  ],
+  date: [
+    "EQ" /* EQ */,
+    "GT" /* GT */,
+    "GTANDEQ" /* GT_AND_EQ */,
+    "LT" /* LT */,
+    "LTANDEQ" /* LT_AND_EQ */,
+    "NOTEQ" /* NOT_EQ */,
+    "ISNULL" /* IS_NULL */,
+    "ISNOTNULL" /* IS_NOT_NULL */,
+    "IN" /* IN */,
+    "NOTIN" /* NOT_IN */
+  ]
+};
+var EditorsMap = {};
+function initDefaultEditor() {
+  Object.keys(typeToOPs).forEach((type) => {
+    const allowOPs = typeToOPs[type];
+    allowOPs.forEach((op) => {
+      if (ExcludeOPs.includes(op)) {
+        return;
+      }
+      const key = "".concat(type, "_").concat(op);
+      if (EditorsMap[key]) {
+        return;
+      }
+      if (type === "date" && !["IN" /* IN */, "NOTIN" /* NOT_IN */].includes(op)) {
+        EditorsMap[key] = {
+          appId,
+          editorType: "DATEPICKER",
+          id: key
+        };
+      } else {
+        EditorsMap[key] = {
+          appId,
+          editorType: "TEXTBOX",
+          id: key
+        };
+      }
+    });
+  });
+}
+initDefaultEditor();
+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("\u672A\u652F\u6301\u7684\u7C7B\u578B".concat(properties[key].type));
+        return;
+    }
+    addFields.push({
+      key,
+      description: properties[key].description,
+      type
+    });
+  });
+  const codeNameToId = {};
+  (_a = c.appDataEntity.appDEFields) == null ? 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("\u672A\u652F\u6301\u7684\u7C7B\u578B", item.type);
+      return;
+    }
+    ops.forEach((op) => {
+      const editorModel = EditorsMap["".concat(item.type, "_").concat(op)];
+      addSearchBarFilters.push({
+        appId,
+        appDEFieldId: codeNameToId[item.key],
+        id: item.key,
+        caption: item.description,
+        defsearchMode: {
+          appId,
+          valueOP: op
+        },
+        editor: editorModel
+      });
+    });
+  });
+  return addSearchBarFilters;
+}
+
 // src/controller/control/search-bar/search-bar.controller.ts
 var SearchBarController = class extends ControlController {
   constructor() {
@@ -24929,6 +25287,13 @@ var SearchBarController = class extends ControlController {
      * @Date: 2023-12-21 10:17:43
      */
     this.isBackendSearchGroup = this.model.searchBarStyle === "SEARCHBAR2";
+    /**
+     * 启用自定义过滤项
+     * @author lxm
+     * @date 2023-12-29 04:15:34
+     * @type {boolean}
+     */
+    this.enableFilter = this.model.enableFilter === true;
   }
   /**
    * 表格控制器
@@ -24943,12 +25308,19 @@ var SearchBarController = class extends ControlController {
     super.initState();
     this.state.query = "";
     this.state.selectedGroupItem = null;
-    this.state.visible = !!(this.model.enableQuickSearch || this.model.enableGroup || this.model.enableFilter);
-    if (this.model.enableFilter) {
-      this.resetFilter();
-    }
     this.state.searchBarGroups = [];
     this.state.selectedSearchGroupItem = null;
+    this.initFilterState();
+  }
+  /**
+   * 初始化Filter相关的属性
+   * @author lxm
+   * @date 2023-12-29 04:18:02
+   * @protected
+   */
+  initFilterState() {
+    this.resetFilter();
+    this.state.visible = !!(this.model.enableQuickSearch || this.model.enableGroup || this.enableFilter);
   }
   async onCreated() {
     await super.onCreated();
@@ -24964,9 +25336,39 @@ var SearchBarController = class extends ControlController {
       this.service = new SearchBarService(this.model, this.view.model.codeName);
       await this.service.init(this.context);
     }
+    await this.initByEntitySchema();
     await this.initSearchBarFilters();
     await this.initSearBarGroups();
   }
+  /**
+   * 根据实体jsonschema初始化
+   * @author lxm
+   * @date 2023-12-29 04:21:31
+   * @return {*}  {Promise<void>}
+   */
+  async initByEntitySchema() {
+    var _a;
+    this.enableFilter = true;
+    const json = await getEntitySchema(this.appDataEntity.id, this.context);
+    if (!json) {
+      return;
+    }
+    const addSearchBarFilters = calcFilterModelBySchema(json, this);
+    const mergeFilters = [];
+    (_a = this.model.searchBarFilters) == null ? void 0 : _a.forEach((filter) => {
+      const findindex = addSearchBarFilters.findIndex(
+        (item) => {
+          var _a2;
+          return item.appDEFieldId === filter.appDEFieldId && (((_a2 = filter.defsearchMode) == null ? void 0 : _a2.valueOP) ? item.defsearchMode.valueOP === filter.defsearchMode.valueOP : true);
+        }
+      );
+      if (findindex === -1) {
+        mergeFilters.push(filter);
+      }
+    });
+    addSearchBarFilters.push(...mergeFilters);
+    this.searchBarFilters = addSearchBarFilters;
+  }
   /**
    * 计算快速搜索的占位
    * @author lxm
@@ -25062,8 +25464,8 @@ var SearchBarController = class extends ControlController {
    */
   async initSearchBarFilters() {
     var _a;
-    if ((_a = this.model.searchBarFilters) == null ? void 0 : _a.length) {
-      this.model.searchBarFilters.forEach((item) => {
+    if ((_a = this.searchBarFilters) == null ? void 0 : _a.length) {
+      this.searchBarFilters.forEach((item) => {
         const filterController = new SearchBarFilterController(item, this);
         this.filterControllers.push(filterController);
       });
@@ -26190,7 +26592,7 @@ var TreeController = class extends MDControlController {
    * @param {string} appId
    * @return {*}  {Promise<void>}
    */
-  async doUIAction(uiActionId, nodeData, event, appId) {
+  async doUIAction(uiActionId, nodeData, event, appId2) {
     const eventArgs = this.getEventArgs();
     const nodeParams = this.parseTreeNodeData(nodeData);
     const result = await UIActionUtil.exec(
@@ -26200,7 +26602,7 @@ var TreeController = class extends MDControlController {
         ...nodeParams,
         event
       },
-      appId
+      appId2
     );
     if (result.closeView) {
       this.view.closeView();
@@ -27767,12 +28169,13 @@ var TreeGridExController = class extends TreeController {
   initState() {
     super.initState();
     this.state.columnStates = [];
+    this.state.rootNodes = [];
     this.state.rows = {};
   }
   async onCreated() {
     await super.onCreated();
-    this.initColumnStates();
     await this.initGridColumns();
+    this.initColumnStates();
   }
   async initService() {
     this.service = new TreeGridExService(this.model);
@@ -29041,7 +29444,6 @@ var GanttController = class extends TreeGridExController {
    */
   initState() {
     super.initState();
-    this.state.rootNodes = [];
     this.state.ganttStyle = {};
   }
   /**
@@ -29114,9 +29516,9 @@ var GanttController = class extends TreeGridExController {
     if (nodeModel) {
       const newData = isTransformData ? 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,
@@ -29269,11 +29671,11 @@ var AppHub = class {
    * @param {IAppDataEntity} model
    * @param {string} [appId=ibiz.env.appId]
    */
-  registerAppDataEntity(model, appId = ibiz.env.appId) {
-    if (!this.dataEntities.has(appId)) {
-      this.dataEntities.set(appId, /* @__PURE__ */ new Map());
+  registerAppDataEntity(model, appId2 = ibiz.env.appId) {
+    if (!this.dataEntities.has(appId2)) {
+      this.dataEntities.set(appId2, /* @__PURE__ */ new Map());
     }
-    const map = this.dataEntities.get(appId);
+    const map = this.dataEntities.get(appId2);
     map.set(model.id, model);
   }
   /**
@@ -29284,9 +29686,9 @@ var AppHub = class {
    * @param {string} tag 视图 codeName 或者视图 id
    * @param {string} [appId=ibiz.env.appId]
    */
-  setAppView(tag, appId = ibiz.env.appId) {
+  setAppView(tag, appId2 = ibiz.env.appId) {
     const id = this.calcAppViewId(tag);
-    this.view2appMap.set(id, appId);
+    this.view2appMap.set(id, appId2);
   }
   /**
    * 判断应用视图是否存在
@@ -29308,9 +29710,9 @@ var AppHub = class {
    * @param {string} appId
    * @return {*}  {(Promise<string | null>)}
    */
-  async getAppStyle(appId) {
+  async getAppStyle(appId2) {
     if (this.modelLoaderProvider) {
-      return this.modelLoaderProvider.getAppStyle(appId);
+      return this.modelLoaderProvider.getAppStyle(appId2);
     }
     return null;
   }
@@ -29324,15 +29726,15 @@ var AppHub = class {
    */
   async getAppView(tag) {
     const id = this.calcAppViewId(tag);
-    const appId = this.view2appMap.get(id) || ibiz.env.appId;
-    if (!this.appMap.has(appId)) {
-      await this.createApp(appId);
+    const appId2 = this.view2appMap.get(id) || ibiz.env.appId;
+    if (!this.appMap.has(appId2)) {
+      await this.createApp(appId2);
     }
     if (this.views.has(id)) {
       return this.views.get(id);
     }
     if (this.modelLoaderProvider) {
-      const appView = await this.modelLoaderProvider.getAppView(appId, id);
+      const appView = await this.modelLoaderProvider.getAppView(appId2, id);
       this.registerAppView(appView);
       return appView;
     }
@@ -29347,9 +29749,9 @@ var AppHub = class {
    * @param {string} [appId=ibiz.env.appId]
    * @return {*}  {Promise<IAppDataEntity>}
    */
-  async getAppDataEntity(id, appId = ibiz.env.appId) {
-    if (this.dataEntities.has(appId)) {
-      const map = this.dataEntities.get(appId);
+  async getAppDataEntity(id, appId2 = ibiz.env.appId) {
+    if (this.dataEntities.has(appId2)) {
+      const map = this.dataEntities.get(appId2);
       if (map.has(id)) {
         return map.get(id);
       }
@@ -29357,14 +29759,14 @@ var AppHub = class {
     if (this.modelLoaderProvider) {
       let entity;
       if (id.indexOf(".") !== -1) {
-        entity = await this.modelLoaderProvider.getAppDataEntity(appId, id);
+        entity = await this.modelLoaderProvider.getAppDataEntity(appId2, id);
       } else {
         entity = await this.modelLoaderProvider.getAppDataEntityByCodeName(
-          appId,
+          appId2,
           id
         );
       }
-      this.registerAppDataEntity(entity, appId);
+      this.registerAppDataEntity(entity, appId2);
       return entity;
     }
     throw new RuntimeError61("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
@@ -31258,6 +31660,7 @@ var RemotePluginItem = class {
   }
 };
 export {
+  APPMENUITEM_PROVIDER_PREFIX,
   APP_COUNTER_PROVIDER_PREFIX,
   ASYNC_ACTION_PROVIDER_PREFIX,
   AcFetchMethod,
@@ -31509,6 +31912,7 @@ export {
   generateRules,
   getAllPanelField,
   getAppCounterProvider,
+  getAppMenuItemProvider,
   getAppViewRef,
   getAsyncActionProvider,
   getChildNodeRSs,
@@ -31521,6 +31925,7 @@ export {
   getDeACMode,
   getDefaultValue,
   getEditorProvider,
+  getEntitySchema,
   getFormDetailProvider,
   getGridColumnProvider,
   getMatchResPath,
@@ -31558,6 +31963,7 @@ export {
   presetDEMethodProvider,
   presetUIActionProvider,
   registerAppCounterProvider,
+  registerAppMenuItemProvider,
   registerAsyncActionProvider,
   registerControlProvider,
   registerDEMethodProvider,