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

package/out/interface/service/service/i-app-de.service.d.ts

@@ -1,9 +1,11 @@
 import { IHttpResponse, IPortalAsyncAction } from '@ibiz-template/core';
+import { IAppDEMethodDTO, IAppDataEntity } from '@ibiz/model-core';
 import { DECache } from '../../../service/utils';
 import { IFileService } from './i-file.service';
 import { IWorkFlowService } from './i-wf.service';
 import { IConfigService } from './i-config.service';
 import { IDataEntity } from '../i-data-entity/i-data-entity';
+import { MethodDto } from '../../../service';
 /**
  * 实体服务
  *
@@ -54,6 +56,14 @@ export interface IAppDEService {
      * @type {IFileService}
      */
     readonly file: IFileService;
+    /**
+     * 当前实体服务对应的实体模型
+     *
+     * @author chitanda
+     * @date 2024-01-17 17:01:16
+     * @type {IAppDataEntity}
+     */
+    readonly model: IAppDataEntity;
     /**
      * 执行实体服务方法
      *
@@ -250,5 +260,18 @@ export interface IAppDEService {
      * @return {*}  {void}
      */
     destroy(): void;
+    /**
+     * 创建DTO实例
+     * @author lxm
+     * @date 2024-01-10 09:48:34
+     * @param {IAppDEMethodDTO} [dto] dto模型对象
+     * @param {{
+     *       isLocalMode?: boolean; 是否是临时模式
+     *     }} [opts]
+     * @return {*}  {MethodDto}
+     */
+    createMethodDto(dto?: IAppDEMethodDTO, opts?: {
+        isLocalMode?: boolean;
+    }): MethodDto;
 }
 //# sourceMappingURL=i-app-de.service.d.ts.map

package/out/interface/service/service/i-app-de.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-app-de.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-app-de.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"i-app-de.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-app-de.service.ts"],"names":[],"mappings":"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"}

package/out/interface/service/service/i-wf.service.d.ts

