@ibiz-template/runtime 0.7.31-alpha.0 → 0.7.34

package/dist/index.esm.js

@@ -11977,11 +11977,12 @@ function updateKeyDefine4(target, keys) {
   });
 }
 var ChartData = class {
-  constructor(deData, seriesModel, catalog, groupName) {
+  constructor(deData, seriesModel, catalog, groupName, chartId) {
     this._seriesModelId = seriesModel == null ? void 0 : seriesModel.id;
     this._catalog = catalog;
     this._groupName = groupName;
     this._uuid = createUUID5();
+    this._chartid = chartId;
     return new Proxy(this, {
       set(target, p, value) {
         if (Object.prototype.hasOwnProperty.call(deData, p)) {
@@ -12241,6 +12242,15 @@ var _DEServiceUtil = class _DEServiceUtil {
      * @type {Map<string, Map<string, IAppDEService>>} Map<域标识, Map<实体标识, 实体服务>>
      */
     this.cache = /* @__PURE__ */ new Map();
+    /**
+     * 创建中缓存
+     *
+     * @author tony001
+     * @date 2024-07-24 22:07:21
+     * @protected
+     * @type {Map<string, Promise<IAppDEService>>}
+     */
+    this.creatingCache = /* @__PURE__ */ new Map();
   }
   /**
    * 注册服务工厂方法
@@ -12277,24 +12287,46 @@ var _DEServiceUtil = class _DEServiceUtil {
     }
     const map = this.cache.get(sandboxId);
     if (!map.has(id)) {
-      const entityModel = await ibiz.hub.getAppDataEntity(
-        id,
-        this.appModel.appId
-      );
-      if (!entityModel) {
-        throw new RuntimeError23(ibiz.i18n.t("runtime.service.noFound", { id }));
-      }
-      const constructor = _DEServiceUtil.constructorCache.get(id.toUpperCase());
-      let service;
-      if (constructor) {
-        service = await constructor(sandboxId, entityModel);
+      const cacheKey = "".concat(sandboxId, "@").concat(id);
+      let result;
+      if (this.creatingCache.has(cacheKey)) {
+        result = await this.creatingCache.get(cacheKey);
       } else {
-        service = new DEService(sandboxId, entityModel);
+        const service = this.createServiceInstance(sandboxId, id);
+        this.creatingCache.set(cacheKey, service);
+        result = await service;
+        this.creatingCache.delete(cacheKey);
       }
-      map.set(id, service);
+      map.set(id, result);
     }
     return map.get(id);
   }
+  /**
+   * 创建实体服务实例
+   *
+   * @author tony001
+   * @date 2024-07-24 22:07:28
+   * @param {string} sandboxId
+   * @param {string} id
+   * @return {*}  {Promise<IAppDEService>}
+   */
+  async createServiceInstance(sandboxId, id) {
+    const entityModel = await ibiz.hub.getAppDataEntity(
+      id,
+      this.appModel.appId
+    );
+    if (!entityModel) {
+      throw new RuntimeError23(ibiz.i18n.t("runtime.service.noFound", { id }));
+    }
+    const constructor = _DEServiceUtil.constructorCache.get(id.toUpperCase());
+    let service;
+    if (constructor) {
+      service = await constructor(sandboxId, entityModel);
+    } else {
+      service = new DEService(sandboxId, entityModel);
+    }
+    return service;
+  }
   /**
    * 重置服务, 删除指定域下的所有服务缓存
    *
@@ -15888,6 +15920,274 @@ var RecordNavUtil = class {
   }
 };
 
+// src/utils/jsonschema-util/jsonschema-util.ts
+import qs3 from "qs";
+var JsonSchemaUtil = class {
+  constructor() {
+    /**
+     * 值操作数组
+     *
+     * @author tony001
+     * @date 2024-07-25 00:07:57
+     * @private
+     */
+    this.valueOPArray = [
+      { valueOP: "EQ" /* EQ */, label: "\u7B49\u4E8E", sqlOP: "=" },
+      { valueOP: "NOTEQ" /* NOT_EQ */, label: "\u4E0D\u7B49\u4E8E", sqlOP: "<>" },
+      { valueOP: "GT" /* GT */, label: "\u5927\u4E8E", sqlOP: ">" },
+      { valueOP: "GTANDEQ" /* GT_AND_EQ */, label: "\u5927\u4E8E\u7B49\u4E8E", sqlOP: ">=" },
+      { valueOP: "LT" /* LT */, label: "\u5C0F\u4E8E", sqlOP: "<" },
+      { valueOP: "LTANDEQ" /* LT_AND_EQ */, label: "\u5C0F\u4E8E\u7B49\u4E8E", sqlOP: "<=" },
+      { valueOP: "ISNULL" /* IS_NULL */, label: "\u4E3A\u7A7A", sqlOP: "IS NULL" },
+      { valueOP: "ISNOTNULL" /* IS_NOT_NULL */, label: "\u975E\u7A7A", sqlOP: "IS NOT NULL" },
+      { valueOP: "IN" /* IN */, label: "\u5C5E\u4E8E", sqlOP: "IN" },
+      { valueOP: "NOTIN" /* NOT_IN */, label: "\u4E0D\u5C5E\u4E8E", sqlOP: "NOT IN" },
+      { valueOP: "LIKE" /* LIKE */, label: "\u6587\u672C\u5305\u542B", sqlOP: "LIKE" },
+      { valueOP: "LIFTLIKE" /* LIFT_LIKE */, label: "\u6587\u672C\u5DE6\u5305\u542B", sqlOP: "" },
+      { valueOP: "RIGHT_LIKE" /* RIGHT_LIKE */, label: "\u6587\u672C\u53F3\u5305\u542B", sqlOP: "" },
+      { valueOP: "EXISTS" /* EXISTS */, label: "\u5B58\u5728", sqlOP: "" },
+      { valueOP: "NOTEXISTS" /* NOT_EXISTS */, label: "\u4E0D\u5B58\u5728", sqlOP: "" }
+    ];
+    /**
+     * 数据类型映射操作符
+     *
+     * @author tony001
+     * @date 2024-07-25 00:07:31
+     * @private
+     * @type {{
+     *     [p: string]: ValueOP[];
+     *   }}
+     */
+    this.DataTypeToOPs = {
+      ["STRING" /* 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" /* 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" /* 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 */
+      ],
+      ["CODELIST" /* CODELIST */]: [
+        "EQ" /* EQ */,
+        "NOTEQ" /* NOT_EQ */,
+        "ISNULL" /* IS_NULL */,
+        "ISNOTNULL" /* IS_NOT_NULL */,
+        "IN" /* IN */,
+        "NOTIN" /* NOT_IN */
+      ],
+      ["FOREIGNKEY" /* FOREIGNKEY */]: [
+        "EQ" /* EQ */,
+        "NOTEQ" /* NOT_EQ */,
+        "ISNULL" /* IS_NULL */,
+        "ISNOTNULL" /* IS_NOT_NULL */,
+        "IN" /* IN */,
+        "NOTIN" /* NOT_IN */
+      ],
+      ["CHILD" /* CHILD */]: ["EXISTS" /* EXISTS */, "NOTEXISTS" /* NOT_EXISTS */]
+    };
+    /**
+     * 排除操作符
+     *
+     * @author tony001
+     * @date 2024-07-25 17:07:51
+     * @private
+     * @type {string[]}
+     */
+    this.excludeOPs = [
+      "ISNULL" /* IS_NULL */,
+      "ISNOTNULL" /* IS_NOT_NULL */,
+      "EXISTS" /* EXISTS */,
+      "NOTEXISTS" /* NOT_EXISTS */
+    ];
+    /**
+     * 数据类型映射编辑器
+     *
+     * @author tony001
+     * @date 2024-07-25 00:07:07
+     * @private
+     * @type {({
+     *     [p: string]: IData| undefined;
+     *   })}
+     */
+    this.DataTypeToEditor = {
+      ["STRING" /* STRING */]: {
+        appId: "",
+        editorType: "TEXTBOX"
+      },
+      ["NUMBER" /* NUMBER */]: {
+        appId: "",
+        editorType: "NUMBER"
+      },
+      ["DATE" /* DATE */]: {
+        appId: "",
+        editorType: "DATEPICKEREX",
+        dateTimeFormat: "YYYY-MM-DD"
+      },
+      ["CODELIST" /* CODELIST */]: {
+        appId: "",
+        valueType: "SIMPLE",
+        editorType: "MDROPDOWNLIST",
+        appCodeListId: "",
+        editorParams: {
+          overflowMode: "ellipsis"
+        }
+      },
+      ["FOREIGNKEY" /* FOREIGNKEY */]: {
+        appId: "",
+        editorType: "ADDRESSPICKUP",
+        appDEDataSetId: "fetchdefault",
+        objectIdField: "srfkey",
+        objectNameField: "srfmajortext",
+        valueType: "OBJECTS",
+        editorParams: {
+          overflowMode: "ellipsis"
+        }
+      },
+      ["CHILD" /* CHILD */]: void 0
+    };
+  }
+  /**
+   * 获取jsonschema属性数据
+   *
+   * @author tony001
+   * @date 2024-07-25 00:07:49
+   * @param {string} entityId
+   * @param {IContext} context
+   * @param {IParams} [params={}]
+   * @return {*}  {Promise<IData[]>}
+   */
+  async getEntitySchemaFields(entityId, context, params = {}) {
+    var _a;
+    const result = [];
+    const strParams = qs3.stringify(params);
+    const app = ibiz.hub.getApp(context.srfappid);
+    const entity = await ibiz.hub.getAppDataEntity(entityId, context.srfappid);
+    let url = "/jsonschema/".concat(entity.name);
+    if (entity.dynaSysMode === 0 && ibiz.appData) {
+      url += "?dynamodeltag=".concat(ibiz.appData.dynamodeltag).concat(strParams ? "&".concat(strParams) : "");
+    } else {
+      url += "".concat(strParams ? "?".concat(strParams) : "");
+    }
+    const res = await app.net.get(url);
+    const { data } = res;
+    if (!data.properties) {
+      return result;
+    }
+    const { properties } = data;
+    if (!(Object.keys(properties).length > 0)) {
+      return result;
+    }
+    for (let i = 0; i < Object.keys(properties).length; i++) {
+      const key = Object.keys(properties)[i];
+      const item = properties[key];
+      let type = "STRING" /* STRING */;
+      const originalType = item.type;
+      if (originalType === "array" || item.extension) {
+        break;
+      }
+      switch (originalType) {
+        case "string":
+          if (item.$ref) {
+            type = "FOREIGNKEY" /* FOREIGNKEY */;
+          }
+          if (item.enumSource) {
+            type = "CODELIST" /* CODELIST */;
+          }
+          if (item.format === "date-time") {
+            type = "DATE" /* DATE */;
+          }
+          break;
+        case "integer":
+        case "number":
+          type = "NUMBER" /* NUMBER */;
+          if (item.enumSource) {
+            type = "CODELIST" /* CODELIST */;
+          }
+          break;
+        default:
+          if (item.$ref) {
+            type = "FOREIGNKEY" /* FOREIGNKEY */;
+          }
+          break;
+      }
+      result.push({
+        type,
+        originalType,
+        appDEFieldId: key,
+        caption: item.description,
+        appCodeListId: item.enumSource,
+        appDataEntityId: (_a = item.$ref) == null ? void 0 : _a.split(".")[0]
+      });
+    }
+    return result;
+  }
+  /**
+   * 通过数据类型获取可使用操作标识集合
+   *
+   * @author tony001
+   * @date 2024-07-25 16:07:24
+   * @param {string} dataType
+   * @return {*}  {IData[]}
+   */
+  getValueOPsByDataType(dataType) {
+    let result = [];
+    result = this.valueOPArray.filter(
+      (mode) => this.DataTypeToOPs[dataType].includes(mode.valueOP)
+    );
+    return result;
+  }
+  /**
+   * 获取仿真编辑器
+   *
+   * @author tony001
+   * @date 2024-07-25 17:07:11
+   * @param {IContext} context
+   * @param {IData} item
+   * @return {*}  {Promise<IData>}
+   */
+  getMockEditor(context, item, valueOP) {
+    if (valueOP && this.excludeOPs.includes(valueOP))
+      return;
+    const baseMockEditor = this.DataTypeToEditor[item.type];
+    if (!baseMockEditor)
+      return;
+    baseMockEditor.appId = context.srfappid;
+    if (item.type === "CODELIST" /* CODELIST */) {
+      baseMockEditor.appCodeListId = item.appCodeListId;
+    }
+    if (item.type === "FOREIGNKEY" /* FOREIGNKEY */) {
+      baseMockEditor.appDataEntityId = item.appDataEntityId;
+    }
+    return baseMockEditor;
+  }
+};
+
 // src/utils/dr-ctrl-util/index.ts
 function calcItemVisibleByCounter(item, counter) {
   const { enableMode, counterId } = item;
@@ -16020,10 +16320,7 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
       case "POPUPMODAL":
         return this.openModal(appView, context, params);
       case "POPUPAPP":
-        throw new ModelError15(
-          appView,
-          ibiz.i18n.t("runtime.command.app.unsupportedPopupapp")
-        );
+        return this.openPopupApp(appView, context, params);
       case "POPOVER":
         return this.openPopover(appView, context, params, opts);
       case "DRAWER_LEFT":
@@ -16126,6 +16423,20 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
   async openUserCustom(appView, context, params = {}) {
     return ibiz.openView.custom(appView.id, context, params);
   }
+  /**
+   * 独立程序弹出
+   *
+   * @author zzq
+   * @date 2024-07-19 20:07:55
+   * @protected
+   * @param {IViewConfig} appView
+   * @param {IContext} [context]
+   * @param {IParams} [params={}]
+   * @return {*}  {Promise<void>}
+   */
+  async openPopupApp(appView, context, params = {}) {
+    return ibiz.openView.popupApp(appView.id, context, params);
+  }
 };
 _OpenAppViewCommand.TAG = "ibiz.app-view.open";
 var OpenAppViewCommand = _OpenAppViewCommand;
@@ -17920,9 +18231,9 @@ async function fetchImportSchemas(opts) {
 }
 
 // src/controller/utils/jsonschema/entity.ts
-import qs3 from "qs";
+import qs4 from "qs";
 async function getEntitySchema(entityId, context, params = {}) {
-  const strParams = qs3.stringify(params);
+  const strParams = qs4.stringify(params);
   const app = ibiz.hub.getApp(context.srfappid);
   const entity = await ibiz.hub.getAppDataEntity(entityId, context.srfappid);
   let url = "/jsonschema/".concat(entity.name);
@@ -21535,7 +21846,13 @@ var BaseSeriesGenerator = class {
       deData["".concat(this.catalogField, "_value")] = deData[this.catalogField];
       Object.assign(deData, { [this.catalogField]: catalog });
     }
-    const tempChartData = new ChartData(deData, this.model, catalog, group);
+    const tempChartData = new ChartData(
+      deData,
+      this.model,
+      catalog,
+      group,
+      this.chartGenerator.extraArgs.chartId
+    );
     groupData[group].get(catalog).chartData = tempChartData;
     (_a = this.chartDataArr) == null ? void 0 : _a.push(tempChartData);
   }
@@ -21605,8 +21922,13 @@ var BaseSeriesGenerator = class {
     this.chartDataArr = [];
     const groupData = this.groupData;
     const { seriesCodeListId, catalogCodeListId } = this.model;
+    const getOrigin = (origin) => {
+      if (origin && origin.$origin) {
+        return getOrigin(origin.$origin);
+      }
+      return origin;
+    };
     data.forEach((item) => {
-      var _a, _b;
       let group = DEFAULT_GROUP;
       if (this.groupField) {
         const groupVal = this.translateVal(
@@ -21616,6 +21938,15 @@ var BaseSeriesGenerator = class {
         if (isNil25(groupVal)) {
           return;
         }
+        const tempOrigin = getOrigin(item.$origin);
+        if (seriesCodeListId) {
+          this.catalogMap.set(groupVal, tempOrigin[this.groupField]);
+        } else {
+          this.catalogMap.set(
+            item[this.groupField],
+            tempOrigin[this.groupField]
+          );
+        }
         group = groupVal;
       }
       if (!groupData[group]) {
@@ -21630,10 +21961,14 @@ var BaseSeriesGenerator = class {
               tempCodeLists.push({ codename, codelist: clone22(codeListItems) });
             } else if (mode === "field") {
               const tempdata = data.map((_data) => {
-                var _a2, _b2;
+                let tempValue;
+                const tempOrigin = getOrigin(_data.$origin);
+                if (tempOrigin) {
+                  tempValue = tempOrigin[codename];
+                }
                 return {
                   text: _data[codename],
-                  value: (_b2 = (_a2 = _data.$origin) == null ? void 0 : _a2.$origin) == null ? void 0 : _b2[codename]
+                  value: tempValue
                 };
               });
               tempCodeLists.push({ codename, codelist: tempdata });
@@ -21703,8 +22038,13 @@ var BaseSeriesGenerator = class {
         return;
       }
       if (!catalogCodeListId) {
+        let tempValue;
+        const tempOrigin = getOrigin(item.$origin);
+        if (tempOrigin) {
+          tempValue = tempOrigin[this.catalogField];
+        }
         this.catalogMap.set(item[this.catalogField], {
-          [this.catalogField]: (_b = (_a = item.$origin) == null ? void 0 : _a.$origin) == null ? void 0 : _b[this.catalogField]
+          [this.catalogField]: tempValue
         });
       }
       if (!groupData[group].get(catalog)) {
@@ -22297,8 +22637,9 @@ function parseUserParams2(userParams) {
   return convertStringFunc(option);
 }
 var ChartOptionsGenerator2 = class {
-  constructor(model) {
+  constructor(model, extraArgs = {}) {
     this.model = model;
+    this.extraArgs = extraArgs;
     /**
      * 根据模型配置算出来的静态echarts配置
      * @author lxm
@@ -22593,10 +22934,10 @@ var ChartOptionsGenerator2 = class {
     if (controlParam && ((_a = controlParam.ctrlParams) == null ? void 0 : _a.ZONE)) {
       const length = (_b = this.model.dechartSerieses) == null ? void 0 : _b.length;
       if (length) {
-        const height = 90 / length;
+        const height = 85 / length;
         const items = [];
         for (let i = 0; i < length; i++) {
-          const top = i * height + 5;
+          const top = i * height + 10;
           const bottom = 100 - (height + top);
           items.push({
             top: "".concat(top, "%"),
@@ -22660,7 +23001,7 @@ var ChartOptionsGenerator2 = class {
                   if (((_a2 = controlParam.ctrlParams) == null ? void 0 : _a2.MODE) === "ROW") {
                     const yAxisData = this.handleAxisLayout(
                       codeListItems,
-                      40,
+                      60,
                       tempCatalogFields.length,
                       index
                     );
@@ -22724,7 +23065,7 @@ var ChartOptionsGenerator2 = class {
                 });
               } else {
                 Object.assign(this.chartUserParam.grid, {
-                  left: (catalogLength + 1) * 40
+                  left: (catalogLength + 1) * 60
                 });
               }
               const tempyAxis = this.chartUserParam.yAxis;
@@ -22745,7 +23086,7 @@ var ChartOptionsGenerator2 = class {
                   {
                     value: mergeName.split("").join("\n"),
                     textStyle: {
-                      padding: [0, catalogLength * 40, 0, 0],
+                      padding: [0, catalogLength * 50, 0, 0],
                       ...nameTextStyle
                     }
                   }
@@ -23036,7 +23377,9 @@ var ChartController = class extends MDControlController {
     await super.onCreated();
     this.service = new ChartService(this.model);
     await this.service.init(this.context);
-    this.generator = new ChartOptionsGenerator2(this.model);
+    this.generator = new ChartOptionsGenerator2(this.model, {
+      chartId: this.controlParams.chartid
+    });
     await this.generator.init(this.context, this.params);
     this.parseGridParam();
     this.resizeChart = this.resizeChart.bind(this);
@@ -23120,7 +23463,7 @@ var ChartController = class extends MDControlController {
    * @memberof ChartController
    */
   computedDrillDetailParam(arg) {
-    var _a, _b;
+    var _a, _b, _c;
     const { seriesType } = arg;
     const targetSerie = this.computedClickSerieModel(arg);
     let measureId = "";
@@ -23155,6 +23498,28 @@ var ChartController = class extends MDControlController {
           });
         }
       }
+      if (targetSerie.seriesField) {
+        const group = arg.data[2];
+        let tempValue;
+        const getOrigin = (origin) => {
+          if (origin && origin.$origin) {
+            return getOrigin(origin.$origin);
+          }
+          return origin;
+        };
+        const tempOrigin = getOrigin(group.$origin);
+        if (tempOrigin) {
+          tempValue = tempOrigin[targetSerie.seriesField];
+        } else {
+          tempValue = (_c = this.generator.seriesGenerators) == null ? void 0 : _c[0].catalogMap.get(
+            group[targetSerie.seriesField]
+          );
+        }
+        dimension.push({
+          name: targetSerie.seriesField,
+          value: tempValue
+        });
+      }
     }
     return {
       measure: {
@@ -26411,7 +26776,6 @@ var DashboardController = class extends ControlController {
     super.initState();
   }
   async onCreated() {
-    this.model.enableCustomized = true;
     await super.onCreated();
     await this.initPortlets(this.model.controls);
     const { appDataEntityId } = this.view.model;
@@ -26976,12 +27340,13 @@ var PortletPartController = class {
     return new PortletPartState();
   }
   /**
-   * 刷新门户部件
+   * 刷新
    *
-   * @author zzq
-   * @date 2024-04-25 10:03:33
+   * @author tony001
+   * @date 2024-07-23 22:07:02
+   * @return {*}  {Promise<void>}
    */
-  refresh() {
+  async refresh() {
   }
   /**
    * 设置配置数据
@@ -27182,12 +27547,12 @@ var ViewPortletController = class extends PortletPartController {
     return null;
   }
   /**
-   * 刷新门户部件
+   * 刷新
    *
-   * @author zzq
-   * @date 2024-04-25 10:03:33
+   * @author tony001
+   * @date 2024-07-23 22:07:30
    */
-  refresh() {
+  async refresh() {
     if (this.contentController) {
       this.contentController.callUIAction(
         "Refresh" /* REFRESH */
@@ -27203,12 +27568,13 @@ var MenuPortletController = class extends PortletPartController {
 // src/controller/control/dashboard/portlet/chart-portlet/chart-portlet.controller.ts
 var ChartPortletController = class extends PortletPartController {
   /**
-   * 刷新门户部件
+   * 刷新
    *
-   * @author zzq
-   * @date 2024-04-25 10:03:33
+   * @author tony001
+   * @date 2024-07-23 22:07:01
+   * @return {*}  {Promise<void>}
    */
-  refresh() {
+  async refresh() {
     if (this.contentController) {
       this.contentController.refresh();
     }
@@ -27226,12 +27592,13 @@ var HtmlPortletController = class extends PortletPartController {
 // src/controller/control/dashboard/portlet/list-portlet/list-portlet.controller.ts
 var ListPortletController = class extends PortletPartController {
   /**
-   * 刷新门户部件
+   * 刷新
    *
-   * @author zzq
-   * @date 2024-04-25 10:03:33
+   * @author tony001
+   * @date 2024-07-23 22:07:41
+   * @return {*}  {Promise<void>}
    */
-  refresh() {
+  async refresh() {
     if (this.contentController) {
       this.contentController.refresh();
     }
@@ -27263,11 +27630,18 @@ var ReportPortletController = class extends PortletPartController {
    * 刷新报表部件
    *
    * @author tony001
-   * @date 2024-06-19 18:06:14
+   * @date 2024-07-23 22:07:16
+   * @return {*}  {Promise<void>}
    */
-  refresh() {
+  async refresh() {
     if (this.contentController) {
-      this.contentController.refresh();
+      if (this.dashboard.controlParams.multimode === "true") {
+        this.dashboard.evt.emit("onItemModelReset", {
+          name: this.model.id
+        });
+      } else {
+        this.contentController.refresh();
+      }
     }
   }
 };
@@ -32868,8 +33242,11 @@ var GridController = class extends MDControlController {
         }
       });
       const { degridColumns = [] } = this.model;
-      this.dataExportParam.fields = degridColumns.map((item) => item.id);
-      this.dataExportParam.header = degridColumns.map((item) => item.caption);
+      const exportColumns = degridColumns.filter(
+        (x) => !x.hiddenDataItem && !x.hideDefault && x.hideMode !== 2
+      );
+      this.dataExportParam.fields = exportColumns.map((item) => item.id);
+      this.dataExportParam.header = exportColumns.map((item) => item.caption);
     }
   }
   /**
@@ -32924,14 +33301,6 @@ var GridController = class extends MDControlController {
       );
     }
     const groupFieldName = this.groupFieldColumn.model.id;
-    if (!this.groupFieldColumn.model.appCodeListId) {
-      throw new RuntimeModelError63(
-        this.groupFieldColumn.model,
-        ibiz.i18n.t("runtime.controller.control.grid.noCodeTable", {
-          groupFieldName
-        })
-      );
-    }
     const index = this.state.columnStates.findIndex(
       (item) => item.key === this.groupFieldColumn.model.codeName
     );
@@ -33073,7 +33442,8 @@ var GridController = class extends MDControlController {
       });
       this.state.groups = [];
       groupMap.forEach((value, key) => {
-        const codeListItem = this.groupCodeListItems.find(
+        var _a;
+        const codeListItem = (_a = this.groupCodeListItems) == null ? void 0 : _a.find(
           (item) => item.value === key
         );
         this.state.groups.push({
@@ -36659,6 +37029,13 @@ var SearchBarController = class extends ControlController {
      * @type {IParams}
      */
     this.jsonSchemaParams = {};
+    /**
+     * schema实体映射map
+     *
+     * @author zhanghengfeng
+     * @date 2024-07-22 16:07:55
+     */
+    this.schemaEntityMap = /* @__PURE__ */ new Map();
     /**
      * 是否启用存储
      *
@@ -36752,6 +37129,29 @@ var SearchBarController = class extends ControlController {
     await this.initSearchBarFilters();
     await this.initSearBarGroups(true);
   }
+  /**
+   * 初始化schema实体映射map
+   *
+   * @author zhanghengfeng
+   * @date 2024-07-22 16:07:14
+   * @param {IData} json
+   * @return {*}
+   */
+  async initSchemaEntityMap(json) {
+    if (!json.properties) {
+      return;
+    }
+    const { properties } = json;
+    if (!(Object.keys(properties).length > 0)) {
+      return;
+    }
+    const map = /* @__PURE__ */ new Map();
+    Object.keys(properties).forEach((key) => {
+      var _a, _b;
+      map.set(key, (_b = (_a = properties[key]) == null ? void 0 : _a.$ref) == null ? void 0 : _b.split(".")[0]);
+    });
+    this.schemaEntityMap = map;
+  }
   /**
    * 根据实体jsonschema初始化
    * @author lxm
@@ -36773,6 +37173,7 @@ var SearchBarController = class extends ControlController {
     if (!json) {
       return;
     }
+    await this.initSchemaEntityMap(json);
     const addSearchBarFilters = await calcFilterModelBySchema(
       json,
       this.model.appDataEntityId,
@@ -37022,6 +37423,17 @@ var SearchBarController = class extends ControlController {
         }
       }
     });
+    if (!searchconds) {
+      const customNodes = [
+        {
+          nodeType: "GROUP",
+          logicType: "AND",
+          children: []
+        }
+      ];
+      this.attachCustomCond(customNodes);
+      return calcSearchConds(customNodes);
+    }
     return searchconds;
   }
   /**
@@ -37177,7 +37589,18 @@ var SearchBarController = class extends ControlController {
     if (this.grid && this.state.selectedSearchGroupItem) {
       const nodes = clone34(this.state.filterNodes);
       this.attachCustomCond(nodes);
-      const filters = calcSearchCondExs(nodes);
+      let filters = calcSearchCondExs(nodes);
+      if (!filters) {
+        const customNodes = [
+          {
+            nodeType: "GROUP",
+            logicType: "AND",
+            children: []
+          }
+        ];
+        this.attachCustomCond(customNodes);
+        filters = calcSearchCondExs(customNodes);
+      }
       const saveParams = {
         searchconds: filters,
         sort: this.grid.state.sortQuery,
@@ -44879,6 +45302,13 @@ var GlobalUtil = class {
      * @date 2024-07-15 13:07:51
      */
     this.record = new RecordNavUtil();
+    /**
+     * JsonSchema工具类
+     *
+     * @author tony001
+     * @date 2024-07-25 00:07:31
+     */
+    this.jsonSchema = new JsonSchemaUtil();
     this.error.register(new DefaultErrorHandler());
   }
   /**
@@ -46268,7 +46698,6 @@ var en = {
         grid: {
           unsupported: "Unsupported types {type}",
           attributeColumns: "Attribute columns with no grouping attributes configured",
-          noCodeTable: "The attribute column {groupFieldName} of the grouping attribute does not have a configuration code table",
           configureFirstColumn: "Please configure the grouping attribute column {groupFieldName} as the first column",
           requiresCodeTable: "Code table grouping mode requires code table configuration",
           noMatchCodeTable: "The grouping code table does not match the code table for the attribute column {groupFieldName}",
@@ -46858,7 +47287,6 @@ var zhCn = {
         grid: {
           unsupported: "\u672A\u652F\u6301\u7684\u7C7B\u578B{type}",
           attributeColumns: "\u6CA1\u6709\u914D\u7F6E\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217",
-          noCodeTable: "\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217{groupFieldName}\u6CA1\u6709\u914D\u7F6E\u4EE3\u7801\u8868",
           configureFirstColumn: "\u8BF7\u5C06\u5206\u7EC4\u5C5E\u6027\u5217{groupFieldName}\u914D\u7F6E\u4E3A\u7B2C\u4E00\u5217",
           requiresCodeTable: "\u4EE3\u7801\u8868\u5206\u7EC4\u6A21\u5F0F\u9700\u8981\u914D\u7F6E\u4EE3\u7801\u8868",
           noMatchCodeTable: "\u5206\u7EC4\u4EE3\u7801\u8868\u4E0E\u5C5E\u6027\u5217{groupFieldName}\u7684\u4EE3\u7801\u8868\u4E0D\u4E00\u81F4",
@@ -47456,6 +47884,7 @@ export {
   INTERNAL_MESSAGE_PROVIDER_PREFIX,
   InternalMessageService,
   ItemsValueOPs,
+  JsonSchemaUtil,
   KanbanController,
   KanbanService,
   LayoutPanelUtil,