@ibiz-template/runtime 0.1.0 → 0.1.1

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

@@ -1,12 +1,17 @@
-import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
+import {
+  ModelError,
+  RuntimeError,
+  RuntimeModelError,
+} from '@ibiz-template/core';
 import {
   IAppUIOpenDataLogic,
   INavigateParam,
   IAppUINewDataLogic,
+  IAppUILogicRefViewBase,
 } from '@ibiz/model-core';
 import { notNilEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
-import { IUILogicParams } from '../../interface';
+import { IModalData, IUILogicParams } from '../../interface';
 import { convertNavData } from '../../utils';
 import { LogicExecutor } from './logic-executor';
 
@@ -55,7 +60,8 @@ export class AppUILogicExecutor extends LogicExecutor {
     appUILogic: IAppUIOpenDataLogic,
     parameters: IUILogicParams,
   ): Promise<void> {
-    const { context, params, data, ...rest } = parameters;
+    const { context, params, ...rest } = parameters;
+    const { data } = parameters;
     if (!data?.[0]) {
       throw new RuntimeError('opendata没有可操作数据！');
     }
@@ -116,21 +122,33 @@ export class AppUILogicExecutor extends LogicExecutor {
     appUILogic: IAppUINewDataLogic,
     parameters: IUILogicParams,
   ): Promise<void> {
-    const { context, params, data, ...rest } = parameters;
-    // 准备需要的模型
-    const newViewRef = appUILogic.newDataAppView;
-    if (!newViewRef) {
-      throw new RuntimeModelError(
-        appUILogic,
-        'newdata视图逻辑没有配置默认新建数据视图',
-      );
-    }
-    const newView = newViewRef.refAppViewId;
-    if (!newView) {
-      throw new RuntimeModelError(
-        appUILogic,
-        'newdata视图逻辑的默认新建数据视图没有实际引用视图',
-      );
+    const { context, params, ...rest } = parameters;
+    const { data } = parameters;
+    const { enableWizardAdd, enableBatchAdd, batchAddOnly, newDataAppView } =
+      appUILogic;
+
+    let newViewRef: IAppUILogicRefViewBase | undefined;
+    if (enableWizardAdd) {
+      newViewRef = await this.getWizardNewViewRef(appUILogic, parameters);
+      if (!newViewRef) {
+        // 选择视图取消操作直接返回
+        return;
+      }
+    } else if (enableBatchAdd) {
+      // todo 批添加
+      throw new ModelError(appUILogic, 'enableBatchAdd暂未支持');
+    } else if (batchAddOnly) {
+      // todo 只支持批添加
+      throw new ModelError(appUILogic, 'batchAddOnly暂未支持');
+    } else {
+      // 准备需要的模型
+      newViewRef = newDataAppView;
+      if (!newViewRef || !newViewRef.refAppViewId) {
+        throw new RuntimeModelError(
+          appUILogic,
+          'newdata视图逻辑没有配置默认新建数据视图',
+        );
+      }
     }
 
     // 处理导航参数
@@ -154,21 +172,63 @@ export class AppUILogicExecutor extends LogicExecutor {
       _data.srfkey = undefined;
       tempParams = Object.assign(tempParams, _data.$origin);
     }
-    if (appUILogic.enableWizardAdd) {
-      // todo 向导添加
-    } else if (appUILogic.enableBatchAdd) {
-      // todo 批添加
-    } else if (appUILogic.batchAddOnly) {
-      // todo 只支持批添加
-    }
 
     // 打开视图
     await ibiz.commands.execute(
       OpenAppViewCommand.TAG,
-      newView,
+      newViewRef.refAppViewId,
       tempContext,
       tempParams,
       rest,
     );
   }
+
+  /**
+   * 获取向导新建视图引用
+   * 返回undefined为取消操作
+   * 找不到会报错
+   * @author lxm
+   * @date 2023-08-03 06:37:22
+   * @protected
+   * @param {IAppUINewDataLogic} appUILogic
+   * @param {IUILogicParams} parameters
+   * @return {*}  {(Promise<IAppUILogicRefViewBase | undefined>)}
+   */
+  protected async getWizardNewViewRef(
+    appUILogic: IAppUINewDataLogic,
+    parameters: IUILogicParams,
+  ): Promise<IAppUILogicRefViewBase | undefined> {
+    const { wizardAppView, newDataAppViews } = appUILogic;
+    const { context, params, ...rest } = parameters;
+    // 索引实体的向导添加
+    if (!wizardAppView || !wizardAppView.refAppViewId) {
+      throw new RuntimeModelError(appUILogic, '缺少默认索引实体选择视图');
+    }
+
+    // 打开视图
+    const result = await ibiz.commands.execute<IModalData>(
+      OpenAppViewCommand.TAG,
+      wizardAppView.refAppViewId,
+      context,
+      params,
+      { ...rest, openMode: 'POPUPMODAL' },
+    );
+
+    if (!result.ok) {
+      // 取消
+      return;
+    }
+    const selectData = result.data?.[0];
+    if (!selectData) {
+      throw new RuntimeError('请选中一条数据');
+    }
+    const indexType = selectData.srfkey;
+    const findView = newDataAppViews?.find(item => item.refMode === indexType);
+    if (!findView) {
+      throw new RuntimeError(
+        `没有找到与索引类型${indexType}相关的实体的编辑视图`,
+      );
+    }
+    return findView;
+  }
 }

package/src/service/service/entity/method/fetch.ts

@@ -1,6 +1,11 @@
-import { HttpResponse } from '@ibiz-template/core';
+import {
+  HttpResponse,
+  ModelError,
+  RuntimeModelError,
+} from '@ibiz-template/core';
 import { ascSort, descSort } from 'qx-util';
 import { clone, equals, isEmpty, isNil, where } from 'ramda';
+import { IAppDEDataSet } from '@ibiz/model-core';
 import { PSDEDQCondEngine, SearchFilter } from '../../../utils';
 import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
@@ -16,20 +21,43 @@ import { execFieldLogics } from '../../../../de-logic';
  * @extends {Method}
  */
 export class FetchMethod extends Method {
+  declare method: IAppDEDataSet;
+
   async exec(
     context: IParams,
     data: IData,
     params: IParams,
   ): Promise<HttpResponse<IDataEntity[]>> {
     if (this.isLocalMode) {
+      // 临时数据
       const items = await this.searchLocal(
         null,
         new SearchFilter(context, data),
       );
       return new HttpResponse<IDataEntity[]>(items, 200);
     }
-    const path = this.calcPath(context);
-    const res = await this.request(path, context, data, params);
+
+    // 根据数据集合来源查询数据
+    let res: HttpResponse<IData[]>;
+    switch (this.method.dataSetType) {
+      case 'INDEXDE':
+      case 'CODELIST':
+        res = await this.fetchCodeListSet(context, params);
+        break;
+      case 'REMOTE':
+        {
+          const path = this.calcPath(context);
+          res = await this.request(path, context, data, params);
+        }
+        break;
+      default:
+        throw new ModelError(
+          this.method,
+          `数据来源类型${this.method.dataSetType}暂未支持`,
+        );
+    }
+
+    // 转换实体对象
     const items: IData[] = res.data || [];
     res.data = items.map(item => this.createEntity(item));
 
@@ -41,8 +69,7 @@ export class FetchMethod extends Method {
         ),
       );
     }
-
-    return res;
+    return res as HttpResponse<IDataEntity[]>;
   }
 
   /**
@@ -174,4 +201,34 @@ export class FetchMethod extends Method {
     const items = list.slice(start, end).map(item => clone(item));
     return items;
   }
+
+  /**
+   * 获取代码表数据来源的集合
+   * @author lxm
+   * @date 2023-08-03 02:55:00
+   * @param {IParams} context
+   * @param {IParams} params
+   * @return {*}  {Promise<HttpResponse<IData[]>>}
+   */
+  protected async fetchCodeListSet(
+    context: IParams,
+    params: IParams,
+  ): Promise<HttpResponse<IData[]>> {
+    const { appCodeListId } = this.method;
+    if (!appCodeListId) {
+      throw new RuntimeModelError(this.method, '没有指定数据来源代码表');
+    }
+    const codeItems = await this.app.codeList.get(
+      appCodeListId,
+      context,
+      params,
+    );
+    const { keyAppDEFieldId, majorAppDEFieldId } = this.entity;
+    const dataSet = codeItems.map(item => ({
+      [keyAppDEFieldId!]: item.value,
+      [majorAppDEFieldId!]: item.text,
+    }));
+
+    return new HttpResponse(dataSet, 200);
+  }
 }