@ibiz-template/model-helper 0.7.41-alpha.13 → 0.7.41-alpha.131

package/out/index.d.ts

@@ -1,7 +1,8 @@
 import '@ibiz/model-core';
 import '@ibiz-template/runtime';
+export type { IModelHandler } from './interface';
 export * from './model-helper';
 export * from './locale';
 export { ModelHelper } from './model-helper';
-export { MergeSubModelHelper } from './utils';
+export { MergeSubModelHelper, registerModelHandler, ModelHandler, } from './utils';
 //# sourceMappingURL=index.d.ts.map

package/out/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,wBAAwB,CAAC;AAEhC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,wBAAwB,CAAC;AAEhC,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,YAAY,GACb,MAAM,SAAS,CAAC"}

package/out/index.js

@@ -3,4 +3,4 @@ import '@ibiz-template/runtime';
 export * from './model-helper';
 export * from './locale';
 export { ModelHelper } from './model-helper';
-export { MergeSubModelHelper } from './utils';
+export { MergeSubModelHelper, registerModelHandler, ModelHandler, } from './utils';

package/out/interface/i-model-handler.d.ts

@@ -0,0 +1,20 @@
+/**
+ * @description 模型处理器
+ * @export
+ * @interface IModelHandler
+ */
+export interface IModelHandler {
+    /**
+     * @description 执行模型处理
+     *
+     * 调用约定：
+     * - 入参 `model` 为当前已处理的模型对象，处理器可就地修改该对象，也可返回一个新的模型对象。
+     * - 返回值将作为下一个处理器的入参，并最终作为该路径模型的最终结果被缓存。
+     * - 若返回 `null`、`undefined` 等假值，将中断当前路径后续处理器的执行，并回退到原始模型。
+     * - 处理器抛出异常时同样会中断后续执行，并回退到原始模型。
+     * @param {IModel} model 当前待处理的模型对象
+     * @returns {IModel} 处理后的模型对象
+     */
+    execute(model: IModel): IModel;
+}
+//# sourceMappingURL=i-model-handler.d.ts.map

package/out/interface/i-model-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"i-model-handler.d.ts","sourceRoot":"","sources":["../../src/interface/i-model-handler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;;;;;;OAUG;IACH,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC"}

package/out/interface/i-model-handler.js

@@ -0,0 +1 @@
+export {};

package/out/interface/index.d.ts

@@ -0,0 +1,2 @@
+export type { IModelHandler } from './i-model-handler';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/interface/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC"}

package/out/interface/index.js

@@ -0,0 +1 @@
+export {};

package/out/locale/en/index.d.ts

@@ -5,6 +5,10 @@ export declare const en: {
             maximumTier: string;
             circularRecursive: string;
             calculatedEntities: string;
+            transformNoModelData: string;
+            transformException: string;
+            tryGetModel: string;
+            invalidPathPattern: string;
         };
         noInitialized: string;
         noFoundEntity: string;

package/out/locale/en/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/locale/en/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,EAAE;;;;;;;;;;;;;CAed,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/locale/en/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;CAuBd,CAAC"}

package/out/locale/en/index.js

@@ -5,6 +5,10 @@ export const en = {
             maximumTier: 'Service path calculation exceeds maximum tier 10',
             circularRecursive: 'A circular recursive reference appears in the computational resource relationship path, triggering the entity:',
             calculatedEntities: 'Current list of calculated entities. ',
+            transformNoModelData: '[{dynaModelFilePath}] model transformation exception, no model data returned',
+            transformException: '[{dynaModelFilePath}] model transformation exception',
+            tryGetModel: '[Custom extension model data] Try to get the extension model of path [{dynaModelFilePath}]',
+            invalidPathPattern: '[Model handler path validation failed]: wildcards are not allowed in even-position path segments, [{pathPattern}] registration skipped',
         },
         noInitialized: '[{appId}] is not initialized, please call initModelUtil method to initialize it first',
         noFoundEntity: 'Application [{appId}] data entity not found [{tag}]',

package/out/locale/zh-CN/index.d.ts

