@ibiz-template/runtime 0.3.3 → 0.3.4

package/src/controller/control/exp-bar/chart-exp-bar.controller.ts

@@ -1,4 +1,4 @@
-import { IChartExpBar, IDEChart } from '@ibiz/model-core';
+import { IChartExpBar, IDEChart, INavigatable } from '@ibiz/model-core';
 import {
   IChartExpBarState,
   IChartExpBarEvent,
@@ -6,6 +6,8 @@ import {
   INavViewMsg,
 } from '../../../interface';
 import { ExpBarControlController } from './exp-bar.controller';
+import { ChartController } from '../chart';
+import { convertNavData } from '../../../utils';
 
 /**
  * 图表导航栏控制器
@@ -23,6 +25,90 @@ export class ChartExpBarController
   >
   implements IChartExpBarController
 {
+  /**
+   * 导航页面首次打开且没有回显时，
+   * 默认取第一条数据进行导航
+   * 对于不同的导航，第一条可导航的数据可能定义不同，可以重写改方法。
+   * @author lxm
+   * @date 2023-08-10 03:58:15
+   * @protected
+   */
+  protected navByFirstItem(): void {
+    const data = this.xDataController.state.items[0];
+    if (!data) {
+      // 导航视图传空让他导航占位绘制空界面
+      this.state.srfnav = '';
+      this._evt.emit('onNavViewChange', {
+        navViewMsg: {
+          key: '',
+          isCache: this.isCache,
+        },
+      });
+      return;
+    }
+    // 默认选中并激活第一项(这里的第一项是我们自己封装的chartData)
+    const activeSeriesGenerator = (
+      this.xDataController as ChartController
+    ).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: INavigatable & { appDataEntityId?: string },
+    data: IData,
+    context: IContext,
+    params: IParams,
+  ): { context: IContext; params: IParams } {
+    const { context: tempContext, params: tempParams } = super.prepareParams(
+      XDataModel,
+      data,
+      context,
+      params,
+    );
+    // 序列上或配置导航相关参数
+    if (data._seriesModelId) {
+      const seriesModel = (XDataModel as IDEChart).dechartSerieses?.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 };
+  }
+
   /**
    * 获取导航视图
    *
@@ -37,11 +123,18 @@ export class ChartExpBarController
     context: IContext,
     params: IParams,
   ): INavViewMsg {
-    const viewModelId = (this.XDataModel as IDEChart).dechartSerieses?.[0]
-      .navAppViewId;
+    let viewModelId;
+    if (data._seriesModelId) {
+      const seriesModel = (this.XDataModel as IDEChart).dechartSerieses?.find(
+        series => {
+          return series.id === data._seriesModelId;
+        },
+      );
+      viewModelId = 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,

package/src/interface/controller/state/control/i-chart.state.ts

@@ -9,3 +9,27 @@ import { IMDControlState } from './i-md-control.state';
  * @extends {IMDControlState}
  */
 export interface IChartState extends IMDControlState {}
+
+/**
+ * 图表数据格式
+ *
+ */
+export interface IChartData {
+  /**
+   * 序列模型id
+   *
+   */
+  _seriesModelId?: string;
+
+  /**
+   * 分组名称
+   *
+   */
+  _groupName?: string;
+
+  /**
+   * 分类值
+   *
+   */
+  _catalog?: string;
+}

package/src/service/vo/chart-data/chart-data.ts

@@ -0,0 +1,75 @@
+/* eslint-disable no-constructor-return */
+import { createUUID } from 'qx-util';
+import { IDEChartSeries } from '@ibiz/model-core';
+import { IChartData } from '../../../interface';
+
+// 更新属性，缺的补充定义
+function updateKeyDefine(target: IParams, keys: string[]): void {
+  keys.forEach(key => {
+    if (!Object.prototype.hasOwnProperty.call(target, key)) {
+      Object.defineProperty(target, key, {
+        enumerable: true,
+        configurable: true,
+        writable: true,
+        value: undefined,
+      });
+    }
+  });
+}
+
+export class ChartData implements IChartData {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [key: string | symbol]: any;
+
+  _seriesModelId?: string;
+
+  _catalog?: string;
+
+  _groupName?: string;
+
+  _uuid?: string;
+
+  constructor(
+    deData: IData,
+    seriesModel?: IDEChartSeries,
+    catalog?: string,
+    groupName?: string,
+  ) {
+    this._seriesModelId = seriesModel?.id;
+
+    this._catalog = catalog;
+
+    this._groupName = groupName;
+
+    this._uuid = createUUID();
+
+    return new Proxy<ChartData>(this, {
+      set(target, p, value): boolean {
+        if (Object.prototype.hasOwnProperty.call(deData, p)) {
+          deData[p] = value;
+        } else {
+          target[p] = value;
+        }
+        return true;
+      },
+
+      get(target, p, _receiver): unknown {
+        if (target[p] !== undefined) {
+          return target[p];
+        }
+        if (deData[p] !== undefined) {
+          return deData[p];
+        }
+      },
+
+      ownKeys(target): ArrayLike<string | symbol> {
+        // 整合所有并排除重复
+        const allKeys = [
+          ...new Set([...Object.keys(target), ...Object.keys(deData)]),
+        ];
+        updateKeyDefine(target, allKeys);
+        return allKeys;
+      },
+    });
+  }
+}

package/src/service/vo/chart-data/index.ts

@@ -0,0 +1 @@
+export { ChartData } from './chart-data';

package/src/service/vo/index.ts

@@ -4,3 +4,4 @@ export * from './ui-map-field';
 export * from './calendar-item-data';
 export * from './map-data';
 export * from './panel-data';
+export * from './chart-data';