@ibiz-template/runtime 0.2.8 → 0.2.10

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

@@ -114,6 +114,8 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
     }
   }
 
+  destroy(): void {}
+
   /**
    * 创建面板状态对象
    *

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';
@@ -115,6 +117,14 @@ export class PanelController<
     this.load();
   }
 
+  protected async onDestroyed(): Promise<void> {
+    await super.onDestroyed();
+    this.data.destroy?.();
+    Object.values(this.panelItems).forEach(item => {
+      item.destroy();
+    });
+  }
+
   /**
    * 初始化面板成员控制器
    *
@@ -183,6 +193,8 @@ export class PanelController<
     // 转换数据，处理原始数据和面板项的映射。
     const panelData = this.convertData(data);
 
+    // 清空上一个，如果存在的话。
+    this.data.destroy?.();
     this.state.data = panelData;
     this.panelStateNotify(PanelNotifyState.LOAD);
   }
@@ -221,28 +233,18 @@ export class PanelController<
    * @returns {*}  {IData}
    * @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;
-    //   }
-    // });
+  convertData(data: IData): PanelData {
+    const fields = getAllPanelField(this.model);
+    const fieldKeys = fields.map(item => item.id!);
+    const panelData = new PanelData(fields, data);
 
-    // 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;
+    // 面板属性变更的触发变更通知
+    panelData._evt.on('change', key => {
+      if (fieldKeys.includes(key)) {
+        this.dataChangeNotify([key]);
+      }
+    });
+    return panelData;
   }
 
   /**
@@ -287,7 +289,6 @@ export class PanelController<
 
     // 改变值
     this.state.data[name] = value;
-    this.dataChangeNotify([name]);
   }
 
   protected initControlScheduler(logics: IControlLogic[] = []): void {

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

@@ -52,4 +52,11 @@ export interface IPanelItemController {
    * @date 2022-09-20 18:09:07
    */
   panelStateNotify(state: PanelNotifyState): Promise<void>;
+
+  /**
+   * 销毁方法
+   * @author lxm
+   * @date 2023-11-02 03:31:29
+   */
+  destroy(): void;
 }

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

@@ -27,6 +27,22 @@ export interface IMapState extends IMDControlState {
    */
   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
@@ -34,6 +50,14 @@ export interface IMapState extends IMDControlState {
    * @type {string}
    */
   areaCode: string | number;
+
+  /**
+   * 地图json数据基础路径
+   * @author lxm
+   * @date 2023-11-01 03:37:19
+   * @type {string}
+   */
+  jsonBaseUrl?: string;
 }
 
 /**
@@ -52,12 +76,12 @@ export interface IMapData {
   _id: string;
 
   /**
-   * 类型
+   * 呈现样式
    * @author lxm
-   * @date 2023-10-30 06:20:14
-   * @type {('point' | 'area')}
+   * @date 2023-11-02 04:59:12
+   * @type {string}
    */
-  _type: 'point' | 'area';
+  _itemStyle: string;
 
   /**
    * 地图项id

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

package/src/interface/ui-login/i-ui-logic-context.ts

@@ -0,0 +1,95 @@
+export interface IUILogicContext {
+  /**
+   * 上一次返回值
+   */
+  lastReturn: unknown;
+
+  /**
+   * 上下文
+   */
+  readonly context: IContext;
+
+  /**
+   * 数据
+   */
+  readonly data: IData;
+
+  /**
+   * 视图参数
+   */
+  readonly viewParam: IParams;
+
+  /**
+   * 界面逻辑参数
+   *
+   * @author chitanda
+   * @date 2023-11-01 17:11:52
+   * @type {Record<string, unknown>}
+   */
+  readonly params: Record<string, unknown>;
+
+  /**
+   * UI 逻辑执行返回值
+   *
+   * @author chitanda
+   * @date 2023-11-01 17:11:29
+   * @type {unknown}
+   */
+  result: unknown;
+
+  /**
+   * 是否存在结束节点
+   *
+   * @author chitanda
+   * @date 2023-11-01 17:11:57
+   * @type {boolean}
+   */
+  isEndNode: boolean;
+
+  /**
+   * 默认参数节点名称
+   *
+   * @default 'Default'
+   * @author chitanda
+   * @date 2023-11-01 17:11:31
+   * @type {string}
+   */
+  defaultParamName: string;
+
+  /**
+   * 重置实体逻辑参数
+   *
+   * @author chitanda
+   * @date 2023-11-01 17:11:18
+   * @param {string} name
+   */
+  resetParam(name: string): void;
+
+  /**
+   * 设置上一次返回值
+   *
+   * @author chitanda
+   * @date 2023-11-01 17:11:31
+   * @param {string} name
+   */
+  renewParam(name: string): void;
+
+  /**
+   * 设置上一次返回值
+   *
+   * @author chitanda
+   * @date 2023-11-01 17:11:48
+   * @param {unknown} value
+   */
+  setLastReturn(value: unknown): void;
+
+  /**
+   * 是否是实体参数变量（即后台数据对象）
+   *
+   * @author chitanda
+   * @date 2023-11-01 17:11:01
+   * @param {string} paramId
+   * @return {*}  {boolean}
+   */
+  isEntityParam(paramId: string): boolean;
+}

