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

package/dist/index.esm.js

@@ -15159,7 +15159,6 @@ var BIReportUtil = class {
     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;
@@ -15172,33 +15171,35 @@ var BIReportUtil = class {
             pssysbicubemeasureid: item.pssysbicubemeasureid,
             pssysbicubeid: item.pssysbicubeid,
             codename: (_a = item.pssysbicubemeasureid) == null ? void 0 : _a.split(".").pop(),
-            pssysbicubemeasurename: item.pssysbicubemeasurename
+            pssysbicubemeasurename: item.pssysbicubemeasurename,
+            birepitemparams: item.birepitemparams
           });
         }
         if (item.birepitemtype === "DIMENSION") {
-          if (!biReportItems.dimension) {
-            biReportItems.dimension = [];
-          }
-          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
-            });
+          const tempDimension = {
+            pssysbischemeid: item.pssysbischemeid,
+            pssysbicubedimensionid: item.pssysbicubedimensionid,
+            pssysbicubeid: item.pssysbicubeid,
+            codename: (_b = item.pssysbicubedimensionid) == null ? void 0 : _b.split(".").pop(),
+            pssysbicubedimensionname: item.pssysbicubedimensionname,
+            placement: item.placement,
+            birepitemparams: item.birepitemparams
+          };
+          if (item.placement === "COLHEADER") {
+            if (!biReportItems.dimension_col) {
+              biReportItems.dimension_col = [];
+            }
+            biReportItems.dimension_col.push(tempDimension);
+          } else if (biReportUIModel && biReportUIModel.group && biReportUIModel.group.indexof(item.pssysbicubedimensionid) !== -1) {
+            if (!biReportItems.group) {
+              biReportItems.group = [];
+            }
+            biReportItems.group.push(tempDimension);
           } else {
-            biReportItems.dimension.push({
-              pssysbischemeid: item.pssysbischemeid,
-              pssysbicubedimensionid: item.pssysbicubedimensionid,
-              pssysbicubeid: item.pssysbicubeid,
-              codename,
-              pssysbicubedimensionname: item.pssysbicubedimensionname
-            });
+            if (!biReportItems.dimension) {
+              biReportItems.dimension = [];
+            }
+            biReportItems.dimension.push(tempDimension);
           }
         }
       });
@@ -15215,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;
   }
@@ -15227,6 +15231,7 @@ var BIReportUtil = class {
    */
   async translateReportPanelToConfig(model) {
     const config = {};
+    let reportUIModelObj = {};
     const biReportDatas = {};
     const { appDEReport } = model;
     const propertyData = {
@@ -15244,14 +15249,15 @@ var BIReportUtil = class {
     } = appDEReport.appBIReport;
     propertyData.caption = name;
     config.selectCubeId = "".concat(tempAppBISchemeId, ".").concat(appBICubeId);
-    let extendDimension = [];
     if (reportUIModel) {
-      const reportUIModelObj = JSON.parse(reportUIModel);
+      reportUIModelObj = JSON.parse(reportUIModel);
       config.selectChartType = reportUIModelObj.selectChartType;
       propertyData.style = reportUIModelObj.style;
-      propertyData.data.filter = reportUIModelObj.filter;
-      if (reportUIModelObj.extendDimension) {
-        extendDimension = reportUIModelObj.extendDimension;
+      if (reportUIModelObj.filter) {
+        propertyData.data.filter = reportUIModelObj.filter;
+      }
+      if (reportUIModelObj.period) {
+        propertyData.data.period = reportUIModelObj.period;
       }
     } else {
       config.selectChartType = "NUMBER";
@@ -15266,7 +15272,8 @@ var BIReportUtil = class {
           pssysbicubemeasureid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId, ".").concat(measure.measureTag),
           pssysbicubemeasurename: measure.measureName,
           pssysbicubeid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId),
-          codename: measure.measureTag
+          codename: measure.measureTag,
+          birepitemparams: measure.birepitemparams
         });
       });
     }
