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

package/dist/index.esm.js

@@ -15461,8 +15461,9 @@ var Application = class {
    * @date 2022-12-22 15:12:26
    * @param {IApplication} model
    */
-  constructor(model) {
+  constructor(model, subAppRef) {
     this.model = model;
+    this.subAppRef = subAppRef;
     /**
      * 应用实体名称到应用实体代码名称的映射
      *
@@ -15496,7 +15497,7 @@ var Application = class {
      */
     this.appBIReportMap = /* @__PURE__ */ new Map();
     this.net = new Net({
-      baseURL: "".concat(ibiz.env.baseUrl, "/").concat(this.appId)
+      baseURL: "".concat(ibiz.env.baseUrl, "/").concat(subAppRef && subAppRef.serviceId ? subAppRef.serviceId : this.appId)
     });
     this.configCache = new ConfigService(
       this.appId,
@@ -20343,6 +20344,20 @@ var BaseSeriesGenerator = class {
   constructor(model, chartGenerator) {
     this.model = model;
     this.chartGenerator = chartGenerator;
+    /**
+     * 分类属性(小写)
+     * @author lxm
+     * @date 2023-06-09 02:44:57
+     * @type {string}
+     */
+    this.catalogField = "";
+    /**
+     * 分类属性(小写)数组，用于构建多维度分层
+     *
+     * @type {string[]}
+     * @memberof BaseSeriesGenerator
+     */
+    this.catalogFields = [];
     /**
      * 根据分组处理出来的图表数据数组
      * @author lxm
@@ -20364,6 +20379,7 @@ var BaseSeriesGenerator = class {
      * @type {boolean}
      */
     this.autoCompleteCategory = true;
+    var _a;
     this.model = model;
     this.chartGenerator = chartGenerator;
     const { chartSeriesEncode, caption, id, userParam } = model;
@@ -20379,6 +20395,18 @@ var BaseSeriesGenerator = class {
         ibiz.i18n.t("runtime.controller.control.chart.missingValue")
       );
     }
+    if (chartGenerator.model.controlParam && ((_a = chartGenerator.model.controlParam.ctrlParams) == null ? void 0 : _a.CATALOGFIELDS)) {
+      try {
+        const tempCatalogFields = JSON.parse(
+          chartGenerator.model.controlParam.ctrlParams.CATALOGFIELDS
+        );
+        if (Array.isArray(tempCatalogFields)) {
+          this.catalogFields = tempCatalogFields;
+        }
+      } catch (e) {
+        throw new Error(ibiz.i18n.t("runtime.control.chart.errorJson"));
+      }
+    }
     this.catalogField = chartGenerator.getFieldKey(model.catalogField);
     this.valueField = chartGenerator.getFieldKey(model.valueField);
     this.groupField = model.seriesField ? chartGenerator.getFieldKey(model.seriesField) : void 0;
@@ -20463,6 +20491,42 @@ var BaseSeriesGenerator = class {
     groupData[group].get(catalog).chartData = tempChartData;
     (_a = this.chartDataArr) == null ? void 0 : _a.push(tempChartData);
   }
+  /**
+   * 处理多分类分组
+   *
+   * @param {IData[]} prevItems
+   * @param {IData[]} nextItems
+   * @return {*}
+   * @memberof BaseSeriesGenerator
+   */
+  handleMultiCatalogGroup(prevItems, nextItems) {
+    let tempItems = [];
+    if (prevItems.length === 0) {
+      tempItems = nextItems.map((item) => {
+        return {
+          text: item.text,
+          value: item.value
+        };
+      });
+    } else {
+      for (let prev = 0; prev < prevItems.length; prev++) {
+        if (nextItems.length > 0) {
+          for (let next = 0; next < nextItems.length; next++) {
+            tempItems.push({
+              text: "".concat(prevItems[prev].text, "_").concat(nextItems[next].text),
+              value: nextItems[next].value
+            });
+          }
+        } else {
+          tempItems.push({
+            text: prevItems[prev].text,
+            value: prevItems[prev].value
+          });
+        }
+      }
+    }
+    return tempItems;
+  }
   /**
    * 计算分组数据
    * @author lxm
@@ -20489,7 +20553,35 @@ var BaseSeriesGenerator = class {
       }
       if (!groupData[group]) {
         groupData[group] = /* @__PURE__ */ new Map();
-        if (catalogCodeListId && this.autoCompleteCategory) {
+        if (this.catalogFields.length > 0) {
+          let tempCodes = [];
+          const tempCodeLists = [];
+          this.catalogFields.forEach((catalog2) => {
+            const { codelistId } = catalog2;
+            if (codelistId && this.autoCompleteCategory) {
+              const codeListItems = this.chartGenerator.codeListMap.get(codelistId);
+              tempCodeLists.push(clone21(codeListItems));
+            }
+          });
+          for (let i = 0; i < tempCodeLists.length; i++) {
+            tempCodes = this.handleMultiCatalogGroup(
+              tempCodes,
+              tempCodeLists[i]
+            );
+          }
+          tempCodes.forEach((x) => {
+            groupData[group].set(x.text, { value: 0 });
+            this.prepareChartData(
+              groupData,
+              {
+                [this.valueField]: 0,
+                [this.catalogField]: x.value
+              },
+              x.text,
+              group
+            );
+          });
+        } else if (catalogCodeListId && this.autoCompleteCategory) {
           const codeListItems = this.chartGenerator.codeListMap.get(catalogCodeListId);
           codeListItems.forEach((x) => {
             groupData[group].set(x.text, { value: 0 });
@@ -20505,11 +20597,31 @@ var BaseSeriesGenerator = class {
           });
         }
       }
-      const catalog = this.translateVal(
-        catalogCodeListId,
-        item[this.catalogField],
-        true
-      );
+      let catalog = "";
+      if (this.catalogFields.length > 0) {
+        const tempCatalog = [];
+        this.catalogFields.forEach((_catalog) => {
+          const mergeCatalog = this.translateVal(
+            _catalog.codelistId,
+            item[_catalog.codename],
+            true
+          );
+          if (!mergeCatalog) {
+            return;
+          }
+          tempCatalog.push(mergeCatalog);
+        });
+        if (tempCatalog.length !== this.catalogFields.length) {
+          return;
+        }
+        catalog = tempCatalog.join("_");
+      } else {
+        catalog = this.translateVal(
+          catalogCodeListId,
+          item[this.catalogField],
+          true
+        );
+      }
       if (!catalog) {
         return;
       }
@@ -20525,7 +20637,10 @@ var BaseSeriesGenerator = class {
       } else {
         this.prepareChartData(
           groupData,
-          { ...item, [this.valueField]: groupData[group].get(catalog).value },
+          {
+            ...item,
+            [this.valueField]: groupData[group].get(catalog).value
+          },
           catalog,
           group
         );
@@ -21255,6 +21370,140 @@ var ChartOptionsGenerator2 = class {
     });
     return AxisOption;
   }
+  /**
+   * 初始化多分类的X轴配置
+   *
+   * @return {*}  {Promise<void>}
+   * @memberof ChartOptionsGenerator
+   */
+  async initMultiCatalogxAxis(context, params) {
+    var _a, _b, _c, _d, _e;
+    const { controlParam } = this.model;
+    if (controlParam && ((_a = controlParam.ctrlParams) == null ? void 0 : _a.CATALOGFIELDS)) {
+      try {
+        const tempCatalogFields = JSON.parse(
+          controlParam.ctrlParams.CATALOGFIELDS
+        );
+        const tempaxis = [];
+        let titleshow = true;
+        let labelshoww = true;
+        let gridIndex = 0;
+        if (Array.isArray(tempCatalogFields)) {
+          const app = ibiz.hub.getApp(context.srfappid);
+          if (this.chartUserParam && this.chartUserParam.xAxis) {
+            if (Array.isArray(this.chartUserParam.xAxis)) {
+              const tempconfig = this.chartUserParam.xAxis[this.chartUserParam.xAxis.length - 1];
+              titleshow = tempconfig.name === void 0 ? true : !!tempconfig.name;
+              labelshoww = ((_b = tempconfig.axisLabel) == null ? void 0 : _b.show) === void 0 ? true : (_c = tempconfig.axisLabel) == null ? void 0 : _c.show;
+            } else {
+              titleshow = this.chartUserParam.xAxis.name === void 0 ? true : !!this.chartUserParam.xAxis.name;
+              labelshoww = ((_d = this.chartUserParam.xAxis.axisLabel) == null ? void 0 : _d.show) === void 0 ? true : (_e = this.chartUserParam.xAxis.axisLabel) == null ? void 0 : _e.show;
+            }
+          }
+          if (this.chartUserParam && this.chartUserParam.grid && Array.isArray(this.chartUserParam.grid)) {
+            gridIndex = this.chartUserParam.grid.length - 1;
+          }
+          await Promise.all(
+            tempCatalogFields.slice(0, -1).map(async (catalog, index) => {
+              if (catalog.mode === "codelist" && catalog.codelistId) {
+                const codeListItems = await app.codeList.get(
+                  catalog.codelistId,
+                  context,
+                  params
+                );
+                if (codeListItems) {
+                  const tempxAxisData = [];
+                  const xAxisData = codeListItems.map((code) => {
+                    return {
+                      value: code.text,
+                      textStyle: {
+                        lineHeight: 45 * (tempCatalogFields.length - 1 - index)
+                      }
+                    };
+                  });
+                  if (index === 0) {
+                    tempaxis.push({
+                      show: labelshoww,
+                      gridIndex,
+                      type: "category",
+                      data: xAxisData,
+                      position: "bottom"
+                    });
+                  } else {
+                    let length = 1;
+                    for (let i = 0; i < tempaxis.length; i++) {
+                      length *= tempaxis[i].data.length;
+                    }
+                    for (let i = 0; i < length; i++) {
+                      tempxAxisData.push(...xAxisData);
+                    }
+                    tempaxis.push({
+                      show: labelshoww,
+                      gridIndex,
+                      type: "category",
+                      data: tempxAxisData,
+                      position: "bottom"
+                    });
+                  }
+                }
+              }
+            })
+          );
+          const mergeName = tempCatalogFields.map((catalog) => {
+            return catalog.name;
+          }).join("/");
+          tempaxis.push({
+            type: "category",
+            gridIndex,
+            show: titleshow,
+            data: [
+              {
+                value: mergeName,
+                textStyle: {
+                  lineHeight: labelshoww ? 45 * tempCatalogFields.length : 45
+                }
+              }
+            ],
+            position: "bottom"
+          });
+          if (this.chartUserParam) {
+            if (this.chartUserParam.xAxis && Array.isArray(this.chartUserParam.xAxis)) {
+              this.chartUserParam.xAxis = [
+                ...this.chartUserParam.xAxis,
+                ...tempaxis
+              ];
+            } else if (this.chartUserParam.xAxis) {
+              this.chartUserParam.xAxis = [
+                this.chartUserParam.xAxis,
+                ...tempaxis
+              ];
+            }
+            if (!this.chartUserParam.grid) {
+              this.chartUserParam.grid = {};
+            }
+            let { length } = tempCatalogFields;
+            if (!labelshoww) {
+              length = 1;
+            }
+            if (!titleshow) {
+              length -= 1;
+            }
+            if (length === 0) {
+              Object.assign(this.chartUserParam.grid, {
+                bottom: 45
+              });
+            } else {
+              Object.assign(this.chartUserParam.grid, {
+                bottom: (length > 2 ? length - 1 : length) * 45
+              });
+            }
+          }
+        }
+      } catch (e) {
+        throw new Error(ibiz.i18n.t("runtime.control.chart.errorJson"));
+      }
+    }
+  }
   /**
    * 初始化
    * @author lxm
@@ -21265,6 +21514,7 @@ var ChartOptionsGenerator2 = class {
    */
   async init(context, params) {
     await this.loadCodeList(context, params);
+    await this.initMultiCatalogxAxis(context, params);
     this.entity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
       this.model.appId
@@ -21293,7 +21543,7 @@ var ChartOptionsGenerator2 = class {
    * @return {*}  {Promise<void>}
    */
   async loadCodeList(context, params) {
-    var _a;
+    var _a, _b, _c;
     this.codeListMap.clear();
     if (!((_a = this.model.dechartSerieses) == null ? void 0 : _a.length)) {
       return;
@@ -21306,11 +21556,29 @@ var ChartOptionsGenerator2 = class {
       const codeListItems = await app.codeList.get(key, context, params);
       this.codeListMap.set(key, codeListItems);
     };
+    if ((_c = (_b = this.model.controlParam) == null ? void 0 : _b.ctrlParams) == null ? void 0 : _c.CATALOGFIELDS) {
+      try {
+        const tempCatalogFields = JSON.parse(
+          this.model.controlParam.ctrlParams.CATALOGFIELDS
+        );
+        if (Array.isArray(tempCatalogFields)) {
+          await Promise.all(
+            tempCatalogFields.map(async (catalog) => {
+              if (catalog.mode === "codelist") {
+                await loadCodeList(catalog.codelistId);
+              }
+            })
+          );
+        }
+      } catch (e) {
+        throw new Error(ibiz.i18n.t("runtime.control.chart.errorJson"));
+      }
+    }
     await Promise.all(
       this.model.dechartSerieses.map(async (series) => {
         const { seriesCodeListId, catalogCodeListId } = series;
-        await loadCodeList(seriesCodeListId);
         await loadCodeList(catalogCodeListId);
+        await loadCodeList(seriesCodeListId);
       })
     );
   }
@@ -37541,41 +37809,6 @@ var KanbanController = class extends DataViewControlController {
     }
     return super.handleDataGroup();
   }
-  /**
-   * 处理自动分组
-   *
-   * @memberof KanbanController
-   */
-  handleAutoGroup() {
-    const { groupAppDEFieldId } = this.model;
-    if (groupAppDEFieldId) {
-      const { items } = this.state;
-      const groupMap = /* @__PURE__ */ new Map();
-      items.forEach((item) => {
-        const groupVal = item[groupAppDEFieldId];
-        if (isNil33(groupVal)) {
-          return;
-        }
-        if (!groupMap.has(groupVal)) {
-          groupMap.set(groupVal, []);
-        }
-        groupMap.get(groupVal).push(item);
-      });
-      const groups = [];
-      groupMap.forEach((value, key) => {
-        const codeListItem = this.groupCodeListItems.find(
-          (item) => item.value === key
-        );
-        groups.push({
-          caption: codeListItem.text,
-          color: codeListItem.color,
-          key: codeListItem.value,
-          children: [...value]
-        });
-      });
-      this.state.groups = groups;
-    }
-  }
   /**
    * 处理代码表分组
    *
@@ -37658,7 +37891,7 @@ var KanbanController = class extends DataViewControlController {
       );
     }
     this.state.updating = true;
-    const computeMoveData = (_fromIndex, _toIndex, _draggedItem, targetArray) => {
+    const computeMoveData = (_fromIndex, _toIndex, _draggedItem, targetArray, isCrossGroup) => {
       let moveData = {};
       const targetItem = targetArray[_toIndex];
       if (!targetItem) {
@@ -37687,7 +37920,7 @@ var KanbanController = class extends DataViewControlController {
       } else {
         moveData = {
           srftargetkey: targetItem.srfkey,
-          srfmovetype: _fromIndex > _toIndex ? "MOVEBEFORE" : "MOVEAFTER"
+          srfmovetype: _toIndex < targetArray.length - 1 ? "MOVEBEFORE" : isCrossGroup ? "MOVEBEFORE" : "MOVEAFTER"
         };
       }
       return moveData;
@@ -37722,7 +37955,13 @@ var KanbanController = class extends DataViewControlController {
         );
       }
     }
-    const params = computeMoveData(fromIndex, toIndex, draggedItem, originArr);
+    const params = computeMoveData(
+      fromIndex,
+      toIndex,
+      draggedItem,
+      originArr,
+      info.from !== info.to
+    );
     try {
       const { ok, result } = await this.moveOrderItem(draggedItem, params);
       if (ok) {
@@ -41728,7 +41967,8 @@ var AppHub = class {
       throw new RuntimeError68(ibiz.i18n.t("runtime.utils.firstregister"));
     }
     const appModel = await this.modelLoaderProvider.getApp(id);
-    const app = new Application(appModel);
+    const subAppRef = await this.modelLoaderProvider.getSubAppRef(id);
+    const app = new Application(appModel, subAppRef);
     this.appMap.set(id, app);
     await this.modelLoaderProvider.initApp(id);
     await app.init();
@@ -44165,7 +44405,10 @@ var en = {
           noSupportSequence: "Charts do not support sequence types at this time {seriesType}",
           noFindSequence: "Cannot find generator for {seriesIndex} sequence!",
           noInitialised: "The chart object is not properly initialised",
-          noCalculated: "Options have not been calculated."
+          noCalculated: "Options have not been calculated.",
+          classificationNotArray: "The configured classification attribute value is not an array",
+          classificationNotString: "The configured classification attribute value is not an string",
+          errorJson: "JSON parsing error"
         },
         dataView: {
           noBehaviourGroup: "No interface behaviour group is configured for the action",
@@ -44747,7 +44990,10 @@ var zhCn = {
           noSupportSequence: "\u56FE\u8868\u6682\u672A\u652F\u6301\u5E8F\u5217\u7C7B\u578B{seriesType}",
           noFindSequence: "\u627E\u4E0D\u5230{seriesIndex}\u5E8F\u5217\u7684generator\uFF01",
           noInitialised: "chart\u5BF9\u8C61\u6CA1\u6709\u6B63\u786E\u521D\u59CB\u5316",
-          noCalculated: "options\u8FD8\u6CA1\u8BA1\u7B97"
+          noCalculated: "options\u8FD8\u6CA1\u8BA1\u7B97",
+          classificationNotArray: "\u914D\u7F6E\u7684\u5206\u7C7B\u5C5E\u6027\u503C\u4E0D\u662F\u4E00\u4E2A\u6570\u7EC4",
+          classificationNotString: "\u914D\u7F6E\u7684\u5206\u7C7B\u5C5E\u6027\u503C\u4E0D\u662F\u4E00\u4E2A\u5B57\u7B26\u4E32",
+          errorJson: "JSON\u89E3\u6790\u9519\u8BEF"
         },
         dataView: {
           noBehaviourGroup: "\u64CD\u4F5C\u9879\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4",