@ibiz-template/runtime 0.2.7 → 0.2.9

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/panel/panel/panel.controller.ts

@@ -16,7 +16,9 @@ import {
   IControlProvider,
   IPanelItemContainerController,
 } from '../../../../interface';
+import { getAllPanelField } from '../../../../model';
 import { getPanelItemProvider } from '../../../../register';
+import { PanelData } from '../../../../service/vo';
 import { ControlController } from '../../../common';
 import { PanelNotifyState } from '../../../constant';
 import { ControllerEvent } from '../../../utils';
@@ -222,27 +224,8 @@ export class PanelController<
    * @memberof PanelController
    */
   convertData(data: IData): IData {
-    // const map: IData = {};
-    // // 绑定数据项和name不一致的映射到map里
-    // this.model.panelFields.forEach(field => {
-    //   if (field.id !== field.dataFieldName) {
-    //     map[field.id] = field.dataFieldName;
-    //   }
-    // });
-
-    // return new Proxy(data, {
-    //   get(target, p, receiver) {
-    //     if (Reflect.ownKeys(map).includes(p)) {
-    //       return Reflect.get(target, map[p], receiver);
-    //     }
-    //     return Reflect.get(target, p, receiver);
-    //   },
-    //   set(target, p, value, receiver) {
-    //     Reflect.set(target, p, value, receiver);
-    //     return true;
-    //   },
-    // });
-    return data;
+    const fields = getAllPanelField(this.model);
+    return new PanelData(fields, data);
   }
 
   /**

package/src/controller/utils/data-file-util/data-file-util.ts

@@ -0,0 +1,156 @@
+import {
+  IPortalAsyncAction,
+  IPortalMessage,
+  RuntimeError,
+} from '@ibiz-template/core';
+import { IAppDataEntity } from '@ibiz/model-core';
+
+// 异步导入URL
+const asyncImportUrl = '/asyncimportdata2';
+
+// 标准导入url
+const importUrl = '/importdata2';
+
+// 导入结果类型
+export type ImportDataResult = {
+  total: number;
+  success: number;
+  message?: string;
+};
+// 导出结果类型
+export type IExportDataResult = {
+  // 是否导出成功
+  ok: boolean;
+  // 导出文件地址 (后期异步导出可能会用到)
+  url?: string;
+};
+
+/**
+ * 监听异步作业
+ *
+ * @author zk
+ * @date 2023-10-31 03:10:31
+ * @param {string} id
+ * @return {*}  {Promise<ImportDataResult>}
+ */
+function listenAsyncAction(id: string): Promise<ImportDataResult> {
+  return new Promise(resolve => {
+    const callBack = (msg: IPortalMessage): void => {
+      // 兼容接口返回类型与实际返回类型不一致
+      const messageid = msg.messageid || (msg.data as IData).asyncacitonid;
+      if (
+        id === messageid &&
+        (msg.data as IPortalAsyncAction).actionstate === 30
+      ) {
+        // 返回结果是字符串， 需解析
+        try {
+          const result = JSON.parse(
+            (msg.data as IPortalAsyncAction).actionresult as string,
+          );
+          resolve(result as ImportDataResult);
+        } catch (error) {
+          throw new RuntimeError('解析数据发生错误');
+        } finally {
+          // 异步作业结束 取消订阅
+          ibiz.mc.command.asyncAction.off(callBack);
+        }
+      } else if ((msg.data as IPortalAsyncAction).actionstate === 40) {
+        resolve({
+          total: 0,
+          success: 0,
+          message: (msg.data as IPortalAsyncAction).actionresult as string,
+        });
+        // 异步作业结束 取消订阅
+        ibiz.mc.command.asyncAction.off(callBack);
+      }
+    };
+    ibiz.mc.command.asyncAction.on(callBack);
+  });
+}
+
+/**
+ * 异步作业导入方法
+ *
+ * @author zk
+ * @date 2023-10-31 02:10:06
+ * @export
+ * @param {File} file
+ * @param {IAppDataEntity} appDataEntity
+ * @return {*}  {Promise<IData>}
+ */
+export async function asyncImportData(
+  file: File,
+  appDataEntity: IAppDataEntity,
+): Promise<ImportDataResult> {
+  const data = new FormData();
+  data.append('file', file);
+  const url = `${appDataEntity.codeName2!.toLowerCase()}/${asyncImportUrl}`;
+  const res = await ibiz.net.request(url, {
+    method: 'post',
+    data,
+    headers: { 'Content-Type': 'multipart/form-data' },
+  });
+  return listenAsyncAction(res.data.asyncacitonid);
+}
+
+/**
+ * 标准导入方法
+ *
+ * @author zk
+ * @date 2023-10-31 02:10:29
+ * @export
+ * @param {File} file
+ * @param {IAppDataEntity} appDataEntity
+ * @return {*}  {Promise<IData>}
+ */
+export async function importData(
+  file: File,
+  appDataEntity: IAppDataEntity,
+): Promise<ImportDataResult> {
+  const data = new FormData();
+  data.append('file', file);
+  const url = `${appDataEntity.codeName2!.toLowerCase()}/${importUrl}`;
+  const res = await ibiz.net.request(url, {
+    method: 'post',
+    data,
+    headers: { 'Content-Type': 'multipart/form-data' },
+  });
+  // 错误情况 服务层会抛出异常
+  return res.data as ImportDataResult;
+}
+
+/**
+ * 标准导出方法
+ *
+ * @author zk
+ * @date 2023-10-31 09:10:13
+ * @export
+ * @param {string[]} header
+ * @param {IData[][]} data
+ * @param {string} fileName
+ * @return {*}  {Promise<IExportDataResult>}
+ */
+export async function exportData(
+  header: string[],
+  data: IData[][],
+  fileName: string,
+): Promise<IExportDataResult> {
+  if (!ibiz.util.getExcelUtil) {
+    throw new RuntimeError('ibiz.util.getExportExcel不存在');
+  }
+  const exportExcel = await ibiz.util.getExcelUtil();
+  if (!exportExcel) {
+    throw new RuntimeError('导出模块加载错误');
+  }
+  try {
+    exportExcel.exportJsonToExcel({
+      header, // 表头内容 数组格式
+      data, // 具体数据 这是个二维数组
+      filename: fileName, // 文件名称
+      autoWidth: true, // 单元格是否自适应
+    });
+    return { ok: true };
+  } catch (error) {
+    return { ok: false };
+  }
+}