@@ -40,11 +40,12 @@ export interface IWorkFlowService {
     /**
      * 获取标准工作流版本信息
      *
-     * @author lxm
-     * @date 2022-09-29 14:09:45
-     * @returns {*}  {Promise<IHttpResponse<IData>>}
+     * @author chitanda
+     * @date 2024-01-10 16:01:30
+     * @param {string} srfWFTag
+     * @return {*}  {Promise<IHttpResponse<IData>>}
      */
-    getWFVersion(): Promise<IHttpResponse<IData>>;
+    getWFVersion(srfWFTag: string): Promise<IHttpResponse<IData>>;
     /**
      * 工作流撤销
      *

package/out/interface/service/service/i-wf.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-wf.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-wf.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,WAAW,gBAAgB;IAC/B;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAE5D;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAE3E;;;;;;;OAOG;IACH,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAE/D;;;;;;;OAOG;IACH,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAEtE;;;;;;OAMG;IACH,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAE9C;;;;;;;;;OASG;IACH,UAAU,CACR,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAEjC;;;;;;;;;;OAUG;IACH,IAAI,CACF,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;CAClC"}
+{"version":3,"file":"i-wf.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-wf.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,WAAW,gBAAgB;IAC/B;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAE5D;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAE3E;;;;;;;OAOG;IACH,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAE/D;;;;;;;OAOG;IACH,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAEtE;;;;;;;OAOG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAE9D;;;;;;;;;OASG;IACH,UAAU,CACR,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAEjC;;;;;;;;;;OAUG;IACH,IAAI,CACF,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;CAClC"}

package/out/plugin/index.d.ts

@@ -1,4 +1,4 @@
 export { PluginStaticResource } from './plugin-static-resource/plugin-static-resource';
-export type { RemotePluginConfig } from './remote-plugin-item/remote-plugin-item';
+export type { ISystemImportMap, RemotePluginConfig, } from './remote-plugin-item/remote-plugin-item';
 export { RemotePluginItem } from './remote-plugin-item/remote-plugin-item';
 //# sourceMappingURL=index.d.ts.map

package/out/plugin/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AACvF,YAAY,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AACvF,YAAY,EACV,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC"}

package/out/plugin/remote-plugin-item/remote-plugin-item.d.ts

@@ -1,3 +1,41 @@
+/**
+ * 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 +101,14 @@ export interface RemotePluginConfig {
      * @type {boolean}
      */
     app?: boolean;
+    /**
+     * 额外的 systemjs 模块声明
+     *
+     * @author chitanda
+     * @date 2024-01-11 20:01:37
+     * @type {ISystemImportMap}
+     */
+    'systemjs-importmap'?: ISystemImportMap;
 }
 /**
  * 远程插件项

package/out/plugin/remote-plugin-item/remote-plugin-item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote-plugin-item.d.ts","sourceRoot":"","sources":["../../../src/plugin/remote-plugin-item/remote-plugin-item.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B;;;;;;OAMG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IAC3B;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAEpC;;;;;;;;OAQG;gBACS,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB;CAKlE"}
+{"version":3,"file":"remote-plugin-item.d.ts","sourceRoot":"","sources":["../../../src/plugin/remote-plugin-item/remote-plugin-item.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC;;;;;;OAMG;IACH,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;CAC9C;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B;;;;;;OAMG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,gBAAgB,CAAC;CACzC;AAED;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IAC3B;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAEpC;;;;;;;;OAQG;gBACS,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB;CAKlE"}

package/out/register/helper/app-menu-item-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-menu-item-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/app-menu-item-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,iBAAiB;AACjB,eAAO,MAAM,2BAA2B,gBAAgB,CAAC;AAEzD;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,oBAAoB,GACnC,IAAI,CAEN;AAQD;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAwB3C"}
+{"version":3,"file":"app-menu-item-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/app-menu-item-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,iBAAiB;AACjB,eAAO,MAAM,2BAA2B,gBAAgB,CAAC;AAEzD;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,oBAAoB,GACnC,IAAI,CAEN;AAQD;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAoB3C"}

package/out/register/helper/app-menu-item-register.js

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

package/out/register/helper/panel-item-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel-item-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/panel-item-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAGrD,gBAAgB;AAChB,eAAO,MAAM,yBAAyB,cAAc,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,kBAAkB,GACjC,IAAI,CAKN;AAQD;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAiEzC"}
+{"version":3,"file":"panel-item-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/panel-item-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAGrD,gBAAgB;AAChB,eAAO,MAAM,yBAAyB,cAAc,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,kBAAkB,GACjC,IAAI,CAKN;AAQD;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAuEzC"}

package/out/register/helper/panel-item-register.js

@@ -26,7 +26,7 @@ function getProvider(key) {
 export async function getPanelItemProvider(model) {
     var _a;
     let provider;
-    const { itemType, sysPFPluginId, appId } = model;
+    const { itemType, sysPFPluginId, appId, controlRenders } = model;
     // 找插件适配器
     if (sysPFPluginId) {
         const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
@@ -40,42 +40,48 @@ export async function getPanelItemProvider(model) {
             return provider;
         }
     }
-    // 特殊容器类型
-    if (itemType === 'CONTAINER') {
-        const predefinedType = model.predefinedType || 'DEFAULT';
-        const key = `CONTAINER_${predefinedType}`;
-        provider = getProvider(key);
-        if (!provider) {
-            ibiz.log.error(`找不到面板容器预置类型为${predefinedType}的适配器，注册key为${key}`);
-        }
-        else {
-            return provider;
-        }
+    if (controlRenders && controlRenders.length > 0) {
+        // 默认预定义 绘制器
+        provider = getProvider('PREDEFINE_RENDER');
     }
-    // 特殊直接内容类型
-    if (itemType === 'RAWITEM') {
-        const predefinedType = ((_a = model.rawItem) === null || _a === void 0 ? void 0 : _a.predefinedType) || 'DEFAULT';
-        const key = `RAWITEM_${predefinedType}`;
-        provider = getProvider(key);
-        if (!provider) {
-            ibiz.log.error(`找不到面板成员直接内容预置类型为${predefinedType}的适配器，注册key为${key}`);
-        }
-        else {
-            return provider;
+    else {
+        // 特殊容器类型
+        if (itemType === 'CONTAINER') {
+            const predefinedType = model.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;
-        if (editor && editor.predefinedType) {
-            const key = `FIELD_${editor.predefinedType.toUpperCase()}`;
+        // 特殊直接内容类型
+        if (itemType === 'RAWITEM') {
+            const predefinedType = ((_a = model.rawItem) === null || _a === void 0 ? void 0 : _a.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;
+            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}对应的适配器`);
     }

package/out/service/dto/method.dto.d.ts

@@ -13,19 +13,9 @@ export declare class MethodDto {
     protected entity: IAppDataEntity;
     protected isLocalMode?: boolean | undefined;
     protected dto?: IAppDEMethodDTO | undefined;
-    protected inSelfLoop?: boolean | undefined;
     protected app?: IAppService;
     protected fields: IAppDEMethodDTOField[];
     protected dtoMap: Map<string, MethodDto>;
-    /**
-     * 当前 DTO 是否已经计算过关系相关逻辑
-     *
-     * @link this.calcRs
-     * @author chitanda
-     * @date 2023-12-26 16:12:18
-     * @protected
-     */
-    protected isCalcRs: boolean;
     /**
      * Creates an instance of MethodDto.
      * @author lxm
@@ -34,19 +24,8 @@ export declare class MethodDto {
      * @param {IAppDataEntity} entity
      * @param {boolean} [isLocalMode]
      * @param {IAppDEMethodDTO} [dto]
-     * @param {boolean} [inSelfLoop] 是否在自关系循环中
-     */
-    constructor(service: IAppDEService, entity: IAppDataEntity, isLocalMode?: boolean | undefined, dto?: IAppDEMethodDTO | undefined, inSelfLoop?: boolean | undefined);
-    /**
-     * 查找本地 DTO 存储数据
-     *
-     * @author chitanda
-     * @date 2023-12-22 14:12:19
-     * @param {IContext} context
-     * @param {IParams} [params]
-     * @return {*}  {IDataEntity[]}
      */
