@ibiz-template/runtime 0.2.6 → 0.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -30,7 +30,7 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/core": "^0.2.6",
-    "@ibiz/model-core": "^0.0.19",
+    "@ibiz/model-core": "^0.0.20",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
     "@types/systemjs": "^6.13.3",
@@ -47,7 +47,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.1.0",
-    "@ibiz/model-core": "^0.0.19",
+    "@ibiz/model-core": "^0.0.20",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "9e2ff8788567c10c7f048f95797e1a533b0027e8"
+  "gitHead": "98917f0e99351acbe3ca6241011ff1da2794e55a"
 }

package/src/controller/common/control/md-control.controller.ts

@@ -1,6 +1,7 @@
 /* eslint-disable max-classes-per-file */
 import { isElementSame, RuntimeError } from '@ibiz-template/core';
 import { IAppDataEntity, IMDControl } from '@ibiz/model-core';
+import { debounce } from 'lodash-es';
 import {
   IMDControlController,
   IMDControlEvent,
@@ -89,7 +90,12 @@ export class MDControlController<
     this.dataEntity.appDEFields?.forEach(field => {
       this.fieldIdNameMap.set(field.id!, field.name!);
     });
-    this.onDataChange = this.onDataChange.bind(this);
+
+    const fn = this.onDataChange.bind(this);
+    this.onDataChange = debounce(msg => {
+      fn(msg);
+    }, 300);
+
     ibiz.mc.command.change.on(this.onDataChange);
 
     // 设置默认排序
@@ -228,6 +234,10 @@ export class MDControlController<
       await this.endLoading();
     }
 
+    this.state.items.forEach((item, index) => {
+      item.srfserialnum = index + 1;
+    });
+
     this.actionNotification('FETCHSUCCESS');
     return this.state.items;
   }

package/src/controller/control/chart/generator/chart-options-generator.ts

