@ibiz-template/runtime 0.7.41-alpha.9 → 0.7.41-alpha.91

package/out/register/helper/de-method-register.js

@@ -1,5 +1,6 @@
 import { RuntimeError } from '@ibiz-template/core';
 import { getPluginRegisterKey } from './common-register';
+import { CustomRegister } from '../custom-register';
 /** 实体行为适配器前缀 */
 export const DEMETHOD_PROVIDER_PREFIX = 'DEMETHOD';
 /**
@@ -24,9 +25,22 @@ function getProvider(key) {
  * @param {IAppView} model
  * @return {*}  {Promise<IDEMethodProvider>}
  */
-export async function getDEMethodProvider(model) {
+export async function getDEMethodProvider(model, entityModel) {
     let provider;
     const { methodType, sysPFPluginId, appId } = model;
+    const registerKey = CustomRegister.getRegisterKey(DEMETHOD_PROVIDER_PREFIX, {
+        deMethodModel: model,
+        entityModel,
+    });
+    provider = getProvider(registerKey);
+    if (!provider) {
+        ibiz.log.debug(ibiz.i18n.t('runtime.register.helper.customRegistration', {
+            registerKey,
+        }));
+    }
+    else {
+        return provider;
+    }
     // 找插件适配器
     if (sysPFPluginId) {
         const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);

package/out/register/helper/editor-register.d.ts

@@ -1,4 +1,4 @@
-import { IEditor } from '@ibiz/model-core';
+import { IControl, IControlItem, IEditor } from '@ibiz/model-core';
 import { IEditorProvider } from '../../interface';
 /** 编辑器适配器前缀 */
 export declare const EDITOR_PROVIDER_PREFIX = "EDITOR";
@@ -12,12 +12,12 @@ export declare const EDITOR_PROVIDER_PREFIX = "EDITOR";
  */
 export declare function registerEditorProvider(key: string, callback: () => IEditorProvider): void;
 /**
- * 获取编辑器适配器
- * @author lxm
- * @date 2023-05-06 09:29:23
+ * @description 获取编辑器适配器
  * @export
- * @param {IAppView} model
- * @return {*}  {Promise<IEditorProvider>}
+ * @param {IEditor} model 编辑器模型
+ * @param {IControlItem} [ctrlItem] 控件项模型
+ * @param {IControl} [ctrl] 部件模型
+ * @returns {*}  {(Promise<IEditorProvider | undefined>)}
  */
-export declare function getEditorProvider(model: IEditor): Promise<IEditorProvider | undefined>;
+export declare function getEditorProvider(model: IEditor, ctrlItem?: IControlItem, ctrl?: IControl): Promise<IEditorProvider | undefined>;
 //# sourceMappingURL=editor-register.d.ts.map

package/out/register/helper/editor-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/editor-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGlD,eAAe;AACf,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAE/C;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,eAAe,GAC9B,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAsEtC"}
+{"version":3,"file":"editor-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/editor-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAIlD,eAAe;AACf,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAE/C;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,eAAe,GAC9B,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,OAAO,EACd,QAAQ,CAAC,EAAE,YAAY,EACvB,IAAI,CAAC,EAAE,QAAQ,GACd,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAuFtC"}

package/out/register/helper/editor-register.js

@@ -1,4 +1,5 @@
 import { getPluginRegisterKey } from './common-register';
+import { CustomRegister } from '../custom-register';
 /** 编辑器适配器前缀 */
 export const EDITOR_PROVIDER_PREFIX = 'EDITOR';
 /**
@@ -16,16 +17,31 @@ function getProvider(key) {
     return ibiz.register.get(`${EDITOR_PROVIDER_PREFIX}_${key}`);
 }
 /**
- * 获取编辑器适配器
- * @author lxm
- * @date 2023-05-06 09:29:23
+ * @description 获取编辑器适配器
  * @export
- * @param {IAppView} model
- * @return {*}  {Promise<IEditorProvider>}
+ * @param {IEditor} model 编辑器模型
+ * @param {IControlItem} [ctrlItem] 控件项模型
+ * @param {IControl} [ctrl] 部件模型
+ * @returns {*}  {(Promise<IEditorProvider | undefined>)}
  */
-export async function getEditorProvider(model) {
+export async function getEditorProvider(model, ctrlItem, ctrl) {
     let provider;
     const { editorType, editorStyle, predefinedType, sysPFPluginId, appId } = model;
+    // 找自定义的编辑器适配器
+    const registerKey = CustomRegister.getRegisterKey(EDITOR_PROVIDER_PREFIX, {
+        controlItemModel: ctrlItem,
+        controlModel: ctrl,
+        editorModel: model,
+    });
+    provider = getProvider(registerKey);
+    if (!provider) {
+        ibiz.log.debug(ibiz.i18n.t('runtime.register.helper.customRegistration', {
+            registerKey,
+        }));
+    }
+    else {
+        return provider;
+    }
     // 找插件适配器
     if (sysPFPluginId) {
         const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);

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,EACL,QAAQ,EACR,MAAM,EAGN,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAIrD,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,EACjB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,QAAQ,GAClB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CA+GzC"}
+{"version":3,"file":"panel-item-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/panel-item-register.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,MAAM,EAGN,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAIrD,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,EACjB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,QAAQ,GAClB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAkHzC"}

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

@@ -25,9 +25,9 @@ function getProvider(key) {
  * @return {*}  {Promise<IPanelItemProvider>}
  */
 export async function getPanelItemProvider(model, panelModel, viewModel) {
-    var _a, _b;
+    var _a;
     let provider;
-    const { itemType, sysPFPluginId, appId, controlRenders } = model;
+    const { itemType, sysPFPluginId, appId, controlRenders, id } = model;
     // 找自定义注册的适配器
     const registerKey = CustomRegister.getRegisterKey(PANELITEM_PROVIDER_PREFIX, {
         controlItemModel: model,
@@ -58,7 +58,8 @@ export async function getPanelItemProvider(model, panelModel, viewModel) {
             return provider;
         }
     }
-    if (controlRenders && controlRenders.length > 0) {
+    const renders = (controlRenders === null || controlRenders === void 0 ? void 0 : controlRenders.filter(render => render.id !== `${id === null || id === void 0 ? void 0 : id.toLowerCase()}_tooltip`)) || [];
+    if (renders.length > 0) {
         // 默认预定义 绘制器
         provider = getProvider('PREDEFINE_RENDER');
     }
@@ -105,8 +106,7 @@ export async function getPanelItemProvider(model, panelModel, viewModel) {
         }
         // 特殊部件占位
         if (itemType === 'CTRLPOS') {
-            const id = (_b = model.id) === null || _b === void 0 ? void 0 : _b.toUpperCase();
-            const key = `CTRLPOS_${id}`;
+            const key = `CTRLPOS_${id === null || id === void 0 ? void 0 : id.toUpperCase()}`;
             provider = getProvider(key);
             if (provider) {
                 return provider;

package/out/register/helper/ui-action-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-action-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/ui-action-register.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAGpD,gBAAgB;AAChB,eAAO,MAAM,wBAAwB,aAAa,CAAC;AAEnD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,iBAAiB,GAChC,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,iBAAiB,CAAC,CAuC5B"}
+{"version":3,"file":"ui-action-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/ui-action-register.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAIpD,gBAAgB;AAChB,eAAO,MAAM,wBAAwB,aAAa,CAAC;AAEnD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,iBAAiB,GAChC,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,iBAAiB,CAAC,CAqD5B"}

package/out/register/helper/ui-action-register.js

@@ -1,5 +1,6 @@
 import { RuntimeError } from '@ibiz-template/core';
 import { getPluginRegisterKey } from './common-register';
+import { CustomRegister } from '../custom-register';
 /** 界面行为适配器前缀 */
 export const UIACTION_PROVIDER_PREFIX = 'UIACTION';
 /**
@@ -27,6 +28,19 @@ function getProvider(key) {
 export async function getUIActionProvider(model) {
     let provider;
     const { uiactionMode, sysPFPluginId, appId, uiactionTag } = model;
+    // 找自定义注册的适配器
+    const registerKey = CustomRegister.getRegisterKey(UIACTION_PROVIDER_PREFIX, {
+        uiActionModel: model,
+    });
+    provider = getProvider(registerKey);
+    if (!provider) {
+        ibiz.log.debug(ibiz.i18n.t('runtime.register.helper.customRegistration', {
+            registerKey,
+        }));
+    }
+    else {
+        return provider;
+    }
     // 找插件适配器
     if (sysPFPluginId) {
         const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);

package/out/service/app-data-entity/app-data-entity.d.ts

@@ -21,6 +21,7 @@ export declare class AppDataEntity implements IDataEntity {
     srfmajortext: string;
     tempsrfkey: string;
     srfordervalue: number;
+    srfunionkey: string;
     get srfuf(): Srfuf;
     /**
      * Creates an instance of AppDataEntity.

package/out/service/app-data-entity/app-data-entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-data-entity.d.ts","sourceRoot":"","sources":["../../../src/service/app-data-entity/app-data-entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,WAAW;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,UAAkB,KAAK,EAAE,KAAK,CAAC;IAE/B,UAAkB,OAAO,EAAE,cAAc,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,aAAa,EAAE,MAAM,CAAC;IAEtB,WAAW,EAAE,MAAM,CAAC;IAEpB,aAAa,EAAE,MAAM,CAAC;IAEtB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAErB,UAAU,EAAE,MAAM,CAAC;IAEnB,aAAa,EAAE,MAAM,CAAC;IAE9B,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED;;;;;;;OAOG;gBACS,MAAM,EAAE,cAAc,EAAE,IAAI,GAAE,KAAK,GAAG,aAAkB;IAyFpE;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAgClC;;;;;;OAMG;IACH,KAAK,IAAI,aAAa;IAOtB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,aAAa;IAiBlD;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;CA6B5E"}
+{"version":3,"file":"app-data-entity.d.ts","sourceRoot":"","sources":["../../../src/service/app-data-entity/app-data-entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,WAAW;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,UAAkB,KAAK,EAAE,KAAK,CAAC;IAE/B,UAAkB,OAAO,EAAE,cAAc,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,aAAa,EAAE,MAAM,CAAC;IAEtB,WAAW,EAAE,MAAM,CAAC;IAEpB,aAAa,EAAE,MAAM,CAAC;IAEtB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAErB,UAAU,EAAE,MAAM,CAAC;IAEnB,aAAa,EAAE,MAAM,CAAC;IAEtB,WAAW,EAAE,MAAM,CAAC;IAE5B,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED;;;;;;;OAOG;gBACS,MAAM,EAAE,cAAc,EAAE,IAAI,GAAE,KAAK,GAAG,aAAkB;IAiGpE;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IA+ClC;;;;;;OAMG;IACH,KAAK,IAAI,aAAa;IAQtB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,aAAa;IAiBlD;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;CA6B5E"}

package/out/service/app-data-entity/app-data-entity.js

@@ -97,6 +97,13 @@ export class AppDataEntity {
             writable: true,
             value: isNil(this.srfkey) ? createUUID() : this.srfkey,
         });
+        // 设置联合主键（存在联合主键属性集合才有值）
+        Object.defineProperty(this, 'srfunionkey', {
+            enumerable: false,
+            configurable: true,
+            writable: true,
+            value: '',
+        });
         this.defineProperties();
     }
     /**
@@ -110,17 +117,32 @@ export class AppDataEntity {
         var _a;
         const { _data, convertVal } = this;
         const properties = {};
+        // fix：odoo#0059
+        const excludeKeys = [
+            '_entity',
+            '_data',
+            'srfdeid',
+            'srfdecodename',
+            'srfkeyfield',
+            'srfkey',
+            'srfmajorfield',
+            'srfmajortext',
+            'tempsrfkey',
+            'srfunionkey',
+        ];
         const keys = Object.keys(_data);
         keys.forEach(key => {
-            properties[key] = {
-                enumerable: true,
-                set(val) {
-                    _data[key] = val;
-                },
-                get() {
-                    return _data[key];
-                },
-            };
+            if (excludeKeys.indexOf(key) === -1) {
+                properties[key] = {
+                    enumerable: true,
+                    set(val) {
+                        _data[key] = val;
+                    },
+                    get() {
+                        return _data[key];
+                    },
+                };
+            }
         });
         (_a = this._entity.appDEFields) === null || _a === void 0 ? void 0 : _a.forEach(field => {
             const key = field.codeName.toLowerCase();
@@ -149,6 +171,7 @@ export class AppDataEntity {
         const entity = new AppDataEntity(this._entity, this._data);
         entity.srfkey = this.srfkey;
         entity.srfordervalue = this.srfordervalue;
+        entity.srfunionkey = this.srfunionkey;
         return entity;
     }
     /**

package/out/service/de-service-util.d.ts

@@ -155,5 +155,20 @@ export declare class DEServiceUtil implements IApiDEServiceUtil {
      * @return {*}  {Promise<IData>}
      */
     computeAppDEMappingParam(context: IContext, appDataEntityId: string): Promise<IData>;
+    /**
+     * @description 记录当前域变更
+     * @param {('ADD' | 'RESET' | 'UNDO' | 'REDO')} actionType 添加数据 | 重置数据
+     * @returns {*}  {void}
+     * @memberof DEServiceUtil
+     */
+    recordUIDomainChanges(srfsessionid: string, actionType: 'ADD' | 'RESET'): void;
+    /**
+     * @description 取消当前域变更，'UNDO' | 'REDO'暂未支持
+     * @param {string} srfsessionid 域标识
+     * @param {('INIT' | 'UNDO' | 'REDO')} targetState 目标状态，初始化状态|撤销上一步操作|重做下一步操作
+     * @returns {*}  {void}
+     * @memberof DEServiceUtil
+     */
+    cancelUIDomainDChanges(srfsessionid: string, targetState: 'INIT' | 'UNDO' | 'REDO'): void;
 }
 //# sourceMappingURL=de-service-util.d.ts.map

package/out/service/de-service-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-service-util.d.ts","sourceRoot":"","sources":["../../src/service/de-service-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAGtB;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,CACjC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,cAAc,KACxB,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,iBAAiB;IAiDzC,SAAS,CAAC,QAAQ,EAAE,YAAY;IAhD5C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAa;IAErE;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAa;IAEzE;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CACxD;IAEZ;;;;;OAKG;IACH,SAAS,CAAC,eAAe,EAAE,GAAG,CAC5B,MAAM,EACN;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,CACxC,CAAa;IAEd;;;;;;OAMG;gBACmB,QAAQ,EAAE,YAAY;IAK5C;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,oBAAoB,GAAG,IAAI;IAIpE;;;;OAIG;IACH,8BAA8B,CAAC,IAAI,EAAE,mBAAmB,GAAG,IAAI;IAwB/D;;;;;;;;OAQG;IACG,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAyCvE;;;;;;;;OAQG;IACG,qBAAqB,CACzB,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,aAAa,CAAC;IAkBzB;;;;;;;OAOG;IACH,KAAK,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAc9B;;;;;OAKG;IACH,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAY1C;;;;;;;OAOG;IACH,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAWvC;;;;;;;;;OASG;IACH,kBAAkB,CAChB,OAAO,EAAE,QAAQ,EACjB,QAAQ,EAAE,MAAM,EAChB,aAAa,GAAE,MAAM,EAAO,GAC3B,IAAI;IA6BP;;;;;;;;;;OAUG;IACG,IAAI,CACR,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS,EACpC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,EAC7B,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IA2BhC;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,OAAO,EAAE,QAAQ,EACjB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,CAAC;CAqClB"}
+{"version":3,"file":"de-service-util.d.ts","sourceRoot":"","sources":["../../src/service/de-service-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAGtB;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,CACjC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,cAAc,KACxB,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,iBAAiB;IAiDzC,SAAS,CAAC,QAAQ,EAAE,YAAY;IAhD5C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAa;IAErE;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAa;IAEzE;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CACxD;IAEZ;;;;;OAKG;IACH,SAAS,CAAC,eAAe,EAAE,GAAG,CAC5B,MAAM,EACN;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,CACxC,CAAa;IAEd;;;;;;OAMG;gBACmB,QAAQ,EAAE,YAAY;IAK5C;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,oBAAoB,GAAG,IAAI;IAIpE;;;;OAIG;IACH,8BAA8B,CAAC,IAAI,EAAE,mBAAmB,GAAG,IAAI;IAwB/D;;;;;;;;OAQG;IACG,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAyCvE;;;;;;;;OAQG;IACG,qBAAqB,CACzB,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,aAAa,CAAC;IAkBzB;;;;;;;OAOG;IACH,KAAK,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAc9B;;;;;OAKG;IACH,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAY1C;;;;;;;OAOG;IACH,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAWvC;;;;;;;;;OASG;IACH,kBAAkB,CAChB,OAAO,EAAE,QAAQ,EACjB,QAAQ,EAAE,MAAM,EAChB,aAAa,GAAE,MAAM,EAAO,GAC3B,IAAI;IAgCP;;;;;;;;;;OAUG;IACG,IAAI,CACR,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS,EACpC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,EAC7B,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IA2BhC;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,OAAO,EAAE,QAAQ,EACjB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,CAAC;IAsCjB;;;;;OAKG;IACH,qBAAqB,CACnB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,KAAK,GAAG,OAAO,GAC1B,IAAI;IAaP;;;;;;OAMG;IACH,sBAAsB,CACpB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GACpC,IAAI;CAiBR"}

package/out/service/de-service-util.js

@@ -234,6 +234,9 @@ export class DEServiceUtil {
         if (service) {
             service.local.clear();
         }
+        if (context.srfskipcleartmpres === true) {
+            return;
+        }
         // 根据关系清理掉子实体的临时数据缓存
         const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
         if (uiDomain) {
@@ -315,6 +318,48 @@ export class DEServiceUtil {
         }
         return result;
     }
+    /**
+     * @description 记录当前域变更
+     * @param {('ADD' | 'RESET' | 'UNDO' | 'REDO')} actionType 添加数据 | 重置数据
+     * @returns {*}  {void}
+     * @memberof DEServiceUtil
+     */
+    recordUIDomainChanges(srfsessionid, actionType) {
+        if (!this.cache.has(srfsessionid)) {
+            return;
+        }
+        const map = this.cache.get(srfsessionid);
+        if (map.size > 0) {
+            const services = Array.from(map.values());
+            for (let i = 0; i < services.length; i++) {
+                services[i].local.recordChanges(actionType);
+            }
+        }
+    }
+    /**
+     * @description 取消当前域变更，'UNDO' | 'REDO'暂未支持
+     * @param {string} srfsessionid 域标识
+     * @param {('INIT' | 'UNDO' | 'REDO')} targetState 目标状态，初始化状态|撤销上一步操作|重做下一步操作
+     * @returns {*}  {void}
+     * @memberof DEServiceUtil
+     */
+    cancelUIDomainDChanges(srfsessionid, targetState) {
+        // 后续需支持undo和redo后再行调整
+        if (!this.cache.has(srfsessionid) || targetState !== 'INIT') {
+            return;
+        }
+        // 还原界面域变更数据
+        const map = this.cache.get(srfsessionid);
+        if (map.size > 0) {
+            const services = Array.from(map.values());
+            for (let i = 0; i < services.length; i++) {
+                services[i].local.cancelChanges(targetState);
+            }
+        }
+        // 还原界面域变更状态
+        const uiDomain = ibiz.uiDomainManager.get(srfsessionid);
+        uiDomain === null || uiDomain === void 0 ? void 0 : uiDomain.dataChangeCompleted();
+    }
 }
 /**
  * 实体服务构造方法缓存

package/out/service/mqtt/collaborate.service.d.ts

@@ -5,6 +5,14 @@ export declare class CollaborateService {
     protected mqttTopic: string;
     protected token: string;
     protected appId: string;
+    /**
+     * 设定最大重连次数
+     */
+    MAX_RECONNECT_TIMES: number;
+    /**
+     * 重连次数
+     */
+    reconnectCount: number;
     /**
      * 发送消息
      *

package/out/service/mqtt/collaborate.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collaborate.service.d.ts","sourceRoot":"","sources":["../../../src/service/mqtt/collaborate.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAc,OAAO,EAAE,MAAM,SAAS,CAAC;AAE9C,qBAAa,kBAAkB;IAyE3B,SAAS,CAAC,EAAE,EAAE,MAAM;IACpB,SAAS,CAAC,SAAS,EAAE,MAAM;IAC3B,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,KAAK,EAAE,MAAM;IA3EzB;;;;;;OAMG;IACH,SAAS,CAAC,cAAc,SAAyB;IAEjD;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAE7B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;QACpB,OAAO,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC;QACnC,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;QAC9B,SAAS,EAAE,MAAM,IAAI,CAAC;QACtB,KAAK,EAAE,MAAM,IAAI,CAAC;KACnB,CAAC,CAAiB;IAEnB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IAEpB;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,cAAc,CAU/B;IAEF;;;;;;;;OAQG;gBAES,EAAE,EAAE,MAAM,EACV,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM;IAOzB;;;;;;OAMG;IACH,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,GAAG,eAAe,GAAG,IAAI;IAInE;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA+C9B;;;;;OAKG;IACH,KAAK,IAAI,IAAI;CAId"}
+{"version":3,"file":"collaborate.service.d.ts","sourceRoot":"","sources":["../../../src/service/mqtt/collaborate.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAc,OAAO,EAAE,MAAM,SAAS,CAAC;AAE9C,qBAAa,kBAAkB;IAmF3B,SAAS,CAAC,EAAE,EAAE,MAAM;IACpB,SAAS,CAAC,SAAS,EAAE,MAAM;IAC3B,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,KAAK,EAAE,MAAM;IArFzB;;OAEG;IACH,mBAAmB,SAAK;IAExB;;OAEG;IACH,cAAc,SAAK;IAEnB;;;;;;OAMG;IACH,SAAS,CAAC,cAAc,SAAyB;IAEjD;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAE7B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;QACpB,OAAO,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC;QACnC,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;QAC9B,SAAS,EAAE,MAAM,IAAI,CAAC;QACtB,KAAK,EAAE,MAAM,IAAI,CAAC;KACnB,CAAC,CAAiB;IAEnB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IAEpB;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,cAAc,CAU/B;IAEF;;;;;;;;OAQG;gBAES,EAAE,EAAE,MAAM,EACV,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM;IAOzB;;;;;;OAMG;IACH,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,GAAG,eAAe,GAAG,IAAI;IAInE;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAuD9B;;;;;OAKG;IACH,KAAK,IAAI,IAAI;CAId"}

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

@@ -14,6 +14,14 @@ export class CollaborateService {
         this.mqttTopic = mqttTopic;
         this.token = token;
         this.appId = appId;
+        /**
+         * 设定最大重连次数
+         */
+        this.MAX_RECONNECT_TIMES = 3;
+        /**
+         * 重连次数
+         */
+        this.reconnectCount = 0;
         /**
          * 发送消息
          *
@@ -70,6 +78,7 @@ export class CollaborateService {
      * @return {*}  {Promise<void>}
      */
     async connect() {
+        this.reconnectCount = 0;
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         const module = await import('mqtt/dist/mqtt.min');
@@ -98,7 +107,13 @@ export class CollaborateService {
             ibiz.log.debug('collaborate message');
         });
         this.client.on('reconnect', () => {
+            var _a;
             this.readyState = 0;
+            this.reconnectCount += 1;
+            if (this.reconnectCount >= this.MAX_RECONNECT_TIMES) {
+                (_a = this.client) === null || _a === void 0 ? void 0 : _a.end(true);
+                ibiz.log.warn(`the maximum number of reconnection attempts has been reached (${this.MAX_RECONNECT_TIMES}), and reconnection will be stopped.`);
+            }
             this.evt.emit('reconnect');
         });
         this.client.on('close', () => {

package/out/service/mqtt/mqtt.service.d.ts

@@ -13,6 +13,14 @@ export declare class MqttService {
     protected mqttTopic: string;
     protected token: string;
     protected appId: string;
+    /**
+     * 设定最大重连次数
+     */
+    MAX_RECONNECT_TIMES: number;
+    /**
+     * 重连次数
+     */
+    reconnectCount: number;
     /**
      * 接受消息通知
      *

package/out/service/mqtt/mqtt.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mqtt.service.d.ts","sourceRoot":"","sources":["../../../src/service/mqtt/mqtt.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAE,OAAO,EAAc,MAAM,SAAS,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,WAAW;IA0DpB,SAAS,CAAC,SAAS,EAAE,MAAM;IAC3B,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,KAAK,EAAE,MAAM;IA3DzB;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;QACpB,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,KAAK,IAAI,CAAC;KACvD,CAAC,CAAiB;IAEnB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IAEpB;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,cAAc,CAU/B;IAEF;;;;;;;;OAQG;gBAES,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM;IAOzB;;;;;;;OAOG;IACH,OAAO,CAAC,kBAAkB;IAa1B;;;;;;;;OAQG;IACH,OAAO,CAAC,aAAa;IAkBrB;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA+B9B;;;;;OAKG;IACH,KAAK,IAAI,IAAI;CAId"}
+{"version":3,"file":"mqtt.service.d.ts","sourceRoot":"","sources":["../../../src/service/mqtt/mqtt.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAE,OAAO,EAAc,MAAM,SAAS,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,WAAW;IAoEpB,SAAS,CAAC,SAAS,EAAE,MAAM;IAC3B,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,KAAK,EAAE,MAAM;IArEzB;;OAEG;IACH,mBAAmB,SAAK;IAExB;;OAEG;IACH,cAAc,SAAK;IAEnB;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;QACpB,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,KAAK,IAAI,CAAC;KACvD,CAAC,CAAiB;IAEnB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IAEpB;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,cAAc,CAU/B;IAEF;;;;;;;;OAQG;gBAES,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM;IAOzB;;;;;;;OAOG;IACH,OAAO,CAAC,kBAAkB;IAa1B;;;;;;;;OAQG;IACH,OAAO,CAAC,aAAa;IAkBrB;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAuC9B;;;;;OAKG;IACH,KAAK,IAAI,IAAI;CAId"}

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

@@ -22,6 +22,14 @@ export class MqttService {
         this.mqttTopic = mqttTopic;
         this.token = token;
         this.appId = appId;
+        /**
+         * 设定最大重连次数
+         */
+        this.MAX_RECONNECT_TIMES = 3;
+        /**
+         * 重连次数
+         */
+        this.reconnectCount = 0;
         /**
          * 接受消息通知
          *
@@ -104,6 +112,7 @@ export class MqttService {
      * @return {*}  {Promise<void>}
      */
     async connect() {
+        this.reconnectCount = 0;
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         const module = await import('mqtt/dist/mqtt.min');
@@ -124,7 +133,13 @@ export class MqttService {
             this.evt.emit('message', topic, msg);
         });
         this.client.on('reconnect', () => {
+            var _a;
             ibiz.log.warn('mqtt reconnect');
+            this.reconnectCount += 1;
+            if (this.reconnectCount >= this.MAX_RECONNECT_TIMES) {
+                (_a = this.client) === null || _a === void 0 ? void 0 : _a.end(true);
+                ibiz.log.warn(`the maximum number of reconnection attempts has been reached (${this.MAX_RECONNECT_TIMES}), and reconnection will be stopped.`);
+            }
         });
         this.client.on('close', () => {
             ibiz.log.warn('mqtt close');

package/out/service/service/code-list/code-list.service.d.ts

@@ -27,6 +27,13 @@ export declare class CodeListService implements IApiCodeListService {
      * @type {Map<string, CodeListItem[]>}
      */
     protected cache: Map<string, readonly CodeListItem[] | DynamicCodeListCache>;
+    /**
+     * 已合并子应用代码表标识缓存
+     *
+     * @protected
+     * @type {Map<string, DynamicCodeListCache>}
+     */
+    protected mergedSubCodeListCache: Array<string>;
     constructor(appModel: IApplication);
     /**
      * 获取静态代码表

package/out/service/service/code-list/code-list.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-list.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/code-list/code-list.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGnD;;;;;;;GAOG;AACH,qBAAa,eAAgB,YAAW,mBAAmB;IAoB7C,SAAS,CAAC,QAAQ,EAAE,YAAY;IAnB5C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,4BAAmC;IAEzD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,oBAAoB,CAAC,CAChE;gBAEU,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE;IAc3D;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAMzC;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIlD;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,OAAO,GACrB,QAAQ,CAAC,YAAY,CAAC,EAAE;IA2C3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;IAiBnC;;;;;;;OAOG;IACH,gBAAgB,CACd,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,EAC9C,KAAK,EAAE,MAAM,GAAG,MAAM,GACrB,YAAY,GAAG,SAAS;IA2B3B;;;;;;;;OAQG;IACG,OAAO,CACX,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAWpC;;;;;OAKG;IACG,mBAAmB,CACvB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAqB5C;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAQhB"}
+{"version":3,"file":"code-list.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/code-list/code-list.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGnD;;;;;;;GAOG;AACH,qBAAa,eAAgB,YAAW,mBAAmB;IA4B7C,SAAS,CAAC,QAAQ,EAAE,YAAY;IA3B5C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,4BAAmC;IAEzD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,oBAAoB,CAAC,CAChE;IAEZ;;;;;OAKG;IACH,SAAS,CAAC,sBAAsB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAM;gBAE/B,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE;IAc3D;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAMzC;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAelD;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,OAAO,GACrB,QAAQ,CAAC,YAAY,CAAC,EAAE;IA2C3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;IAiBnC;;;;;;;OAOG;IACH,gBAAgB,CACd,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,EAC9C,KAAK,EAAE,MAAM,GAAG,MAAM,GACrB,YAAY,GAAG,SAAS;IA2B3B;;;;;;;;OAQG;IACG,OAAO,CACX,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAWpC;;;;;OAKG;IACG,mBAAmB,CACvB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAqB5C;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAQhB"}

package/out/service/service/code-list/code-list.service.js

@@ -30,6 +30,13 @@ export class CodeListService {
          * @type {Map<string, CodeListItem[]>}
          */
         this.cache = new Map();
+        /**
+         * 已合并子应用代码表标识缓存
+         *
+         * @protected
+         * @type {Map<string, DynamicCodeListCache>}
+         */
+        this.mergedSubCodeListCache = [];
     }
     /**
      * 获取静态代码表
@@ -76,7 +83,16 @@ export class CodeListService {
      * @returns {*}
      */
     getCodeList(tag) {
-        return this.allCodeLists.get(tag);
+        const codelist = this.allCodeLists.get(tag);
+        // 仅主应用合并所有子应用同代码表标识代码表
+        // mergedSubCodeListCache防止界面请求重复合并问题
+        if (this.appModel.appId === ibiz.env.appId &&
+            codelist &&
+            !this.mergedSubCodeListCache.includes(codelist.codeListTag)) {
+            ibiz.hub.mergeSubAppCodeList(codelist);
+            this.mergedSubCodeListCache.push(codelist.codeListTag);
+        }
+        return codelist;
     }
     /**
      * 格式化代码表

package/out/service/service/control/md-control.service.d.ts

@@ -1,5 +1,5 @@
 import { IHttpResponse } from '@ibiz-template/core';
-import { IDEDataExport, IMDAjaxControl } from '@ibiz/model-core';
+import { IAppDEDataExport, IMDAjaxControl } from '@ibiz/model-core';
 import { ControlVO } from '../../vo/control.vo';
 import { ControlService } from './control.service';
 export declare class MDControlService<T extends IMDAjaxControl = IMDAjaxControl> extends ControlService<T> {
@@ -74,16 +74,14 @@ export declare class MDControlService<T extends IMDAjaxControl = IMDAjaxControl>
      */
     updateBatch(context: IContext, data: ControlVO[]): Promise<IHttpResponse<ControlVO[]>>;
     /**
-     * 导出数据
-     *
-     * @author lxm
-     * @date 2022-11-25 14:11:09
-     * @param {IPSDEDataExport} dataExport 导出模型
+     * @description 导出数据
+     * @param {IAppDEDataExport} dataExport 导出模型
      * @param {IContext} context 上下文
      * @param {IParams} [params={}] 请求参数
-     * @returns {*}  {Promise<IHttpResponse>}
+     * @returns {*}  {Promise<boolean>}
+     * @memberof MDControlService
      */
-    exportData(dataExport: IDEDataExport, context: IContext, params?: IParams): Promise<IHttpResponse<Blob>>;
+    exportData(dataExport: IAppDEDataExport, context: IContext, params?: IParams): Promise<boolean>;
     /**
      * 处理响应
      *

package/out/service/service/control/md-control.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/md-control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAQtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAOzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EAAE,GAChB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,UAAU,CACd,UAAU,EAAE,aAAa,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAa/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CA8BvD"}
+{"version":3,"file":"md-control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/md-control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAQtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAOzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EAAE,GAChB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAYtC;;;;;;;OAOG;IACG,UAAU,CACd,UAAU,EAAE,gBAAgB,EAC5B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,OAAO,CAAC;IAcnB;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CA8BvD"}

package/out/service/service/control/md-control.service.js

@@ -113,18 +113,17 @@ export class MDControlService extends ControlService {
         return res;
     }
     /**
-     * 导出数据
-     *
-     * @author lxm
-     * @date 2022-11-25 14:11:09
-     * @param {IPSDEDataExport} dataExport 导出模型
+     * @description 导出数据
+     * @param {IAppDEDataExport} dataExport 导出模型
      * @param {IContext} context 上下文
      * @param {IParams} [params={}] 请求参数
-     * @returns {*}  {Promise<IHttpResponse>}
+     * @returns {*}  {Promise<boolean>}
+     * @memberof MDControlService
      */
     async exportData(dataExport, context, params = {}) {
         const entityService = await this.app.deService.getService(context, this.model.appDataEntityId);
-        return entityService.file.exportData(dataExport, this.model.fetchControlAction.appDEMethodId, context, params);
+        return entityService.file.export(dataExport, dataExport.appDEDataSetId ||
+            this.model.fetchControlAction.appDEMethodId, context, params);
     }
     /**
      * 处理响应