@ibiz-template/model-helper 0.7.34 → 0.7.38-alpha.12

package/out/model-helper.d.ts

@@ -1,6 +1,7 @@
 import { 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';
 /**
  * 模型加载工具类
  *
@@ -13,7 +14,22 @@ export declare class ModelHelper {
     protected getModel: (url: string, params?: IParams) => Promise<IModel>;
     protected defaultAppId: string;
     protected permission: boolean;
+    /**
+     * dsl解析包
+     *
+     * @author tony001
+     * @date 2024-09-26 16:09:49
+     * @protected
+     */
     protected dsl: DSLHelper;
+    /**
+     * 子应用模型合并对象
+     *
+     * @author tony001
+     * @date 2024-09-26 16:09:51
+     * @protected
+     */
+    protected merge: MergeSubModelHelper;
     /**
      * 当前子应用清单
      *
@@ -70,6 +86,16 @@ export declare class ModelHelper {
      * @return {*}  {Promise<void>}
      */
     protected initToHub(appId?: string | IObject): Promise<void>;
+    /**
+     * 递归填充指定应用标识
+     *
+     * @author tony001
+     * @date 2024-09-09 15:09:20
+     * @protected
+     * @param {IModel} model
+     * @param {string} appId
+     */
+    protected deepFillSubAppId(model: IModel, appId: string): void;
     /**
      * 初始化子应用相关内容
      *

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

@@ -1,7 +1,7 @@
 import { DSLHelper, calcUniqueTag } from '@ibiz/rt-model-api';
 import { ModelUtil } from './model-util';
 import { ModelLoader } from './model-loader';
-import { mergeAppMenu, mergeDEDrControl, plural } from './utils';
+import { MergeSubModelHelper, plural } from './utils';
 /**
  * 模型加载工具类
  *
@@ -23,7 +23,22 @@ export class ModelHelper {
         this.getModel = getModel;
         this.defaultAppId = defaultAppId;
         this.permission = permission;
+        /**
+         * dsl解析包
+         *
+         * @author tony001
+         * @date 2024-09-26 16:09:49
+         * @protected
+         */
         this.dsl = new DSLHelper();
+        /**
+         * 子应用模型合并对象
+         *
+         * @author tony001
+         * @date 2024-09-26 16:09:51
+         * @protected
+         */
+        this.merge = new MergeSubModelHelper();
         /**
          * 当前子应用清单
          *
@@ -143,6 +158,34 @@ export class ModelHelper {
             }
         }
     }
+    /**
+     * 递归填充指定应用标识
+     *
+     * @author tony001
+     * @date 2024-09-09 15:09:20
+     * @protected
+     * @param {IModel} model
+     * @param {string} appId
+     */
+    deepFillSubAppId(model, appId) {
+        model.appId = appId;
+        const keys = Object.keys(model);
+        keys.forEach(key => {
+            const value = model[key];
+            if (value && typeof value === 'object') {
+                if (Array.isArray(value)) {
+                    value.forEach(item => {
+                        if (item && typeof item === 'object') {
+                            this.deepFillSubAppId(item, appId);
+                        }
+                    });
+                }
+                else {
+                    this.deepFillSubAppId(value, appId);
+                }
+            }
+        });
+    }
     /**
      * 初始化子应用相关内容
      *
@@ -169,6 +212,30 @@ export class ModelHelper {
             const drCtrl = drCtrls[index];
             ibiz.hub.registerSubAppDrControls(subApp.id || ibiz.env.appId, drCtrl);
         });
+        // 设置界面行为组到hub中
+        const appDEUIActionGroupIds = subApp.appDEUIActionGroupIds || [];
+        const appDEUIActionGroups = sourceSubApp.getAllPSAppDEUIActionGroups || [];
+        appDEUIActionGroupIds.forEach((id, index) => {
+            const appDEUIActionGroup = appDEUIActionGroups[index];
+            this.deepFillSubAppId(appDEUIActionGroup, subApp.id);
+            ibiz.hub.registerSubAppDEUIActionGroups(subApp.id || ibiz.env.appId, this.dsl.uiActionGroups(appDEUIActionGroup));
+        });
+        // 设置菜单模型到hub中
+        const appMenuModelIds = subApp.appMenuModelIds || [];
+        const appMenuModels = sourceSubApp.getAllPSAppMenuModels || [];
+        appMenuModelIds.forEach((id, index) => {
+            const appMenuModel = appMenuModels[index];
+            this.deepFillSubAppId(appMenuModel, subApp.id);
+            ibiz.hub.registerSubAppMenuModels(subApp.id || ibiz.env.appId, this.dsl.control(appMenuModel));
+        });
+        // 设置部件模型到hub中
+        const controlIds = subApp.controlIds || [];
+        const appControls = sourceSubApp.getAllPSControls || [];
+        controlIds.forEach((id, index) => {
+            const appControl = appControls[index];
+            this.deepFillSubAppId(appControl, subApp.id);
+            ibiz.hub.registerSubAppControls(subApp.id || ibiz.env.appId, this.dsl.control(appControl));
+        });
     }
     /**
      * 获取应用模型
@@ -254,31 +321,18 @@ export class ModelHelper {
         const controls = view.controls
             ? view.controls
             : (_a = view.viewLayoutPanel) === null || _a === void 0 ? void 0 : _a.controls;
-        // 合并菜单
-        const dstAppMenu = view.viewType === 'APPINDEXVIEW' &&
-            (controls === null || controls === void 0 ? void 0 : controls.find(item => {
-                return item.controlType === 'APPMENU';
-            }));
-        if (dstAppMenu) {
-            for (let i = 0; i < this.subAppRefs.length; i++) {
-                const srcAppMenu = this.subAppRefs[i].appMenuModel;
-                if (srcAppMenu) {
-                    mergeAppMenu(dstAppMenu, srcAppMenu);
-                }
-            }
-        }
+        // 合并主菜单
+        this.merge.mergeAppMainMenu(view, controls, this.subAppRefs);
+        // 合并扩展菜单
+        this.merge.mergeSubAppExtendedMenu(view, controls, this.subAppRefs);
         // 合并DrCtrl
-        const dstDRCtrl = controls === null || controls === void 0 ? void 0 : controls.find(item => {
-            return item.controlType === 'DRBAR' || item.controlType === 'DRTAB';
-        });
-        if (dstDRCtrl) {
-            for (let i = 0; i < this.subAppRefs.length; i++) {
-                const srcDRCtrl = ibiz.hub.getSubAppDrControl(dstDRCtrl.uniqueTag, this.subAppRefs[i].appId);
-                if (srcDRCtrl) {
-                    mergeDEDrControl(dstDRCtrl, srcDRCtrl);
-                }
-            }
-        }
+        this.merge.mergeSubAppDRCtrl(view, controls, this.subAppRefs);
+        // 合并工具栏界面行为组
+        this.merge.mergeSubAppToolbarActionGroup(view, controls, this.subAppRefs);
+        // 合并上下文菜单（树视图部件）
+        this.merge.mergeSubAppTreeContextMenuActionGroup(view, controls, this.subAppRefs);
+        // 合并树视图部件
+        this.merge.mergeSubAppTreeView(view, controls, this.subAppRefs);
     }
     /**
      * 根据应用视图 codeName 获取应用视图模型
@@ -308,6 +362,7 @@ export class ModelHelper {
     async loadAppViewModel(viewId, params, appId) {
         const model = await this.getModelUtil(appId).getAppViewModel(viewId, params, true);
         const dsl = this.dsl.appView(model);
+        this.calcAppViewSubAppModel(dsl);
         return dsl;
     }
     /**

package/out/utils/index.d.ts

@@ -2,6 +2,5 @@ export { formatPath } from './format-path/format-path';
 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 { mergeAppMenu } from './merge-model/merge-app-menu';
-export { mergeDEDrControl } from './merge-model/merge-de-drcontrol';
+export { MergeSubModelHelper } from './merge-model/merge-model-helper';
 //# 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,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,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"}

package/out/utils/index.js

@@ -2,5 +2,4 @@ export { formatPath } from './format-path/format-path';
 export { mergeModel } from './merge-model/merge-model';
 export { plural, pluralLower } from './plural/plural';
 export { ServicePathUtil, } from './service-path-util/service-path-util';
-export { mergeAppMenu } from './merge-model/merge-app-menu';
-export { mergeDEDrControl } from './merge-model/merge-de-drcontrol';
+export { MergeSubModelHelper } from './merge-model/merge-model-helper';

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

@@ -1,4 +1,14 @@
 import { IAppMenuModel } from '@ibiz/model-core';
+/**
+ * 合并切分菜单
+ *
+ * @author tony001
+ * @date 2024-09-26 18:09:31
+ * @export
+ * @param {IAppMenuModel} main
+ * @param {IAppMenuModel} sub
+ */
+export declare function mergeSplitAppMenu(main: IAppMenuModel, sub: IAppMenuModel, isReverse?: boolean): void;
 /**
  * 合并主菜单和子菜单
  * @author lxm

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;AAiC/D;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CAe1E"}
+{"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;AA0C/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

@@ -1,3 +1,4 @@
+import { clone } from 'ramda';
 /**
  * 递归合并主菜单项和子菜单项
  * @author lxm
@@ -5,7 +6,7 @@
  * @param {IAppMenuItem} mainItem
  * @param {IAppMenuItem} subItem
  */
-function mergeMenuItem(mainItem, subItem) {
+function mergeMenuItem(mainItem, subItem, isReverse = false) {
     var _a, _b, _c;
     // 主菜单项没有子菜单项直接合并替换
     if (!((_a = mainItem.appMenuItems) === null || _a === void 0 ? void 0 : _a.length)) {
@@ -30,24 +31,31 @@ function mergeMenuItem(mainItem, subItem) {
                 addItems.push(item);
             }
         });
-        mainItem.appMenuItems.push(...addItems);
+        if (isReverse) {
+            mainItem.appMenuItems = addItems.concat(mainItem.appMenuItems);
+        }
+        else {
+            mainItem.appMenuItems.push(...addItems);
+        }
     }
 }
 /**
- * 合并主菜单和子菜单
- * @author lxm
- * @date 2023-12-07 03:15:54
+ * 合并切分菜单
+ *
+ * @author tony001
+ * @date 2024-09-26 18:09:31
+ * @export
  * @param {IAppMenuModel} main
  * @param {IAppMenuModel} sub
  */
