@ibiz-template/runtime 0.7.25 → 0.7.26-alpha.1

package/dist/index.esm.js

@@ -15461,8 +15461,9 @@ var Application = class {
    * @date 2022-12-22 15:12:26
    * @param {IApplication} model
    */
-  constructor(model) {
+  constructor(model, subAppRef) {
     this.model = model;
+    this.subAppRef = subAppRef;
     /**
      * 应用实体名称到应用实体代码名称的映射
      *
@@ -15496,7 +15497,7 @@ var Application = class {
      */
     this.appBIReportMap = /* @__PURE__ */ new Map();
     this.net = new Net({
-      baseURL: "".concat(ibiz.env.baseUrl, "/").concat(this.appId)
+      baseURL: "".concat(ibiz.env.baseUrl, "/").concat(subAppRef && subAppRef.serviceId ? subAppRef.serviceId : this.appId)
     });
     this.configCache = new ConfigService(
       this.appId,
@@ -20343,6 +20344,20 @@ var BaseSeriesGenerator = class {
   constructor(model, chartGenerator) {
     this.model = model;
     this.chartGenerator = chartGenerator;
+    /**
+     * 分类属性(小写)
+     * @author lxm
+     * @date 2023-06-09 02:44:57
+     * @type {string}
+     */
+    this.catalogField = "";
+    /**
+     * 分类属性(小写)数组，用于构建多维度分层
+     *
+     * @type {string[]}
+     * @memberof BaseSeriesGenerator
+     */
+    this.catalogFields = [];
     /**
      * 根据分组处理出来的图表数据数组
      * @author lxm
@@ -20364,6 +20379,7 @@ var BaseSeriesGenerator = class {
      * @type {boolean}
      */
     this.autoCompleteCategory = true;
+    var _a;
     this.model = model;
     this.chartGenerator = chartGenerator;
     const { chartSeriesEncode, caption, id, userParam } = model;
@@ -20379,6 +20395,18 @@ var BaseSeriesGenerator = class {
         ibiz.i18n.t("runtime.controller.control.chart.missingValue")
       );
     }
+    if (chartGenerator.model.controlParam && ((_a = chartGenerator.model.controlParam.ctrlParams) == null ? void 0 : _a.CATALOGFIELDS)) {
+      try {
+        const tempCatalogFields = JSON.parse(
+          chartGenerator.model.controlParam.ctrlParams.CATALOGFIELDS
+        );
+        if (Array.isArray(tempCatalogFields)) {
+          this.catalogFields = tempCatalogFields;
+        }
+      } catch (e) {
+        throw new Error(ibiz.i18n.t("runtime.control.chart.errorJson"));
+      }
+    }
     this.catalogField = chartGenerator.getFieldKey(model.catalogField);
     this.valueField = chartGenerator.getFieldKey(model.valueField);
     this.groupField = model.seriesField ? chartGenerator.getFieldKey(model.seriesField) : void 0;
@@ -20463,6 +20491,42 @@ var BaseSeriesGenerator = class {
     groupData[group].get(catalog).chartData = tempChartData;
     (_a = this.chartDataArr) == null ? void 0 : _a.push(tempChartData);
   }
+  /**
+   * 处理多分类分组
+   *
+   * @param {IData[]} prevItems
+   * @param {IData[]} nextItems
+   * @return {*}
+   * @memberof BaseSeriesGenerator
+   */
+  handleMultiCatalogGroup(prevItems, nextItems) {
+    let tempItems = [];
+    if (prevItems.length === 0) {
+      tempItems = nextItems.map((item) => {
+        return {
+          text: item.text,
+          value: item.value
+        };
+      });
+    } else {
+      for (let prev = 0; prev < prevItems.length; prev++) {
+        if (nextItems.length > 0) {
+          for (let next = 0; next < nextItems.length; next++) {
+            tempItems.push({
+              text: "".concat(prevItems[prev].text, "_").concat(nextItems[next].text),
+              value: nextItems[next].value
+            });
+          }
+        } else {
+          tempItems.push({
+            text: prevItems[prev].text,
+            value: prevItems[prev].value
+          });
+        }
+      }
+    }
+    return tempItems;
+  }
   /**
    * 计算分组数据
    * @author lxm
@@ -20489,7 +20553,35 @@ var BaseSeriesGenerator = class {
       }
       if (!groupData[group]) {
         groupData[group] = /* @__PURE__ */ new Map();
-        if (catalogCodeListId && this.autoCompleteCategory) {
+        if (this.catalogFields.length > 0) {
+          let tempCodes = [];
+          const tempCodeLists = [];
+          this.catalogFields.forEach((catalog2) => {
+            const { codelistId } = catalog2;
+            if (codelistId && this.autoCompleteCategory) {
+              const codeListItems = this.chartGenerator.codeListMap.get(codelistId);
+              tempCodeLists.push(clone21(codeListItems));
+            }
+          });
+          for (let i = 0; i < tempCodeLists.length; i++) {
+            tempCodes = this.handleMultiCatalogGroup(
+              tempCodes,
+              tempCodeLists[i]
+            );
+          }
+          tempCodes.forEach((x) => {
+            groupData[group].set(x.text, { value: 0 });
+            this.prepareChartData(
+              groupData,
+              {
+                [this.valueField]: 0,
+                [this.catalogField]: x.value
+              },
+              x.text,
+              group
+            );
+          });
+        } else if (catalogCodeListId && this.autoCompleteCategory) {
           const codeListItems = this.chartGenerator.codeListMap.get(catalogCodeListId);
           codeListItems.forEach((x) => {
             groupData[group].set(x.text, { value: 0 });
@@ -20505,11 +20597,31 @@ var BaseSeriesGenerator = class {
           });
         }
       }
-      const catalog = this.translateVal(
-        catalogCodeListId,
-        item[this.catalogField],
-        true
-      );
+      let catalog = "";
+      if (this.catalogFields.length > 0) {
+        const tempCatalog = [];
+        this.catalogFields.forEach((_catalog) => {
+          const mergeCatalog = this.translateVal(
+            _catalog.codelistId,
+            item[_catalog.codename],
+            true
+          );
+          if (!mergeCatalog) {
+            return;
+          }
+          tempCatalog.push(mergeCatalog);
+        });
+        if (tempCatalog.length !== this.catalogFields.length) {
+          return;
+        }
+        catalog = tempCatalog.join("_");
+      } else {
+        catalog = this.translateVal(
+          catalogCodeListId,
+          item[this.catalogField],
+          true
+        );
+      }
       if (!catalog) {
         return;
       }
@@ -20525,7 +20637,10 @@ var BaseSeriesGenerator = class {
       } else {
         this.prepareChartData(
           groupData,
-          { ...item, [this.valueField]: groupData[group].get(catalog).value },
+          {
+            ...item,
+            [this.valueField]: groupData[group].get(catalog).value
+          },
           catalog,
           group
         );
@@ -21255,6 +21370,140 @@ var ChartOptionsGenerator2 = class {
     });
     return AxisOption;
   }
+  /**
+   * 初始化多分类的X轴配置
+   *
+   * @return {*}  {Promise<void>}
+   * @memberof ChartOptionsGenerator
+   */
+  async initMultiCatalogxAxis(context, params) {
+    var _a, _b, _c, _d, _e;
+    const { controlParam } = this.model;
+    if (controlParam && ((_a = controlParam.ctrlParams) == null ? void 0 : _a.CATALOGFIELDS)) {
+      try {
+        const tempCatalogFields = JSON.parse(
+          controlParam.ctrlParams.CATALOGFIELDS
+        );
+        const tempaxis = [];
+        let titleshow = true;
+        let labelshoww = true;
+        let gridIndex = 0;
+        if (Array.isArray(tempCatalogFields)) {
+          const app = ibiz.hub.getApp(context.srfappid);
+          if (this.chartUserParam && this.chartUserParam.xAxis) {
+            if (Array.isArray(this.chartUserParam.xAxis)) {
+              const tempconfig = this.chartUserParam.xAxis[this.chartUserParam.xAxis.length - 1];
+              titleshow = tempconfig.name === void 0 ? true : !!tempconfig.name;
+              labelshoww = ((_b = tempconfig.axisLabel) == null ? void 0 : _b.show) === void 0 ? true : (_c = tempconfig.axisLabel) == null ? void 0 : _c.show;
+            } else {
+              titleshow = this.chartUserParam.xAxis.name === void 0 ? true : !!this.chartUserParam.xAxis.name;
+              labelshoww = ((_d = this.chartUserParam.xAxis.axisLabel) == null ? void 0 : _d.show) === void 0 ? true : (_e = this.chartUserParam.xAxis.axisLabel) == null ? void 0 : _e.show;
+            }
+          }
+          if (this.chartUserParam && this.chartUserParam.grid && Array.isArray(this.chartUserParam.grid)) {
+            gridIndex = this.chartUserParam.grid.length - 1;
+          }
+          await Promise.all(
+            tempCatalogFields.slice(0, -1).map(async (catalog, index) => {
+              if (catalog.mode === "codelist" && catalog.codelistId) {
+                const codeListItems = await app.codeList.get(
+                  catalog.codelistId,
+                  context,
+                  params
+                );
+                if (codeListItems) {
+                  const tempxAxisData = [];
+                  const xAxisData = codeListItems.map((code) => {
+                    return {
+                      value: code.text,
+                      textStyle: {
+                        lineHeight: 45 * (tempCatalogFields.length - 1 - index)
+                      }
+                    };
+                  });
+                  if (index === 0) {
+                    tempaxis.push({
+                      show: labelshoww,
+                      gridIndex,
+                      type: "category",
+                      data: xAxisData,
+                      position: "bottom"
+                    });
+                  } else {
+                    let length = 1;
+                    for (let i = 0; i < tempaxis.length; i++) {
+                      length *= tempaxis[i].data.length;
+                    }
+                    for (let i = 0; i < length; i++) {
+                      tempxAxisData.push(...xAxisData);
+                    }
+                    tempaxis.push({
+                      show: labelshoww,
+                      gridIndex,
+                      type: "category",
+                      data: tempxAxisData,
+                      position: "bottom"
+                    });
+                  }
+                }
+              }
+            })
+          );
+          const mergeName = tempCatalogFields.map((catalog) => {
+            return catalog.name;
+          }).join("/");
+          tempaxis.push({
+            type: "category",
+            gridIndex,
+            show: titleshow,
+            data: [
+              {
+                value: mergeName,
+                textStyle: {
+                  lineHeight: labelshoww ? 45 * tempCatalogFields.length : 45
+                }
+              }
+            ],
+            position: "bottom"
+          });
+          if (this.chartUserParam) {
+            if (this.chartUserParam.xAxis && Array.isArray(this.chartUserParam.xAxis)) {
+              this.chartUserParam.xAxis = [
+                ...this.chartUserParam.xAxis,
+                ...tempaxis
+              ];
+            } else if (this.chartUserParam.xAxis) {
+              this.chartUserParam.xAxis = [
+                this.chartUserParam.xAxis,
+                ...tempaxis
+              ];
+            }
+            if (!this.chartUserParam.grid) {
+              this.chartUserParam.grid = {};
+            }
+            let { length } = tempCatalogFields;
+            if (!labelshoww) {
+              length = 1;
+            }
+            if (!titleshow) {
+              length -= 1;
+            }
+            if (length === 0) {
+              Object.assign(this.chartUserParam.grid, {
+                bottom: 45
+              });
+            } else {
+              Object.assign(this.chartUserParam.grid, {
+                bottom: (length > 2 ? length - 1 : length) * 45
+              });
+            }
+          }
+        }
+      } catch (e) {
+        throw new Error(ibiz.i18n.t("runtime.control.chart.errorJson"));
+      }
+    }
+  }
   /**
    * 初始化
    * @author lxm
@@ -21265,6 +21514,7 @@ var ChartOptionsGenerator2 = class {
    */
   async init(context, params) {
     await this.loadCodeList(context, params);
+    await this.initMultiCatalogxAxis(context, params);
     this.entity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
       this.model.appId
@@ -21293,7 +21543,7 @@ var ChartOptionsGenerator2 = class {
    * @return {*}  {Promise<void>}
    */
   async loadCodeList(context, params) {
-    var _a;
+    var _a, _b, _c;
     this.codeListMap.clear();
     if (!((_a = this.model.dechartSerieses) == null ? void 0 : _a.length)) {
       return;
@@ -21306,11 +21556,29 @@ var ChartOptionsGenerator2 = class {
       const codeListItems = await app.codeList.get(key, context, params);
       this.codeListMap.set(key, codeListItems);
     };
+    if ((_c = (_b = this.model.controlParam) == null ? void 0 : _b.ctrlParams) == null ? void 0 : _c.CATALOGFIELDS) {
+      try {
+        const tempCatalogFields = JSON.parse(
+          this.model.controlParam.ctrlParams.CATALOGFIELDS
+        );
+        if (Array.isArray(tempCatalogFields)) {
+          await Promise.all(
+            tempCatalogFields.map(async (catalog) => {
+              if (catalog.mode === "codelist") {
+                await loadCodeList(catalog.codelistId);
+              }
+            })
+          );
+        }
+      } catch (e) {
+        throw new Error(ibiz.i18n.t("runtime.control.chart.errorJson"));
+      }
+    }
     await Promise.all(
       this.model.dechartSerieses.map(async (series) => {
         const { seriesCodeListId, catalogCodeListId } = series;
-        await loadCodeList(seriesCodeListId);
         await loadCodeList(catalogCodeListId);
+        await loadCodeList(seriesCodeListId);
       })
     );
   }
@@ -24656,7 +24924,8 @@ var DashboardController = class extends ControlController {
       "CHART" /* CHART */,
       "APPMENU" /* APP_MENU */,
       "TOOLBAR" /* TOOLBAR */,
-      "LIST" /* LIST */
+      "LIST" /* LIST */,
+      "REPORTPANEL" /* REPORT_PANEL */
     ];
     await Promise.all(
       portletModels.map(async (portlet) => {
@@ -25319,6 +25588,21 @@ var ListPortletController = class extends PortletPartController {
 var RawItemPortletController = class extends PortletPartController {
 };
 
+// src/controller/control/dashboard/portlet/report-portlet/report-portlet.controller.ts
+var ReportPortletController = class extends PortletPartController {
+  /**
+   * 刷新报表部件
+   *
+   * @author tony001
+   * @date 2024-06-19 18:06:14
+   */
+  refresh() {
+    if (this.contentController) {
+      this.contentController.refresh();
+    }
+  }
+};
+
 // src/controller/control/data-view/data-view.controller.ts
 import { RuntimeModelError as RuntimeModelError54 } from "@ibiz-template/core";
 import { isNil as isNil26 } from "ramda";
@@ -28839,10 +29123,19 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
    */
   setFormController(id, controller) {
     this.formMap.set(id, controller);
+    controller.evt.on("onLoadSuccess", (event) => {
+      var _a, _b;
+      const formData = (_a = event.data) == null ? void 0 : _a[0];
+      const item = (_b = this.state.items) == null ? void 0 : _b.find((child) => child.id === id);
+      if (item && formData) {
+        item.title = formData.srfmajortext || "";
+      }
+    });
     controller.evt.on("onSaveSuccess", (event) => {
       const formData = event.data[0];
       const item = this.state.items.find((x) => x.id === id);
-      if (item) {
+      if (item && formData) {
+        item.title = formData.srfmajortext || "";
         if (item.context[this.deName] !== formData.srfkey) {
           item.context[this.deName] = formData.srfkey;
         }
@@ -28881,7 +29174,8 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
         })
       );
     }
-    await controller.remove();
+    await controller.remove({ silent: true });
+    this.formMap.delete(id);
     const index = this.state.items.findIndex((item) => item.id === id);
     if (index !== -1) {
       this.state.items.splice(index, 1);
@@ -30942,6 +31236,7 @@ var GridController = class extends MDControlController {
     }
     await this.updateRows(this.state.rows);
     this.calcGroupData(this.state.items);
+    await this.loadRemoteAgg();
     this.calcAggResult(this.state.items);
     this.calcShowMode(this.state.items);
     return items;
@@ -31029,6 +31324,7 @@ var GridController = class extends MDControlController {
       );
     }
     const params = await this.getFetchParams();
+    delete params.sort;
     const app = ibiz.hub.getApp(this.context.srfappid);
     const res = await app.deService.exec(
       aggAppDataEntityId,
@@ -32145,46 +32441,52 @@ var GridFieldColumnController = class extends GridColumnController {
    */
   calcFieldAgg(items) {
     const { aggField, aggMode, aggValueFormat, unitName } = this.model;
-    if (isNil29(aggMode) || aggMode === "NONE") {
-      return;
-    }
     const fieldName = aggField || this.model.id;
-    items = items.filter((item) => !isNil29(item[fieldName]));
     let aggValue;
-    if (this.grid.model.aggMode === "PAGE") {
-      switch (aggMode) {
-        case "SUM":
-          aggValue = items.map((item) => item[fieldName]).reduce((a, b) => plus2(a, b), 0);
-          break;
-        case "AVG":
-          aggValue = items.map((item) => item[fieldName]).reduce((a, b) => plus2(a, b), 0) / items.length;
-          break;
-        case "MAX":
-          aggValue = Math.max(...items.map((item) => item[fieldName]));
-          break;
-        case "MIN":
-          aggValue = Math.min(...items.map((item) => item[fieldName]));
-          break;
-        default:
-          throw new ModelError29(
-            this.model,
-            ibiz.i18n.t("runtime.controller.control.grid.noSupportedMode", {
-              aggMode
-            })
-          );
+    if (this.grid.model.aggMode === "ALL") {
+      if (!this.grid.state.remoteAggResult) {
+        return;
       }
-    } else if (this.grid.model.aggMode === "ALL") {
-      throw new ModelError29(
-        this.model,
-        ibiz.i18n.t("runtime.controller.control.grid.remoteAggregation")
-      );
+      aggValue = this.grid.state.remoteAggResult[fieldName] || "";
     } else {
-      throw new ModelError29(
-        this.grid.model,
-        ibiz.i18n.t("runtime.controller.control.grid.aggregateMode", {
-          aggMode: this.grid.model.aggMode
-        })
-      );
+      if (isNil29(aggMode) || aggMode === "NONE") {
+        return;
+      }
+      items = items.filter((item) => !isNil29(item[fieldName]));
+      if (this.grid.model.aggMode === "PAGE") {
+        switch (aggMode) {
+          case "SUM":
+            aggValue = items.map((item) => item[fieldName]).reduce((a, b) => plus2(a, b), 0);
+            break;
+          case "AVG":
+            aggValue = items.map((item) => item[fieldName]).reduce((a, b) => plus2(a, b), 0) / items.length;
+            break;
+          case "MAX":
+            aggValue = Math.max(
+              ...items.map((item) => item[fieldName])
+            );
+            break;
+          case "MIN":
+            aggValue = Math.min(
+              ...items.map((item) => item[fieldName])
+            );
+            break;
+          default:
+            throw new ModelError29(
+              this.model,
+              ibiz.i18n.t("runtime.controller.control.grid.noSupportedMode", {
+                aggMode
+              })
+            );
+        }
+      } else {
+        throw new ModelError29(
+          this.grid.model,
+          ibiz.i18n.t("runtime.controller.control.grid.aggregateMode", {
+            aggMode: this.grid.model.aggMode
+          })
+        );
+      }
     }
     let value = "".concat(aggValue);
     if (aggValueFormat) {
@@ -37507,41 +37809,6 @@ var KanbanController = class extends DataViewControlController {
     }
     return super.handleDataGroup();
   }
-  /**
-   * 处理自动分组
-   *
-   * @memberof KanbanController
-   */
-  handleAutoGroup() {
-    const { groupAppDEFieldId } = this.model;
-    if (groupAppDEFieldId) {
-      const { items } = this.state;
-      const groupMap = /* @__PURE__ */ new Map();
-      items.forEach((item) => {
-        const groupVal = item[groupAppDEFieldId];
-        if (isNil33(groupVal)) {
-          return;
-        }
-        if (!groupMap.has(groupVal)) {
-          groupMap.set(groupVal, []);
-        }
-        groupMap.get(groupVal).push(item);
-      });
-      const groups = [];
-      groupMap.forEach((value, key) => {
-        const codeListItem = this.groupCodeListItems.find(
-          (item) => item.value === key
-        );
-        groups.push({
-          caption: codeListItem.text,
-          color: codeListItem.color,
-          key: codeListItem.value,
-          children: [...value]
-        });
-      });
-      this.state.groups = groups;
-    }
-  }
   /**
    * 处理代码表分组
    *
@@ -37624,36 +37891,36 @@ var KanbanController = class extends DataViewControlController {
       );
     }
     this.state.updating = true;
-    const computeMoveData = (_fromIndex, _toIndex, _draggedItem, targetArray, allArray) => {
+    const computeMoveData = (_fromIndex, _toIndex, _draggedItem, targetArray, isCrossGroup) => {
       let moveData = {};
       const targetItem = targetArray[_toIndex];
       if (!targetItem) {
         let tempArray = [];
         if (targetArray.length > 0) {
           tempArray = targetArray;
-        } else if (allArray.length > 0) {
-          tempArray = allArray;
         }
-        const maxItem = tempArray.reduce((prev, curr) => {
-          const sortCondition = prev[sortField] > curr[sortField];
-          if (sortCondition && prev[this.dataEntity.keyAppDEFieldId] !== _draggedItem.srfkey) {
+        if (tempArray.length > 0) {
+          const maxItem = tempArray.reduce((prev, curr) => {
+            const sortCondition = prev[sortField] > curr[sortField];
+            if (sortCondition && prev[this.dataEntity.keyAppDEFieldId] !== _draggedItem.srfkey) {
+              return prev;
+            }
+            if (!sortCondition && curr[this.dataEntity.keyAppDEFieldId] !== _draggedItem.srfkey) {
+              return curr;
+            }
             return prev;
+          });
+          if (maxItem && maxItem[this.dataEntity.keyAppDEFieldId] !== _draggedItem.srfkey) {
+            moveData = {
+              srftargetkey: maxItem.srfkey,
+              srfmovetype: "MOVEAFTER"
+            };
           }
-          if (!sortCondition && curr[this.dataEntity.keyAppDEFieldId] !== _draggedItem.srfkey) {
-            return curr;
-          }
-          return prev;
-        });
-        if (maxItem) {
-          moveData = {
-            srftargetkey: maxItem.srfkey,
-            srfmovetype: "MOVEAFTER"
-          };
         }
       } else {
         moveData = {
           srftargetkey: targetItem.srfkey,
-          srfmovetype: "MOVEBEFORE"
+          srfmovetype: _toIndex < targetArray.length - 1 ? "MOVEBEFORE" : isCrossGroup ? "MOVEBEFORE" : "MOVEAFTER"
         };
       }
       return moveData;
@@ -37693,21 +37960,23 @@ var KanbanController = class extends DataViewControlController {
       toIndex,
       draggedItem,
       originArr,
-      this.state.items
+      info.from !== info.to
     );
     try {
-      const result = await this.moveOrderItem(draggedItem, params);
-      if (Array.isArray(result) && result.length > 0) {
-        result.forEach((item) => {
-          const index = this.state.items.findIndex(
-            (x) => x.srfkey === item[this.dataEntity.keyAppDEFieldId]
-          );
-          if (index !== -1) {
-            this.state.items[index][sortField] = item[sortField];
-          }
-        });
-      } else {
-        await this.refresh();
+      const { ok, result } = await this.moveOrderItem(draggedItem, params);
+      if (ok) {
+        if (Array.isArray(result) && result.length > 0) {
+          result.forEach((item) => {
+            const index = this.state.items.findIndex(
+              (x) => x.srfkey === item[this.dataEntity.keyAppDEFieldId]
+            );
+            if (index !== -1) {
+              this.state.items[index][sortField] = item[sortField];
+            }
+          });
+        } else {
+          await this.refresh();
+        }
       }
     } catch (error) {
       this.state.updating = false;
@@ -37733,17 +38002,17 @@ var KanbanController = class extends DataViewControlController {
     const tempContext = this.context.clone();
     tempContext[deName] = draggedItem.srfkey;
     if (!moveMeta.srftargetkey || !moveMeta.srfmovetype) {
-      throw new RuntimeModelError68(
-        this.model,
+      ibiz.log.error(
         ibiz.i18n.t("runtime.controller.common.md.computeMoveMetaError")
       );
+      return { ok: false };
     }
     const res = await this.service.moveOrderItem(
       tempContext,
       draggedItem,
       moveMeta
     );
-    return res.data;
+    return { ok: true, result: res.data };
   }
   /**
    * 批量更新修改的项，并更新后台返回的数据，然后重新计算分组和排序
@@ -39598,7 +39867,7 @@ var ReportPanelBaseGenerator = class {
    * @param {IDEReportPanel} model
    * @memberof ReportPanelBaseGenerator
    */
-  constructor(model) {
+  constructor(model, reportPanel) {
     /**
      * 配置
      *
@@ -39607,6 +39876,7 @@ var ReportPanelBaseGenerator = class {
      */
     this.config = {};
     this.model = model;
+    this.reportPanel = reportPanel;
     this.setConfig();
   }
   /**
@@ -39633,7 +39903,7 @@ var ReportPanelBaseGenerator = class {
    * @return {*}  {Promise<IData>}
    * @memberof ReportPanelBaseGenerator
    */
-  load(data) {
+  load(data = {}) {
     return Promise.resolve(data);
   }
 };
@@ -39691,7 +39961,7 @@ var UserReportPanelGenerator = class extends ReportPanelBaseGenerator {
    * @return {*}  {Promise<IData>}
    * @memberof UserReportPanelGenerator
    */
-  load(data) {
+  load(data = {}) {
     if (this.protoRef) {
       this.protoRef.setData(data);
     }
@@ -39731,6 +40001,20 @@ var BIReportPanelGenerator = class extends ReportPanelBaseGenerator {
     sourceModel.reportTag = this.model.appDEReport.id;
     this.config = sourceModel;
   }
+  /**
+   * 加载数据
+   *
+   * @author tony001
+   * @date 2024-06-20 11:06:52
+   * @param {IData} data
+   * @return {*}  {Promise<IData>}
+   */
+  load(data = {}) {
+    if (this.protoRef) {
+      this.protoRef.refresh("ALL");
+    }
+    return Promise.resolve(data);
+  }
 };
 
 // src/controller/control/report-panel/generator/generator-factory.ts
@@ -39738,12 +40022,14 @@ var ReportPanelGeneratorFactory = class {
   /**
    * 获取报表面板生成器实例
    *
+   * @author tony001
+   * @date 2024-06-20 15:06:18
    * @static
    * @param {IDEReportPanel} model
+   * @param {IReportPanelController} reportPanel
    * @return {*}  {ReportPanelBaseGenerator}
-   * @memberof ReportPanelGeneratorFactory
    */
-  static getInstance(model) {
+  static getInstance(model, reportPanel) {
     if (!model || !model.appDEReport || !model.appDEReport.reportType) {
       throw new Error(
         ibiz.i18n.t("runtime.controller.control.reportPanel.reportType")
@@ -39751,9 +40037,9 @@ var ReportPanelGeneratorFactory = class {
     }
     switch (model.appDEReport.reportType) {
       case "USER":
-        return new UserReportPanelGenerator(model);
+        return new UserReportPanelGenerator(model, reportPanel);
       case "USER2":
-        return new User2ReportPanelGenerator(model);
+        return new User2ReportPanelGenerator(model, reportPanel);
       case "DESYSBIREPORTS":
       case "SYSBICUBE":
       case "DESYSBICUBES":
@@ -39761,7 +40047,7 @@ var ReportPanelGeneratorFactory = class {
       case "SYSBIREPORT":
       case "SYSBICUBEREPORTS":
       case "ALLSYSBIREPORTS":
-        return new BIReportPanelGenerator(model);
+        return new BIReportPanelGenerator(model, reportPanel);
       default:
         throw new Error(
           ibiz.i18n.t("runtime.controller.control.reportPanel.noImplemented", {
@@ -39785,6 +40071,19 @@ var ReportPanelController = class extends ControlController {
   get _evt() {
     return this.evt;
   }
+  /**
+   * 是否为bi报表
+   *
+   * @author tony001
+   * @date 2024-06-19 18:06:02
+   * @readonly
+   */
+  get isBIReport() {
+    if (this.state.reportType === "DESYSBIREPORTS" || this.state.reportType === "SYSBICUBE" || this.state.reportType === "DESYSBICUBES" || this.state.reportType === "ALLSYSBICUBES" || this.state.reportType === "SYSBIREPORT" || this.state.reportType === "SYSBICUBEREPORTS" || this.state.reportType === "ALLSYSBIREPORTS") {
+      return true;
+    }
+    return false;
+  }
   /**
    * 初始化状态
    *
@@ -39805,7 +40104,7 @@ var ReportPanelController = class extends ControlController {
    */
   async onCreated() {
     await super.onCreated();
-    this.generator = ReportPanelGeneratorFactory.getInstance(this.model);
+    this.generator = ReportPanelGeneratorFactory.getInstance(this.model, this);
     this.dataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
       this.model.appId
@@ -39845,7 +40144,7 @@ var ReportPanelController = class extends ControlController {
    * @memberof ReportPanelController
    */
   async load(args = {}) {
-    if (this.state.reportType && (this.state.reportType === "DESYSBIREPORTS" || this.state.reportType === "SYSBICUBE" || this.state.reportType === "DESYSBICUBES" || this.state.reportType === "ALLSYSBICUBES" || this.state.reportType === "SYSBIREPORT" || this.state.reportType === "SYSBICUBEREPORTS" || this.state.reportType === "ALLSYSBIREPORTS")) {
+    if (this.state.reportType && this.isBIReport) {
       return {};
     }
     await this.startLoading();
@@ -39906,6 +40205,10 @@ var ReportPanelController = class extends ControlController {
    * @memberof ReportPanelController
    */
   getData() {
+    var _a;
+    if (this.isBIReport) {
+      return ((_a = this.generator.protoRef) == null ? void 0 : _a.state.items) || [];
+    }
     return [this.state.data];
   }
   /**
@@ -39913,23 +40216,27 @@ var ReportPanelController = class extends ControlController {
    * @date 2023-05-23 03:42:41
    */
   async refresh() {
-    this.doNextActive(() => this.load({ isInitialLoad: false }), {
-      key: "refresh"
-    });
+    if (this.isBIReport) {
+      this.generator.load();
+    } else {
+      this.doNextActive(() => this.load({ isInitialLoad: false }), {
+        key: "refresh"
+      });
+    }
   }
   /**
    * 打开设计界面
    *
    * @author tony001
    * @date 2024-06-18 16:06:46
-   * @return {*}  {Promise<boolean>}
+   * @return {*}  {Promise<IModalData>}
    */
   async openReportDesignPage() {
-    if (this.state.reportType && (this.state.reportType === "DESYSBIREPORTS" || this.state.reportType === "SYSBICUBE" || this.state.reportType === "DESYSBICUBES" || this.state.reportType === "ALLSYSBICUBES" || this.state.reportType === "SYSBIREPORT" || this.state.reportType === "SYSBICUBEREPORTS" || this.state.reportType === "ALLSYSBIREPORTS")) {
+    if (this.state.reportType && this.isBIReport) {
       const modal = ibiz.overlay.createModal(
         "iBizBIReportDesign",
         {
-          dismiss: () => modal.dismiss(),
+          dismiss: (_data) => modal.dismiss(_data),
           context: this.context,
           viewParams: this.params,
           config: this.generator.config
@@ -39942,9 +40249,9 @@ var ReportPanelController = class extends ControlController {
       );
       modal.present();
       const result = await modal.onWillDismiss();
-      return result.ok || false;
+      return result;
     }
-    return true;
+    return { ok: false, data: [] };
   }
 };
 
@@ -41660,7 +41967,8 @@ var AppHub = class {
       throw new RuntimeError68(ibiz.i18n.t("runtime.utils.firstregister"));
     }
     const appModel = await this.modelLoaderProvider.getApp(id);
-    const app = new Application(appModel);
+    const subAppRef = await this.modelLoaderProvider.getSubAppRef(id);
+    const app = new Application(appModel, subAppRef);
     this.appMap.set(id, app);
     await this.modelLoaderProvider.initApp(id);
     await app.init();
@@ -41871,6 +42179,33 @@ var ViewEngineBase = class {
   get footerToolbar() {
     return this.view.getController("footertoolbar");
   }
+  /**
+   * 搜索表单控制器
+   * @author lxm
+   * @date 2023-05-22 01:56:25
+   * @readonly
+   */
+  get searchForm() {
+    return this.view.getController("searchform");
+  }
+  /**
+   * 搜索栏控制器
+   * @author lxm
+   * @date 2023-05-22 01:56:25
+   * @readonly
+   */
+  get searchBar() {
+    return this.view.getController("searchbar");
+  }
+  /**
+   * 获取分页搜索视图上移的搜索表单控制器
+   * @author lxm
+   * @date 2023-05-22 01:56:25
+   * @readonly
+   */
+  get tabSearchForm() {
+    return this.view.getController("tabsearchform");
+  }
   /**
    * 获取视图布局面板控制器
    * @author lxm
@@ -42010,6 +42345,20 @@ var ViewEngineBase = class {
     if (key === "ShortCut" /* SHOTR_CUT */) {
       return this.onShortCut(_args);
     }
+    if (key === "ToggleFilter" /* TOGGLE_FILTER */) {
+      this.toggleFilter();
+      return null;
+    }
+    if (key === "Search" /* SEARCH */) {
+      const searchForm = this.searchForm || this.tabSearchForm;
+      await searchForm.search();
+      return null;
+    }
+    if (key === "Reset" /* RESET */) {
+      const searchForm = this.searchForm || this.tabSearchForm;
+      await searchForm.reset();
+      return null;
+    }
     return void 0;
   }
   /**
@@ -42191,6 +42540,20 @@ var ViewEngineBase = class {
       data.srfdataaccaction
     );
   }
+  /**
+   * 切换搜索表单的显示与否
+   * @author lxm
+   * @date 2023-06-06 09:20:35
+   * @protected
+   */
+  toggleFilter() {
+    if (this.searchForm) {
+      const searchformContainer = this.viewLayoutPanel.panelItems.view_searchform;
+      if (searchformContainer) {
+        searchformContainer.state.visible = !searchformContainer.state.visible;
+      }
+    }
+  }
 };
 
 // src/engine/md-view.engine.ts
@@ -42207,24 +42570,6 @@ var MDViewEngine = class extends ViewEngineBase {
   get xdataControlName() {
     return this.view.model.xdataControlName;
   }
-  /**
-   * 搜索表单控制器
-   * @author lxm
-   * @date 2023-05-22 01:56:25
-   * @readonly
-   */
-  get searchForm() {
-    return this.view.getController("searchform");
-  }
-  /**
-   * 搜索栏控制器
-   * @author lxm
-   * @date 2023-05-22 01:56:25
-   * @readonly
-   */
-  get searchBar() {
-    return this.view.getController("searchbar");
-  }
   /**
    * 获取分页搜索视图上移的工具栏控制器
    * @author lxm
@@ -42236,15 +42581,6 @@ var MDViewEngine = class extends ViewEngineBase {
   get tabToolbar() {
     return this.view.getController("tabtoolbar");
   }
-  /**
-   * 获取分页搜索视图上移的搜索表单控制器
-   * @author lxm
-   * @date 2023-05-22 01:56:25
-   * @readonly
-   */
-  get tabSearchForm() {
-    return this.view.getController("tabsearchform");
-  }
   /**
    * 获取分页搜索视图上移的搜索栏控制器
    * @author lxm
@@ -42383,10 +42719,6 @@ var MDViewEngine = class extends ViewEngineBase {
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
-    if (key === "ToggleFilter" /* TOGGLE_FILTER */) {
-      this.toggleFilter();
-      return null;
-    }
     if (key === "Edit" /* EDIT */ || key === "View" /* VIEW */) {
       return this.openData(args);
     }
@@ -42409,16 +42741,6 @@ var MDViewEngine = class extends ViewEngineBase {
       await this.exportData(args);
       return null;
     }
-    if (key === "Search" /* SEARCH */) {
-      const searchForm = this.searchForm || this.tabSearchForm;
-      await searchForm.search();
-      return null;
-    }
-    if (key === "Reset" /* RESET */) {
-      const searchForm = this.searchForm || this.tabSearchForm;
-      await searchForm.reset();
-      return null;
-    }
     if (key === "Copy" /* COPY */) {
       this.copy(args);
       return null;
@@ -42634,20 +42956,6 @@ var MDViewEngine = class extends ViewEngineBase {
     const visible = !!(searchBar.enableQuickSearch || searchBar.enableGroup || searchBar.enableFilter === true);
     return visible;
   }
-  /**
-   * 切换搜索表单的显示与否
-   * @author lxm
-   * @date 2023-06-06 09:20:35
-   * @protected
-   */
-  toggleFilter() {
-    if (this.searchForm) {
-      const searchformContainer = this.viewLayoutPanel.panelItems.view_searchform;
-      if (searchformContainer) {
-        searchformContainer.state.visible = !searchformContainer.state.visible;
-      }
-    }
-  }
   /**
    * 计算移除的模型名称
    *
@@ -44097,7 +44405,10 @@ var en = {
           noSupportSequence: "Charts do not support sequence types at this time {seriesType}",
           noFindSequence: "Cannot find generator for {seriesIndex} sequence!",
           noInitialised: "The chart object is not properly initialised",
-          noCalculated: "Options have not been calculated."
+          noCalculated: "Options have not been calculated.",
+          classificationNotArray: "The configured classification attribute value is not an array",
+          classificationNotString: "The configured classification attribute value is not an string",
+          errorJson: "JSON parsing error"
         },
         dataView: {
           noBehaviourGroup: "No interface behaviour group is configured for the action",
@@ -44679,7 +44990,10 @@ var zhCn = {
           noSupportSequence: "\u56FE\u8868\u6682\u672A\u652F\u6301\u5E8F\u5217\u7C7B\u578B{seriesType}",
           noFindSequence: "\u627E\u4E0D\u5230{seriesIndex}\u5E8F\u5217\u7684generator\uFF01",
           noInitialised: "chart\u5BF9\u8C61\u6CA1\u6709\u6B63\u786E\u521D\u59CB\u5316",
-          noCalculated: "options\u8FD8\u6CA1\u8BA1\u7B97"
+          noCalculated: "options\u8FD8\u6CA1\u8BA1\u7B97",
+          classificationNotArray: "\u914D\u7F6E\u7684\u5206\u7C7B\u5C5E\u6027\u503C\u4E0D\u662F\u4E00\u4E2A\u6570\u7EC4",
+          classificationNotString: "\u914D\u7F6E\u7684\u5206\u7C7B\u5C5E\u6027\u503C\u4E0D\u662F\u4E00\u4E2A\u5B57\u7B26\u4E32",
+          errorJson: "JSON\u89E3\u6790\u9519\u8BEF"
         },
         dataView: {
           noBehaviourGroup: "\u64CD\u4F5C\u9879\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4",
@@ -45365,6 +45679,7 @@ export {
   RemotePluginItem,
   ReportPanelController,
   ReportPanelService,
+  ReportPortletController,
   RouteConst,
   ScriptFactory,
   ScriptFunction,