@@ -5,6 +5,10 @@ export declare const zhCn: {
             maximumTier: string;
             circularRecursive: string;
             calculatedEntities: string;
+            transformNoModelData: string;
+            transformException: string;
+            tryGetModel: string;
+            invalidPathPattern: string;
         };
         noInitialized: string;
         noFoundEntity: string;

package/out/locale/zh-CN/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/locale/zh-CN/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI;;;;;;;;;;;;;CAahB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/locale/zh-CN/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;CAmBhB,CAAC"}

package/out/locale/zh-CN/index.js

@@ -5,6 +5,10 @@ export const zhCn = {
             maximumTier: '服务路径计算超过最大层级 10',
             circularRecursive: '计算资源关系路径出现循环递归引用，触发实体：',
             calculatedEntities: '当前已计算过实体清单: ',
+            transformNoModelData: '[{dynaModelFilePath}]模型转化异常，未返回模型数据',
+            transformException: '[{dynaModelFilePath}]模型转化异常',
+            tryGetModel: '[自定义扩展模型数据] 尝试获取路径[{dynaModelFilePath}]的扩展模型',
+            invalidPathPattern: '[模型处理器校验路径失败]，偶数位路径段不允许使用通配符，[{pathPattern}]已跳过注册',
         },
         noInitialized: '[{appId}]未初始化，请先调用 initModelUtil 方法初始化',
         noFoundEntity: '应用[{appId}]未找到数据实体[{tag}]',

package/out/model-helper.d.ts

@@ -1,4 +1,4 @@
-import { IAppDataEntity, IAppView, IApplication, IAppLan, ISubAppRef, IAppBIScheme, IAppBICube, IAppBIReport } from '@ibiz/model-core';
+import { IAppCodeList, IAppDataEntity, IAppView, IApplication, IAppLan, ISubAppRef, IAppBIScheme, IAppBICube, IAppBIReport } from '@ibiz/model-core';
 import { DSLHelper } from '@ibiz/rt-model-api';
 import { ModelUtil } from './model-util';
 import { MergeSubModelHelper } from './utils';
@@ -136,6 +136,13 @@ export declare class ModelHelper {
      * @return {*}  {(Promise<string | null>)}
      */
     getAppStyle(appId?: string | IObject): Promise<string | null>;
+    /**
+     * @description 计算应用实体需要合并的子应用模型
+     * @protected
+     * @param {IAppDataEntity} appDataEntity
+     * @memberof ModelHelper
+     */
+    protected calcAppDataEntitySubAppModel(appDataEntity: IAppDataEntity): void;
     /**
      * 根据应用实体 codeName 获取应用实体模型
      *
@@ -247,5 +254,10 @@ export declare class ModelHelper {
      * @return {*}  {string}
      */
     protected calcAppId(data?: IObject | string): string;
+    /**
+     * 合并子应用代码表
+     * @param codeList
+     */
+    mergeSubAppCodeList(codeList: IAppCodeList): void;
 }
 //# sourceMappingURL=model-helper.d.ts.map

package/out/model-helper.d.ts.map

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

package/out/model-helper.js

@@ -156,7 +156,7 @@ export class ModelHelper {
         }
         // 模型扩展标准视图布局面板
         const subViewRefs = app.model.appSubViewTypeRefs || [];