package/src/controller/utils/index.ts

@@ -6,3 +6,4 @@ export * from './util/util';
 export * from './value-rule/value-rule';
 export * from './value-ex/value-ex';
 export * from './value-default/value-default';
+export * from './data-file-util/data-file-util';

package/src/global/global-util/global-util.ts

@@ -1,4 +1,4 @@
-import { IExportExcelUtil } from '../../interface';
+import { IExcelUtil } from '../../interface';
 import {
   TextUtil,
   LayoutPanelUtil,
@@ -67,7 +67,7 @@ export class GlobalUtil {
    * @author lxm
    * @date 2023-08-24 10:47:06
    */
-  getExportExcel?: () => Promise<IExportExcelUtil>;
+  getExcelUtil?: () => Promise<IExcelUtil>;
 
   /**
    * 显示应用级别的加载提示

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/controller/control/panel-item/i-panel-data-container.controller.ts

@@ -25,5 +25,5 @@ export interface IPanelDataContainerController
    * @param {string} name 要设置的数据的属性名称
    * @param {unknown} value 要设置的值
    */
-  setDataValue?(name: string, value: unknown): Promise<void>;
+  setDataValue(name: string, value: unknown): Promise<void>;
 }

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';

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

@@ -0,0 +1,148 @@
+import { IMDControlState } from './i-md-control.state';
+
+/**
+ * 地图部件状态
+ * @author lxm
+ * @date 2023-05-22 02:18:43
+ * @export
+ * @interface IMapState
+ * @extends {IMDControlState}
+ */
+export interface IMapState extends IMDControlState {
+  items: IMapData[];
+
+  /**
+   * 点的数据
+   * @author lxm
+   * @date 2023-10-31 09:48:54
+   * @type {IMapData[]}
+   */
+  pointData: IMapData[];
+
+  /**
+   * 区域的数据
+   * @author lxm
+   * @date 2023-10-31 09:49:02
+   * @type {IMapData[]}
+   */
+  areaData: IMapData[];
+
+  /**
+   * 区域编码是否是字符串
+   * @author lxm
+   * @date 2023-11-01 03:30:09
+   * @type {boolean}
+   */
+  strAreaCode: boolean;
+
+  /**
+   * 默认显示的区域代码
+   * @author lxm
+   * @date 2023-10-31 09:03:23
+   * @type {string}
+   */
+  defaultAreaCode: string | number;
+
+  /**
+   * 当前区域代码
+   * @author lxm
+   * @date 2023-10-31 09:03:23
+   * @type {string}
+   */
+  areaCode: string | number;
+
+  /**
+   * 地图json数据基础路径
+   * @author lxm
+   * @date 2023-11-01 03:37:19
+   * @type {string}
+   */
+  jsonBaseUrl?: string;
+}
+
+/**
+ * 地图数据格式
+ *
+ * @export
+ * @class ITreeNodeData
+ */
+export interface IMapData {
+  /**
+   * 唯一标识
+   * @author lxm
+   * @date 2023-10-30 06:20:08
+   * @type {string}
+   */
+  _id: string;
+
+  /**
+   * 类型
+   * @author lxm
+   * @date 2023-10-30 06:20:14
+   * @type {('point' | 'area')}
+   */
+  _type: 'point' | 'area';
+
+  /**
+   * 地图项id
+   * @author lxm
+   * @date 2023-10-30 06:20:40
+   * @type {string}
+   */
+  _mapItemId: string;
+
+  /**
+   * 经度
+   * @author lxm
+   * @date 2023-10-30 09:25:34
+   * @type {string}
+   */
+  _longitude?: string;
+
+  /**
+   * 纬度
+   * @author lxm
+   * @date 2023-10-30 09:25:34
+   * @type {string}
+   */
+  _latitude?: string;
+
+  /**
+   * 区域标识
+   * @author lxm
+   * @date 2023-10-30 09:26:18
+   */
+  _areaCode?: string;
+
+  /**
+   * 提示信息
+   * @author lxm
+   * @date 2023-10-30 09:34:47
+   * @type {string}
+   */
+  _tooltip?: string;
+
+  /**
+   * 统计数据值
+   * @author lxm
+   * @date 2023-10-31 10:47:50
+   * @type {number}
+   */
+  _value?: number;
+
+  /**
+   * 文本值
+   * @author lxm
+   * @date 2023-10-31 10:47:50
+   * @type {number}
+   */
+  _text?: string;
+
+  /**
+   * 图标
+   * @author lxm
+   * @date 2023-10-31 10:47:50
+   * @type {number}
+   */
+  _symbol?: string;
+}

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

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

package/src/interface/index.ts

@@ -1,5 +1,4 @@
 export * from './common';
-export * from './util';
 export * from './provider';
 export * from './register';
 export * from './controller';
@@ -8,3 +7,5 @@ export * from './engine';
 export * from './logic-scheduler';
 export * from './model';
 export * from './studio';
+export * from './ui-login';
+export * from './util';

package/src/interface/provider/i-ui-login-node.provider.ts

@@ -0,0 +1,23 @@
+import { IDEUIPFPluginLogic } from '@ibiz/model-core';
+import { IUILogicContext } from '../ui-login';
+
+/**
+ * 界面逻辑前端节点适配器
+ *
+ * @author chitanda
+ * @date 2023-11-01 17:11:16
+ * @export
+ * @interface IUILogicNodeProvider
+ */
+export interface IUILogicNodeProvider {
+  /**
+   * 执行界面逻辑 节点
+   *
+   * @author chitanda
+   * @date 2023-11-01 18:11:17
+   * @param {IDEUIPFPluginLogic} model
+   * @param {IUILogicContext} ctx
+   * @return {*}  {Promise<unknown>}
+   */
+  exec(model: IDEUIPFPluginLogic, ctx: IUILogicContext): Promise<unknown>;
+}

package/src/interface/provider/index.ts

@@ -9,3 +9,4 @@ export * from './i-form-detail.provider';
 export * from './i-editor.provider';
 export * from './i-portlet.provider';
 export { IAppCounterProvider } from './i-app-counter.provider';
+export type { IUILogicNodeProvider } from './i-ui-login-node.provider';