@ibiz-template/runtime 0.7.26 → 0.7.28-alpha.0

package/dist/index.esm.js

@@ -15107,13 +15107,19 @@ var BIReportUtil = class {
           params
         );
         if (res.data) {
-          config = this.translateReportToConfig(res.data);
+          config = await this.translateDEReportToConfig(res.data);
+          if (data.srfreporttag) {
+            config.reportTag = data.srfreporttag;
+          }
+          if (data.srfbischematag) {
+            config.selectedSchemeId = data.srfbischematag;
+          }
         }
       } catch (error) {
         throw new RuntimeError25(error.message);
       }
     } else if (data.mode === "UI") {
-      config = data.reportPanel.generator.config;
+      config = this.translateReportPanelToConfig(data.reportPanel.model);
     }
     const modal = ibiz.overlay.createModal(
       "iBizBIReportDesign",
@@ -15134,7 +15140,7 @@ var BIReportUtil = class {
     return result;
   }
   /**
-   * 报表数据转化配置数据
+   * 实体报表数据转化配置数据
    *
    * @author tony001
    * @date 2024-06-30 11:06:00
@@ -15142,7 +15148,7 @@ var BIReportUtil = class {
    * @param {IData} data
    * @return {*}  {IData}
    */
-  translateReportToConfig(data) {
+  async translateDEReportToConfig(data) {
     const config = {};
     let biReportUIModel = {};
     if (data.bireportuimodel) {
@@ -15151,7 +15157,9 @@ var BIReportUtil = class {
     config.selectChartType = (biReportUIModel == null ? void 0 : biReportUIModel.selectChartType) || "NUMBER";
     config.reportTag = "bi_report";
     config.selectCubeId = data.pssysbicubeid;
+    config.selectedSchemeId = data.pssysbischemeid;
     const biReportItems = {};
+    const extendDimension = (biReportUIModel == null ? void 0 : biReportUIModel.extendDimension) || [];
     if (data.pssysbireportitems && data.pssysbireportitems.length > 0) {
       data.pssysbireportitems.forEach((item) => {
         var _a, _b;
@@ -15163,19 +15171,35 @@ var BIReportUtil = class {
             pssysbischemeid: item.pssysbischemeid,
             pssysbicubemeasureid: item.pssysbicubemeasureid,
             pssysbicubeid: item.pssysbicubeid,
-            codename: (_a = item.pssysbicubemeasureid) == null ? void 0 : _a.split(".").pop()
+            codename: (_a = item.pssysbicubemeasureid) == null ? void 0 : _a.split(".").pop(),
+            pssysbicubemeasurename: item.pssysbicubemeasurename
           });
         }
         if (item.birepitemtype === "DIMENSION") {
           if (!biReportItems.dimension) {
             biReportItems.dimension = [];
           }
-          biReportItems.dimension.push({
-            pssysbischemeid: item.pssysbischemeid,
-            pssysbicubedimensionid: item.pssysbicubedimensionid,
-            pssysbicubeid: item.pssysbicubeid,
-            codename: (_b = item.pssysbicubedimensionid) == null ? void 0 : _b.split(".").pop()
-          });
+          if (extendDimension.length > 0 && !biReportItems.extendDimension) {
+            biReportItems.extendDimension = [];
+          }
+          const codename = (_b = item.pssysbicubedimensionid) == null ? void 0 : _b.split(".").pop();
+          if (extendDimension.includes(codename)) {
+            biReportItems.extendDimension.push({
+              pssysbischemeid: item.pssysbischemeid,
+              pssysbicubedimensionid: item.pssysbicubedimensionid,
+              pssysbicubeid: item.pssysbicubeid,
+              codename,
+              pssysbicubedimensionname: item.pssysbicubedimensionname
+            });
+          } else {
+            biReportItems.dimension.push({
+              pssysbischemeid: item.pssysbischemeid,
+              pssysbicubedimensionid: item.pssysbicubedimensionid,
+              pssysbicubeid: item.pssysbicubeid,
+              codename,
+              pssysbicubedimensionname: item.pssysbicubedimensionname
+            });
+          }
         }
       });
     }
@@ -15188,9 +15212,179 @@ var BIReportUtil = class {
     if (biReportUIModel.style) {
       Object.assign(propertyData, { style: biReportUIModel.style });
     }
+    if (biReportUIModel.filter) {
+      propertyData.data.filter = biReportUIModel.filter;
+    }
     config.propertyData = propertyData;
     return config;
   }
+  /**
+   * 报表面板数据转化配置界面数据
+   *
+   * @param {IDEReportPanel} model
+   * @return {*}  {Promise<IData>}
+   * @memberof BIReportUtil
+   */
+  async translateReportPanelToConfig(model) {
+    const config = {};
+    const biReportDatas = {};
+    const { appDEReport } = model;
+    const propertyData = {
+      data: biReportDatas
+    };
+    config.reportTag = appDEReport.id;
+    const tempAppBISchemeId = appDEReport.appBISchemeId.split(".").pop();
+    config.selectedSchemeId = tempAppBISchemeId;
+    const {
+      name,
+      appBICubeId,
+      appBIReportDimensions,
+      appBIReportMeasures,
+      reportUIModel
+    } = appDEReport.appBIReport;
+    propertyData.caption = name;
+    config.selectCubeId = "".concat(tempAppBISchemeId, ".").concat(appBICubeId);
+    let extendDimension = [];
+    if (reportUIModel) {
+      const reportUIModelObj = JSON.parse(reportUIModel);
+      config.selectChartType = reportUIModelObj.selectChartType;
+      propertyData.style = reportUIModelObj.style;
+      propertyData.data.filter = reportUIModelObj.filter;
+      if (reportUIModelObj.extendDimension) {
+        extendDimension = reportUIModelObj.extendDimension;
+      }
+    } else {
+      config.selectChartType = "NUMBER";
+    }
+    if (appBIReportMeasures && appBIReportMeasures.length > 0) {
+      appBIReportMeasures.forEach((measure) => {
+        if (!biReportDatas.measure) {
+          biReportDatas.measure = [];
+        }
+        biReportDatas.measure.push({
+          pssysbischemeid: tempAppBISchemeId,
+          pssysbicubemeasureid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId, ".").concat(measure.measureTag),
+          pssysbicubemeasurename: measure.measureName,
+          pssysbicubeid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId),
+          codename: measure.measureTag
+        });
+      });
+    }
+    if (appBIReportDimensions && appBIReportDimensions.length > 0) {
+      appBIReportDimensions.forEach((dimension) => {
+        if (!biReportDatas.dimension) {
+          biReportDatas.dimension = [];
+        }
+        if (extendDimension.length > 0 && !biReportDatas.extendDimension) {
+          biReportDatas.extendDimension = [];
+        }
+        if (extendDimension.includes(dimension.dimensionTag)) {
+          biReportDatas.extendDimension.push({
+            pssysbischemeid: tempAppBISchemeId,
+            pssysbicubedimensionid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId, ".").concat(dimension.dimensionTag),
+            pssysbicubedimensionname: dimension.dimensionName,
+            pssysbicubeid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId),
+            codename: dimension.dimensionTag,
+            pscodelistid: dimension.appCodeListId
+          });
+        } else {
+          biReportDatas.dimension.push({
+            pssysbischemeid: tempAppBISchemeId,
+            pssysbicubedimensionid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId, ".").concat(dimension.dimensionTag),
+            pssysbicubedimensionname: dimension.dimensionName,
+            pssysbicubeid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId),
+            codename: dimension.dimensionTag,
+            pscodelistid: dimension.appCodeListId
+          });
+        }
+      });
+    }
+    config.propertyData = propertyData;
+    return config;
+  }
+  /**
+   * 指定参数数据转化为应用BI报表数据
+   *
+   * @param {{
+   *     reportTag: string;
+   *     selectChartType: string;
+   *     selectCubeId: string;
+   *     caption: string;
+   *     data: IData;
+   *     style: IData;
+   *   }} arg
+   * @return {*}  {Promise<IData>}
+   * @memberof BIReportUtil
+   */
+  async translateDataToAppBIReport(arg) {
+    const { reportTag, selectChartType, selectCubeId, caption, data, style } = arg;
+    const app = ibiz.hub.getApp(ibiz.env.appId);
+    const targetData = {
+      pssysbireportitems: [],
+      pssysbischemeid: selectCubeId.split(".")[0],
+      pssysbicubeid: selectCubeId,
+      bireportuimodel: JSON.stringify({
+        selectChartType,
+        style,
+        filter: data == null ? void 0 : data.filter,
+        group: data == null ? void 0 : data.group
+      }),
+      pssysappid: app.model.codeName,
+      bireporttag: reportTag,
+      pssysbireportname: caption,
+      validflag: 1
+    };
+    if (data && data.measure) {
+      data.measure.forEach((measure) => {
+        const tempMeasure = {
+          birepitemtype: "MEASURE",
+          pssysbischemeid: measure.pssysbischemeid,
+          pssysbicubemeasureid: measure.pssysbicubemeasureid,
+          pssysbicubeid: measure.pssysbicubeid,
+          pssysbicubename: measure.pssysbicubename,
+          pssysbicubemeasurename: measure.pssysbicubemeasurename,
+          validflag: 1
+        };
+        targetData.pssysbireportitems.push(tempMeasure);
+      });
+    }
+    if (data && data.dimension) {
+      data.dimension.forEach((dimension) => {
+        const tempDimension = {
+          birepitemtype: "DIMENSION",
+          pssysbischemeid: dimension.pssysbischemeid,
+          pssysbicubedimensionid: dimension.pssysbicubedimensionid,
+          pssysbicubeid: dimension.pssysbicubeid,
+          pssysbicubename: dimension.pssysbicubename,
+          pssysbicubedimensionname: dimension.pssysbicubedimensionname,
+          validflag: 1
+        };
+        targetData.pssysbireportitems.push(tempDimension);
+      });
+    }
+    if (data && data.extendDimension) {
+      const extendDimension = [];
+      data.extendDimension.forEach((dimension) => {
+        extendDimension.push(dimension.codename);
+        const tempDimension = {
+          birepitemtype: "DIMENSION",
+          pssysbischemeid: dimension.pssysbischemeid,
+          pssysbicubedimensionid: dimension.pssysbicubedimensionid,
+          pssysbicubeid: dimension.pssysbicubeid,
+          pssysbicubename: dimension.pssysbicubename,
+          pssysbicubedimensionname: dimension.pssysbicubedimensionname,
+          validflag: 1
+        };
+        targetData.pssysbireportitems.push(tempDimension);
+      });
+      const uiModel = JSON.parse(targetData.bireportuimodel);
+      targetData.bireportuimodel = JSON.stringify({
+        ...uiModel,
+        extendDimension
+      });
+    }
+    return targetData;
+  }
 };
 
 // src/utils/dr-ctrl-util/index.ts