-    select(context: IContext, params?: IParams): IDataEntity[];
+    constructor(service: IAppDEService, entity: IAppDataEntity, isLocalMode?: boolean | undefined, dto?: IAppDEMethodDTO | undefined);
     /**
      * 转换数组成ListMap
      *

package/out/service/dto/method.dto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAM1E;;;;;;;GAOG;AACH,qBAAa,SAAS;IA4BlB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,WAAW,CAAC;IACtB,SAAS,CAAC,GAAG,CAAC;IACd,SAAS,CAAC,UAAU,CAAC;IA/BvB,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAErD;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,UAAS;IAE3B;;;;;;;;;OASG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,WAAW,CAAC,qBAAS,EACrB,GAAG,CAAC,6BAAiB,EACrB,UAAU,CAAC,qBAAS;IAUhC;;;;;;;;OAQG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,WAAW,EAAE;IAI1D;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAQ7B;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAS7B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,KAAK,CAAC;IAwEjB;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAgDpE;;;;;;;;;OASG;cACa,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC3E;;;;;;;;;OASG;cACa,WAAW,CACzB,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,SAAS,CAAC;CAmBtB"}
+{"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAM1E;;;;;;;GAOG;AACH,qBAAa,SAAS;IAiBlB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,WAAW,CAAC;IACtB,SAAS,CAAC,GAAG,CAAC;IAnBhB,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAErD;;;;;;;;OAQG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,WAAW,CAAC,qBAAS,EACrB,GAAG,CAAC,6BAAiB;IAUjC;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAQ7B;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAS7B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,KAAK,CAAC;IA0FjB;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAkDpE;;;;;;;;;OASG;cACa,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA4B3E;;;;;;;;;OASG;cACa,WAAW,CACzB,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,SAAS,CAAC;CAoBtB"}

package/out/service/dto/method.dto.js

@@ -1,4 +1,5 @@
-import { ModelError } from '@ibiz-template/core';
+import { ModelError, RuntimeModelError } from '@ibiz-template/core';
+import { clone } from 'ramda';
 import { findModelChild } from '../../model';
 /**
  * 应用实体服务方法转换 DTO
@@ -17,24 +18,13 @@ export class MethodDto {
      * @param {IAppDataEntity} entity
      * @param {boolean} [isLocalMode]
      * @param {IAppDEMethodDTO} [dto]
-     * @param {boolean} [inSelfLoop] 是否在自关系循环中
      */
