@ibiz-template/runtime 0.3.3 → 0.3.5-alpha.0

package/dist/index.esm.js

@@ -5269,11 +5269,18 @@ var AppDataEntity = class _AppDataEntity {
    * @return {*}  {AppDataEntity}
    */
   assign(data) {
+    let _data = {};
     if (data instanceof _AppDataEntity) {
-      Object.assign(this._data, data._data);
+      _data = data._data;
     } else {
-      Object.assign(this._data, data);
+      _data = data;
     }
+    Object.keys(_data).forEach((key) => {
+      if (_data[key] === void 0) {
+        delete _data[key];
+      }
+    });
+    Object.assign(this._data, _data);
     return this;
   }
   /**
@@ -8680,8 +8687,56 @@ var PanelData = class {
   }
 };
 
+// src/service/vo/chart-data/chart-data.ts
+import { createUUID as createUUID4 } from "qx-util";
+function updateKeyDefine3(target, keys) {
+  keys.forEach((key) => {
+    if (!Object.prototype.hasOwnProperty.call(target, key)) {
+      Object.defineProperty(target, key, {
+        enumerable: true,
+        configurable: true,
+        writable: true,
+        value: void 0
+      });
+    }
+  });
+}
+var ChartData = class {
+  constructor(deData, seriesModel, catalog, groupName) {
+    this._seriesModelId = seriesModel == null ? void 0 : seriesModel.id;
+    this._catalog = catalog;
+    this._groupName = groupName;
+    this._uuid = createUUID4();
+    return new Proxy(this, {
+      set(target, p, value) {
+        if (Object.prototype.hasOwnProperty.call(deData, p)) {
+          deData[p] = value;
+        } else {
+          target[p] = value;
+        }
+        return true;
+      },
+      get(target, p, _receiver) {
+        if (target[p] !== void 0) {
+          return target[p];
+        }
+        if (deData[p] !== void 0) {
+          return deData[p];
+        }
+      },
+      ownKeys(target) {
+        const allKeys = [
+          .../* @__PURE__ */ new Set([...Object.keys(target), ...Object.keys(deData)])
+        ];
+        updateKeyDefine3(target, allKeys);
+        return allKeys;
+      }
+    });
+  }
+};
+
 // src/service/mqtt/mqtt.service.ts