@@ -4,6 +4,7 @@ import type {
   XAXisComponentOption,
   YAXisComponentOption,
   ECElementEvent,
+  LegendComponentOption,
 } from 'echarts';
 import {
   IAppDataEntity,
@@ -207,10 +208,6 @@ export class ChartOptionsGenerator {
     const { showLegend, legendPos } = chartLegend;
     const legendOption: EChartsOption['legend'] = {};
     legendOption.show = showLegend;
-    // 图表单序列不应出图例
-    if (this.model.dechartSerieses?.length === 1) {
-      legendOption.show = false;
-    }
     const position = legendPos?.toLowerCase();
     if (position === 'left' || position === 'right') {
       legendOption.left = position;
@@ -365,6 +362,18 @@ export class ChartOptionsGenerator {
     });
     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
+    ) {
+      (this.staticOptions.legend as LegendComponentOption).show = false;
+    }
+
     // 合并静态和动态的options
     this.options = mergeDeepRight(
       this.staticOptions,

package/src/controller/control/chart/generator/funnel-series-generator.ts

@@ -2,6 +2,11 @@ import { IChartSeriesFunnel } from '@ibiz/model-core';
 import type { ECElementEvent, FunnelSeriesOption, SeriesOption } from 'echarts';
 import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
 
+interface funnelSeriesData {
+  name: string;
+  value: IData[];
+}
+
 /**
  * 漏斗图序列生成器
  * @author lxm
@@ -20,14 +25,15 @@ export class FunnelSeriesGenerator extends BaseSeriesGenerator<IChartSeriesFunne
     return options;
   }
 
-  protected calcSeriesData(catalogData: CatalogData): {
-    name: string;
-    value: IData[];
-  }[] {
-    return Object.keys(catalogData).map(catalog => {
-      const data = catalogData.get(catalog)!;
-      return { name: catalog, value: [data.value, data.deData?.srfkey] };
+  protected calcSeriesData(catalogData: CatalogData): funnelSeriesData[] {
+    const temData: funnelSeriesData[] = [];
+    catalogData.forEach((catalog, key) => {
+      temData.push({
+        name: key,
+        value: [catalog.value, catalog.deData?.srfkey],
+      });
     });
+    return temData;
   }
 
   getSrfkeyByParams(params: ECElementEvent): string {

package/src/controller/control/chart/generator/pie-series-generator.ts

@@ -2,6 +2,11 @@ import { IChartSeriesPie } from '@ibiz/model-core';
 import type { ECElementEvent, PieSeriesOption, SeriesOption } from 'echarts';
 import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
 
+interface pieSeriesData {
+  name: string;
+  value: IData[];
+}
+
 /**
  * 饼图序列生成器
  * @author lxm
@@ -20,14 +25,15 @@ export class PieSeriesGenerator extends BaseSeriesGenerator<IChartSeriesPie> {
     return options;
   }
 
-  protected calcSeriesData(catalogData: CatalogData): {
-    name: string;
-    value: IData[];
-  }[] {
-    return Object.keys(catalogData).map(catalog => {
-      const data = catalogData.get(catalog)!;
-      return { name: catalog, value: [data.value, data.deData?.srfkey] };
+  protected calcSeriesData(catalogData: CatalogData): pieSeriesData[] {
+    const temData: pieSeriesData[] = [];
+    catalogData.forEach((catalog, key) => {
+      temData.push({
+        name: key,
+        value: [catalog.value, catalog.deData?.srfkey],
+      });
     });
+    return temData;
   }
 
   getSrfkeyByParams(params: ECElementEvent): string {

package/src/controller/control/chart/generator/radar-series-generator.ts

@@ -5,7 +5,7 @@ import { BaseSeriesGenerator, DEFAULT_GROUP } from './base-series-generator';
 import { RadarCoordSystem } from './radar-coord-system';
 
 /**
- * 饼图序列生成器
+ * 雷达序列生成器
  * @author lxm
  * @date 2023-06-11 06:19:03
  * @export
@@ -39,8 +39,8 @@ export class RadarSeriesGenerator extends BaseSeriesGenerator<IChartSeriesRadar>
 
     // 更新雷达坐标系指示器和最大值
     Object.values(groupData).forEach(catalogData => {
-      Object.keys(catalogData).forEach(catalog => {
-        radar.updateIndicator(catalog, catalogData.get(catalog)!.value);
+      catalogData.forEach((catalog, key) => {
+        radar.updateIndicator(key, catalog.value);
       });
     });
   }

package/src/controller/control/form/edit-form/edit-form.controller.ts

@@ -428,6 +428,9 @@ export class EditFormController
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfStart(context, params, this.data);
+      if (this.view.modal.mode === 'ROUTE') {
+        ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
+      }
     } catch (error) {
       this.actionNotification('WFSTARTERROR', {
         error: error as Error,
@@ -457,6 +460,9 @@ export class EditFormController
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfSubmit(context, params, this.data);
+      if (this.view.modal.mode === 'ROUTE') {
+        ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
+      }
     } catch (error) {
       this.actionNotification('WFSUBMITERROR', {
         error: error as Error,

package/src/controller/control/grid/grid/grid.controller.ts

@@ -525,10 +525,6 @@ export class GridController
     rowState.data = res.data;
     rowState.modified = false;
 
-    this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
-      default: `${res.data.srfmajortext || ''}保存成功`,
-      data: res.data,
-    });
     this.gridStateNotify(rowState, GridNotifyState.SAVE);
     await this.evt.emit('onSaveSuccess', undefined);
   }

package/src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts

@@ -308,7 +308,11 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
     }
     const isDate = DataTypes.isDate(this.dataType!);
     if (isDate) {
-      return dayjs(strVal).format(this.valueFormat);
+      const formatVal = dayjs(strVal).format(this.valueFormat);
+      if (formatVal !== 'Invalid Date') {
+        return formatVal;
+      }
+      return strVal;
     }
     return ibiz.util.text.format(strVal, this.valueFormat);
   }

package/src/controller/control/index.ts

@@ -22,3 +22,4 @@ export * from './kanban/index';
 export * from './tree-grid-ex/index';
 export * from './tree-grid/index';
 export * from './medit-view-panel/index';
+export * from './map/index';

package/src/controller/control/map/index.ts

@@ -0,0 +1,2 @@
+export * from './map.controller';
+export * from './map.service';

package/src/controller/control/map/map.controller.ts

@@ -0,0 +1,126 @@
+import { ISysMap } from '@ibiz/model-core';
+import { MapService } from './map.service';
+import {
+  IMapController,
+  IMapData,
+  IMapEvent,
+  IMapState,
+  MDCtrlLoadParams,
+} from '../../../interface';
+import { MDControlController } from '../../common';
+
+export class MapController
+  extends MDControlController<ISysMap, IMapState, IMapEvent>
+  implements IMapController
+{
+  declare service: MapService;
+
+  protected initState(): void {
+    super.initState();
+    this.state.size = 1000;
+    this.state.pointData = [];
+    this.state.areaData = [];
+    this.state.areaCode = 320000;
+  }
+
+  protected async onCreated(): Promise<void> {
+    await super.onCreated();
+    this.service = new MapService(this.model);
+    await this.service.init(this.context);
+  }
+
+  /**
+   * 部件加载数据行为
+   *
+   * @author lxm
+   * @date 2022-08-19 14:08:50
+   */
+  async load(args: MDCtrlLoadParams = {}): Promise<IData[]> {
+    if (this.state.isSimple) {
+      return [];
+    }
+    await this.startLoading();
+    try {
+      // *初始加载需要重置分页
+      const isInitialLoad = args.isInitialLoad === true;
+
+      // *查询参数处理
+      const { context } = this.handlerAbilityParams(args);
+      const params = await this.getFetchParams(args?.viewParam);
+      context.srfareacode = this.state.areaCode;
+
+      const res = await this.service.fetchAll(context, params);
+
+      this.state.items = res.data;
+
+      await this.afterLoad(args, res.data);
+
+      this.state.isLoaded = true;
+      await this._evt.emit('onLoadSuccess', {
+        isInitialLoad,
+      });
+    } catch (error) {
+      await this._evt.emit('onLoadError', undefined);
+      this.actionNotification('FETCHERROR', {
+        error: error as Error,
+      });
+      throw error;
+    } finally {
+      await this.endLoading();
+    }
+
+    this.actionNotification('FETCHSUCCESS');
+    return this.state.items;
+  }
+
+  async afterLoad(args: MDCtrlLoadParams, items: IData[]): Promise<IData[]> {
+    const result = (await super.afterLoad(args, items)) as IMapData[];
+
+    const tempareaData: IMapData[] = [];
+    const temppointData: IMapData[] = [];
+    result.forEach(item => {
+      if (item._type === 'area') {
+        tempareaData.push(item);
+      } else if (item._type === 'point') {
+        temppointData.push(item);
+      }
+    });
+    this.state.pointData = temppointData;
+    this.state.areaData = tempareaData;
+
+    return result;
+  }
+
+  /**
+   * 地图变更事件处理
+   * @author lxm
+   * @date 2023-10-31 05:28:36
+   * @param {(string | number)} areaCode
+   */
+  onMapChange(areaCode: string | number): void {
+    // 修改预置视图参数，然后加载
+    this.state.areaCode = areaCode;
+    this.load({});
+    this.evt.emit('onMapChange', { areaCode });
+  }
+
+  /**
+   * 地图区域点击事件处理
+   * @author lxm
+   * @date 2023-10-31 05:30:54
+   * @param {IMapData} mapData
+   */
+  onAreaClick(mapData: IMapData): void {
+    this.evt.emit('onAreaClick', { data: [mapData] });
+  }
+
+  /**
+   * 地图散点点击事件处理
+   * @author lxm
+   * @date 2023-10-31 05:30:58
+   * @param {IMapData} mapData
+   */
+  onPointClick(mapData: IMapData): void {
+    this.evt.emit('onPointClick', { data: [mapData] });
+  }
+}

package/src/controller/control/map/map.service.ts

@@ -0,0 +1,79 @@
+import { HttpResponse, IHttpResponse } from '@ibiz-template/core';
+import { ISysMap } from '@ibiz/model-core';
+import { IMapData } from '../../../interface';
+import { parseUserParams } from '../../../model';
+import { MapData, MDControlService } from '../../../service';
+import { convertNavData, ScriptFactory } from '../../../utils';
+
+/**
+ * 地图部件服务
+ * @author lxm
+ * @date 2023-05-15 09:53:35
+ * @export
+ * @class GridService
+ * @extends {MDControlService<ISysMap>}
+ */
+export class MapService extends MDControlService<ISysMap> {
+  async init(context?: IContext | undefined): Promise<void> {
+    await super.init(context);
+  }
+
+  /**
+   * 加载所有地图项的数据
+   * @author lxm
+   * @date 2023-10-30 06:27:32
+   * @param {IParams} context
+   * @param {IParams} [params={}]
+   * @return {*}  {Promise<IHttpResponse<IMapData[]>>}
+   */
+  async fetchAll(
+    context: IContext,
+    params: IParams = {},
+  ): Promise<IHttpResponse<IMapData[]>> {
+    const allData: IMapData[] = [];
+    // 没有面板项返回空数组
+    if (this.model.sysMapItems?.length) {
+      const app = ibiz.hub.getApp(context.srfappid);
+      await Promise.all(
+        this.model.sysMapItems.map(async mapItem => {
+          const { appDataEntityId, appDEDataSetId, customCond } = mapItem;
+          const _context = context.clone();
+          const _params = { ...params };
+
+          if (customCond) {
+            const customParams = ScriptFactory.execSingleLine(
+              customCond,
+            ) as IData;
+            if (customParams) {
+              const { navigateContexts, navigateParams } =
+                parseUserParams(customParams);
+              if (navigateContexts) {
+                Object.assign(
+                  _context,
+                  convertNavData(navigateContexts, params, context),
+                );
+              }
+              if (navigateParams) {
+                Object.assign(
+                  _params,
+                  convertNavData(navigateContexts, params, context),
+                );
+              }
+            }
+          }
+
+          const res = (await app.deService.exec(
+            appDataEntityId!,
+            appDEDataSetId!,
+            _context,
+            _params,
+          )) as IHttpResponse<IData[]>;
+          if (res.data) {
+            allData.push(...res.data.map(item => new MapData(item, mapItem)));
+          }
+        }),
+      );
+    }
+    return new HttpResponse<IMapData[]>(allData, 200);
+  }
+}

package/src/controller/control/panel/panel/panel-item.controller.ts

@@ -172,10 +172,10 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
    * @param {IData} data
    */
   calcItemDisabled(data: IData): void {
-    let enable = !this.dynaLogicResult.disabled;
+    let { disabled } = this.dynaLogicResult;
 
     // 上层计算为启用时计算预定义项启用逻辑
-    if (enable && this.panel.scheduler) {
+    if (disabled !== true && this.panel.scheduler) {
       const itemEnable = this.panel.scheduler.triggerItemEnable(
         this.model.id!,
         {
@@ -183,12 +183,14 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
         },
       );
       if (itemEnable !== undefined) {
-        enable = itemEnable;
+        disabled = !itemEnable;
       }
     }
 
-    // 修改state
-    this.state.disabled = !enable;
+    // 有值的时候才会去修改state
+    if (disabled !== undefined) {
+      this.state.disabled = disabled;
+    }
   }
 
   /**
@@ -201,7 +203,7 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
     let { visible } = this.dynaLogicResult;
 
     // 上层计算为显示时计算预定义项显示逻辑
-    if (visible && this.panel.scheduler) {
+    if (visible !== false && this.panel.scheduler) {
       const itemVIsible = this.panel.scheduler.triggerItemVisible(
         this.model.id!,
         {
@@ -213,8 +215,10 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
       }
     }
 
-    // 修改state
-    this.state.visible = visible;
+    // 有值的时候才会去修改state
+    if (visible !== undefined) {
+      this.state.visible = visible;
+    }
   }
 
   /**
@@ -224,10 +228,10 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
    * @param {IData} data
    */
   calcItemRequired(data: IData): void {
-    let allowEmpty = !this.dynaLogicResult.required;
+    let { required } = this.dynaLogicResult;
 
     // 上层计算为启用时计算预定义项启用逻辑
-    if (allowEmpty && this.panel.scheduler) {
+    if (required !== true && this.panel.scheduler) {
       const itemAllowEmpty = this.panel.scheduler.triggerItemBlank(
         this.model.id!,
         {
@@ -235,12 +239,14 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
         },
       );
       if (itemAllowEmpty !== undefined) {
-        allowEmpty = itemAllowEmpty;
+        required = !itemAllowEmpty;
       }
     }
 
-    // 修改state
-    this.state.required = !allowEmpty;
+    // 有值的时候才会去修改state
+    if (required !== undefined) {
+      this.state.required = required;
+    }
   }
 
   /**
@@ -249,10 +255,14 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
    * @date 2023-09-21 03:36:37
    * @protected
    */
-  protected dynaLogicResult = {
-    visible: true,
-    disabled: false,
-    required: false,
+  protected dynaLogicResult: {
+    visible?: boolean;
+    disabled?: boolean;
+    required?: boolean;
+  } = {
+    visible: undefined,
+    disabled: undefined,
+    required: undefined,
   };
 
   /**

package/src/controller/control/pickup-view-panel/pickup-view-panel.controller.ts

@@ -50,6 +50,13 @@ export class PickupViewPanelController
     await super.onCreated();
     // 等待嵌入视图mounted完成，选择视图面板才mounted
     this.mountCounter.enroll(this.model.embeddedAppDEViewId!);
+  }
+
+  updateContextParams(opts: {
+    context?: IContext | undefined;
+    params?: IParams | undefined;
+  }): void {
+    super.updateContextParams(opts);
     this.initNavParam();
   }
 

package/src/interface/common/i-global-config/i-global-config.ts

@@ -12,6 +12,15 @@ import { IGlobalViewConfig } from './i-global-view-config';
  * @interface IGlobalConfig
  */
 export interface IGlobalConfig {
+  /**
+   * 设置应用主题
+   *
+   * @author chitanda
+   * @date 2023-10-30 21:10:01
+   * @type {string}
+   */
+  theme?: string;
+
   /**
    * 全局视图配置
    * @return {*}

package/src/interface/controller/controller/control/i-map.controller.ts

@@ -0,0 +1,15 @@
+import { ISysMap } from '@ibiz/model-core';
+import { IMapEvent } from '../../event';
+import { IMapState } from '../../state';
+import { IMDControlController } from './i-md-control.controller';
+
+/**
+ * 地图控制器
+ * @author lxm
+ * @date 2023-05-04 01:47:16
+ * @export
+ * @interface IChartController
+ * @extends {IMDControlController}
+ */
+export interface IMapController
+  extends IMDControlController<ISysMap, IMapState, IMapEvent> {}

package/src/interface/controller/controller/control/index.ts

@@ -35,3 +35,4 @@ export * from './i-tree-grid.controller';
 export * from './i-tree-grid-ex.controller';
 export * from './i-medit-view-panel.controller';
 export * from './i-chart-exp-bar.controller';
+export * from './i-map.controller';

package/src/interface/controller/event/control/i-map.event.ts

@@ -0,0 +1,48 @@
+import { EventBase } from '../argument';
+import { IMDControlEvent } from './i-md-control.event';
+
+/**
+ * 地图部件事件
+ *
+ * @author lxm
+ * @date 2022-08-30 16:08:43
+ * @export
+ * @interface IMDControlEvent
+ */
+export interface IMapEvent extends IMDControlEvent {
+  /**
+   * 地图变更事件（下探，返回）
+   * @author lxm
+   * @date 2023-03-26 06:15:06
+   * @param {emitArgs} undefined
+   * @return {*}  {Promise<void>}
+   */
+  onMapChange: {
+    event: EventBase & { areaCode: string | number };
+    emitArgs: { areaCode: string | number };
+  };
+
+  /**
+   * 地图区域点击事件
+   * @author lxm
+   * @date 2023-03-26 06:15:06
+   * @param {emitArgs} undefined
+   * @return {*}  {Promise<void>}
+   */
+  onAreaClick: {
+    event: EventBase;
+    emitArgs: { data: IData[] };
+  };
+
+  /**
+   * 地图散点点击事件
+   * @author lxm
+   * @date 2023-03-26 06:15:06
+   * @param {emitArgs} undefined
+   * @return {*}  {Promise<void>}
+   */
+  onPointClick: {
+    event: EventBase;
+    emitArgs: { data: IData[] };
+  };
+}

package/src/interface/controller/event/control/index.ts

@@ -31,3 +31,4 @@ export * from './i-tree-grid.event';
 export * from './i-tree-grid-ex.event';
 export * from './i-medit-view-panel.event';
 export * from './i-chart-exp-bar.event';
+export * from './i-map.event';