@ibiz-template/runtime 0.7.28-alpha.1 → 0.7.29-alpha.0

package/dist/index.esm.js

@@ -15216,6 +15216,9 @@ var BIReportUtil = class {
     if (biReportUIModel.filter) {
       propertyData.data.filter = biReportUIModel.filter;
     }
+    if (biReportUIModel.period) {
+      propertyData.data.period = biReportUIModel.period;
+    }
     config.propertyData = propertyData;
     return config;
   }
@@ -15250,7 +15253,12 @@ var BIReportUtil = class {
       reportUIModelObj = JSON.parse(reportUIModel);
       config.selectChartType = reportUIModelObj.selectChartType;
       propertyData.style = reportUIModelObj.style;
-      propertyData.data.filter = reportUIModelObj.filter;
+      if (reportUIModelObj.filter) {
+        propertyData.data.filter = reportUIModelObj.filter;
+      }
+      if (reportUIModelObj.period) {
+        propertyData.data.period = reportUIModelObj.period;
+      }
     } else {
       config.selectChartType = "NUMBER";
     }
@@ -15325,15 +15333,21 @@ var BIReportUtil = class {
   async translateDataToAppBIReport(arg) {
     const { reportTag, selectChartType, selectCubeId, caption, data, style } = arg;
     const app = ibiz.hub.getApp(ibiz.env.appId);
+    const tempUIReportModel = {
+      selectChartType,
+      style
+    };
+    if (data.filter) {
+      Object.assign(tempUIReportModel, { filter: data.filter });
+    }
+    if (data.period) {
+      Object.assign(tempUIReportModel, { period: data.period });
+    }
     const targetData = {
       pssysbireportitems: [],
       pssysbischemeid: selectCubeId.split(".")[0],
       pssysbicubeid: selectCubeId,
-      bireportuimodel: JSON.stringify({
-        selectChartType,
-        style,
-        filter: data == null ? void 0 : data.filter
-      }),
+      bireportuimodel: JSON.stringify(tempUIReportModel),
       pssysappid: app.model.codeName,
       bireporttag: reportTag,
       pssysbireportname: caption,
@@ -15384,9 +15398,6 @@ var BIReportUtil = class {
    */
   async mergeSpecialParams(type, sourceData, targetData) {
     switch (type) {
-      case "NUMBER":
-        await this.mergeNumberSpecialParams(sourceData, targetData);
-        break;
       case "CROSSTABLE":
         await this.mergeCrosstableSpecialParams(sourceData, targetData);
         break;
@@ -15404,18 +15415,6 @@ var BIReportUtil = class {
         break;
     }
   }
-  /**
-   * 处理数字特殊参数（同环比）
-   *
-   * @author tony001
-   * @date 2024-07-05 10:07:35
-   * @param {IData} sourceData
-   * @param {IData} targetData
-   * @return {*}  {Promise<void>}
-   */
-  async mergeNumberSpecialParams(sourceData, targetData) {
-    console.log(sourceData, targetData);
-  }
   /**
    * 处理交叉表特殊参数（维度列）
    *
@@ -15835,8 +15834,10 @@ var _AppFuncCommand = class _AppFuncCommand {
    * @param {IParams} [params]
    */
   executeJavaScript(appFunc, context, params) {
-    ibiz.log.warn("executeJavaScript", appFunc, context, params);
-    throw new RuntimeError27(ibiz.i18n.t("runtime.common.unrealized"));
+    ScriptFactory.execScriptFn(
+      { context, params, data: {}, el: null, view: null },
+      appFunc.jscode
+    );
   }
   /**
    * 自定义应用功能
@@ -25958,7 +25959,7 @@ var CustomDashboardController = class {
      */
     this.portletConfig = {};
     /**
-     * 自定义定制范围类型（public：公开，personal：个人，data：数据，dynamic: 自定义动态,默认是按照个人区分，配置了应用功能组件才生效）
+     * 自定义定制范围类型（public：公开，personal：个人，data：数据，默认是按照个人区分，配置了应用功能组件才生效）
      *
      * @author tony001
      * @date 2024-04-24 19:04:47
@@ -25981,6 +25982,22 @@ var CustomDashboardController = class {
      * @type {string}
      */
     this.ownerId = "";
+    /**
+     * 多数据模式，启用时请求参数从上下文中获取srfdynadashboardid的值
+     *
+     * @author tony001
+     * @date 2024-07-08 14:07:51
+     * @type {boolean}
+     */
+    this.multiMode = false;
+    /**
+     * 展示设计按钮，启用定制默认会展示
+     *
+     * @author tony001
+     * @date 2024-07-08 14:07:15
+     * @type {boolean}
+     */
+    this.showDesignBtn = true;
     this.context = dashboard.context;
     this.params = dashboard.params;
     this.init(dashboard.controlParams);
@@ -26006,7 +26023,10 @@ var CustomDashboardController = class {
       this.ownerId = this.context[controlParams.owner_id];
     }
     if (controlParams.multimode === "true") {
-      this.type = "dynamic";
+      this.multiMode = true;
+    }
+    if (controlParams.showdesignbtn === "false") {
+      this.showDesignBtn = false;
     }
     if (this.model.appDynaDashboardUtilId) {
       const app = ibiz.hub.getApp(this.context.srfappid);
@@ -26031,14 +26051,15 @@ var CustomDashboardController = class {
    */
   getResourceTag() {
     var _a, _b;
+    if (this.multiMode) {
+      return this.context.srfdynadashboardid;
+    }
     const base = "".concat(this.context.srfappid, "_dashboard_").concat(((_a = this.model.appDataEntityId) == null ? void 0 : _a.toLowerCase()) || "app", "_").concat((_b = this.model.codeName) == null ? void 0 : _b.toLowerCase());
     switch (this.type) {
       case "personal":
         return "".concat(base, "_").concat(this.context.srfpersonid);
       case "data":
         return "".concat(base, "_").concat(this.ownerType, "_").concat(this.ownerId);
-      case "dynamic":
-        return "".concat(this.context.srfdynadashboardid);
       default:
         return base;
     }
@@ -26050,6 +26071,9 @@ var CustomDashboardController = class {
    * @Date: 2023-09-20 16:22:49
    */
   async loadCustomModelData() {
+    if (this.multiMode && !this.context.srfdynadashboardid) {
+      return { model: this.customModelData, config: this.portletConfig };
+    }
     let res;
     if (this.util) {
       res = await this.util.load(