@@ -20717,6 +20911,23 @@ var BaseSeriesGenerator = class {
     }
     return isExclude ? void 0 : val;
   }
+  /**
+   * 获取序列颜色
+   *
+   * @param {string} group
+   * @return {*}  {string}
+   * @memberof BaseSeriesGenerator
+   */
+  getSeriesColor(group) {
+    let color = "";
+    const maps = this.chartGenerator.codeListMap.values();
+    const codeListItems = [...maps].flat();
+    const item = codeListItems.find((x) => x.text === group);
+    if (item) {
+      color = item.color || "";
+    }
+    return color;
+  }
   /**
    * 准备图表数据
    * @return {*}
@@ -20909,6 +21120,10 @@ var BaseSeriesGenerator = class {
       if (group !== DEFAULT_GROUP) {
         options.name = group;
       }
+      const color = this.getSeriesColor(group);
+      if (color) {
+        options.color = color;
+      }
       if (this.seriesUserParam) {
         options = mergeDeepRight(options, this.seriesUserParam);
       }
@@ -22129,6 +22344,9 @@ var ChartService = class extends MDControlService {
 
 // src/controller/control/chart/chart.controller.ts
 var ChartController = class extends MDControlController {
+  get _evt() {
+    return this.evt;
+  }
   initState() {
     super.initState();
     this.state.size = 1e3;
@@ -22347,7 +22565,7 @@ var ChartController = class extends MDControlController {
    * @author lxm
    * @date 2023-06-07 10:03:48
    */