package/src/interface/ui-login/index.ts

@@ -0,0 +1 @@
+export type { IUILogicContext } from './i-ui-logic-context';

package/src/interface/util/{i-export-excel/i-export-excel.ts → i-excel-util/i-excel-util.ts}

@@ -1,11 +1,11 @@
 /**
- * 导出excel文件工具
+ * excel文件工具
  * @author lxm
  * @date 2023-08-24 10:45:32
  * @export
- * @interface IExportExcelUtil
+ * @interface IExcelUtil
  */
-export interface IExportExcelUtil {
+export interface IExcelUtil {
   /**
    * 导出成Excel文件
    * @author lxm

package/src/interface/util/index.ts

@@ -12,4 +12,4 @@ export { IOverlayController } from './i-overlay-controller/i-overlay-controller'
 export { IOverlayPopoverContainer } from './i-overlay-popover-container/i-overlay-popover-container';
 
 export { IScriptFunctionOpts } from './script/i-script-function';
-export { IExportExcelUtil } from './i-export-excel/i-export-excel';
+export { IExcelUtil } from './i-excel-util/i-excel-util';

package/src/logic-scheduler/executor/app-ui-logic-executor.ts

@@ -12,7 +12,7 @@ import {
 import { notNilEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
 import { IModalData, IUILogicParams } from '../../interface';
-import { calcDeCodeNameById, getFormTypeFieldName } from '../../model';
+import { calcDeCodeNameById } from '../../model';
 import { convertNavData } from '../../utils';
 import { LogicExecutor } from './logic-executor';
 import { Srfuf } from '../../service';
@@ -47,16 +47,13 @@ export class AppUILogicExecutor extends LogicExecutor {
   }
 
   /**
-   * 执行应用预置界面逻辑opendata
+   * 执行应用预置界面逻辑 opendata
    *
-   * @author lxm
-   * @date 2022-08-22 14:08:03
-   * @export
-   * @param {IPSAppUIOpenDataLogic} appUILogic 应用预置界面逻辑opendata模型对象
-   * @param {IContext} context 上下文参数
-   * @param {(IData | null)} data 数据集合
-   * @param {IParams} params 视图参数
-   * @param {IData} [opts] 额外参数，event是js原生事件
+   * @author chitanda
+   * @date 2023-11-02 11:11:36
+   * @param {IAppUIOpenDataLogic} appUILogic 应用预置界面逻辑 opendata 模型对象
+   * @param {IUILogicParams} parameters
+   * @return {*}  {Promise<IModalData>}
    */
   async executeOpenDataAppUILogic(
     appUILogic: IAppUIOpenDataLogic,
@@ -67,6 +64,7 @@ export class AppUILogicExecutor extends LogicExecutor {
     if (!data?.[0]) {
       throw new RuntimeError('opendata没有可操作数据！');
     }
+    // openDataAppViews 只有[索引实体]或[多表单实体]才会有值
     const openViewRefs = appUILogic.openDataAppViews;
     let openViewRef: IAppUILogicRefViewBase | undefined;
     if (openViewRefs) {
@@ -118,18 +116,21 @@ export class AppUILogicExecutor extends LogicExecutor {
     appUILogic: IAppUIOpenDataLogic,
     parameters: IUILogicParams,
   ): Promise<IAppUILogicRefViewBase> {
-    const appDataEntityId = parameters.view.model.appDataEntityId!;
-    // 表单类型属性
-    const formTypeName = await getFormTypeFieldName(appDataEntityId);
-    if (!formTypeName) {
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      parameters.view.model.appDataEntityId!,
+    )!;
+    // [多表单实体] or [索引实体]类型属性
+    const typeFileName =
+      appDataEntity.formTypeAppDEFieldId || appDataEntity.dataTypeAppDEFieldId;
+    if (!typeFileName) {
       throw new RuntimeModelError(
         appUILogic,
-        `${appDataEntityId}实体缺少表单类型应用实体属性`,
+        `${appDataEntity.codeName}[多表单实体] or [索引实体]缺少类型属性配置`,
       );
     }
     const { data } = parameters;
     // 表单类型值
-    const formTypeValue = data[0][formTypeName];
+    const formTypeValue = data[0][typeFileName];
     if (!formTypeValue) {
       throw new RuntimeModelError(appUILogic, '数据源无表单类型应用实体属性值');
     }

package/src/model/data-entity/data-entity.ts

@@ -52,23 +52,6 @@ export async function getDeACMode(
   return deACMode;
 }
 
-/**
- * 从实体里找到表单类型应用实体属性
- *
- * @author zk
- * @date 2023-09-07 05:09:41
- * @export
- * @param {string} entityId
- * @param {string} [srfappid]
- * @return {*}  {(Promise<string | undefined>)}
- */
-export async function getFormTypeFieldName(
-  entityId: string,
-): Promise<string | undefined> {
-  const appDataEntity = await ibiz.hub.getAppDataEntity(entityId)!;
-  return appDataEntity.formTypeAppDEFieldId;
-}
-
 /**
  * 从实体里找到实体逻辑
  * @author lxm

package/src/model/panel/index.ts

@@ -1 +1,2 @@
 export * from './data-container';
+export * from './panel-field';

package/src/model/panel/panel-field.ts

@@ -0,0 +1,49 @@
+import {
+  IPanel,
+  IPanelContainer,
+  IPanelField,
+  IPanelItem,
+} from '@ibiz/model-core';
+import { isDataContainer } from './data-container';
+
+const ChildKeys = ['panelItems', 'panelTabPages', 'rootPanelItems'] as const;
+
+function _getAllPanelField(model: IData): IPanelField[] {
+  let childItems: IPanelItem[] = [];
+  for (const key of ChildKeys) {
+    if (model[key]) {
+      childItems = model[key];
+      break;
+    }
+  }
+  const fields: IPanelField[] = [];
+
+  if (childItems.length) {
+    // 过滤出当前层级的子里面的所有面板属性
+    fields.push(...childItems.filter(item => item.itemType === 'FIELD'));
+
+    // 递归遍历拿子里面的成员
+    childItems.forEach(item => {
+      // 如果是数据容器则不往下找
+      if (!isDataContainer(item)) {
+        fields.push(..._getAllPanelField(item));
+      }
+    });
+  }
+
+  return fields;
+}
+
+/**
+ * 获取所有子面板属性模型
+ * @author lxm
+ * @date 2023-11-01 04:45:44
+ * @export
+ * @param {(IPanel | IPanelContainer)} model
+ * @return {*}  {IPanelField[]}
+ */
+export function getAllPanelField(
+  model: IPanel | IPanelContainer,
+): IPanelField[] {
+  return _getAllPanelField(model);
+}

package/src/model/utils/util.ts

@@ -1,8 +1,10 @@
 import {
   IAppView,
   IAppViewRef,
+  IApplication,
   IControl,
   IModelObject,
+  ISysPFPlugin,
 } from '@ibiz/model-core';
 
 /**
@@ -106,3 +108,21 @@ export function parseUserParams(userParams: Record<string, string>): {
 
   return { navigateContexts, navigateParams, other };
 }
+
+/**
+ * 从应用里面获取插件配置参数
+ *
+ * @author chitanda
+ * @date 2023-11-01 17:11:28
+ * @export
+ * @param {IApplication} app
+ * @param {string} id
+ * @return {*}  {ISysPFPlugin}
+ */
+export function getPFPlugin(app: IApplication, id: string): ISysPFPlugin {
+  const plugin = app.appPFPluginRefs?.find(item => item.id === id);
+  if (!plugin) {
+    throw new Error(`未找到插件${id}`);
+  }
+  return plugin;
+}