-export function mergeAppMenu(main, sub) {
+export function mergeSplitAppMenu(main, sub, isReverse = false) {
     var _a;
     const addItems = [];
     (_a = sub.appMenuItems) === null || _a === void 0 ? void 0 : _a.forEach(item => {
         var _a;
         const sameMenu = (_a = main.appMenuItems) === null || _a === void 0 ? void 0 : _a.find(x => x.id === item.id);
         if (sameMenu) {
-            mergeMenuItem(sameMenu, item);
+            mergeMenuItem(sameMenu, item, isReverse);
         }
         else {
             addItems.push(item);
@@ -56,5 +64,64 @@ export function mergeAppMenu(main, sub) {
     if (!main.appMenuItems) {
         main.appMenuItems = [];
     }
-    main.appMenuItems.push(...addItems);
+    if (isReverse) {
+        main.appMenuItems = addItems.concat(main.appMenuItems);
+    }
+    else {
+        main.appMenuItems.push(...addItems);
+    }
+}
+/**
+ * 合并主菜单和子菜单
+ * @author lxm
+ * @date 2023-12-07 03:15:54
+ * @param {IAppMenuModel} main
+ * @param {IAppMenuModel} sub
+ */
+export function mergeAppMenu(main, sub) {
+    var _a, _b, _c, _d;
+    if (!main.appMenuItems) {
+        main.appMenuItems = [];
+    }
+    if (!sub.appMenuItems) {
+        sub.appMenuItems = [];
+    }
+    // 主菜单分割下标
+    const mainSplitIndex = main.appMenuItems.findIndex(item => {
+        return item.itemType === 'SEPERATOR' && item.spanMode;
+    });
+    // 子菜单分割下标
+    const subSplitIndex = sub.appMenuItems.findIndex(item => {
+        return item.itemType === 'SEPERATOR' && item.spanMode;
+    });
+    // 主菜单无分割，子菜单有or无分割，全整添加到主菜单
+    if (mainSplitIndex === -1) {
+        mergeSplitAppMenu(main, sub);
+    }
+    else {
+        const topMainAppMenu = clone(main);
+        const bottomMainAppMenu = clone(main);
+        topMainAppMenu.appMenuItems =
+            ((_a = topMainAppMenu.appMenuItems) === null || _a === void 0 ? void 0 : _a.slice(0, mainSplitIndex)) || [];
+        bottomMainAppMenu.appMenuItems =
+            ((_b = bottomMainAppMenu.appMenuItems) === null || _b === void 0 ? void 0 : _b.slice(mainSplitIndex + 1)) || [];
+        if (subSplitIndex === -1) {
+            // 主菜单有分割，子菜单无分割，添加到主菜单头部上
+            mergeSplitAppMenu(topMainAppMenu, sub);
+        }
+        else {
+            // 主菜单有分割，子菜单有分割，隐射添加到主菜单
+            const topSubAppMenu = clone(sub);
+            const bottomSubAppMenu = clone(sub);
+            topSubAppMenu.appMenuItems =
+                ((_c = topSubAppMenu.appMenuItems) === null || _c === void 0 ? void 0 : _c.slice(0, subSplitIndex)) || [];
+            bottomSubAppMenu.appMenuItems =
+                ((_d = bottomSubAppMenu.appMenuItems) === null || _d === void 0 ? void 0 : _d.slice(subSplitIndex + 1)) || [];
+            mergeSplitAppMenu(topMainAppMenu, topSubAppMenu);
+            mergeSplitAppMenu(bottomMainAppMenu, bottomSubAppMenu, true);
+        }
+        main.appMenuItems = topMainAppMenu.appMenuItems
+            .concat(main.appMenuItems[mainSplitIndex])
+            .concat(bottomMainAppMenu.appMenuItems || []);
+    }
 }

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

@@ -0,0 +1,3 @@
+import { IUIActionGroup } from '@ibiz/model-core';
+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

@@ -0,0 +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"}

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

@@ -0,0 +1,14 @@
+export function mergeAppDEUIActionGroup(dst, src) {
+    if (!dst || !src) {
+        return;
+    }
+    // 合并界面行为组项
+    if (src.uiactionGroupDetails) {
+        if (!dst.uiactionGroupDetails) {
+            dst.uiactionGroupDetails = [];
+        }
+        src.uiactionGroupDetails.forEach((item) => {
+            dst.uiactionGroupDetails.push(item);
+        });
+    }
+}

package/out/utils/merge-model/merge-model-helper.d.ts

@@ -0,0 +1,71 @@
+import { IAppView, IControl, ISubAppRef } from '@ibiz/model-core';
+import { DSLHelper } from '@ibiz/rt-model-api';
+/**
+ * 子应用模型合并对象
+ *
+ * @author tony001
+ * @date 2024-09-26 16:09:56
+ * @export
+ * @class MergeSubModelHelper
+ */
+export declare class MergeSubModelHelper {
+    /**
+     * dsl解析包
+     *
+     * @author tony001
+     * @date 2024-09-26 16:09:48
+     * @protected
+     */
+    protected dsl: DSLHelper;
+    /**
+     * 合并应用主菜单
+     *
+     * @author tony001
+     * @date 2024-09-26 16:09:03
+     * @param {(IControl[] | undefined)} controls
+     * @param {ISubAppRef[]} subAppRefs
+     */
+    mergeAppMainMenu(view: IAppView, controls: IControl[] | undefined, subAppRefs: ISubAppRef[]): void;
+    /**
+     * 合并扩展菜单
+     *
+     * @author tony001
+     * @date 2024-09-26 16:09:27
+     * @param {(IControl[] | undefined)} controls
+     * @param {ISubAppRef[]} subAppRefs
+     * @return {*}  {void}
+     */
+    mergeSubAppExtendedMenu(view: IAppView, controls: IControl[] | undefined, subAppRefs: ISubAppRef[]): void;
+    /**
+     * 合并DRCtrl
+     *
+     * @author tony001
+     * @date 2024-09-26 16:09:01
+     * @param {IAppView} view
+     * @param {(IControl[] | undefined)} controls
+     * @param {ISubAppRef[]} subAppRefs
+     */
+    mergeSubAppDRCtrl(view: IAppView, controls: IControl[] | undefined, subAppRefs: ISubAppRef[]): void;
+    /**
+     * 合并工具栏界面行为组项
+     *
+     * @author tony001
+     * @date 2024-09-26 16:09:23
+     * @param {IAppView} view
+     * @param {(IControl[] | undefined)} controls
+     * @param {ISubAppRef[]} subAppRefs
+     */
+    mergeSubAppToolbarActionGroup(view: IAppView, controls: IControl[] | undefined, subAppRefs: ISubAppRef[]): void;
+    /**
+     * 合并树上下文菜单
+     *
+     * @author tony001
+     * @date 2024-09-26 16:09:02
+     * @param {IAppView} view
+     * @param {(IControl[] | undefined)} controls
+     * @param {ISubAppRef[]} subAppRefs
+     */
+    mergeSubAppTreeContextMenuActionGroup(view: IAppView, controls: IControl[] | undefined, subAppRefs: ISubAppRef[]): void;
+    mergeSubAppTreeView(view: IAppView, controls: IControl[] | undefined, subAppRefs: ISubAppRef[]): void;
+}
+//# sourceMappingURL=merge-model-helper.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-model-helper.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-model-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EACR,QAAQ,EAKR,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAK/C;;;;;;;GAOG;AACH,qBAAa,mBAAmB;IAC9B;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,YAAmB;IAEhC;;;;;;;OAOG;IACH,gBAAgB,CACd,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAcP;;;;;;;;OAQG;IACH,uBAAuB,CACrB,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAuBP;;;;;;;;OAQG;IACH,iBAAiB,CACf,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAiBP;;;;;;;;OAQG;IACH,6BAA6B,CAC3B,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IA8CP;;;;;;;;OAQG;IACH,qCAAqC,CACnC,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAuEP,mBAAmB,CACjB,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;CAuBR"}