-import { QXEvent as QXEvent3, createUUID as createUUID4, isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
+import { QXEvent as QXEvent3, createUUID as createUUID5, isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
 var MqttService = class {
   /**
    * Creates an instance of MqttService.
@@ -8715,7 +8770,7 @@ var MqttService = class {
       // 超时时间
       connectTimeout: 6e3,
       // 认证信息
-      clientId: createUUID4(),
+      clientId: createUUID5(),
       username: "",
       password: "",
       // 心跳时间
@@ -9420,7 +9475,7 @@ var PanelNotifyState = /* @__PURE__ */ ((PanelNotifyState2) => {
 })(PanelNotifyState || {});
 
 // src/controller/common/view/view.controller.ts
-import { createUUID as createUUID6, notNilEmpty as notNilEmpty6 } from "qx-util";
+import { createUUID as createUUID7, notNilEmpty as notNilEmpty6 } from "qx-util";
 import { IBizContext as IBizContext2, RuntimeError as RuntimeError28 } from "@ibiz-template/core";
 import { isEmpty as isEmpty8, isNil as isNil18, isNotNil as isNotNil2 } from "ramda";
 
@@ -10220,7 +10275,7 @@ var ValueExUtil = class {
 // src/controller/utils/value-default/value-default.ts
 import { RuntimeError as RuntimeError25, ModelError as ModelError16 } from "@ibiz-template/core";
 import dayjs from "dayjs";
-import { createUUID as createUUID5 } from "qx-util";
+import { createUUID as createUUID6 } from "qx-util";
 import { isNil as isNil16, isNotNil } from "ramda";
 function getDefaultValue(opts, origins) {
   var _a;
@@ -10265,7 +10320,7 @@ function getDefaultValue(opts, origins) {
     case "CONTEXT":
       return params[defaultValue];
     case "UNIQUEID":
-      return createUUID5();
+      return createUUID6();
     default:
       throw new ModelError16({}, "\u9ED8\u8BA4\u503C\u7C7B\u578B[".concat(valueType, "]\u672A\u652F\u6301"));
   }
@@ -10978,7 +11033,7 @@ var ViewController = class extends BaseController {
   handleContextParams() {
     this.context.srfappid = this.model.appId;
     if (isNil18(this.context.srfsessionid) || isEmpty8(this.context.srfsessionid)) {
-      this.context.srfsessionid = createUUID6();
+      this.context.srfsessionid = createUUID7();
     }
     const navContexts = this.model.appViewNavContexts;
     let context = {};
@@ -12263,11 +12318,33 @@ var CalendarController = class extends MDControlController {
     await this.afterLoad(args, items);
     this.state.isLoaded = true;
     this.state.items = items;
+    this.sortItems();
     await this.evt.emit("onLoadSuccess", {
       isInitialLoad
     });
     return items;
   }
+  /**
+   * 前台排序（时间轴类型）
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-22 15:16:43
+   */
+  sortItems() {
+    if (this.model.calendarStyle === "TIMELINE") {
+      this.state.items.sort((a, b) => {
+        const x = a.beginTime;
+        const y = b.beginTime;
+        let result = 0;
+        if (dayjs2(x).isAfter(y)) {
+          result = -1;
+        } else if (dayjs2(x).isBefore(y)) {
+          result = 1;
+        }
+        return result;
+      });
+    }
+  }
   /**
    * 获取当前选中的日期
    *
@@ -12327,8 +12404,10 @@ var CalendarController = class extends MDControlController {
     if (extraParams) {
       Object.assign(resultParams, extraParams);
     }
-    const timeParam = this.getCurSelectDate(resultParams);
-    Object.assign(resultParams, timeParam);
+    if (this.model.calendarStyle !== "TIMELINE") {
+      const timeParam = this.getCurSelectDate(resultParams);
+      Object.assign(resultParams, timeParam);
+    }
     return resultParams;
   }
   /**
@@ -12405,6 +12484,13 @@ var BaseSeriesGenerator = class {
   constructor(model, chartGenerator) {
     this.model = model;
     this.chartGenerator = chartGenerator;
+    /**
+     * 根据分组处理出来的图表数据数组
+     * @author lxm
+     * @date 2023-06-09 02:58:28
+     * @type {GroupData}
+     */
+    this.chartDataArr = [];
     /**
      * 静态的序列options
      * @author lxm
@@ -12491,6 +12577,24 @@ var BaseSeriesGenerator = class {
     }
     return isExclude ? void 0 : val;
   }
+  /**
+   * 准备图表数据
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-23 15:24:12
+   */
+  prepareChartData(groupData, deData, catalog, group) {
+    var _a;
+    if (this.groupField) {
+      Object.assign(deData, { [this.groupField]: group });
+    }
+    if (this.catalogField) {
+      Object.assign(deData, { [this.catalogField]: catalog });
+    }
+    const tempChartData = new ChartData(deData, this.model, catalog, group);
+    groupData[group].get(catalog).chartData = tempChartData;
+    (_a = this.chartDataArr) == null ? void 0 : _a.push(tempChartData);
+  }
   /**
    * 计算分组数据
    * @author lxm
@@ -12500,6 +12604,7 @@ var BaseSeriesGenerator = class {
    */
   calcGroupData(data) {
     this.groupData = {};
+    this.chartDataArr = [];
     const groupData = this.groupData;
     const { seriesCodeListId, catalogCodeListId } = this.model;
     data.forEach((item) => {
@@ -12529,6 +12634,17 @@ var BaseSeriesGenerator = class {
         true
       );
       if (!catalog) {
+        if (catalogCodeListId && this.autoCompleteCategory) {
+          const codeListItems = this.chartGenerator.codeListMap.get(catalogCodeListId);
+          codeListItems.forEach((x) => {
+            this.prepareChartData(
+              groupData,
+              { [this.valueField]: 0 },
+              x.text,
+              group
+            );
+          });
+        }
         return;
       }
       if (!groupData[group].get(catalog)) {
@@ -12538,7 +12654,16 @@ var BaseSeriesGenerator = class {
         groupData[group].get(catalog).value,
         item[this.valueField]
       );
-      groupData[group].get(catalog).deData = item;
+      if (!groupData[group].get(catalog).chartData) {
+        this.prepareChartData(groupData, item, catalog, group);
+      } else {
+        this.prepareChartData(
+          groupData,
+          { [this.valueField]: groupData[group].get(catalog).value },
+          catalog,
+          group
+        );
+      }
     });
     return groupData;
   }
@@ -12566,7 +12691,7 @@ var BaseSeriesGenerator = class {
   }
   /**
    * 生成每条序列的data,由于不同图表类型格式不同所以为any
-   * 默认提供的是二维数组，按[X轴，y轴]格式
+   * 默认提供的是二维数组，按[x轴, y轴, 图表数据]格式
    * @author lxm
    * @date 2023-06-09 03:38:07
    * @param {CatalogData} catalogData
@@ -12576,8 +12701,7 @@ var BaseSeriesGenerator = class {
   calcSeriesData(catalogData) {
     const temData = [];
     catalogData.forEach((catalog, key) => {
-      var _a;
-      temData.push([key, catalog.value, (_a = catalog.deData) == null ? void 0 : _a.srfkey]);
+      temData.push([key, catalog.value, catalog.chartData]);
     });
     return temData;
   }
@@ -12595,14 +12719,18 @@ var BaseSeriesGenerator = class {
     return this.calcGroupSeries(groupData);
   }
   /**
-   * 通过事件的params获取主键
+   * 通过echarts事件的params获取封装好的图表数据
    * @author lxm
    * @date 2023-06-09 10:56:25
    * @param {ECElementEvent} params
    * @return {*}  {string}
    */
-  getSrfkeyByParams(params) {
-    return params.value[2];
+  getChartDataByParams(params) {
+    var _a, _b, _c;
+    if (this.groupData && Object.keys(this.groupData).length === 1) {
+      return (_a = this.groupData[DEFAULT_GROUP].get(params.name)) == null ? void 0 : _a.chartData;
+    }
+    return (_c = (_b = this.groupData) == null ? void 0 : _b[params.seriesName].get(params.name)) == null ? void 0 : _c.chartData;
   }
   /**
    * 数据预处理
@@ -12856,17 +12984,13 @@ var FunnelSeriesGenerator = class extends BaseSeriesGenerator {
   calcSeriesData(catalogData) {
     const temData = [];
     catalogData.forEach((catalog, key) => {
-      var _a;
       temData.push({
         name: key,
-        value: [catalog.value, (_a = catalog.deData) == null ? void 0 : _a.srfkey]
+        value: [catalog.value, catalog.chartData]
       });
     });
     return temData;
   }
-  getSrfkeyByParams(params) {
-    return params.value[1];
-  }
 };
 
 // src/controller/control/chart/generator/pie-series-generator.ts
@@ -12880,17 +13004,13 @@ var PieSeriesGenerator = class extends BaseSeriesGenerator {
   calcSeriesData(catalogData) {
     const temData = [];
     catalogData.forEach((catalog, key) => {
-      var _a;
       temData.push({
         name: key,
-        value: [catalog.value, (_a = catalog.deData) == null ? void 0 : _a.srfkey]
+        value: [catalog.value, catalog.chartData]
       });
     });
     return temData;
   }
-  getSrfkeyByParams(params) {
-    return params.value[1];
-  }
 };
 
 // src/controller/control/chart/generator/scatter-series-generator.ts
@@ -13007,7 +13127,7 @@ var RadarSeriesGenerator = class extends BaseSeriesGenerator {
       const catalogData = groupData[group];
       const value = radar.indicatorKeys.map((key) => {
         if (catalogData.has(key)) {
-          return catalogData.get(key);
+          return catalogData.get(key).value;
         }
         return 0;
       });
@@ -13022,9 +13142,6 @@ var RadarSeriesGenerator = class extends BaseSeriesGenerator {
     }
     return options;
   }
-  getSrfkeyByParams(params) {
-    return params.value[1];
-  }
 };
 
 // src/controller/control/chart/generator/chart-options-generator.ts
@@ -13089,6 +13206,13 @@ var ChartOptionsGenerator2 = class {
      * @date 2023-06-09 07:47:35
      */
     this.codeListMap = /* @__PURE__ */ new Map();
+    /**
+     * 维护图表序列index对应序列生成器Map
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-11-22 17:27:15
+     */
+    this.seriesGeneratorIndexMap = /* @__PURE__ */ new Map();
     const {
       dechartTitle,
       dechartLegend,
@@ -13294,12 +13418,17 @@ var ChartOptionsGenerator2 = class {
     }
     const seriesOption = [];
     this.seriesGenerators.forEach((generator) => {
+      const startIndex = seriesOption.length;
       const series = generator.calcByData(data);
       if (series instanceof Array) {
         seriesOption.push(...series);
       } else {
         seriesOption.push(series);
       }
+      const endIndex = seriesOption.length - 1;
+      for (let i = startIndex; i <= endIndex; i++) {
+        this.seriesGeneratorIndexMap.set(i, generator);
+      }
     });
     this.options.series = seriesOption;
     if (this.seriesGenerators.length === 1 && this.seriesGenerators[0].groupData && Object.keys(this.seriesGenerators[0].groupData).length === 1 && seriesOption[0].type && ["bar", "line", "scatter"].includes(seriesOption[0].type) && this.staticOptions.legend) {
@@ -13317,12 +13446,19 @@ var ChartOptionsGenerator2 = class {
     }
     return this.options;
   }
-  getSrfkeyByParams(params) {
-    const generator = this.seriesGenerators[params.seriesIndex];
+  /**
+   * 根据echarts给的params得到图表数据
+   * @param {ECElementEvent} params
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-22 16:11:50
+   */
+  getChartDataByParams(params) {
+    const generator = this.seriesGeneratorIndexMap.get(params.seriesIndex);
     if (!generator) {
       throw new RuntimeError33("\u627E\u4E0D\u5230".concat(params.seriesIndex, "\u5E8F\u5217\u7684generator\uFF01"));
     }
-    return generator.getSrfkeyByParams(params);
+    return generator.getChartDataByParams(params);
   }
   // protected calcRadarSeries(data: IData[], series: IChartSeriesFunnel) {
   //   // 初始化radarMap
@@ -13409,9 +13545,11 @@ var ChartController = class extends MDControlController {
   initChart(chart) {
     this.chart = chart;
     this.chart.on("click", (params) => {
-      const srfkey = this.generator.getSrfkeyByParams(params);
-      const activeData = this.state.items.find((item) => item.srfkey === srfkey);
-      console.log("\u5B9E\u4F53\u6570\u636E", activeData);
+      const activeData = this.generator.getChartDataByParams(params);
+      console.log("\u6FC0\u6D3B\u6570\u636E", activeData);
+      if (activeData) {
+        this.setActive(activeData);
+      }
     });
   }
   /**
@@ -17146,6 +17284,78 @@ var TreeExpBarController = class extends ExpBarControlController {
 
 // src/controller/control/exp-bar/chart-exp-bar.controller.ts
 var ChartExpBarController = class extends ExpBarControlController {
+  /**
+   * 导航页面首次打开且没有回显时，
+   * 默认取第一条数据进行导航
+   * 对于不同的导航，第一条可导航的数据可能定义不同，可以重写改方法。
+   * @author lxm
+   * @date 2023-08-10 03:58:15
+   * @protected
+   */
+  navByFirstItem() {
+    const data = this.xDataController.state.items[0];
+    if (!data) {
+      this.state.srfnav = "";
+      this._evt.emit("onNavViewChange", {
+        navViewMsg: {
+          key: "",
+          isCache: this.isCache
+        }
+      });
+      return;
+    }
+    const activeSeriesGenerator = this.xDataController.generator.seriesGenerators.find((generator) => {
+      return generator.chartDataArr.length > 0 && generator.model.navAppViewId;
+    });
+    if (activeSeriesGenerator) {
+      this.xDataController.setActive(activeSeriesGenerator.chartDataArr[0]);
+    }
+  }
+  /**
+   * 解析参数
+   *
+   * @author zk
+   * @date 2023-05-29 04:05:52
+   * @param {IDETabViewPanel} tabViewPanel
+   * @return {*}
+   * @memberof ExpBarControlController
+   */
+  prepareParams(XDataModel, data, context, params) {
+    var _a;
+    const { context: tempContext, params: tempParams } = super.prepareParams(
+      XDataModel,
+      data,
+      context,
+      params
+    );
+    if (data._seriesModelId) {
+      const seriesModel = (_a = XDataModel.dechartSerieses) == null ? void 0 : _a.find(
+        (series) => {
+          return series.id === data._seriesModelId;
+        }
+      );
+      if (seriesModel) {
+        const { navigateContexts, navigateParams } = seriesModel;
+        const tempContext2 = convertNavData(
+          navigateContexts,
+          data,
+          params,
+          tempContext
+        );
+        const tempParams2 = convertNavData(
+          navigateParams,
+          data,
+          params,
+          tempParams
+        );
+        return {
+          context: Object.assign(tempContext.clone(), tempContext2),
+          params: tempParams2
+        };
+      }
+    }
+    return { context: tempContext, params: tempParams };
+  }
   /**
    * 获取导航视图
    *
@@ -17157,10 +17367,18 @@ var ChartExpBarController = class extends ExpBarControlController {
    */
   getNavViewMsg(data, context, params) {
     var _a;
-    const viewModelId = (_a = this.XDataModel.dechartSerieses) == null ? void 0 : _a[0].navAppViewId;
+    let viewModelId;
+    if (data._seriesModelId) {
+      const seriesModel = (_a = this.XDataModel.dechartSerieses) == null ? void 0 : _a.find(
+        (series) => {
+          return series.id === data._seriesModelId;
+        }
+      );
+      viewModelId = seriesModel == null ? void 0 : seriesModel.navAppViewId;
+    }
     const result = this.prepareParams(this.XDataModel, data, context, params);
     return {
-      key: data[this.navKeyName],
+      key: data._uuid,
       context: result.context,
       params: result.params,
       viewId: viewModelId,
@@ -18080,7 +18298,7 @@ var FormButtonController = class extends FormDetailController {
 
 // src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts
 import { isOverlap as isOverlap2 } from "@ibiz-template/core";
-import { createUUID as createUUID7, notNilEmpty as notNilEmpty8 } from "qx-util";
+import { createUUID as createUUID8, notNilEmpty as notNilEmpty8 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-druipart/form-druipart.state.ts
 var FormDruipartState = class extends FormDetailState {
@@ -18193,7 +18411,7 @@ var FormDRUIPartController = class extends FormDetailController {
       this.form.context
     );
     if (!this.state.viewComponentKey) {
-      this.state.viewComponentKey = createUUID7();
+      this.state.viewComponentKey = createUUID8();
       this.navContext = newContext;
       this.navParams = newParams;
     } else if (JSON.stringify(this.navContext) !== JSON.stringify(newContext) || JSON.stringify(this.navParams) !== JSON.stringify(newParams)) {
@@ -18949,7 +19167,7 @@ import {
   mergeDefaultInLeft as mergeDefaultInLeft2
 } from "@ibiz-template/core";
 import { debounce as debounce2 } from "lodash-es";
-import { createUUID as createUUID8 } from "qx-util";
+import { createUUID as createUUID9 } from "qx-util";
 import { clone as clone19 } from "ramda";
 
 // src/controller/control/form/edit-form/edit-form.service.ts
@@ -19326,7 +19544,7 @@ var EditFormController = class extends FormController {
       await this.endLoading();
     }
     res.data.srfkey = void 0;
-    res.data.tempsrfkey = createUUID8();
+    res.data.tempsrfkey = createUUID9();
     this.state.modified = false;
     this.state.data = res.data;
     this.formStateNotify("LOAD" /* LOAD */);
@@ -25528,7 +25746,7 @@ var TreeGridService = class extends GridService {
 
 // src/controller/control/medit-view-panel/medit-view-panel.controller.ts
 import { RuntimeError as RuntimeError54 } from "@ibiz-template/core";
-import { createUUID as createUUID9 } from "qx-util";
+import { createUUID as createUUID10 } from "qx-util";
 
 // src/controller/control/medit-view-panel/medit-view-panel.service.ts
 var MEditViewPanelService = class extends MDControlService {
@@ -25614,7 +25832,7 @@ var MEditViewPanelController = class extends MDControlController {
    */
   handlePanelItemParams(arg) {
     const [{ parameterName }] = this.parameters;
-    const id = arg[parameterName] ? arg[parameterName] : "mockId:".concat(createUUID9());
+    const id = arg[parameterName] ? arg[parameterName] : "mockId:".concat(createUUID10());
     const item = {
       id,
       context: this.context.clone(),
@@ -28147,6 +28365,7 @@ export {
   CalendarService,
   CaptionBarController,
   ChartController,
+  ChartData,
   ChartExpBarController,
   ChartPortletController,
   ChartService,