@ibiz-template/runtime 0.5.3-beta.1 → 0.5.3-beta.10

package/src/plugin/remote-plugin-item/remote-plugin-item.ts

@@ -1,3 +1,38 @@
+/**
+ * systemjs importmap 配置定义
+ *
+ * @author chitanda
+ * @date 2024-01-11 20:01:45
+ * @export
+ * @interface ISystemImportMap
+ */
+export interface ISystemImportMap {
+  /**
+   * 基础路径
+   *
+   * @author chitanda
+   * @date 2024-01-11 20:01:53
+   * @type {string}
+   */
+  baseUrl?: string;
+  /**
+   * 脚本
+   *
+   * @author chitanda
+   * @date 2024-01-11 20:01:57
+   * @type {{ [key: string]: string }}
+   */
+  imports: { [key: string]: string };
+  /**
+   * 样式
+   *
+   * @author chitanda
+   * @date 2024-01-11 20:01:38
+   * @type {({ [key: string]: string | string[] })}
+   */
+  styles: { [key: string]: string | string[] };
+}
+
 /**
  * 远程插件配置
  *
@@ -63,6 +98,14 @@ export interface RemotePluginConfig {
    * @type {boolean}
    */
   app?: boolean;
+  /**
+   * 额外的 systemjs 模块声明
+   *
+   * @author chitanda
+   * @date 2024-01-11 20:01:37
+   * @type {ISystemImportMap}
+   */
+  'systemjs-importmap'?: ISystemImportMap;
 }
 
 /**

package/src/register/helper/app-menu-item-register.ts

@@ -57,9 +57,5 @@ export async function getAppMenuItemProvider(
 
   // 找应用菜单项类型
   provider = getProvider(itemType);
-  if (!provider) {
-    ibiz.log.error(`找不到应用菜单项类型${itemType}对应的适配器`);
-  } else {
-    return provider;
-  }
+  return provider;
 }

package/src/register/helper/panel-item-register.ts

@@ -46,7 +46,8 @@ export async function getPanelItemProvider(
   model: IPanelItem,
 ): Promise<IPanelItemProvider | undefined> {
   let provider: IPanelItemProvider | undefined;
-  const { itemType, sysPFPluginId, appId } = model as Required<IPanelItem>;
+  const { itemType, sysPFPluginId, appId, controlRenders } =
+    model as Required<IPanelItem>;
 
   // 找插件适配器
   if (sysPFPluginId) {
@@ -60,50 +61,55 @@ export async function getPanelItemProvider(
       return provider;
     }
   }
-
-  // 特殊容器类型
-  if (itemType === 'CONTAINER') {
-    const predefinedType =
-      (model as IPanelContainer).predefinedType || 'DEFAULT';
-    const key = `CONTAINER_${predefinedType}`;
-    provider = getProvider(key);
-    if (!provider) {
-      ibiz.log.error(
-        `找不到面板容器预置类型为${predefinedType}的适配器，注册key为${key}`,
-      );
-    } else {
-      return provider;
-    }
-  }
-
-  // 特殊直接内容类型
-  if (itemType === 'RAWITEM') {
-    const predefinedType =
-      (model as IPanelRawItem).rawItem?.predefinedType || 'DEFAULT';
-    const key = `RAWITEM_${predefinedType}`;
-    provider = getProvider(key);
-    if (!provider) {
-      ibiz.log.error(
-        `找不到面板成员直接内容预置类型为${predefinedType}的适配器，注册key为${key}`,
-      );
-    } else {
-      return provider;
+  if (controlRenders && controlRenders.length > 0) {
+    // 默认预定义 绘制器
+    provider = getProvider('PREDEFINE_RENDER');
+  } else {
+    // 特殊容器类型
+    if (itemType === 'CONTAINER') {
+      const predefinedType =
+        (model as IPanelContainer).predefinedType || 'DEFAULT';
+      const key = `CONTAINER_${predefinedType}`;
+      provider = getProvider(key);
+      if (!provider) {
+        ibiz.log.error(
+          `找不到面板容器预置类型为${predefinedType}的适配器，注册key为${key}`,
+        );
+      } else {
+        return provider;
+      }
     }
-  }
 
-  if (itemType === 'FIELD') {
-    const { editor } = model as IPanelField;
-    if (editor && editor.predefinedType) {
-      const key = `FIELD_${editor.predefinedType.toUpperCase()}`;
+    // 特殊直接内容类型
+    if (itemType === 'RAWITEM') {
+      const predefinedType =
+        (model as IPanelRawItem).rawItem?.predefinedType || 'DEFAULT';
+      const key = `RAWITEM_${predefinedType}`;
       provider = getProvider(key);
-      if (provider) {
+      if (!provider) {
+        ibiz.log.error(
+          `找不到面板成员直接内容预置类型为${predefinedType}的适配器，注册key为${key}`,
+        );
+      } else {
         return provider;
       }
     }
+
+    if (itemType === 'FIELD') {
+      const { editor } = model as IPanelField;
+      if (editor && editor.predefinedType) {
+        const key = `FIELD_${editor.predefinedType.toUpperCase()}`;
+        provider = getProvider(key);
+        if (provider) {
+          return provider;
+        }
+      }
+    }
+
+    // 找面板成员类型
+    provider = getProvider(itemType);
   }
 
-  // 找面板成员类型
-  provider = getProvider(itemType);
   if (!provider) {
     ibiz.log.error(`找不到面板成员类型${itemType}对应的适配器`);
   } else {

package/src/service/dto/method.dto.ts

@@ -28,16 +28,6 @@ export class MethodDto {
 
   protected dtoMap: Map<string, MethodDto> = new Map();
 
-  /**
-   * 当前 DTO 是否已经计算过关系相关逻辑
-   *
-   * @link this.calcRs
-   * @author chitanda
-   * @date 2023-12-26 16:12:18
-   * @protected
-   */
-  protected isCalcRs = false;
-
   /**
    * Creates an instance of MethodDto.
    * @author lxm
@@ -46,14 +36,12 @@ export class MethodDto {
    * @param {IAppDataEntity} entity
    * @param {boolean} [isLocalMode]
    * @param {IAppDEMethodDTO} [dto]
-   * @param {boolean} [inSelfLoop] 是否在自关系循环中
    */
   constructor(
     protected service: IAppDEService,
     protected entity: IAppDataEntity,
     protected isLocalMode?: boolean,
     protected dto?: IAppDEMethodDTO,
-    protected inSelfLoop?: boolean,
   ) {
     if (dto) {
       this.app = ibiz.hub.getApp(entity.appId);
@@ -205,10 +193,12 @@ export class MethodDto {
    * @return {*}  {Promise<IDataEntity[]>}
    */
   async sets(context: IContext, data: IData[]): Promise<IDataEntity[]> {
-    if (this.isLocalMode && !this.inSelfLoop) {
-      this.service.local.clear();
+    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+    if (uiDomain && uiDomain.state.rsInit !== true) {
+      await this.calcRs(context);
+      uiDomain.calcParentRs();
+      uiDomain.state.rsInit = true;
     }
-    await this.calcRs(context);
     return Promise.all(
       data.map(async datum => {
         const all = this.fields
@@ -224,7 +214,7 @@ export class MethodDto {
               }
               const dto = await this.getFieldDto(context, field);
               const items: IData[] = datum[key];
-              if (items) {
+              if (items && items.length > 0) {
                 const pKey = datum[this.entity.keyAppDEFieldId!];
                 if (field.refPickupAppDEFieldId) {
                   // 特殊处理，在子包内设置父对象标识
@@ -263,10 +253,9 @@ export class MethodDto {
    * @return {*}  {Promise<void>}
    */
   protected async calcRs(context: IContext, depth: number = 0): Promise<void> {
-    if (this.isCalcRs || depth > 10) {
+    if (depth > 10) {
       return;
     }
-    this.isCalcRs = true;
     depth += 1;
 
     const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
@@ -316,12 +305,10 @@ export class MethodDto {
       entity.appDEMethodDTOs || [],
       field.refAppDEMethodDTOId!,
     )!;
-    const inSelfLoop = this.entity.codeName === entity.codeName;
     const service = await this.app!.deService.getService(context, entity.id!);
     service.isLocalMode = true;
     const dto = service.createMethodDto(methodDto, {
       isLocalMode: true,
-      inSelfLoop,
     });
     this.dtoMap.set(field.codeName!, dto);
     return dto;

package/src/service/mqtt/mqtt.service.ts

@@ -99,10 +99,10 @@ export class MqttService {
       ibiz.log.debug('mqtt message', topic, payload.toString());
     });
     this.client.on('reconnect', () => {
-      ibiz.log.debug('mqtt reconnect');
+      ibiz.log.warn('mqtt reconnect');
     });
     this.client.on('close', () => {
-      console.debug('mqtt close');
+      ibiz.log.warn('mqtt close');
     });
   }
 

package/src/service/service/auth/v7-auth.service.ts

@@ -82,6 +82,8 @@ export class V7AuthService implements IAuthService {
       clearCookie(CoreConst.TOKEN_EXPIRES);
       clearCookie(CoreConst.TOKEN_REMEMBER);
       clearCookie(CoreConst.IS_ANONYMOUS);
+      ibiz.appData = undefined;
+      ibiz.orgData = undefined;
       return true;
     } catch (err: unknown) {
       ibiz.notification.error({

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

@@ -8,6 +8,7 @@ import {
   IPortalAsyncAction,
   ModelError,
   RuntimeError,
+  RuntimeModelError,
 } from '@ibiz-template/core';
 import { DECache, calcResPath } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
@@ -94,7 +95,7 @@ export class DEService implements IAppDEService {
    */
   constructor(
     protected srfSessionId: string,
-    protected model: IAppDataEntity,
+    public readonly model: IAppDataEntity,
   ) {
     this.local = new DECache(model);
     this.configCache = new ConfigService(
@@ -126,6 +127,10 @@ export class DEService implements IAppDEService {
     }
     const model = findModelChild(this.model.appDEMethods!, id) as IAppDEMethod;
 
+    if (!model) {
+      throw new RuntimeModelError(this.model, `未找到服务方法: ${id}`);
+    }
+
     // 获取适配器
     const provider = await getDEMethodProvider(model);
     if (!provider) {
@@ -409,15 +414,8 @@ export class DEService implements IAppDEService {
     dto?: IAppDEMethodDTO,
     opts?: {
       isLocalMode?: boolean;
-      inSelfLoop?: boolean;
     },
   ): MethodDto {
-    return new MethodDto(
-      this,
-      this.model,
-      opts?.isLocalMode,
-      dto,
-      opts?.inSelfLoop,
-    );
+    return new MethodDto(this, this.model, opts?.isLocalMode, dto);
   }
 }

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

@@ -7,9 +7,11 @@ import {
 } from '@ibiz-template/core';
 import { IAppDEAction } from '@ibiz/model-core';
 import { isArray, isNil } from 'lodash-es';
+import { ascSort } from 'qx-util';
+import { clone } from 'ramda';
 import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
-import { findDELogic } from '../../../../model';
+import { calcDeCodeNameById, findDELogic } from '../../../../model';
 import { execDELogicAction, execFieldLogics } from '../../../../de-logic';
 
 /**
@@ -48,7 +50,10 @@ export class DEActionMethod extends Method {
     data?: IData | IData[],
     params?: IParams,
   ): Promise<HttpResponse<IData>> {
-    if (data) {
+    let result: IHttpResponse<IData>;
+
+    // 执行变更属性逻辑
+    if (data && !['READ', 'GETDRAFT'].includes(this.method.actionMode!)) {
       await execFieldLogics(this.entity, 'change', context, data, params);
     }
 
@@ -58,64 +63,57 @@ export class DEActionMethod extends Method {
       if (!deLogic) {
         throw new RuntimeModelError(this.method, '缺少实体处理逻辑');
       }
-      return execDELogicAction(deLogic, context, data, params);
-    }
-
-    if (data && !this.isLocalMode) {
-      data = await this.inputHandle(context, data);
-    }
-
-    // 执行变更属性逻辑
-    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 || {});
-        break;
-      case 'Get':
-        result = await this.get(context, params);
-        break;
-      case 'GetDraft':
-        result = await this.getDraft(context, params);
-        break;
-      case 'Remove':
-        result = await this.remove(context, params);
-        break;
-      case 'Update':
-        result = await this.update(context, data!, params);
-        break;
-      case 'CreateTemp':
-        result = await this.createTemp(context, data!);
-        break;
-      case 'GetTemp':
-        result = await this.getTemp(context, data);
-        break;
-      case 'GetDraftTemp':
-        result = await this.getDraftTemp(context, params);
-        break;
-      case 'RemoveTemp':
-        result = await this.removeTemp(context, data);
-        break;
-      case 'UpdateTemp':
-        result = await this.updateTemp(context, data!);
-        break;
-      default: {
-        let path = this.calcPath(context);
-        if (this.method.needResourceKey) {
-          let srfkey = context[this.entity.codeName!.toLowerCase()];
-          if (isNil(srfkey)) {
-            srfkey = isArray(data)
-              ? null
-              : data?.[this.entity.keyAppDEFieldId!];
+      result = await execDELogicAction(deLogic, context, data, params);
+    } else {
+      if (data && !this.isLocalMode) {
+        data = await this.inputHandle(context, data);
+      }
+      switch (this.method.codeName) {
+        case 'Create':
+          result = await this.create(context, data!, params || {});
+          break;
+        case 'Get':
+          result = await this.get(context, params);
+          break;
+        case 'GetDraft':
+          result = await this.getDraft(context, params);
+          break;
+        case 'Remove':
+          result = await this.remove(context, params);
+          break;
+        case 'Update':
+          result = await this.update(context, data!, params);
+          break;
+        case 'CreateTemp':
+          result = await this.createTemp(context, data!);
+          break;
+        case 'GetTemp':
+          result = await this.getTemp(context, data);
+          break;
+        case 'GetDraftTemp':
+          result = await this.getDraftTemp(context, params);
+          break;
+        case 'RemoveTemp':
+          result = await this.removeTemp(context, data);
+          break;
+        case 'UpdateTemp':
+          result = await this.updateTemp(context, data!);
+          break;
+        default: {
+          let path = this.calcPath(context);
+          if (this.method.needResourceKey) {
+            let srfkey = context[this.entity.codeName!.toLowerCase()];
+            if (isNil(srfkey)) {
+              srfkey = isArray(data)
+                ? null
+                : data?.[this.entity.keyAppDEFieldId!];
+            }
+            path = `${path}/${srfkey}`;
           }
-          path = `${path}/${srfkey}`;
+          const res = await this.request(path, context, data, params);
+          res.data = await this.result.handle(context, res.data);
+          result = res;
         }
-        const res = await this.request(path, context, data, params);
-        res.data = await this.result.handle(context, res.data);
-        result = res;
       }
     }
 
@@ -342,6 +340,13 @@ export class DEActionMethod extends Method {
       if (!key && context) {
         key = context[this.entity.codeName!.toLowerCase()];
       }
+      try {
+        await this.associationDeletion(key, context, params);
+      } catch (error) {
+        throw new HttpError({
+          response: new HttpResponse(null, 500, (error as IData).message),
+        } as unknown as Error);
+      }
       const data = this.service.local.delete(context, key)!;
       if (data) {
         return new HttpResponse(data);
@@ -352,6 +357,124 @@ export class DEActionMethod extends Method {
     }
   }
 
+  /**
+   * 关联删除
+   *
+   * @author chitanda
+   * @date 2024-01-17 16:01:47
+   * @protected
+   * @param {string} key
+   * @param {IContext} context
+   * @param {IParams} [params]
+   * @return {*}  {Promise<void>}
+   */
+  protected async associationDeletion(
+    key: string,
+    context: IContext,
+    _params?: IParams,
+  ): Promise<void> {
+    // 当前执行界面域
+    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+
+    // 当前事务
+    const t = uiDomain.transaction;
+    let selfOpenTransaction = false;
+    // 由第一层触发关联删除的位置来打开事务，后续子的关联删除不需要再次打开事务
+    if (t.state.isOpen === false) {
+      t.open();
+      selfOpenTransaction = true;
+    }
+
+    try {
+      let configs = uiDomain.getDERConfigByMajor(this.entity.id!);
+      if (configs.length > 0) {
+        // 当前主数据
+        const data = this.service.local.get(context, key)!;
+
+        // 根据删除顺序排序
+        configs = ascSort(configs, 'removeOrder');
+
+        // 根据关系进行关联删除
+        for (const config of configs) {
+          if (config.rstype !== 'DER1N') {
+            throw new RuntimeModelError(
+              config,
+              '目前只支持[DER1N]关系类型关联删除删除',
+            );
+          }
+          const {
+            removeActionType,
+            removeRejectMsg,
+            minorAppDataEntityId,
+            nestedAppDEDataSetId = 'FetchDefault',
+          } = config;
+          // 获取当前应用域下的子实体服务
+          const app = ibiz.hub.getApp(this.entity.appId!);
+          const minorService = await app.deService.getService(
+            context,
+            minorAppDataEntityId!,
+          );
+          // 克隆上下文，防止污染。并设置当前实体的主键上下文
+          const _context = clone(context);
+          _context[this.entity.codeName!.toLowerCase()] = key;
+          // 查询出关联的子实体数据
+          const res = await minorService.exec(nestedAppDEDataSetId, _context);
+          const items = (res.data || []) as IDataEntity[];
+          switch (removeActionType) {
+            // 同时删除
+            case 1: {
+              for (let i = 0; i < items.length; i++) {
+                const item = items[i];
+                _context[minorService.model.codeName!.toLowerCase()] =
+                  item.srfkey;
+                const res2 = await minorService.remove(_context, item);
+                if (res2.ok === false) {
+                  throw new Error(res2.statusText);
+                }
+              }
+              break;
+            }
+            // 置空
+            case 2:
+              for (let i = 0; i < items.length; i++) {
+                const item = items[i];
+                _context[minorService.model.codeName!.toLowerCase()] =
+                  item.srfkey;
+                item[config.parentAppDEFieldId!.toLowerCase()] = undefined;
+                const res2 = await minorService.updateTemp(_context, item);
+                if (res2.ok === false) {
+                  throw new Error(res2.statusText);
+                }
+              }
+              break;
+            // 限制删除
+            case 3:
+              if (items.length > 0) {
+                const msg = items.map(item => item.srfmajortext).join('、');
+                const message = `无法删除[${this.entity.logicName}-${data.srfmajortext}], 数据被[${minorService.model.logicName}-${msg}]引用`;
+                throw new Error(removeRejectMsg || message);
+              }
+              break;
+            default:
+          }
+        }
+      }
+      // 谁打开的事务，由谁来提交和关闭
+      if (selfOpenTransaction && t.state.isOpen) {
+        t.commit();
+      }
+    } catch (error) {
+      if (selfOpenTransaction && t.state.isOpen) {
+        t.rollback();
+      }
+      throw error;
+    } finally {
+      if (selfOpenTransaction && t.state.isOpen) {
+        t.close();
+      }
+    }
+  }
+
   /**
    * 更新临时数据
    *
@@ -412,7 +535,6 @@ export class DEActionMethod extends Method {
         key = context[this.entity.codeName!.toLowerCase()];
       }
       const data = this.service.local.get(context, key);
-      // await this.executeDEFelidLogic(context, data);
       if (data) {
         return new HttpResponse(data);
       }
@@ -430,15 +552,14 @@ export class DEActionMethod extends Method {
    * @return {*}  {Promise<IHttpResponse>}
    */
   async removeBatchTemp(
-    _context: IParams,
+    _context: IContext,
     _params?: IParams,
   ): Promise<IHttpResponse> {
     // if (params) {
     //   const keys: string[] = params[this.entity.keyName];
     //   if (keys) {
     //     try {
-    //       const s = await this.getService();
-    //       await s.local.deleteBatch(context, keys);
+    //       await this.service.local.deleteBatch(context, keys);
     //     } catch (err) {
     //       return new HttpResponse(err, 500);
     //     }
@@ -464,8 +585,9 @@ export class DEActionMethod extends Method {
     if (configs.length > 0) {
       configs.forEach(config => {
         if (config.parentAppDEFieldId) {
-          const { majorDECodeName, parentAppDEFieldId } = config;
-          const majorLowerCodeName = majorDECodeName!.toLowerCase();
+          const { majorAppDataEntityId, parentAppDEFieldId } = config;
+          const majorDECodeName = calcDeCodeNameById(majorAppDataEntityId!);
+          const majorLowerCodeName = majorDECodeName;
           const pickupLowerDEFName = parentAppDEFieldId.toLowerCase();
           const majorkey = context[majorLowerCodeName];
           // 父主键不能是自身，否则自关系的时候就改错了