@@ -15275,27 +15282,34 @@ var BIReportUtil = class {
         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
-          });
+        const tempDimension = {
+          pssysbischemeid: tempAppBISchemeId,
+          pssysbicubedimensionid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId, ".").concat(dimension.dimensionTag),
+          pssysbicubedimensionname: dimension.dimensionName,
+          pssysbicubeid: "".concat(tempAppBISchemeId, ".").concat(appBICubeId),
+          codename: dimension.dimensionTag,
+          pscodelistid: dimension.appCodeListId,
+          placement: dimension.placement,
+          birepitemparams: dimension.birepitemparams
+        };
+        biReportDatas.dimension.push();
+        if (dimension.placement === "COLHEADER") {
+          if (!biReportDatas.dimension_col) {
+            biReportDatas.dimension_col = [];
+          }
+          biReportDatas.dimension_col.push(tempDimension);
+        } else if (reportUIModelObj && reportUIModelObj.group && reportUIModelObj.group.indexof(
+          "".concat(tempAppBISchemeId, ".").concat(appBICubeId, ".").concat(dimension.dimensionTag)
+        ) !== -1) {
+          if (!biReportDatas.group) {
+            biReportDatas.group = [];
+          }
+          biReportDatas.group.push(tempDimension);
         } 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
-          });
+          if (!biReportDatas.dimension) {
+            biReportDatas.dimension = [];
+          }
+          biReportDatas.dimension.push(tempDimension);
         }
       });
     }
@@ -15319,16 +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,
-        group: data == null ? void 0 : data.group
-      }),
+      bireportuimodel: JSON.stringify(tempUIReportModel),
       pssysappid: app.model.codeName,
       bireporttag: reportTag,
       pssysbireportname: caption,
@@ -15343,6 +15362,7 @@ var BIReportUtil = class {
           pssysbicubeid: measure.pssysbicubeid,
           pssysbicubename: measure.pssysbicubename,
           pssysbicubemeasurename: measure.pssysbicubemeasurename,
+          birepitemparams: measure.birepitemparams,
           validflag: 1
         };
         targetData.pssysbireportitems.push(tempMeasure);
@@ -15357,15 +15377,58 @@ var BIReportUtil = class {
           pssysbicubeid: dimension.pssysbicubeid,
           pssysbicubename: dimension.pssysbicubename,
           pssysbicubedimensionname: dimension.pssysbicubedimensionname,
+          birepitemparams: dimension.birepitemparams,
           validflag: 1
         };
         targetData.pssysbireportitems.push(tempDimension);
       });
     }
