@ibiz-template/runtime 0.7.28 → 0.7.29

package/dist/index.esm.js

@@ -635,6 +635,12 @@ function convertNavData(navParams, ...origins) {
   return convertNavDataByArray(navParamsArr, ...origins);
 }
 function getVal(origins, key) {
+  if (key === "srfcurtime") {
+    return {
+      find: true,
+      value: (/* @__PURE__ */ new Date()).getTime()
+    };
+  }
   const keys = key.split(".");
   let currentVal;
   const findOrigin = origins.find((item) => {
@@ -15190,7 +15196,7 @@ var BIReportUtil = class {
               biReportItems.dimension_col = [];
             }
             biReportItems.dimension_col.push(tempDimension);
-          } else if (biReportUIModel && biReportUIModel.group && biReportUIModel.group.indexof(item.pssysbicubedimensionid) !== -1) {
+          } else if (biReportUIModel && biReportUIModel.group && biReportUIModel.group.indexOf(item.pssysbicubedimensionid) !== -1) {
             if (!biReportItems.group) {
               biReportItems.group = [];
             }
@@ -25732,6 +25738,14 @@ var DashboardController = class extends ControlController {
      * @type {{ [key: string]: IPortletController }}
      */
     this.portlets = {};
+    /**
+     * 动态门户部件Map
+     *
+     * @author tony001
+     * @date 2024-07-09 17:07:57
+     * @type {Map<string, IData>}
+     */
+    this.dynaPortletMap = /* @__PURE__ */ new Map();
   }
   initState() {
     super.initState();
@@ -25895,6 +25909,7 @@ var DashboardController = class extends ControlController {
       tempContext,
       this.params
     );
+    this.dynaPortletMap.set(id, res.data);
     if (res && res.data && res.data.controlmodel) {
       const controlModel = JSON.parse(res.data.controlmodel);
       return await ibiz.hub.translationModelToDsl(
@@ -25959,7 +25974,7 @@ var CustomDashboardController = class {
      */
     this.portletConfig = {};
     /**
-     * 自定义定制范围类型（public：公开，personal：个人，data：数据，dynamic: 自定义动态,默认是按照个人区分，配置了应用功能组件才生效）
+     * 自定义定制范围类型（public：公开，personal：个人，data：数据，默认是按照个人区分，配置了应用功能组件才生效）
      *
      * @author tony001
      * @date 2024-04-24 19:04:47
@@ -25982,6 +25997,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);
@@ -26007,7 +26038,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);
@@ -26032,14 +26066,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;
     }
@@ -26051,6 +26086,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(
@@ -26062,6 +26100,15 @@ var CustomDashboardController = class {
       res = await this.config.load();
     }
     if (res.model) {
+      for (let i = 0; i < res.model.length; i++) {
+        const item = res.model[i];
+        if (item.orignModel) {
+          item.portletModel = await ibiz.hub.translationModelToDsl(
+            item.portletModel,
+            "CTRL"
+          );
+        }
+      }
       this.customModelData = res.model;
     }
     if (res.colNum) {
@@ -32023,10 +32070,12 @@ var GridController = class extends MDControlController {
     if (!this.addSchemaColumn) {
       return;
     }
+    const tempParams = clone31(this.jsonSchemaParams);
+    Object.assign(tempParams, this.params);
     const json = await getEntitySchema(
       this.model.appDataEntityId,
       this.context,
-      this.jsonSchemaParams
+      tempParams
     );
     if (!json) {
       return;
@@ -33297,7 +33346,7 @@ var GridFieldColumnController = class extends GridColumnController {
       leading: true,
       trailing: false
     });
-    this.loadCodeList();
+    await this.loadCodeList();
   }
   /**
    * 初始化属性列界面行为组按钮状态
@@ -35944,10 +35993,12 @@ var SearchBarController = class extends ControlController {
     if (!this.addSchemaFilters) {
       return;
     }
+    const tempParams = clone34(this.jsonSchemaParams);
+    Object.assign(tempParams, this.params);
     const json = await getEntitySchema(
       this.model.appDataEntityId,
       this.context,
-      this.jsonSchemaParams
+      tempParams
     );
     if (!json) {
       return;