-        subViewRefs.forEach(item => {
+        subViewRefs.forEach((item) => {
             if (item.replaceDefault) {
                 ibiz.util.layoutPanel.register(`${item.viewType}_DEFAULT`, item.viewLayoutPanel);
             }
@@ -168,8 +168,18 @@ export class ModelHelper {
             for (let i = 0; i < subAppRefs.length; i++) {
                 const subApp = subAppRefs[i];
                 const sourceSubApp = getAllPSSubAppRefs[i];
-                // eslint-disable-next-line no-await-in-loop
-                await this.initSubApp(app, subApp, sourceSubApp);
+                // 控制插件应用访问权限、通过应用样式参数SUBAPPACCESSKEY定义权限标识
+                if (subApp.accessKey) {
+                    const mianApp = await ibiz.hub.getApp(ibiz.env.appId);
+                    await mianApp.authority.init();
+                    const permitted = mianApp.authority.calcByResCode(subApp.accessKey);
+                    if (permitted) {
+                        await this.initSubApp(app, subApp, sourceSubApp);
+                    }
+                }
+                else {
+                    await this.initSubApp(app, subApp, sourceSubApp);
+                }
             }
         }
     }
@@ -232,7 +242,12 @@ export class ModelHelper {
         const drCtrls = this.dsl.controls(sourceSubApp.getAllPSDEDRControls || []);
         drCtrlIds.forEach((id, index) => {
             const drCtrl = drCtrls[index];
-            ibiz.hub.registerSubAppDrControls(subApp.id || ibiz.env.appId, drCtrl);
+            if (drCtrl.controlType === 'TABEXPPANEL') {
+                ibiz.hub.registerSubAppTabExpPanel(subApp.id || ibiz.env.appId, drCtrl);
+            }
+            else {
+                ibiz.hub.registerSubAppDrControls(subApp.id || ibiz.env.appId, drCtrl);
+            }
         });
         // 设置界面行为组到hub中
         const appDEUIActionGroupIds = subApp.appDEUIActionGroupIds || [];
@@ -258,6 +273,14 @@ export class ModelHelper {
             this.deepFillSubAppId(appControl, subApp.id);
             ibiz.hub.registerSubAppControls(subApp.id || ibiz.env.appId, this.dsl.control(appControl));
         });
+        // 设置代码表模型到hub中
+        const appCodeLists = sourceSubApp.getAllPSAppCodeLists || [];
+        if (subApp.id) {
+            appCodeLists.forEach((appCodeList) => {
+                this.deepFillSubAppId(appCodeList, subApp.id);
+                ibiz.hub.registerSubAppCodeList(subApp.id, this.dsl.appCodeList(appCodeList));
+            });
+        }
         // 实现子应用借助主应用独立打开,srfembsubapp的值为ref三段式的第一段哈希值，条件触发手动加载目标子应用
         if (this.appContext.srfembsubapp &&
             subApp.id &&
@@ -331,6 +354,16 @@ export class ModelHelper {
     getAppStyle(appId) {
         return this.getModelUtil(appId).getAppStyle();
     }
+    /**
+     * @description 计算应用实体需要合并的子应用模型
+     * @protected
+     * @param {IAppDataEntity} appDataEntity
+     * @memberof ModelHelper
+     */
+    calcAppDataEntitySubAppModel(appDataEntity) {
+        // 合并AC模式界面行为组
+        this.merge.mergeSubAppDEACModesActionGroup(appDataEntity.appDEACModes, this.subAppRefs);
+    }
     /**
      * 根据应用实体 codeName 获取应用实体模型
      *
@@ -345,6 +378,9 @@ export class ModelHelper {
         const util = this.getModelUtil(appId);
         const model = await util.getAppDataEntityModel(name, isId, true);
         const dsl = this.dsl.appDataEntity(model);
+        if (!appId || appId === ibiz.env.appId) {
+            this.calcAppDataEntitySubAppModel(dsl);
+        }
         const list = await util.servicePathUtil.calcRequestPaths(dsl.id);
         dsl.requestPaths = list;
         dsl.codeName2 = plural(dsl.codeName.toLowerCase());
@@ -634,4 +670,11 @@ export class ModelHelper {
         }
         return appId;
     }
+    /**
+     * 合并子应用代码表
+     * @param codeList
+     */
+    mergeSubAppCodeList(codeList) {
+        this.merge.mergeSubAppCodeList(codeList, this.subAppRefs);
+    }
 }

package/out/model-loader.d.ts

@@ -1,5 +1,5 @@
 import { ModelLoaderProvider } from '@ibiz-template/runtime';
-import { IApplication, IAppView, IAppDataEntity, IAppBIScheme, IAppBICube, IAppBIReport, ISubAppRef } from '@ibiz/model-core';
+import { IApplication, IAppView, IAppDataEntity, IAppBIScheme, IAppBICube, IAppBIReport, ISubAppRef, IAppCodeList, IAppLan } from '@ibiz/model-core';
 import { ModelHelper } from './model-helper';
 /**
  * 模型加载适配器
@@ -19,11 +19,13 @@ export declare class ModelLoader implements ModelLoaderProvider {
     getAppView(appId: string, codeName: string): Promise<IAppView>;
     getAppDataEntity(appId: string, id: string): Promise<IAppDataEntity>;
     getAppDataEntityByCodeName(appId: string, codeName: string): Promise<IAppDataEntity>;
+    getPSAppLang(language: string, appId?: string | IObject): Promise<IAppLan | null>;
     getAppStyle(appId: string): Promise<string | null>;
     loadAppView(appId: string, viewId: string, params: IParams): Promise<IAppView>;
     getAppBISchemes(appId: string, ids: string[]): Promise<IAppBIScheme[]>;
     getAppAppBICubes(appId: string, ids: string[]): Promise<IAppBICube[]>;
     getAppBIReports(appId: string, ids: string[]): Promise<IAppBIReport[]>;
     translationModelToDsl(data: IData, type: 'APP' | 'VIEW' | 'CTRL' | 'APPENTITY' | 'APPBIREPORT'): Promise<IModel | undefined>;
+    mergeSubAppCodeList(codeList: IAppCodeList): void;
 }
 //# sourceMappingURL=model-loader.d.ts.map

package/out/model-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-loader.d.ts","sourceRoot":"","sources":["../src/model-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EACL,YAAY,EACZ,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,UAAU,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,WAAY,YAAW,mBAAmB;IACzC,SAAS,CAAC,MAAM,EAAE,WAAW;gBAAnB,MAAM,EAAE,WAAW;IAEzC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAItC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAI1C,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAI5D,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAI9D,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAIpE,0BAA0B,CACxB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC;IAI1B,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIlD,WAAW,CACT,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,QAAQ,CAAC;IAIpB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAItE,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAIrE,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAItE,qBAAqB,CACnB,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,WAAW,GAAG,aAAa,GAC1D,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAG/B"}
+{"version":3,"file":"model-loader.d.ts","sourceRoot":"","sources":["../src/model-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EACL,YAAY,EACZ,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,OAAO,EACR,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,WAAY,YAAW,mBAAmB;IACzC,SAAS,CAAC,MAAM,EAAE,WAAW;gBAAnB,MAAM,EAAE,WAAW;IAEzC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAItC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAI1C,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAI5D,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAI9D,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAIpE,0BAA0B,CACxB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC;IAIpB,YAAY,CAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAI1B,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIlD,WAAW,CACT,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,QAAQ,CAAC;IAIpB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAItE,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAIrE,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAItE,qBAAqB,CACnB,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,WAAW,GAAG,aAAa,GAC1D,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI9B,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;CAGlD"}

package/out/model-loader.js

@@ -29,6 +29,9 @@ export class ModelLoader {
     getAppDataEntityByCodeName(appId, codeName) {
         return this.helper.getAppDataEntityModel(codeName, appId, false);
     }
+    async getPSAppLang(language, appId) {
+        return this.helper.getPSAppLang(language, appId);
+    }
     getAppStyle(appId) {
         return this.helper.getAppStyle(appId);
     }
@@ -47,4 +50,7 @@ export class ModelLoader {
     translationModelToDsl(data, type) {
         return this.helper.translationModelToDsl(data, type);
     }
+    mergeSubAppCodeList(codeList) {
+        this.helper.mergeSubAppCodeList(codeList);
+    }
 }

package/out/model-util.d.ts

@@ -164,14 +164,15 @@ export declare class ModelUtil {
      */
     getModel(modelPath: string, params?: IParams, isDynamic?: boolean): Promise<IModel>;
     /**
-     * 递归填充应用标识
+     * 递归填充模型，包括填充模型appId、变换模型
      *
      * @author chitanda
      * @date 2023-08-21 10:08:41
      * @protected
      * @param {IModel} model
+     * @return {*}  {IModel} 返回处理后的模型，若处理器返回新对象则替换原引用
      */
-    protected deepFillAppId(model: IModel): void;
+    protected deepFillModel(model: IModel): IModel;
     /**
      * 计算应用模型请求路径
      *

package/out/model-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-util.d.ts","sourceRoot":"","sources":["../src/model-util.ts"],"names":[],"mappings":"AAGA,OAAO,EAA0B,eAAe,EAAE,MAAM,SAAS,CAAC;AAGlE;;;;;;;GAOG;AACH,qBAAa,SAAS;IA0ClB,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,QAAQ,EAAE,MAAM;IAC1B,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;IACjE,SAAS,CAAC,GAAG,EAAE,OAAO;IACtB,SAAS,CAAC,UAAU,EAAE,OAAO;IAC7B,SAAS,CAAC,UAAU,EAAE,OAAO;IA9C/B;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAG,MAAM,CAAC;IAE5B;;;;;;OAMG;IACH,eAAe,EAAG,eAAe,CAAC;IAElC;;;;;;;;;;OAUG;gBAES,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,EACvD,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,OAAO,EACnB,UAAU,GAAE,OAAc;IAGtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqD3B;;;;;;;OAOG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAepC;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAqB3C;;;;;;;;;OASG;IACG,qBAAqB,CACzB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,OAAc,EACpB,UAAU,GAAE,OAAe,GAC1B,OAAO,CAAC,MAAM,CAAC;IA8BlB;;;;;;;;;OASG;IACG,eAAe,CACnB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAChB,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,MAAM,CAAC;IAiBlB;;;;;;;OAOG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAarD;;;;;;;OAOG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUjD;;;;;;;OAOG;IACG,mBAAmB,CAAC,KAAK,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAWlE;;;;;;;OAOG;IACG,gBAAgB,CAAC,KAAK,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAW/D;;;;;;;OAOG;IACG,eAAe,CAAC,KAAK,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAW9D;;;;;;;;;OASG;IACG,QAAQ,CACZ,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,OAAO,EAChB,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,MAAM,CAAC;IAmBlB;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAmB5C;;;;;;;;;OASG;IACH,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,GAAE,OAAe,GAAG,MAAM;IAW5E;;;;;;;;;OASG;IACH,SAAS,CAAC,cAAc,CACtB,SAAS,EAAE,MAAM,EACjB,SAAS,GAAE,OAAe,GACzB,MAAM;CAQV"}
+{"version":3,"file":"model-util.d.ts","sourceRoot":"","sources":["../src/model-util.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,eAAe,EAChB,MAAM,SAAS,CAAC;AAGjB;;;;;;;GAOG;AACH,qBAAa,SAAS;IA0ClB,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,QAAQ,EAAE,MAAM;IAC1B,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;IACjE,SAAS,CAAC,GAAG,EAAE,OAAO;IACtB,SAAS,CAAC,UAAU,EAAE,OAAO;IAC7B,SAAS,CAAC,UAAU,EAAE,OAAO;IA9C/B;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAG,MAAM,CAAC;IAE5B;;;;;;OAMG;IACH,eAAe,EAAG,eAAe,CAAC;IAElC;;;;;;;;;;OAUG;gBAES,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,EACvD,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,OAAO,EACnB,UAAU,GAAE,OAAc;IAGtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA6C3B;;;;;;;OAOG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAepC;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAqB3C;;;;;;;;;OASG;IACG,qBAAqB,CACzB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,OAAc,EACpB,UAAU,GAAE,OAAe,GAC1B,OAAO,CAAC,MAAM,CAAC;IA8BlB;;;;;;;;;OASG;IACG,eAAe,CACnB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAChB,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,MAAM,CAAC;IAiBlB;;;;;;;OAOG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAqBrD;;;;;;;OAOG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUjD;;;;;;;OAOG;IACG,mBAAmB,CAAC,KAAK,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAWlE;;;;;;;OAOG;IACG,gBAAgB,CAAC,KAAK,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAW/D;;;;;;;OAOG;IACG,eAAe,CAAC,KAAK,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAW9D;;;;;;;;;OASG;IACG,QAAQ,CACZ,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,OAAO,EAChB,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,MAAM,CAAC;IAmBlB;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IA6B9C;;;;;;;;;OASG;IACH,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,GAAE,OAAe,GAAG,MAAM;IAW5E;;;;;;;;;OASG;IACH,SAAS,CAAC,cAAc,CACtB,SAAS,EAAE,MAAM,EACjB,SAAS,GAAE,OAAe,GACzB,MAAM;CAQV"}

package/out/model-util.js

@@ -1,6 +1,6 @@
 import { calcUniqueTag } from '@ibiz/rt-model-api';
 import { isEmpty } from 'ramda';
-import { formatPath, mergeModel, ServicePathUtil } from './utils';
+import { formatPath, mergeModel, ModelTransformer, ServicePathUtil, } from './utils';
 import { PSSysApp } from './model/PSSYSAPP';
 /**
  * 全动模型处理工具类,每个App一个实例
@@ -86,13 +86,6 @@ export class ModelUtil {
             item.minorAppDataEntityId = calcUniqueTag(minor, false);
         });
         this.servicePathUtil = new ServicePathUtil(allDataEntities, allAppDERSs, this);
-        if (this.appModel.getAllPSAppLans &&
-            this.appModel.getAllPSAppLans.length > 0) {
-            ibiz.env.isEnableMultiLan = true;
-        }
-        else {
-            ibiz.env.isEnableMultiLan = false;
-        }
     }
     /**
      * 特殊处理应用模型
@@ -230,7 +223,14 @@ export class ModelUtil {
             const langs = app.getAllPSAppLans;
             const lang = langs.find(item => item.language === language);
             if (lang) {
-                return this.getModel(lang.path);
+                try {
+                    const result = await this.getModel(lang.path || lang.dynaModelFilePath);
+                    return result;
+                }
+                catch (error) {
+                    ibiz.log.error(error);
+                    return {};
+                }
             }
             ibiz.log.error(ibiz.i18n.t('modelHelper.noSupported', { language }));
         }
@@ -331,38 +331,46 @@ export class ModelUtil {
             return this.modelCache.get(url);
         }
         const model = await this.get(url, params);
+        const filledModel = this.deepFillModel(model);
         if (!isParams) {
-            this.modelCache.set(url, model);
+            this.modelCache.set(url, filledModel);
         }
-        this.deepFillAppId(model);
-        return model;
+        return filledModel;
     }
     /**
-     * 递归填充应用标识
+     * 递归填充模型，包括填充模型appId、变换模型
      *
      * @author chitanda
      * @date 2023-08-21 10:08:41
      * @protected
      * @param {IModel} model
+     * @return {*}  {IModel} 返回处理后的模型，若处理器返回新对象则替换原引用
      */
-    deepFillAppId(model) {
-        model.appId = this.appId;
-        const keys = Object.keys(model);
+    deepFillModel(model) {
+        // 变换模型
+        let result = model;
+        if (model.dynaModelFilePath) {
+            result = ModelTransformer.getInstance().transform(model.dynaModelFilePath, model);
+        }
+        // 填充模型appId
+        result.appId = this.appId;
+        const keys = Object.keys(result);
         keys.forEach(key => {
-            const value = model[key];
+            const value = result[key];
             if (value && typeof value === 'object') {
                 if (Array.isArray(value)) {
-                    value.forEach(item => {
+                    value.forEach((item, index) => {
                         if (item && typeof item === 'object') {
-                            this.deepFillAppId(item);
+                            value[index] = this.deepFillModel(item);
                         }
                     });
                 }
                 else {
-                    this.deepFillAppId(value);
+                    result[key] = this.deepFillModel(value);
                 }
             }
         });
+        return result;
     }
     /**
      * 计算应用模型请求路径

package/out/utils/index.d.ts

@@ -3,4 +3,7 @@ export { mergeModel } from './merge-model/merge-model';
 export { plural, pluralLower } from './plural/plural';
 export { ServicePathDeep, ServicePathItem, ServicePathUtil, } from './service-path-util/service-path-util';
 export { MergeSubModelHelper } from './merge-model/merge-model-helper';
+export { ModelHandler } from './model-transformer/model-handler';
+export { ModelTransformer } from './model-transformer/model-transformer';
+export { registerModelHandler } from './model-transformer/model-register';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC"}

package/out/utils/index.js

@@ -3,3 +3,6 @@ export { mergeModel } from './merge-model/merge-model';
 export { plural, pluralLower } from './plural/plural';
 export { ServicePathUtil, } from './service-path-util/service-path-util';
 export { MergeSubModelHelper } from './merge-model/merge-model-helper';
+export { ModelHandler } from './model-transformer/model-handler';
+export { ModelTransformer } from './model-transformer/model-transformer';
+export { registerModelHandler } from './model-transformer/model-register';

package/out/utils/merge-model/merge-app-codelist.d.ts

@@ -0,0 +1,8 @@
+import { IAppCodeList } from '@ibiz/model-core';
+/**
+ * 合并应用代码表,子应用代码表需开启支持动态模式和配置用户标记，合并规则：dynamic_overlay:replace|merge,replace表示子应用代码表完全覆盖主应用代码表，merge表示子应用代码表项合并到主应用代码表项中（前提条件：主应用代码表和子应用代码表均是静态代码表），其他情况不做处理
+ * @param mainCodeList - 主应用代码表
+ * @param subCodeList - 子应用代码表
+ */
+export declare function mergeAppCodeList(mainCodeList: IAppCodeList, subCodeList: IAppCodeList): void;
+//# sourceMappingURL=merge-app-codelist.d.ts.map

package/out/utils/merge-model/merge-app-codelist.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-app-codelist.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-app-codelist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,YAAY,GACxB,IAAI,CA+BN"}

package/out/utils/merge-model/merge-app-codelist.js

@@ -0,0 +1,35 @@
+/**
+ * 合并应用代码表,子应用代码表需开启支持动态模式和配置用户标记，合并规则：dynamic_overlay:replace|merge,replace表示子应用代码表完全覆盖主应用代码表，merge表示子应用代码表项合并到主应用代码表项中（前提条件：主应用代码表和子应用代码表均是静态代码表），其他情况不做处理
+ * @param mainCodeList - 主应用代码表
+ * @param subCodeList - 子应用代码表
+ */
+export function mergeAppCodeList(mainCodeList, subCodeList) {
+    const { userTag } = subCodeList;
+    if (!userTag)
+        return;
+    const [mergeTag, mergeWay] = userTag.split(':');
+    if (!mergeTag ||
+        !mergeWay ||
+        mergeTag !== 'dynamic_overlay' ||
+        (mergeWay !== 'replace' && mergeWay !== 'merge'))
+        return;
+    switch (mergeWay) {
+        case 'replace':
+            mainCodeList = subCodeList;
+            break;
+        case 'merge':
+            if (mainCodeList.codeListType === 'STATIC' &&
+                subCodeList.codeListType === 'STATIC') {
+                if (!mainCodeList.codeItems)
+                    mainCodeList.codeItems = [];
+                if (subCodeList.codeItems && subCodeList.codeItems.length > 0) {
+                    subCodeList.codeItems.forEach(codeItem => {
+                        mainCodeList.codeItems.push(codeItem);
+                    });
+                }
+            }
+            break;
+        default:
+            break;
+    }
+}

package/out/utils/merge-model/merge-app-menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-app-menu.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-app-menu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AA8C/D;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,aAAa,EACnB,GAAG,EAAE,aAAa,EAClB,SAAS,GAAE,OAAe,GACzB,IAAI,CAmBN;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CA2C1E"}
+{"version":3,"file":"merge-app-menu.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-app-menu.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAkD/D;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,aAAa,EACnB,GAAG,EAAE,aAAa,EAClB,SAAS,GAAE,OAAe,GACzB,IAAI,CAmBN;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CA2C1E"}

package/out/utils/merge-model/merge-app-menu.js

@@ -16,9 +16,14 @@ function mergeMenuItem(mainItem, subItem, isReverse = false) {
         }
         else {
             // 子菜单项也没有下级菜单的时候覆盖(不应合并，场景：主菜单项隐藏，有hidden:true的数据，子菜单项显示，无hidden字段，合并还是会隐藏)
-            Object.keys(mainItem).forEach(
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            (key) => delete mainItem[key]);
+            Object.keys(mainItem).forEach((key) => {
+                // 1.合并动态字段场景：如，accessKey，子应用有的话以子应用为准，子应用没有的话，主应用数据为准
+                if (key === 'accessKey' && !subItem[key]) {
+                    return;
+                }
+                // 2. 常规场景：以子应用为准即可
+                delete mainItem[key];
+            });
             Object.assign(mainItem, subItem);
         }
     }

package/out/utils/merge-model/merge-app-uiaction-group.d.ts

@@ -1,3 +1,10 @@
 import { IUIActionGroup } from '@ibiz/model-core';
+/**
+ * 合并两个界面行为组
+ *
+ * @param dst 目标界面行为组，用于接收合并结果
+ * @param src 源界面行为组，提供要合并的数据
+ * @returns 无返回值，直接修改目标对象
+ */
 export declare function mergeAppDEUIActionGroup(dst: IUIActionGroup | undefined, src: IUIActionGroup | undefined): void;
 //# sourceMappingURL=merge-app-uiaction-group.d.ts.map

package/out/utils/merge-model/merge-app-uiaction-group.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-app-uiaction-group.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-app-uiaction-group.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAwB,MAAM,kBAAkB,CAAC;AAExE,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,cAAc,GAAG,SAAS,EAC/B,GAAG,EAAE,cAAc,GAAG,SAAS,GAC9B,IAAI,CAaN"}
+{"version":3,"file":"merge-app-uiaction-group.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-app-uiaction-group.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAwB,MAAM,kBAAkB,CAAC;AAwBxE;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,cAAc,GAAG,SAAS,EAC/B,GAAG,EAAE,cAAc,GAAG,SAAS,GAC9B,IAAI,CAiDN"}

package/out/utils/merge-model/merge-app-uiaction-group.js

@@ -1,14 +1,66 @@
+// dynamic_overlay:before|after|replace|delete:detailid
+/**
+ * 解析动态覆盖标签字符串，提取位置信息和目标ID
+ *
+ * @param tag - 要解析的标签字符串，格式应为 "dynamic_overlay:position:targetId"
+ * @returns 如果解析成功，返回包含position和targetId的对象；否则返回null
+ */
+function parseDynamicOverlay(tag) {
+    if (!tag) {
+        return null;
+    }
+    const match = tag.match(/^dynamic_overlay:(before|after|replace|delete):(.+)$/);
+    if (match) {
+        return { position: match[1], targetId: match[2] };
+    }
+    return null;
+}
+/**
+ * 合并两个界面行为组
+ *
+ * @param dst 目标界面行为组，用于接收合并结果
+ * @param src 源界面行为组，提供要合并的数据
+ * @returns 无返回值，直接修改目标对象
+ */
 export function mergeAppDEUIActionGroup(dst, src) {
     if (!dst || !src) {
         return;
     }
-    // 合并界面行为组项
+    // 合并界面行为组项,根据界面行为组成员用户标记(格式如：dynamic_overlay:before|after|replace|delete:detailid)进行合并，如格式不满足则添加到末尾，如没有用户标记，则直接添加到末尾
     if (src.uiactionGroupDetails) {
         if (!dst.uiactionGroupDetails) {
             dst.uiactionGroupDetails = [];
         }
         src.uiactionGroupDetails.forEach((item) => {
-            dst.uiactionGroupDetails.push(item);
+            const overlayInfo = parseDynamicOverlay(item.userTag);
+            if (overlayInfo && overlayInfo.position && overlayInfo.targetId) {
+                const targetIndex = dst.uiactionGroupDetails.findIndex((x) => x.id === overlayInfo.targetId);
+                if (targetIndex !== -1) {
+                    switch (overlayInfo.position) {
+                        case 'before':
+                            dst.uiactionGroupDetails.splice(targetIndex, 0, item);
+                            break;
+                        case 'after':
+                            dst.uiactionGroupDetails.splice(targetIndex + 1, 0, item);
+                            break;
+                        case 'replace':
+                            dst.uiactionGroupDetails[targetIndex] = item;
+                            break;
+                        case 'delete':
+                            dst.uiactionGroupDetails.splice(targetIndex, 1);
+                            break;
+                        default:
+                            dst.uiactionGroupDetails.push(item);
+                            break;
+                    }
+                }
+                else {
+                    dst.uiactionGroupDetails.push(item);
+                }
+            }
+            else {
+                dst.uiactionGroupDetails.push(item);
+            }
         });
     }
 }