@ibiz-template/runtime 0.1.25 → 0.1.26

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 { getFormTypeFieldName } from '../../model';
+import { calcDeCodeNameById, getFormTypeFieldName } from '../../model';
 import { convertNavData } from '../../utils';
 import { LogicExecutor } from './logic-executor';
 
@@ -113,6 +113,36 @@ export class AppUILogicExecutor extends LogicExecutor {
     );
   }
 
+  protected async calcOpenViewRef(
+    appUILogic: IAppUIOpenDataLogic,
+    parameters: IUILogicParams,
+  ): Promise<IAppUILogicRefViewBase> {
+    const appDataEntityId = parameters.view.model.appDataEntityId!;
+    // 表单类型属性
+    const formTypeName = await getFormTypeFieldName(appDataEntityId);
+    if (!formTypeName) {
+      throw new RuntimeModelError(
+        appUILogic,
+        `${appDataEntityId}实体缺少表单类型应用实体属性`,
+      );
+    }
+    const { data } = parameters;
+    // 表单类型值
+    const formTypeValue = data[0][formTypeName];
+    if (!formTypeValue) {
+      throw new RuntimeModelError(appUILogic, '数据源无表单类型应用实体属性值');
+    }
+    const openViewRefs = appUILogic.openDataAppViews;
+    // 根据表单类型值找到实际打开的视图
+    const findView = openViewRefs?.find(item => item.refMode === formTypeValue);
+    if (!findView) {
+      throw new RuntimeError(
+        `没有找到与表单类型${formTypeValue}相关的实体的编辑视图`,
+      );
+    }
+    return findView;
+  }
+
   /**
    * 执行应用预置界面逻辑newdata
    *
@@ -130,7 +160,7 @@ export class AppUILogicExecutor extends LogicExecutor {
     parameters: IUILogicParams,
   ): Promise<IModalData> {
     const { context, params, ...rest } = parameters;
-    const { data } = parameters;
+    const { data, view } = parameters;
     const { enableWizardAdd, enableBatchAdd, batchAddOnly, newDataAppView } =
       appUILogic;
 
@@ -142,8 +172,20 @@ export class AppUILogicExecutor extends LogicExecutor {
         return { ok: false };
       }
     } else if (enableBatchAdd) {
-      // todo 批添加
-      throw new ModelError(appUILogic, 'enableBatchAdd暂未支持');
+      // 查找批添加打开视图
+      const parentDeName = calcDeCodeNameById(
+        view.parentView!.model.appDataEntityId!,
+      );
+      const batchViews = appUILogic.batchAddAppViews;
+      newViewRef = batchViews?.find(viewRef => {
+        return viewRef.refMode!.toLowerCase() !== parentDeName;
+      });
+      if (!newViewRef) {
+        throw new RuntimeModelError(
+          appUILogic,
+          '没有找到批添加需要打开的选择视图',
+        );
+      }
     } else if (batchAddOnly) {
       // todo 只支持批添加
       throw new ModelError(appUILogic, 'batchAddOnly暂未支持');
@@ -181,13 +223,20 @@ export class AppUILogicExecutor extends LogicExecutor {
     }
 
     // 打开视图
-    return ibiz.commands.execute(
+    const result: IModalData = await ibiz.commands.execute(
       OpenAppViewCommand.TAG,
       newViewRef.refAppViewId,
       tempContext,
       tempParams,
       rest,
     );
+
+    // 执行批添加新建逻辑
+    if (enableBatchAdd && result.data) {
+      await this.doBatchAdd(appUILogic, result.data, context, newViewRef);
+    }
+
+    return result;
   }
 
   /**
@@ -239,33 +288,83 @@ export class AppUILogicExecutor extends LogicExecutor {
     return findView;
   }
 
-  protected async calcOpenViewRef(
+  /**
+   * 拿选中的数据做批添加新建
+   * @author lxm
+   * @date 2023-09-15 05:20:02
+   * @protected
+   * @param {IAppUIOpenDataLogic} appUILogic
+   * @param {IData[]} selections
+   * @param {IContext} context
+   * @param {IAppUILogicRefViewBase} newViewRef
+   * @return {*}  {Promise<void>}
+   */
+  protected async doBatchAdd(
     appUILogic: IAppUIOpenDataLogic,
-    parameters: IUILogicParams,
-  ): Promise<IAppUILogicRefViewBase> {
-    const appDataEntityId = parameters.view.model.appDataEntityId!;
-    // 表单类型属性
-    const formTypeName = await getFormTypeFieldName(appDataEntityId);
-    if (!formTypeName) {
-      throw new RuntimeModelError(
-        appUILogic,
-        `${appDataEntityId}实体缺少表单类型应用实体属性`,
-      );
-    }
-    const { data } = parameters;
-    // 表单类型值
-    const formTypeValue = data[0][formTypeName];
-    if (!formTypeValue) {
-      throw new RuntimeModelError(appUILogic, '数据源无表单类型应用实体属性值');
-    }
-    const openViewRefs = appUILogic.openDataAppViews;
-    // 根据表单类型值找到实际打开的视图
-    const findView = openViewRefs?.find(item => item.refMode === formTypeValue);
-    if (!findView) {
-      throw new RuntimeError(
-        `没有找到与表单类型${formTypeValue}相关的实体的编辑视图`,
+    selections: IData[],
+    context: IContext,
+    newViewRef: IAppUILogicRefViewBase,
+  ): Promise<void> {
+    // 批添加新建选中数据后
+    if (selections?.length) {
+      const selfDe = await ibiz.hub.getAppDataEntity(
+        appUILogic.appDataEntityId!,
+        context.srfappid,
       );
+      const minorDERs = selfDe.minorAppDERSs;
+      const pickParentDeName = newViewRef.refMode!.toLowerCase();
+      if (!minorDERs) {
+        throw new RuntimeModelError(selfDe, '实体没有从关系集合！');
+      }
+
+      // 获取选择视图对应父实体在当前实体里的外键属性名称。
+      let pickParentFieldName: string;
+      minorDERs?.forEach(item => {
+        const majorDeName = calcDeCodeNameById(item.majorAppDataEntityId!);
+        if (pickParentDeName === majorDeName) {
+          pickParentFieldName = item.parentAppDEFieldId!;
+        }
+      });
+
+      // 获取key为keymapping的特殊视图参数
+      const openViewKeyParam = newViewRef.navigateParams?.find(navParam => {
+        return navParam.key === 'keymapping';
+      });
+      let addData: IData[] = [];
+      if (openViewKeyParam) {
+        const keyValuePairs = openViewKeyParam.value!.split(';');
+        const keyMapping: IData = {};
+        // 遍历键值对数组并添加到 keyMapping 映射对象中
+        for (const pair of keyValuePairs) {
+          const [sourceKey, targetKey] = pair.split(':');
+          if (sourceKey && targetKey) {
+            keyMapping[sourceKey] = targetKey;
+          }
+        }
+        addData = selections.map(item => {
+          const tempData: IData = {
+            [pickParentFieldName]: item.srfkey,
+          };
+          // 遍历映射对象，将属性从 item 复制到 tempData
+          for (const key in keyMapping) {
+            if (Object.prototype.hasOwnProperty.call(keyMapping, key)) {
+              const targetKey = keyMapping[key];
+              if (Object.prototype.hasOwnProperty.call(item, key)) {
+                tempData[targetKey] = item[key];
+              }
+            }
+          }
+          return tempData;
+        });
+      } else {
+        addData = selections.map(item => ({
+          [pickParentFieldName]: item.srfkey,
+        }));
+      }
+
+      // 获取实体服务并调用创建接口
+      const service = ibiz.hub.getApp(context.srfappid).deService;
+      await service.exec(selfDe.id!, 'Create', context, addData);
     }
-    return findView;
   }
 }

package/src/service/service/control/control.service.ts

@@ -69,8 +69,8 @@ export class ControlService<T extends IControl = IControl> {
   async exec(
     methodName: string,
     context: IParams,
-    data: IData = {},
-    params: IParams = {},
+    data?: IData,
+    params?: IParams,
   ): Promise<IHttpResponse> {
     const res = await this.app.deService.exec(
       this.model.appDataEntityId!,

package/src/service/service/entity/de.service.ts

@@ -114,8 +114,8 @@ export class DEService implements IAppDEService {
   exec(
     id: string,
     context: IParams,
-    params: IData = {},
-    params2: IParams = {},
+    params?: IData,
+    params2?: IParams,
   ): Promise<IHttpResponse> {
     const method = this.getMethod(id);
     if (method) {

package/src/service/service/entity/method/de-action.ts

@@ -37,8 +37,8 @@ export class DEActionMethod extends Method {
 
   async exec(
     context: IParams,
-    data: IData,
-    params: IParams,
+    data?: IData,
+    params?: IParams,
   ): Promise<HttpResponse<IData>> {
     // 实体逻辑处理
 
@@ -47,22 +47,22 @@ export class DEActionMethod extends Method {
       if (!deLogic) {
         throw new RuntimeModelError(this.method, '缺少实体处理逻辑');
       }
-      return execDELogicAction(deLogic, context, data, params);
+      return execDELogicAction(deLogic, context, data || {}, params || {});
     }
 
-    if (!this.isLocalMode) {
+    if (data && !this.isLocalMode) {
       data = await this.input.handle(context, data);
     }
 
     // 执行变更属性逻辑
-    if (!['READ', 'GETDRAFT'].includes(this.method.actionMode!)) {
-      await execFieldLogics(this.entity, 'change', context, data, params);
+    if (data && !['READ', 'GETDRAFT'].includes(this.method.actionMode!)) {
+      await execFieldLogics(this.entity, 'change', context, data, params || {});
     }
 
     let result: IHttpResponse<IData>;
     switch (this.method.codeName) {
       case 'Create':
-        result = await this.create(context, data, params);
+        result = await this.create(context, data!, params || {});
         break;
       case 'Get':
         result = await this.get(context, params);
@@ -74,10 +74,10 @@ export class DEActionMethod extends Method {
         result = await this.remove(context, params);
         break;
       case 'Update':
-        result = await this.update(context, data, params);
+        result = await this.update(context, data!, params);
         break;
       case 'CreateTemp':
-        result = await this.createTemp(context, data);
+        result = await this.createTemp(context, data!);
         break;
       case 'GetTemp':
         result = await this.getTemp(context, data);
@@ -89,14 +89,14 @@ export class DEActionMethod extends Method {
         result = await this.removeTemp(context, data);
         break;
       case 'UpdateTemp':
-        result = await this.updateTemp(context, data);
+        result = await this.updateTemp(context, data!);
         break;
       default: {
         let path = this.calcPath(context);
         if (this.method.needResourceKey) {
           path = `${path}/${
             context[this.entity.codeName!.toLowerCase()] ||
-            data[this.entity.keyAppDEFieldId!]
+            data?.[this.entity.keyAppDEFieldId!]
           }`;
         }
         const res = await this.request(path, context, data, params);
@@ -106,7 +106,13 @@ export class DEActionMethod extends Method {
     }
 
     // 计算属性逻辑
-    await execFieldLogics(this.entity, 'compute', context, result.data, params);
+    await execFieldLogics(
+      this.entity,
+      'compute',
+      context,
+      result.data,
+      params || {},
+    );
 
     return result;
   }

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

@@ -80,8 +80,8 @@ export abstract class Method {
    */
   abstract exec(
     context: IParams,
-    params: IData,
-    params2: IParams,
+    params?: IData,
+    params2?: IParams,
   ): Promise<HttpResponse>;
 
   /**
@@ -99,8 +99,8 @@ export abstract class Method {
   protected async request(
     path: string,
     context: IParams,
-    data: IData,
-    params: IParams,
+    data?: IData,
+    params?: IParams,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ): Promise<HttpResponse<any>> {
     const { actionType, requestMethod } = this.method as IModel;
@@ -111,7 +111,7 @@ export abstract class Method {
         case 'POST':
           res = await this.app.net.post(
             `${path}/${methodName}`,
-            notNilEmpty(data) ? data : params,
+            notNilEmpty(data) ? data! : params!,
           );
           break;
         case 'GET':
@@ -120,7 +120,7 @@ export abstract class Method {
         case 'PUT': {
           res = await this.app.net.put(
             `${path}/${methodName}`,
-            notNilEmpty(data) ? data : params,
+            notNilEmpty(data) ? data! : params!,
           );
           break;
         }

package/src/types.ts

@@ -166,4 +166,16 @@ declare module '@ibiz-template/core' {
      */
     scheduler: LogicSchedulerCenter;
   }
+
+  interface IEnvironment {
+    /**
+     * 全局提供的功能性配置
+     *
+     * @description 默认无值使用默认配置，可以使用 environment.js 中的 globalConfig 覆盖默认配置
+     * @author chitanda
+     * @date 2023-09-15 14:09:14
+     * @type {IGlobalConfig}
+     */
+    globalConfig?: IGlobalConfig;
+  }
 }

package/src/ui-logic/ui-logic-node/end-node/end-node.ts

@@ -26,7 +26,7 @@ export class EndNode extends UILogicNode {
         ctx.result = null;
         break;
       case 'SRCVALUE': // 直接值
-        ctx.result = rawValue;
+        ctx.result = ibiz.util.rawValue.format(rawValue);
         break;
       case 'LOGICPARAM': // 逻辑参数对象
         ctx.result = ctx.params[returnParamId!];

package/src/ui-logic/utils/handle-src-val.ts

@@ -52,7 +52,7 @@ export function handleSrcVal(
       return undefined;
     // 直接值
     case 'SRCVALUE':
-      return srcValue;
+      return ibiz.util.rawValue.format(srcValue);
     case 'WEBCONTEXT': // 网页请求上下文
     case 'VIEWPARAM': // 视图参数
       value = ctx.viewParams;

package/src/utils/index.ts

@@ -12,3 +12,4 @@ export * from './modal/modal';
 export * from './value-rule/value-rule';
 export * from './script/index';
 export { TextUtil } from './text-util/text-util';
+export { RawValueUtil } from './raw-value-util/raw-value-util';

package/src/utils/raw-value-util/raw-value-util.ts

@@ -0,0 +1,37 @@
+/**
+ * 直接值工具类
+ *
+ * @export
+ * @class RawValueUtil
+ */
+export class RawValueUtil {
+  /**
+   *  字符串是否完全由整数/浮点数组成
+   *
+   * @param {string} str
+   * @return {*}
+   */
+  isNumber(str: string): boolean {
+    return /^-?\d+(\.\d+)?$/.test(str);
+  }
+
+  /**
+   * 转换直接值
+   *
+   * @param {string} val
+   * @return {*}
+   */
+  format(val: string | undefined): number | boolean | string | undefined {
+    let tempVal: number | boolean | string | undefined = val;
+    if (val !== undefined) {
+      if (val === 'true' || val === 'false') {
+        // 布尔值处理
+        tempVal = val === 'true';
+      } else if (this.isNumber(val)) {
+        // 数值处理
+        tempVal = parseFloat(val);
+      }
+    }
+    return tempVal;
+  }
+}