@ibiz-template/runtime 0.5.3-beta.5 → 0.5.3-beta.6

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
@@ -208,7 +198,12 @@ export class MethodDto {
     if (this.isLocalMode && !this.inSelfLoop) {
       this.service.local.clear();
     }
-    await this.calcRs(context);
+    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+    if (uiDomain && uiDomain.state.rsInit !== true) {
+      await this.calcRs(context);
+      uiDomain.calcParentRs();
+      uiDomain.state.rsInit = true;
+    }
     return Promise.all(
       data.map(async datum => {
         const all = this.fields
@@ -263,10 +258,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);

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

@@ -32,40 +32,41 @@ export class FetchMethod extends Method {
     // 过滤参数，必须是对象
     const searchParams = params && !isArray(params) ? params : params2 || {};
 
+    // 根据数据集合来源查询数据
+    let res: HttpResponse<IData[]>;
+
     if (this.isLocalMode) {
       const cond = DEDQCondUtil.getCond(this.method);
       const items = await this.searchLocal(
         cond,
         new SearchFilter(context, searchParams),
       );
-      return new HttpResponse<IDataEntity[]>(items, 200);
-    }
+      res = new HttpResponse<IDataEntity[]>(items, 200);
+    } else {
+      switch (this.method.dataSetType) {
+        case 'INDEXDE':
+        case 'CODELIST':
+        case 'MULTIFORM':
+          res = await this.fetchCodeListSet(context, searchParams);
+          break;
+        case 'REMOTE':
+          {
+            const path = this.calcPath(context);
+            res = await this.request(path, context, params, params2);
+          }
+          break;
+        default:
+          throw new ModelError(
+            this.method,
+            `数据来源类型${this.method.dataSetType}暂未支持`,
+          );
+      }
 
-    // 根据数据集合来源查询数据
-    let res: HttpResponse<IData[]>;
-    switch (this.method.dataSetType) {
-      case 'INDEXDE':
-      case 'CODELIST':
-      case 'MULTIFORM':
-        res = await this.fetchCodeListSet(context, searchParams);
-        break;
-      case 'REMOTE':
-        {
-          const path = this.calcPath(context);
-          res = await this.request(path, context, params, params2);
-        }
-        break;
-      default:
-        throw new ModelError(
-          this.method,
-          `数据来源类型${this.method.dataSetType}暂未支持`,
-        );
+      // 转换实体对象
+      const items: IData[] = res.data || [];
+      res.data = items.map(item => this.createEntity(item));
     }
 
-    // 转换实体对象
-    const items: IData[] = res.data || [];
-    res.data = items.map(item => this.createEntity(item));
-
     // 计算属性逻辑,每条数据走一遍
     if (res.data) {
       await execFieldLogics(

package/src/service/utils/dynamic-code-list/dynamic-code-list.ts

@@ -262,16 +262,16 @@ export class DynamicCodeListCache {
     );
     let resultItems: CodeListItem[] = [];
     if (res.data.length) {
-      res.data.forEach((item: IData) => {
-        if (pvalueAppDEFieldId) {
-          const tempItems = this.prepareTreeData(res.data as IData[]);
-          if (tempItems) {
-            resultItems = tempItems;
-          }
-        } else {
-          resultItems.push(this.convertData(item));
+      if (pvalueAppDEFieldId) {
+        const tempItems = this.prepareTreeData(res.data as IData[]);
+        if (tempItems) {
+          resultItems = tempItems;
         }
-      });
+      } else {
+        res.data.forEach((item: IData) => {
+          resultItems.push(this.convertData(item));
+        });
+      }
     }
     return Object.freeze(resultItems) as CodeListItem[];
   }

package/src/utils/ui-domain/ui-domain.ts

@@ -20,15 +20,34 @@ export class UIDomain {
   readonly id: string;
 
   /**
-   * DTO 父子关系映射
+   * 状态
+   *
+   * @author chitanda
+   * @date 2024-01-15 19:01:51
+   * @type {{ rsInit: boolean }} 关系是否已经初始化
+   */
+  readonly state: { rsInit: boolean } = { rsInit: false };
+
+  /**
+   * DTO 子父关系映射
    *
    * @author chitanda
    * @date 2023-12-26 15:12:13
    * @protected
-   * @type {Map<string, IAppDERS[]>}
+   * @type {Map<string, IAppDERS[]>} Map<子实体, 当前实体的父关系>
    */
   protected rsMap: Map<string, IAppDERS[]> = new Map();
 
+  /**
+   * DTO 父子关系映射
+   *
+   * @author chitanda
+   * @date 2024-01-15 17:01:42
+   * @protected
+   * @type {Map<string, IAppDERS[]>}
+   */
+  protected rs2Map: Map<string, IAppDERS[]> = new Map();
+
   /**
    * Creates an instance of UIDomain.
    *
@@ -50,11 +69,11 @@ export class UIDomain {
    *
    * @author chitanda
    * @date 2023-12-26 15:12:31
-   * @param {string} entity
+   * @param {string} appDataEntityId
    * @param {IAppDERS} configs
    */
-  setDERConfig(deCodeName: string, configs: IAppDERS[]): void {
-    this.rsMap.set(deCodeName, configs);
+  setDERConfig(appDataEntityId: string, configs: IAppDERS[]): void {
+    this.rsMap.set(appDataEntityId, configs);
   }
 
   /**
@@ -62,16 +81,37 @@ export class UIDomain {
    *
    * @author chitanda
    * @date 2023-12-26 16:12:07
-   * @param {string} deCodeName
+   * @param {string} appDataEntityId
    * @return {*}  {IAppDERS[]}
    */
-  getDERConfig(deCodeName: string): IAppDERS[] {
-    if (this.rsMap.has(deCodeName)) {
-      return this.rsMap.get(deCodeName)!;
+  getDERConfig(appDataEntityId: string): IAppDERS[] {
+    if (this.rsMap.has(appDataEntityId)) {
+      return this.rsMap.get(appDataEntityId)!;
     }
     return [];
   }
 
+  /**
+   * 根据模型给的子实体中的父关系模型，计算每个实体的子关系模型
+   *
+   * @author chitanda
+   * @date 2024-01-15 19:01:49
+   */
+  calcParentRs(): void {
+    this.rs2Map.clear();
+    this.rsMap.forEach((configs, appDataEntityId) => {
+      configs.forEach(config => {
+        config.minorAppDataEntityId = appDataEntityId;
+        const major = config.majorAppDataEntityId!;
+        if (!this.rs2Map.has(major)) {
+          this.rs2Map.set(major, []);
+        }
+        this.rs2Map.get(major)!.push(config);
+      });
+    });
+    console.log(Array.from(this.rs2Map.values()));
+  }
+
   /**
    * 界面域销毁
    *