-  updateChart() {
+  async updateChart() {
     if (!this.chart) {
       throw new RuntimeError43(
         ibiz.i18n.t("runtime.controller.control.chart.noInitialised")
@@ -22358,6 +22576,7 @@ var ChartController = class extends MDControlController {
         ibiz.i18n.t("runtime.controller.control.chart.noCalculated")
       );
     }
+    await this._evt.emit("onBeforeUpdate", void 0);
     this.chart.setOption(this.options, { notMerge: true });
     this.resizeChart();
   }
@@ -25160,6 +25379,22 @@ var ToolbarController = class extends ControlController {
             }
           }
         }
+        const groupItem = item;
+        if (groupItem.groupExtractMode && groupItem.uiactionGroup && groupItem.uiactionGroup.uiactionGroupDetails) {
+          groupItem.uiactionGroup.uiactionGroupDetails.forEach(
+            (detail) => {
+              const actionid = detail.uiactionId;
+              if (actionid) {
+                const buttonState = new UIActionButtonState(
+                  detail.id,
+                  this.context.srfappid,
+                  actionid
+                );
+                this.state.buttonsState.addState(detail.id, buttonState);
+              }
+            }
+          );
+        }
       },
       { childrenFields: ["detoolbarItems"] }
     );
@@ -25316,14 +25551,6 @@ var DashboardController = class extends ControlController {
      * @type {{ [key: string]: IPortletController }}
      */
     this.portlets = {};
-    /**
-     * 启用动态
-     *
-     * @author tony001
-     * @date 2024-06-27 11:06:24
-     * @type {boolean}
-     */
-    this.enableDynamic = false;
   }
   initState() {
     super.initState();
@@ -25332,9 +25559,6 @@ var DashboardController = class extends ControlController {
     this.model.enableCustomized = true;
     await super.onCreated();
     await this.initPortlets(this.model.controls);
-    if (this.controlParams.enabledynamic === "true") {
-      this.enableDynamic = true;
-    }
     const { appDataEntityId } = this.view.model;
     if (appDataEntityId) {
       this.view.evt.on("onDataChange", (event) => {
@@ -25430,20 +25654,47 @@ var DashboardController = class extends ControlController {
   async loadAllDynaPortlet() {
     var _a;
     const app = ibiz.hub.getApp(ibiz.env.appId);
-    const res = await app.deService.exec(
-      "psappportlet",
-      "fetchdefault",
-      this.context,
-      {
-        size: 1e3,
-        n_pssysappid_eq: app.model.codeName,
-        n_dynamodelflag_noteq: 0
+    const result = [];
+    if (this.controlParams.dynamiccodelist) {
+      const dynamicCodeListTag = this.controlParams.dynamiccodelist;
+      const codeListItems = await app.codeList.get(
+        dynamicCodeListTag,
+        this.context,
+        this.params
+      );
+      if (codeListItems && codeListItems.length > 0) {
+        codeListItems.forEach((item) => {
+          result.push({
+            ...item.data,
+            psappportletid: item.value,
+            psappportletname: item.text
+          });
+        });
+      }
+    } else {
+      const res = await app.deService.exec(
+        "psappportlet",
+        "fetchdefault",
+        this.context,
+        {
+          size: 1e3,
+          n_pssysappid_eq: app.model.codeName,
+          n_dynamodelflag_noteq: 0
+        }
+      );
+      if (res && ((_a = res.data) == null ? void 0 : _a.length) > 0) {
+        res.data.forEach((item) => {
+          result.push({
+            psappportletid: item.psappportletid,
+            codename: item.codename,
+            psappportletname: item.psappportletname,
+            groupcodename: "Ungroup",
+            groupname: "\u672A\u5206\u7C7B"
+          });
+        });
       }
-    );
-    if (res && ((_a = res.data) == null ? void 0 : _a.length) > 0) {
-      return res.data;
     }
-    return [];
+    return result;
   }
   /**
    * 通过指定标识加载门户部件
@@ -29875,18 +30126,22 @@ var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
    * @date 2023-11-22 04:50:19
    */
   create(index) {
+    const item = {};
     if (this.isSingleData) {
-      this.setValue({});
+      this.setValue(item);
     } else {
       let tempValue = this.value;
       tempValue = tempValue ? [...tempValue] : [];
       if (index !== void 0) {
-        tempValue.splice(index, 0, {});
+        tempValue.splice(index, 0, item);
       } else {
-        tempValue.push({});
+        tempValue.push(item);
       }
       this.setValue(tempValue);
     }
+    this.form.evt.emit("onMDCtrlNew", {
+      args: item
+    });
   }
   /**
    * 删除数据
@@ -29903,6 +30158,9 @@ var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
       return index !== i;
     });
     this.setValue(newArr);
+    this.form.evt.emit("onMDCtrlRemove", {
+      args: newArr
+    });
   }
   /**
    * 表单数据变更通知
@@ -31217,6 +31475,24 @@ var GridService = class extends MDControlService {
     res = this.handleResponse(res);
     return res;
   }
+  /**
+   * 移动并排序数据
+   *
+   * @param {IContext} context
+   * @param {ControlVO} data
+   * @param {IData} args
+   * @return {*}  {Promise<IHttpResponse<ControlVO[]>>}
+   * @memberof GridService
+   */
+  async moveOrderItem(context, data, params) {
+    const moveAction = this.model.moveControlAction.appDEMethodId;
+    const deName = calcDeCodeNameById(this.model.appDataEntityId);
+    const tempContext = context.clone();
+    tempContext[deName] = data.srfkey;
+    let res = await this.exec(moveAction, tempContext, params);
+    res = this.handleResponse(res);
+    return res;
+  }
 };
 
 // src/controller/control/grid/grid/entity-schema.ts
@@ -32685,35 +32961,32 @@ var GridController = class extends MDControlController {
     super.actionNotification(tag, { ...opts || {} });
   }
   /**
-   * 拖拽变更事件处理回调
-   * @author: zzq
-   * @date 2024-04-22 18:12:58
-   * @return {*}  {Promise<void>}
+   * 拖拽改变
+   * @param dragging 拖拽目标
+   * @param drop 放置目标
+   * @param dropType 放置类型
    */
-  async onDragChange() {
-    const sortField = this.model.orderValueAppDEFieldId;
-    const getNextSort = (num) => {
-      return num + (100 - num % 100);
+  async onDragChange(dragging, drop, dropType) {
+    var _a;
+    const moveAction = (_a = this.model.moveControlAction) == null ? void 0 : _a.appDEMethodId;
+    if (!moveAction) {
+      throw new RuntimeModelError63(
+        this.model,
+        ibiz.i18n.t("runtime.controller.common.md.noMoveDataCconfig")
+      );
+    }
+    const moveParams = {
+      srftargetkey: drop.data.srfkey,
+      srfmovetype: dropType === "prev" ? "MOVEBEFORE" : "MOVEAFTER"
     };
-    const changedArr = this.state.rows.map((row) => row.data);
-    let lastSort;
-    const modifiedItems = [];
-    changedArr.forEach((item) => {
-      if (lastSort === void 0) {
-        lastSort = item[sortField] || 100;
-        if (!item[sortField]) {
-          item[sortField] = lastSort;
-          modifiedItems.push(item);
-        }
-      } else {
-        if (!item[sortField] || lastSort >= item[sortField]) {
-          item[sortField] = getNextSort(lastSort);
-          modifiedItems.push(item);
-        }
-        lastSort = item[sortField];
-      }
-    });
-    this.updateChangedItems(modifiedItems);
+    const res = await this.service.moveOrderItem(
+      this.context,
+      dragging.data,
+      moveParams
+    );
+    if (res.ok) {
+      this.refresh();
+    }
   }
   /**
    * 更新改变项数据
@@ -32764,7 +33037,13 @@ var GridController = class extends MDControlController {
 };
 
 // src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts
-import { DataTypes as DataTypes4, ModelError as ModelError29, plus as plus3 } from "@ibiz-template/core";
+import {
+  DataTypes as DataTypes4,
+  ModelError as ModelError29,
+  plus as plus3,
+  base64ToStr,
+  isEmoji
+} from "@ibiz-template/core";
 import dayjs6 from "dayjs";
 import { debounce as debounce2 } from "lodash-es";
 import { clone as clone32, isNil as isNil29 } from "ramda";
@@ -33061,6 +33340,9 @@ var GridFieldColumnController = class extends GridColumnController {
       return ValueExUtil.toText(this.model, value);
     }
     const strVal = "".concat(isNilOrEmpty8(value) ? "" : value);
+    if (isEmoji(strVal)) {
+      return base64ToStr(strVal);
+    }
     if (!this.valueFormat) {
       return strVal;
     }
@@ -37126,92 +37408,59 @@ var TreeController = class extends MDControlController {
    * @return {*}  {Promise<void>}
    */
   async onNodeDrop(draggingNode, dropNode, dropType) {
-    var _a, _b, _c;
+    var _a, _b;
     if (dropType === "inner" && !dropNode._leaf && dropNode._children === void 0) {
       await this.expandNodeByKey([dropNode._id]);
     }
-    const modifiedNodeDatas = [];
     const draggingNodeModel = this.getNodeModel(draggingNode._nodeId);
     const dropInNode = dropType === "inner" ? dropNode : dropNode._parent;
-    const isChangedParent = (dropNode == null ? void 0 : dropNode._id) !== ((_a = draggingNode._parent) == null ? void 0 : _a._id);
+    const isChangedParent = ((_a = dropNode._parent) == null ? void 0 : _a._id) !== ((_b = draggingNode._parent) == null ? void 0 : _b._id);
     let orderNodeModel = this.getNodeModel(dropNode._nodeId);
-    if (dropType === "inner" || ((_b = dropNode._parent) == null ? void 0 : _b._id) !== ((_c = draggingNode._parent) == null ? void 0 : _c._id)) {
+    if (dropType === "inner" || isChangedParent) {
       const dropNodeRs = this.findDropNodeRS(
         dropInNode._nodeId,
         draggingNodeModel.appDataEntityId
       );
       if (dropNodeRs) {
         draggingNode._deData[dropNodeRs.pickupDEFName] = dropInNode._value;
-        modifiedNodeDatas.push(draggingNode);
         orderNodeModel = this.getNodeModel(dropNodeRs.childDETreeNodeId);
       }
-    }
-    const originArr = draggingNode._parent._children;
-    originArr.splice(originArr.indexOf(draggingNode), 1);
-    if (dropType === "inner") {
-      if (!dropNode._children) {
-        dropNode._children = [];
-        dropNode._leaf = true;
-        this.state.expandedKeys.push(dropNode._id);
-      }
-      dropNode._children.push(draggingNode);
-    } else {
-      let insertIndex = dropInNode._children.indexOf(dropNode);
-      if (dropType === "next") {
-        insertIndex += 1;
-      }
-      dropInNode._children.splice(insertIndex, 0, draggingNode);
-    }
-    if (dropType === "inner" || isChangedParent) {
       draggingNode._parent = dropInNode;
       draggingNode._nodeId = orderNodeModel.id;
       this.state.expandedKeys = this.calcExpandedKeys([dropInNode]);
+      await this.updateDeNodeData([draggingNode]);
     }
-    const { sortAppDEFieldId, sortDir, allowOrder } = orderNodeModel;
-    if (allowOrder === true) {
-      if (!sortAppDEFieldId) {
-        throw new RuntimeModelError66(
-          orderNodeModel,
-          ibiz.i18n.t("runtime.controller.control.tree.sortAttribute")
-        );
-      }
-      const sortField = sortAppDEFieldId.toLowerCase();
-      const isAsc = sortDir === "ASC";
-      const changedArr = [...dropInNode._children];
-      if (!isAsc) {
-        changedArr.reverse();
-      }
-      const getNextSort = (num) => {
-        return num + (100 - num % 100);
-      };
-      const getSort = (deData) => {
-        return deData[sortField] || 0;
+    const { moveAppDEActionId, appDataEntityId, allowOrder } = orderNodeModel;
+    if (!moveAppDEActionId) {
+      throw new RuntimeModelError66(
+        this.model,
+        ibiz.i18n.t("runtime.controller.common.md.noMoveDataCconfig")
+      );
+    }
+    if (dropType !== "inner" && allowOrder) {
+      const moveParams = {
+        srftargetkey: dropNode.srfkey,
+        srfmovetype: dropType === "prev" ? "MOVEBEFORE" : "MOVEAFTER"
       };
-      let lastSort;
-      changedArr.forEach((item, index) => {
-        const deData = item._deData;
-        if (lastSort === void 0) {
-          if (item === draggingNode) {
-            if (index === 0) {
-              lastSort = 100;
-            } else {
-              lastSort = getNextSort(getSort(changedArr[index - 1]._deData));
-            }
-            deData[sortField] = lastSort;
-            if (modifiedNodeDatas.indexOf(item) === -1) {
-              modifiedNodeDatas.push(item);
-            }
-          }
+      const app = ibiz.hub.getApp(this.context.srfappid);
+      const deName = calcDeCodeNameById(appDataEntityId);
+      const tempContext = this.context.clone();
+      tempContext[deName] = draggingNode.srfkey;
+      const res = await app.deService.exec(
+        appDataEntityId,
+        moveAppDEActionId,
+        tempContext,
+        moveParams
+      );
+      if (res.ok) {
+        if (isChangedParent) {
+          await this.refreshNodeChildren(draggingNode, true);
+          await this.refreshNodeChildren(dropInNode);
         } else {
-          if (lastSort >= getSort(deData)) {
-            deData[sortField] = getNextSort(lastSort);
-            modifiedNodeDatas.push(item);
-          }
-          lastSort = getSort(deData);
+          await this.refreshNodeChildren(dropInNode);
         }
-      });
+      }
     }
-    await this.updateDeNodeData(modifiedNodeDatas);
     this._evt.emit("onAfterNodeDrop", { isChangedParent });
   }
   /**
@@ -40526,7 +40775,11 @@ var BIReportPanelGenerator = class extends ReportPanelBaseGenerator {
    * @return {*}  {Promise<void>}
    */
   async initConfig() {
-    this.config = this.translateReportToConfig(this.model);
+    const { appDEReport } = this.model;
+    const { appBIReport } = appDEReport;
+    const appBISchemeId = appDEReport.appBISchemeId.split(".").pop();
+    appBIReport.appBISchemeId = appBISchemeId;
+    this.config = appBIReport;
   }
   /**
    * 加载数据
@@ -40542,71 +40795,6 @@ var BIReportPanelGenerator = class extends ReportPanelBaseGenerator {
     }
     return Promise.resolve(data);
   }
-  /**
-   * 转化报表数据到配置数据
-   *
-   * @author tony001
-   * @date 2024-06-28 14:06:43
-   * @private
-   * @param {IModel} model
-   * @return {*}  {IData}
-   */
-  translateReportToConfig(model) {
-    const config = {};
-    const biReportDatas = {};
-    const propertyData = {
-      caption: model.logicName,
-      data: biReportDatas
-    };
-    const { appDEReport } = model;
-    console.log(appDEReport);
-    config.reportTag = appDEReport.id;
-    const tempAppBISchemeId = appDEReport.appBISchemeId.split(".").pop();
-    config.selectedSchemeId = tempAppBISchemeId;
-    const {
-      appBICubeId,
-      appBIReportDimensions,
-      appBIReportMeasures,
-      reportUIModel
-    } = appDEReport.appBIReport;
-    config.selectCubeId = "".concat(tempAppBISchemeId, ".").concat(appBICubeId);
-    if (reportUIModel) {
-      const reportUIModelObj = JSON.parse(reportUIModel);
-      config.selectChartType = reportUIModelObj.selectChartType;
-      propertyData.style = reportUIModelObj.style;
-    } else {
-      config.selectChartType = "NUMBER";
-    }
-    if (appBIReportMeasures && appBIReportMeasures.length > 0) {
-      appBIReportMeasures.forEach((measure) => {
-        if (!biReportDatas.measure) {
-          biReportDatas.measure = [];
-        }
-        biReportDatas.measure.push({
-          pssysbischemeid: tempAppBISchemeId,
-          pssysbicubemeasureid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId, ".").concat(measure.measureTag),
-          pssysbicubeid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId),
-          codename: measure.measureTag
-        });
-      });
-    }
-    if (appBIReportDimensions && appBIReportDimensions.length > 0) {
-      appBIReportDimensions.forEach((dimension) => {
-        if (!biReportDatas.dimension) {
-          biReportDatas.dimension = [];
-        }
-        biReportDatas.dimension.push({
-          pssysbischemeid: tempAppBISchemeId,
-          pssysbicubedimensionid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId, ".").concat(dimension.dimensionTag),
-          pssysbicubeid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId),
-          codename: dimension.dimensionTag,
-          pscodelistid: dimension.appCodeListId
-        });
-      });
-    }
-    config.propertyData = propertyData;
-    return config;
-  }
 };
 
 // src/controller/control/report-panel/generator/generator-factory.ts
@@ -40819,35 +41007,6 @@ var ReportPanelController = class extends ControlController {
       });
     }
   }
-  /**
-   * 打开设计界面
-   *
-   * @author tony001
-   * @date 2024-06-18 16:06:46
-   * @return {*}  {Promise<IModalData>}
-   */
-  async openReportDesignPage() {
-    if (this.state.reportType && this.isBIReport) {
-      const modal = ibiz.overlay.createModal(
-        "iBizBIReportDesign",
-        {
-          dismiss: (_data) => modal.dismiss(_data),
-          context: this.context,
-          viewParams: this.params,
-          config: this.generator.config
-        },
-        {
-          width: "90%",
-          height: "90%",
-          footerHide: true
-        }
-      );
-      modal.present();
-      const result = await modal.onWillDismiss();
-      return result;
-    }
-    return { ok: false, data: [] };
-  }
 };
 
 // src/controller/control/gantt/gantt.controller.ts
@@ -41674,83 +41833,6 @@ var GanttController = class extends TreeGridExController {
       }
     }
   }
-  /**
-   * 处理节点拖入事件
-   *
-   * @param {IGanttNodeData} draggingNode 拖动节点
-   * @param {IGanttNodeData} dropNode 目标节点
-   * @param {('inner' | 'prev' | 'next')} dropType 拖放类型
-   * @return {*}  {Promise<void>}
-   * @memberof GanttController
-   */
-  async onNodeDrop(draggingNode, dropNode, dropType) {
-    var _a, _b;
-    if (dropType === "inner" && !dropNode._leaf && dropNode._children === void 0) {
-      await this.expandNodeByKey([dropNode._id]);
-    }
-    const modifiedNodeDatas = [];
-    const draggingNodeModel = this.getNodeModel(draggingNode._nodeId);
-    const dropInNode = dropType === "inner" ? dropNode : dropNode._parent;
-    let orderNodeModel = this.getNodeModel(dropNode._nodeId);
-    if (dropType === "inner" || ((_a = dropNode._parent) == null ? void 0 : _a._id) !== ((_b = draggingNode._parent) == null ? void 0 : _b._id)) {
-      const dropNodeRs = this.findDropNodeRS(
-        dropInNode._nodeId,
-        draggingNodeModel.appDataEntityId
-      );
-      if (dropNodeRs) {
-        draggingNode._deData[dropNodeRs.pickupDEFName] = dropInNode._value;
-        modifiedNodeDatas.push(draggingNode);
-        orderNodeModel = this.getNodeModel(dropNodeRs.childDETreeNodeId);
-      }
-      draggingNode._parent = dropInNode;
-      draggingNode._nodeId = orderNodeModel.id;
-    }
-    const { sortAppDEFieldId, sortDir, allowOrder } = orderNodeModel;
-    if (allowOrder === true) {
-      if (!sortAppDEFieldId) {
-        throw new RuntimeModelError72(
-          orderNodeModel,
-          ibiz.i18n.t("runtime.controller.control.tree.sortAttribute")
-        );
-      }
-      const sortField = sortAppDEFieldId.toLowerCase();
-      const isAsc = sortDir === "ASC";
-      const changedArr = dropInNode._children;
-      if (!isAsc) {
-        changedArr.reverse();
-      }
-      const getNextSort = (num) => {
-        return num + (100 - num % 100);
-      };
-      const getSort = (deData) => {
-        return deData[sortField] || 0;
-      };
-      let lastSort;
-      changedArr.forEach((item, index) => {
-        const deData = item._deData;
-        if (lastSort === void 0) {
-          if (item === draggingNode) {
-            if (index === 0) {
-              lastSort = 100;
-            } else {
-              lastSort = getNextSort(getSort(changedArr[index - 1]._deData));
-            }
-            deData[sortField] = lastSort;
-            if (modifiedNodeDatas.indexOf(item) === -1) {
-              modifiedNodeDatas.push(item);
-            }
-          }
-        } else {
-          if (lastSort >= getSort(deData)) {
-            deData[sortField] = getNextSort(lastSort);
-            modifiedNodeDatas.push(item);
-          }
-          lastSort = getSort(deData);
-        }
-      });
-    }
-    await this.updateDeNodeData(modifiedNodeDatas);
-  }
   onDEDataChange(msg) {
   }
 };