-    constructor(service, entity, isLocalMode, dto, inSelfLoop) {
+    constructor(service, entity, isLocalMode, dto) {
         this.service = service;
         this.entity = entity;
         this.isLocalMode = isLocalMode;
         this.dto = dto;
-        this.inSelfLoop = inSelfLoop;
         this.dtoMap = new Map();
-        /**
-         * 当前 DTO 是否已经计算过关系相关逻辑
-         *
-         * @link this.calcRs
-         * @author chitanda
-         * @date 2023-12-26 16:12:18
-         * @protected
-         */
-        this.isCalcRs = false;
         if (dto) {
             this.app = ibiz.hub.getApp(entity.appId);
             this.fields = dto.appDEMethodDTOFields || [];
@@ -43,18 +33,6 @@ export class MethodDto {
             this.fields = [];
         }
     }
-    /**
-     * 查找本地 DTO 存储数据
-     *
-     * @author chitanda
-     * @date 2023-12-22 14:12:19
-     * @param {IContext} context
-     * @param {IParams} [params]
-     * @return {*}  {IDataEntity[]}
-     */
-    select(context, params) {
-        return this.service.local.select(context, params);
-    }
     /**
      * 转换数组成ListMap
      *
@@ -122,23 +100,34 @@ export class MethodDto {
                             break;
                         }
                         // 获取当前需要打包子数据的关系配置
-                        let configs = uiDomain.getDERConfig(field.refAppDataEntityId);
-                        // 找到当前层级所在下标
-                        const index = configs.findIndex(config => config.majorDECodeName === this.entity.codeName);
-                        // 过滤出当前层级之后的关系配置
-                        configs = configs.slice(index + 1);
+                        const configs = uiDomain.getDERConfig(field.refAppDataEntityId);
+                        // 获取指定子关系的 dto
                         const dto = await this.getFieldDto(context, field);
-                        // 子数据过滤参数
-                        const filterParams = {};
-                        if (field.refPickupAppDEFieldId) {
-                            filterParams[field.refPickupAppDEFieldId] = data.srfkey;
-                        }
-                        // 子层级数据过滤参数对象必须为空
-                        configs.forEach(config => {
-                            filterParams[config.pickupDEFName.toLowerCase()] = null;
+                        // 获取 dto 实体对应的服务
+                        const service = await ibiz.hub.getAppDEService(dto.entity.appId, field.refAppDataEntityId, context);
+                        // 查找当前 dto 实体在关系配置中和本实体的关系配置
+                        const deRs = configs.find(rs => {
+                            return rs.majorAppDataEntityId === this.entity.id;
                         });
-                        const items = await dto.select(context, filterParams);
-                        if (items) {
+                        // 根据关系配置中的嵌套数据集获取数据，如果没有嵌套数据集则使用默认数据集
+                        let res;
+                        if (deRs && deRs.nestedAppDEDataSetId) {
+                            const _context = clone(context);
+                            _context[this.entity.codeName.toLowerCase()] = data.srfkey;
+                            const _params = {};
+                            if (deRs.parentAppDEFieldId) {
+                                _params[deRs.parentAppDEFieldId] = data.srfkey;
+                            }
+                            res = await service.exec(deRs.nestedAppDEDataSetId, _context, _params);
+                        }
+                        else if (dto.entity.id !== this.entity.id) {
+                            res = await service.exec('FetchDefault', context);
+                        }
+                        else {
+                            throw new RuntimeModelError(field, `子关系未配置嵌套关系数据集, 会导致递归查询死循环，请配置!`);
+                        }
+                        if (res.ok) {
+                            const items = res.data;
                             const arr = [];
                             for (let j = 0; j < items.length; j++) {
                                 arr.push(await dto.get(context, items[j], true));
@@ -165,10 +154,12 @@ export class MethodDto {
      * @return {*}  {Promise<IDataEntity[]>}
      */
     async sets(context, data) {
-        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
                 .filter(field => field.type === 'DTOS')
@@ -184,7 +175,7 @@ export class MethodDto {
                     }
                     const dto = await this.getFieldDto(context, field);
                     const items = datum[key];
-                    if (items) {
+                    if (items && items.length > 0) {
                         const pKey = datum[this.entity.keyAppDEFieldId];
                         if (field.refPickupAppDEFieldId) {
                             // 特殊处理，在子包内设置父对象标识
@@ -222,10 +213,9 @@ export class MethodDto {
      * @return {*}  {Promise<void>}
      */
     async calcRs(context, depth = 0) {
-        if (this.isCalcRs || depth > 10) {
+        if (depth > 10) {
             return;
         }
-        this.isCalcRs = true;
         depth += 1;
         const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
         const dtoFields = this.fields.filter(field => field.type === 'DTOS');
@@ -235,18 +225,11 @@ export class MethodDto {
                 continue;
             }
             const configs = uiDomain.getDERConfig(field.refAppDataEntityId);
-            const index = configs.findIndex(config => config.pickupDEFName === field.refPickupAppDEFieldId);
-            if (index === -1) {
+            if (configs.length === 0) {
                 const dto = await this.getFieldDto(context, field);
-                uiDomain.setDERConfig(field.refAppDataEntityId, {
-                    majorDEName: this.entity.name,
-                    majorDECodeName: this.entity.codeName,
-                    majorDECodeName2: this.entity.codeName2,
-                    minorDEName: dto.entity.name,
-                    minorDECodeName: dto.entity.codeName,
-                    minorDECodeName2: dto.entity.codeName2,
-                    pickupDEFName: field.refPickupAppDEFieldId,
-                });
+                if (dto.entity.minorAppDERSs) {
+                    uiDomain.setDERConfig(field.refAppDataEntityId, dto.entity.minorAppDERSs.filter(rs => rs.rsmode === 1));
+                }
                 await dto.calcRs(context, depth);
             }
         }
@@ -267,10 +250,11 @@ export class MethodDto {
         }
         const entity = await ibiz.hub.getAppDataEntity(field.refAppDataEntityId, this.entity.appId);
         const methodDto = findModelChild(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 = new MethodDto(service, entity, true, methodDto, inSelfLoop);
+        const dto = service.createMethodDto(methodDto, {
+            isLocalMode: true,
+        });
         this.dtoMap.set(field.codeName, dto);
         return dto;
     }

package/out/service/mqtt/mqtt.service.js

@@ -79,10 +79,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/out/service/service/auth/v7-auth.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,mDAAmD,CAAC;AAE9E;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,YAAY;IAChD,IAAI,WAAW,IAAI,OAAO,CAEzB;IAEK,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAqBlC,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC;IAkCb,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAiB1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAiClC,WAAW,IAAI,SAAS,GAAG,SAAS;CAUrC"}
+{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,mDAAmD,CAAC;AAE9E;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,YAAY;IAChD,IAAI,WAAW,IAAI,OAAO,CAEzB;IAEK,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAqBlC,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC;IAkCb,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAmB1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAiClC,WAAW,IAAI,SAAS,GAAG,SAAS;CAUrC"}

package/out/service/service/auth/v7-auth.service.js

@@ -66,6 +66,8 @@ export class V7AuthService {
             clearCookie(CoreConst.TOKEN_EXPIRES);
             clearCookie(CoreConst.TOKEN_REMEMBER);
             clearCookie(CoreConst.IS_ANONYMOUS);
+            ibiz.appData = undefined;
+            ibiz.orgData = undefined;
             return true;
         }
         catch (err) {

package/out/service/service/entity/de.service.d.ts

@@ -1,4 +1,4 @@
-import { IAppDataEntity } from '@ibiz/model-core';
+import { IAppDEMethodDTO, IAppDataEntity } from '@ibiz/model-core';
 import { IHttpResponse, IPortalAsyncAction } from '@ibiz-template/core';
 import { DECache } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
@@ -6,6 +6,7 @@ import { Method } from './method/method';
 import { FileService } from '../file/file.service';
 import { IAppDEService, IDataEntity } from '../../../interface';
 import { ConfigService } from '../config/config.service';
+import { MethodDto } from '../../dto/method.dto';
 /**
  * 实体服务
  *
@@ -16,7 +17,7 @@ import { ConfigService } from '../config/config.service';
  */
 export declare class DEService implements IAppDEService {
     protected srfSessionId: string;
-    protected model: IAppDataEntity;
+    readonly model: IAppDataEntity;
     /**
      * 实体配置存储服务
      *
@@ -110,14 +111,6 @@ export declare class DEService implements IAppDEService {
     updateTemp(context: IContext, params?: IData | IData[], params2?: IParams): Promise<IHttpResponse<IData>>;
     removeTemp(context: IContext, params?: IData | IData[], params2?: IParams): Promise<IHttpResponse<IData>>;
     fetchTempDefault(context: IContext, params?: IData | IData[], params2?: IParams): Promise<IHttpResponse<IData>>;
-    /**
-     * 查询本地数据，根据属性
-     *
-     * @param {IContext} context
-     * @param {IParams} params 根据多实体属性查找，例：{ name: '张三', age: 18, parent: null }
-     * @return {*}  {Promise<IDataEntity[]>}
-     */
-    selectLocal(context: IContext, params?: IParams): Promise<IDataEntity[]>;
     /**
      * 执行服务方法 ac 模式
      *
@@ -182,5 +175,8 @@ export declare class DEService implements IAppDEService {
      * @return {*}  {Promise<void>}
      */
     destroy(): Promise<void>;
+    createMethodDto(dto?: IAppDEMethodDTO, opts?: {
+        isLocalMode?: boolean;
+    }): MethodDto;
 }
 //# sourceMappingURL=de.service.d.ts.map

package/out/service/service/entity/de.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"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"}