-    if (data && data.extendDimension) {
-      const extendDimension = [];
-      data.extendDimension.forEach((dimension) => {
-        extendDimension.push(dimension.codename);
+    await this.mergeSpecialParams(selectChartType, arg, targetData);
+    return targetData;
+  }
+  /**
+   * 合入特殊参数
+   *
+   * @author tony001
+   * @date 2024-07-05 09:07:02
+   * @param {string} type
+   * @param {IData} sourceData
+   * @param {IData} targetData
+   * @return {*}  {Promise<void>}
+   */
+  async mergeSpecialParams(type, sourceData, targetData) {
+    switch (type) {
+      case "CROSSTABLE":
+        await this.mergeCrosstableSpecialParams(sourceData, targetData);
+        break;
+      case "MULTI_SERIES_COL":
+      case "STACK_COL":
+      case "ZONE_COL":
+      case "MULTI_SERIES_BAR":
+      case "STACK_BAR":
+      case "MULTI_SERIES_LINE":
+      case "ZONE_LINE":
+      case "AREA":
+        await this.mergeGroupParams(sourceData, targetData);
+        break;
+      default:
+        break;
+    }
+  }
+  /**
+   * 处理交叉表特殊参数（维度列）
+   *
+   * @author tony001
+   * @date 2024-07-05 10:07:56
+   * @param {IData} sourceData
+   * @param {IData} targetData
+   * @return {*}  {Promise<void>}
+   */
+  async mergeCrosstableSpecialParams(sourceData, targetData) {
+    var _a;
+    const { data } = sourceData;
+    if (data && ((_a = data.dimension_col) == null ? void 0 : _a.length) > 0) {
+      data.dimension_col.forEach((dimension) => {
         const tempDimension = {
           birepitemtype: "DIMENSION",
           pssysbischemeid: dimension.pssysbischemeid,
@@ -15373,17 +15436,44 @@ var BIReportUtil = class {
           pssysbicubeid: dimension.pssysbicubeid,
           pssysbicubename: dimension.pssysbicubename,
           pssysbicubedimensionname: dimension.pssysbicubedimensionname,
+          placement: "COLHEADER",
           validflag: 1
         };
         targetData.pssysbireportitems.push(tempDimension);
       });
-      const uiModel = JSON.parse(targetData.bireportuimodel);
-      targetData.bireportuimodel = JSON.stringify({
-        ...uiModel,
-        extendDimension
+    }
+  }
+  /**
+   * 处理分组特殊参数(添加维度数据并将标识存到ui报表模型的group字段中)
+   *
+   * @author tony001
+   * @date 2024-07-05 10:07:05
+   * @param {IData} sourceData
+   * @param {IData} targetData
+   * @return {*}  {Promise<void>}
+   */
+  async mergeGroupParams(sourceData, targetData) {
+    var _a;
+    const { data } = sourceData;
+    if (data && ((_a = data.group) == null ? void 0 : _a.length) > 0) {
+      const groupNames = [];
+      data.group.forEach((groupItem) => {
+        const tempDimension = {
+          birepitemtype: "DIMENSION",
+          pssysbischemeid: groupItem.pssysbischemeid,
+          pssysbicubedimensionid: groupItem.pssysbicubedimensionid,
+          pssysbicubeid: groupItem.pssysbicubeid,
+          pssysbicubename: groupItem.pssysbicubename,
+          pssysbicubedimensionname: groupItem.pssysbicubedimensionname,
+          validflag: 1
+        };
+        targetData.pssysbireportitems.push(tempDimension);
+        groupNames.push(groupItem.pssysbicubedimensionid);
       });
+      const biReportUIModel = JSON.parse(targetData.bireportuimodel);
+      biReportUIModel.group = groupNames;
+      targetData.bireportuimodel = JSON.stringify(biReportUIModel);
     }
-    return targetData;
   }
 };
 
@@ -15744,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
+    );
   }
   /**
    * 自定义应用功能
@@ -17417,12 +17509,16 @@ async function fetchImportSchemas(opts) {
 }
 
 // src/controller/utils/jsonschema/entity.ts
-async function getEntitySchema(entityId, context) {
+import qs3 from "qs";
+async function getEntitySchema(entityId, context, params = {}) {
+  const strParams = qs3.stringify(params);
   const app = ibiz.hub.getApp(context.srfappid);
   const entity = await ibiz.hub.getAppDataEntity(entityId, context.srfappid);
   let url = "/jsonschema/".concat(entity.name);
   if (entity.dynaSysMode === 0 && ibiz.appData) {
-    url += "?dynamodeltag=".concat(ibiz.appData.dynamodeltag);
+    url += "?dynamodeltag=".concat(ibiz.appData.dynamodeltag).concat(strParams ? "&".concat(strParams) : "");
+  } else {
+    url += "".concat(strParams ? "?".concat(strParams) : "");
   }
   const res = await app.net.get(url);
   return res.data;
@@ -18134,6 +18230,7 @@ var ViewController = class extends BaseController {
    */
   onActivated() {
     this.state.activated = true;
+    this._evt.emit("onActivated", void 0);
     ibiz.log.debug(
       ibiz.i18n.t("runtime.controller.common.view.viewActivation", {
         name: this.model.name,
@@ -18148,6 +18245,7 @@ var ViewController = class extends BaseController {
    * @date 2023-07-12 17:07:06
    */
   onDeactivated() {
+    this._evt.emit("onDeactivated", void 0);
     this.state.activated = false;
     ibiz.log.debug(
       ibiz.i18n.t("runtime.controller.common.view.viewPause", {
@@ -18684,6 +18782,24 @@ var EditorController = class {
   get dataType() {
     return this.parent.dataType;
   }
+  /**
+   * 触发值变更模式
+   *
+   * @readonly
+   * @type {string}
+   * @memberof EditorController
+   */
+  get triggerMode() {
+    if (this.editorParams.triggerMode) {
+      return this.editorParams.triggerMode;
+    }
+    const app = ibiz.hub.getApp(this.context.srfappid);
+    const appUserParam = app.model.userParam || {};
+    if (appUserParam.triggerMode) {
+      return appUserParam.triggerMode;
+    }
+    return "blur";
+  }
   /**
    * 子类不可覆盖或重写此方法，在 init 时需要重写的使用 onInit 方法。
    *
@@ -19076,6 +19192,7 @@ var ControlController = class extends BaseController {
    * @date 2023-07-12 17:07:55
    */
   onActivated() {
+    this._evt.emit("onActivated", void 0);
     this.state.activated = true;
     if (this.awaitActiveCbs.size > 0) {
       this.awaitActiveCbs.forEach((cb) => {
@@ -19097,6 +19214,7 @@ var ControlController = class extends BaseController {
    * @date 2023-07-12 17:07:06
    */
   onDeactivated() {
+    this._evt.emit("onDeactivated", void 0);
     this.state.activated = false;
     ibiz.log.debug(
       ibiz.i18n.t("runtime.controller.common.control.componentPause", {
@@ -21979,6 +22097,7 @@ var ChartOptionsGenerator2 = class {
         const tempaxis = [];
         let titleshow = true;
         let labelshow = true;
+        let fontConifg = {};
         let gridIndex = 0;
         if (Array.isArray(tempCatalogFields)) {
           const app = ibiz.hub.getApp(context.srfappid);
@@ -21998,6 +22117,7 @@ var ChartOptionsGenerator2 = class {
             if (tempconfig) {
               titleshow = tempconfig.name === void 0 ? true : !!tempconfig.name;
               labelshow = ((_g = tempconfig.axisLabel) == null ? void 0 : _g.show) === void 0 ? true : (_h = tempconfig.axisLabel) == null ? void 0 : _h.show;
+              fontConifg = tempconfig.axisLabel;
             }
           }
           if (this.chartUserParam && this.chartUserParam.grid && Array.isArray(this.chartUserParam.grid)) {
@@ -22027,6 +22147,7 @@ var ChartOptionsGenerator2 = class {
                     );
                     tempaxis.push({
                       show: labelshow,
+                      axisLabel: fontConifg,
                       gridIndex,
                       type: "category",
                       data: tempxAxisData,
@@ -22047,6 +22168,7 @@ var ChartOptionsGenerator2 = class {
                     );
                     tempaxis.push({
                       show: labelshow,
+                      axisLabel: fontConifg,
                       gridIndex,
                       type: "category",
                       data: tempxAxisData,
@@ -22084,6 +22206,7 @@ var ChartOptionsGenerator2 = class {
               tempaxis.push({
                 type: "category",
                 gridIndex,
+                axisLabel: fontConifg,
                 show: titleshow,
                 data: [
                   {
@@ -22104,22 +22227,23 @@ var ChartOptionsGenerator2 = class {
             } else {
               if (catalogLength === 0) {
                 Object.assign(this.chartUserParam.grid, {
-                  bottom: 30
+                  bottom: 45
                 });
               } else {
                 Object.assign(this.chartUserParam.grid, {
-                  bottom: (catalogLength + 1) * 24
+                  bottom: (catalogLength + 2) * 24
                 });
               }
               tempaxis.push({
                 type: "category",
                 gridIndex,
                 show: titleshow,
+                axisLabel: fontConifg,
                 data: [
                   {
                     value: mergeName,
                     textStyle: {
-                      padding: [24 * catalogLength, 0, 0, 0]
+                      padding: [24 * catalogLength + 1, 0, 0, 0]
                     }
                   }
                 ],
@@ -24572,7 +24696,9 @@ var UIActionProviderBase = class {
    * @memberof UIActionHandler
    */
   returnError(result, view) {
-    view.state.isClosing = false;
+    if (view) {
+      view.state.isClosing = false;
+    }
     return Object.assign(result, {
       refresh: false,
       closeView: false
@@ -24963,6 +25089,9 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       case "EDITFORM":
         actionResult = await this.openEditForm(action, args);
         break;
+      case "QUICKEDIT":
+        actionResult = await this.openQuickEdit(action, args);
+        break;
       default:
         throw new ModelError26(
           action,
@@ -25204,6 +25333,58 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
     }
     return actionResult;
   }
+  /**
+   * 打开快速编辑
+   *
+   * @protected
+   * @param {IAppDEUIAction} action
+   * @param {IUILogicParams} args
+   * @return {*}  {Promise<IUIActionResult>}
+   * @memberof FrontUIActionProvider
+   */
+  async openQuickEdit(action, args) {
+    const actionResult = {
+      cancel: true
+    };
+    const { context, params, data, event } = args;
+    if (!event) {
+      throw new RuntimeError51(ibiz.i18n.t("runtime.uiAction.lackNativeEvent"));
+    }
+    const { resultContext, resultParams } = await this.handleParams(
+      action,
+      context,
+      data,
+      params
+    );
+    const options = this.handleViewOptionParams(resultParams).modalOption || {};
+    const popoverOpts = mergeRight4(
+      {
+        autoClose: true
+      },
+      options
+    );
+    const overlay = ibiz.overlay.createPopover(
+      "IBizQuickEdit",
+      {
+        context: resultContext,
+        params: resultParams,
+        modelData: action.deeditForm,
+        onClose: (modalData) => {
+          if (modalData.ok) {
+            actionResult.data = modalData.data;
+            actionResult.cancel = false;
+          }
+          if (overlay) {
+            overlay.dismiss();
+          }
+        }
+      },
+      popoverOpts
+    );
+    overlay.present(event.target);
+    await overlay.onWillDismiss();
+    return actionResult;
+  }
 };
 
 // src/ui-action/provider/wf-withdraw-ui-action-provider.ts
@@ -25858,7 +26039,7 @@ var CustomDashboardController = class {
       case "data":
         return "".concat(base, "_").concat(this.ownerType, "_").concat(this.ownerId);
       case "dynamic":
-        return "".concat(base, "_").concat(this.context.srfdynadashboardid);
+        return "".concat(this.context.srfdynadashboardid);
       default:
         return base;
     }
@@ -31603,6 +31784,14 @@ var GridController = class extends MDControlController {
      * @type {boolean}
      */
     this.addSchemaColumn = false;
+    /**
+     * jsonschema参数
+     *
+     * @author zhanghengfeng
+     * @date 2024-07-05 15:07:13
+     * @type {IParams}
+     */
+    this.jsonSchemaParams = {};
     /**
      * 是否显示百分比
      *
@@ -31772,6 +31961,14 @@ var GridController = class extends MDControlController {
    */
   async onCreated() {
     this.addSchemaColumn = this.controlParams.enablejsonschema === "true";
+    const jsonSchemaParams = JSON.parse(
+      this.controlParams.jsonschemaparams || "{}"
+    );
+    this.jsonSchemaParams = convertNavData(
+      jsonSchemaParams,
+      this.params,
+      this.context
+    );
     this.showPercent = this.controlParams.showpercent === "true";
     await this.initByEntitySchema();
     await super.onCreated();
@@ -31828,7 +32025,8 @@ var GridController = class extends MDControlController {
     }
     const json = await getEntitySchema(
       this.model.appDataEntityId,
-      this.context
+      this.context,
+      this.jsonSchemaParams
     );
     if (!json) {
       return;
@@ -33027,7 +33225,11 @@ var GridController = class extends MDControlController {
     const totalResult = {};
     Object.values(this.fieldColumns).forEach((column) => {
       const fieldName = column.model.id;
-      const result = this.state.items.map((item) => item[fieldName]).reduce((a, b) => plus2(a, b), 0);
+      const result = this.state.items.map((item) => item[fieldName]).reduce((a, b) => {
+        const aValue = Number(a) || 0;
+        const bValue = Number(b) || 0;
+        return plus2(aValue, bValue);
+      }, 0);
       if (result) {
         totalResult[fieldName] = result;
       }
@@ -33263,9 +33465,12 @@ var GridFieldColumnController = class extends GridColumnController {
    * @return {*}  {(string | undefined)}
    */
   calcFieldAgg(items) {
-    const { aggField, aggMode, aggValueFormat, unitName } = this.model;
+    const { aggField, aggMode, aggValueFormat, unitName, appCodeListId } = this.model;
     const fieldName = aggField || this.model.id;
     let aggValue;
+    if (appCodeListId) {
+      return;
+    }
     if (this.grid.model.aggMode === "ALL") {
       if (!this.grid.state.remoteAggResult) {
         return;
@@ -33279,10 +33484,18 @@ var GridFieldColumnController = class extends GridColumnController {
       if (this.grid.model.aggMode === "PAGE") {
         switch (aggMode) {
           case "SUM":
-            aggValue = items.map((item) => item[fieldName]).reduce((a, b) => plus3(a, b), 0);
+            aggValue = items.map((item) => item[fieldName]).reduce((a, b) => {
+              const aValue = Number(a) || 0;
+              const bValue = Number(b) || 0;
+              return plus3(aValue, bValue);
+            }, 0);
             break;
           case "AVG":
-            aggValue = items.map((item) => item[fieldName]).reduce((a, b) => plus3(a, b), 0) / items.length;
+            aggValue = items.map((item) => item[fieldName]).reduce((a, b) => {
+              const aValue = Number(a) || 0;
+              const bValue = Number(b) || 0;
+              return plus3(aValue, bValue);
+            }, 0) / items.length;
             break;
           case "MAX":
             aggValue = Math.max(
@@ -35621,6 +35834,14 @@ var SearchBarController = class extends ControlController {
      * @date 2024-01-05 10:10:37
      */
     this.addSchemaFilters = false;
+    /**
+     * jsonschema参数
+     *
+     * @author zhanghengfeng
+     * @date 2024-07-05 15:07:47
+     * @type {IParams}
+     */
+    this.jsonSchemaParams = {};
     /**
      * 是否启用存储
      *
@@ -35682,6 +35903,14 @@ var SearchBarController = class extends ControlController {
   }
   async onCreated() {
     this.addSchemaFilters = this.controlParams.enablejsonschema === "true";
+    const jsonSchemaParams = JSON.parse(
+      this.controlParams.jsonschemaparams || "{}"
+    );
+    this.jsonSchemaParams = convertNavData(
+      jsonSchemaParams,
+      this.params,
+      this.context
+    );
     this.enableStorage = this.controlParams.storage === "true";
     await this.initByEntitySchema();
     await super.onCreated();
@@ -35717,7 +35946,8 @@ var SearchBarController = class extends ControlController {
     }
     const json = await getEntitySchema(
       this.model.appDataEntityId,
-      this.context
+      this.context,
+      this.jsonSchemaParams
     );
     if (!json) {
       return;