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

package/dist/index.esm.js

@@ -24656,7 +24656,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 +25320,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 +28855,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 +28906,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 +30968,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 +31056,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 +32173,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) {
@@ -37624,36 +37658,36 @@ var KanbanController = class extends DataViewControlController {
       );
     }
     this.state.updating = true;
-    const computeMoveData = (_fromIndex, _toIndex, _draggedItem, targetArray, allArray) => {
+    const computeMoveData = (_fromIndex, _toIndex, _draggedItem, targetArray) => {
       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: _fromIndex > _toIndex ? "MOVEBEFORE" : "MOVEAFTER"
         };
       }
       return moveData;
@@ -37688,26 +37722,22 @@ var KanbanController = class extends DataViewControlController {
         );
       }
     }
-    const params = computeMoveData(
-      fromIndex,
-      toIndex,
-      draggedItem,
-      originArr,
-      this.state.items
-    );
+    const params = computeMoveData(fromIndex, toIndex, draggedItem, originArr);
     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 +37763,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 +39628,7 @@ var ReportPanelBaseGenerator = class {
    * @param {IDEReportPanel} model
    * @memberof ReportPanelBaseGenerator
    */
-  constructor(model) {
+  constructor(model, reportPanel) {
     /**
      * 配置
      *
@@ -39607,6 +39637,7 @@ var ReportPanelBaseGenerator = class {
      */
     this.config = {};
     this.model = model;
+    this.reportPanel = reportPanel;
     this.setConfig();
   }
   /**
@@ -39633,7 +39664,7 @@ var ReportPanelBaseGenerator = class {
    * @return {*}  {Promise<IData>}
    * @memberof ReportPanelBaseGenerator
    */
-  load(data) {
+  load(data = {}) {
     return Promise.resolve(data);
   }
 };
@@ -39691,7 +39722,7 @@ var UserReportPanelGenerator = class extends ReportPanelBaseGenerator {
    * @return {*}  {Promise<IData>}
    * @memberof UserReportPanelGenerator
    */
-  load(data) {
+  load(data = {}) {
     if (this.protoRef) {
       this.protoRef.setData(data);
     }
@@ -39731,6 +39762,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 +39783,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,10 +39798,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);
-      case "DESYSBIREPORTS":
+        return new User2ReportPanelGenerator(model, reportPanel);
       case "DESYSBIREPORTS":
       case "SYSBICUBE":
       case "DESYSBICUBES":
@@ -39762,7 +39808,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", {
@@ -39786,6 +39832,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;
+  }
   /**
    * 初始化状态
    *
@@ -39806,7 +39865,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
@@ -39846,7 +39905,7 @@ var ReportPanelController = class extends ControlController {
    * @memberof ReportPanelController
    */
   async load(args = {}) {
-    if (this.state.reportType && (this.state.reportType === "DESYSBIREPORTS" || 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();
@@ -39907,6 +39966,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];
   }
   /**
@@ -39914,23 +39977,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 === "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(
-        "BIReportDesign",
+        "iBizBIReportDesign",
         {
-          dismiss: () => modal.dismiss(),
+          dismiss: (_data) => modal.dismiss(_data),
           context: this.context,
           viewParams: this.params,
           config: this.generator.config
@@ -39943,9 +40010,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: [] };
   }
 };
 
@@ -41872,6 +41939,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
@@ -42011,6 +42105,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;
   }
   /**
@@ -42192,6 +42300,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
@@ -42208,24 +42330,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
@@ -42237,15 +42341,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
@@ -42384,10 +42479,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);
     }
@@ -42410,16 +42501,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;
@@ -42635,20 +42716,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;
-      }
-    }
-  }
   /**
    * 计算移除的模型名称
    *
@@ -45366,6 +45433,7 @@ export {
   RemotePluginItem,
   ReportPanelController,
   ReportPanelService,
+  ReportPortletController,
   RouteConst,
   ScriptFactory,
   ScriptFunction,