@ibiz-template/runtime 0.7.26-alpha.1 → 0.7.26-alpha.2

package/out/controller/control/chart/generator/chart-options-generator.js

@@ -253,7 +253,7 @@ export class ChartOptionsGenerator {
      * @memberof ChartOptionsGenerator
      */
     async initMultiCatalogxAxis(context, params) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         const { controlParam } = this.model;
         if (controlParam && ((_a = controlParam.ctrlParams) === null || _a === void 0 ? void 0 : _a.CATALOGFIELDS)) {
             try {
@@ -261,29 +261,50 @@ export class ChartOptionsGenerator {
                 const tempCatalogFields = JSON.parse(controlParam.ctrlParams.CATALOGFIELDS);
                 const tempaxis = [];
                 let titleshow = true;
-                let labelshoww = true;
+                let labelshow = true;
                 let gridIndex = 0;
                 if (Array.isArray(tempCatalogFields)) {
                     const app = ibiz.hub.getApp(context.srfappid);
                     if (this.chartUserParam && this.chartUserParam.xAxis) {
-                        if (Array.isArray(this.chartUserParam.xAxis)) {
+                        if (((_b = controlParam.ctrlParams) === null || _b === void 0 ? void 0 : _b.MODE) === 'ROW') {
+                            if (Array.isArray(this.chartUserParam.yAxis)) {
+                                const tempconfig = this.chartUserParam.yAxis[this.chartUserParam.yAxis.length - 1];
+                                titleshow =
+                                    tempconfig.name === undefined ? true : !!tempconfig.name;
+                                labelshow =
+                                    ((_c = tempconfig.axisLabel) === null || _c === void 0 ? void 0 : _c.show) === undefined
+                                        ? true
+                                        : (_d = tempconfig.axisLabel) === null || _d === void 0 ? void 0 : _d.show;
+                            }
+                            else {
+                                titleshow =
+                                    ((_e = this.chartUserParam.yAxis) === null || _e === void 0 ? void 0 : _e.name) === undefined
+                                        ? true
+                                        : !!this.chartUserParam.yAxis.name;
+                                labelshow =
+                                    ((_g = (_f = this.chartUserParam.yAxis) === null || _f === void 0 ? void 0 : _f.axisLabel) === null || _g === void 0 ? void 0 : _g.show) === undefined
+                                        ? true
+                                        : (_h = this.chartUserParam.yAxis.axisLabel) === null || _h === void 0 ? void 0 : _h.show;
+                            }
+                        }
+                        else if (Array.isArray(this.chartUserParam.xAxis)) {
                             const tempconfig = this.chartUserParam.xAxis[this.chartUserParam.xAxis.length - 1];
                             titleshow =
                                 tempconfig.name === undefined ? true : !!tempconfig.name;
-                            labelshoww =
-                                ((_b = tempconfig.axisLabel) === null || _b === void 0 ? void 0 : _b.show) === undefined
+                            labelshow =
+                                ((_j = tempconfig.axisLabel) === null || _j === void 0 ? void 0 : _j.show) === undefined
                                     ? true
-                                    : (_c = tempconfig.axisLabel) === null || _c === void 0 ? void 0 : _c.show;
+                                    : (_k = tempconfig.axisLabel) === null || _k === void 0 ? void 0 : _k.show;
                         }
                         else {
                             titleshow =
                                 this.chartUserParam.xAxis.name === undefined
                                     ? true
                                     : !!this.chartUserParam.xAxis.name;
-                            labelshoww =
-                                ((_d = this.chartUserParam.xAxis.axisLabel) === null || _d === void 0 ? void 0 : _d.show) === undefined
+                            labelshow =
+                                ((_l = this.chartUserParam.xAxis.axisLabel) === null || _l === void 0 ? void 0 : _l.show) === undefined
                                     ? true
-                                    : (_e = this.chartUserParam.xAxis.axisLabel) === null || _e === void 0 ? void 0 : _e.show;
+                                    : (_m = this.chartUserParam.xAxis.axisLabel) === null || _m === void 0 ? void 0 : _m.show;
                         }
                     }
                     if (this.chartUserParam &&
@@ -294,42 +315,85 @@ export class ChartOptionsGenerator {
                     await Promise.all(tempCatalogFields
                         .slice(0, -1)
                         .map(async (catalog, index) => {
+                        var _a;
                         if (catalog.mode === 'codelist' && catalog.codelistId) {
                             const codeListItems = await app.codeList.get(catalog.codelistId, context, params);
                             if (codeListItems) {
                                 const tempxAxisData = [];
-                                const xAxisData = codeListItems.map((code) => {
-                                    return {
-                                        value: code.text,
-                                        textStyle: {
-                                            lineHeight: 45 * (tempCatalogFields.length - 1 - index),
-                                        },
-                                    };
-                                });
-                                if (index === 0) {
-                                    tempaxis.push({
-                                        show: labelshoww,
-                                        gridIndex,
-                                        type: 'category',
-                                        data: xAxisData,
-                                        position: 'bottom',
+                                if (((_a = controlParam.ctrlParams) === null || _a === void 0 ? void 0 : _a.MODE) === 'ROW') {
+                                    const yAxisData = codeListItems.map((code) => {
+                                        return {
+                                            value: code.text,
+                                            textStyle: {
+                                                padding: [
+                                                    0,
+                                                    40 + 40 * (tempCatalogFields.length - index - 1),
+                                                    0,
+                                                    0,
+                                                ],
+                                            },
+                                        };
                                     });
+                                    if (index === 0) {
+                                        tempaxis.push({
+                                            show: labelshow,
+                                            gridIndex,
+                                            type: 'category',
+                                            data: yAxisData,
+                                            position: 'left',
+                                        });
+                                    }
+                                    else {
+                                        let length = 1;
+                                        for (let i = 0; i < tempaxis.length; i++) {
+                                            length *= tempaxis[i].data.length;
+                                        }
+                                        for (let i = 0; i < length; i++) {
+                                            tempxAxisData.push(...yAxisData);
+                                        }
+                                        tempaxis.push({
+                                            show: labelshow,
+                                            gridIndex,
+                                            type: 'category',
+                                            data: tempxAxisData,
+                                            position: 'left',
+                                        });
+                                    }
                                 }
                                 else {
-                                    let length = 1;
-                                    for (let i = 0; i < tempaxis.length; i++) {
-                                        length *= tempaxis[i].data.length;
+                                    const xAxisData = codeListItems.map((code) => {
+                                        return {
+                                            value: code.text,
+                                            textStyle: {
+                                                lineHeight: 45 * (tempCatalogFields.length - 1 - index),
+                                            },
+                                        };
+                                    });
+                                    if (index === 0) {
+                                        tempaxis.push({
+                                            show: labelshow,
+                                            gridIndex,
+                                            type: 'category',
+                                            data: xAxisData,
+                                            position: 'bottom',
+                                        });
                                     }
-                                    for (let i = 0; i < length; i++) {
-                                        tempxAxisData.push(...xAxisData);
+                                    else {
+                                        let length = 1;
+                                        for (let i = 0; i < tempaxis.length; i++) {
+                                            length *= tempaxis[i].data.length;
+                                        }
+                                        for (let i = 0; i < length; i++) {
+                                            tempxAxisData.push(...xAxisData);
+                                        }
+                                        tempaxis.push({
+                                            show: labelshow,
+                                            gridIndex,
+                                            type: 'category',
+                                            data: tempxAxisData,
+                                            position: 'bottom',
+                                        });
                                     }
-                                    tempaxis.push({
-                                        show: labelshoww,
-                                        gridIndex,
-                                        type: 'category',
-                                        data: tempxAxisData,
-                                        position: 'bottom',
-                                    });
                                 }
                             }
                         }
@@ -338,59 +402,114 @@ export class ChartOptionsGenerator {
                         .map((catalog) => {
                         return catalog.name;
                     })
-                        .join('/');
-                    tempaxis.push({
-                        type: 'category',
-                        gridIndex,
-                        show: titleshow,
-                        data: [
-                            {
-                                value: mergeName,
-                                textStyle: {
-                                    lineHeight: labelshoww ? 45 * tempCatalogFields.length : 45,
+                        .join('/')
+                        .split('')
+                        .join('\n');
+                    if (((_o = controlParam.ctrlParams) === null || _o === void 0 ? void 0 : _o.MODE) !== 'ROW') {
+                        tempaxis.push({
+                            type: 'category',
+                            gridIndex,
+                            show: titleshow,
+                            data: [
+                                {
+                                    value: mergeName,
+                                    textStyle: {
+                                        lineHeight: labelshow ? 45 * tempCatalogFields.length : 45,
+                                    },
                                 },
-                            },
-                        ],
-                        position: 'bottom',
-                    });
+                            ],
+                            position: 'bottom',
+                        });
+                    }
                     if (this.chartUserParam) {
-                        if (this.chartUserParam.xAxis &&
-                            Array.isArray(this.chartUserParam.xAxis)) {
-                            this.chartUserParam.xAxis = [
-                                ...this.chartUserParam.xAxis,
-                                ...tempaxis,
-                            ];
-                        }
-                        else if (this.chartUserParam.xAxis) {
-                            this.chartUserParam.xAxis = [
-                                this.chartUserParam.xAxis,
-                                ...tempaxis,
-                            ];
-                        }
-                        if (!this.chartUserParam.grid) {
-                            this.chartUserParam.grid = {};
-                        }
-                        let { length } = tempCatalogFields;
-                        if (!labelshoww) {
-                            length = 1;
-                        }
-                        if (!titleshow) {
-                            length -= 1;
-                        }
-                        if (length === 0) {
-                            Object.assign(this.chartUserParam.grid, {
-                                bottom: 45,
+                        if (((_p = controlParam.ctrlParams) === null || _p === void 0 ? void 0 : _p.MODE) === 'ROW') {
+                            if (!this.chartUserParam.grid) {
+                                this.chartUserParam.grid = {};
+                            }
+                            let { length } = tempCatalogFields;
+                            if (!labelshow) {
+                                length = 1;
+                            }
+                            if (!titleshow) {
+                                length -= 1;
+                            }
+                            if (length === 0) {
+                                Object.assign(this.chartUserParam.grid, {
+                                    bottom: 45,
+                                });
+                            }
+                            else {
+                                Object.assign(this.chartUserParam.grid, {
+                                    left: (length + 1) * 60,
+                                });
+                            }
+                            tempaxis.push({
+                                type: 'category',
+                                gridIndex,
+                                show: titleshow,
+                                data: [
+                                    {
+                                        value: mergeName,
+                                        textStyle: {
+                                            padding: [0, length * 60, 0, 0],
+                                        },
+                                    },
+                                ],
+                                position: 'left',
                             });
+                            if (this.chartUserParam.yAxis &&
+                                Array.isArray(this.chartUserParam.yAxis)) {
+                                this.chartUserParam.yAxis = [
+                                    ...this.chartUserParam.yAxis,
+                                    ...tempaxis,
+                                ];
+                            }
+                            else if (this.chartUserParam.yAxis) {
+                                this.chartUserParam.yAxis = [
+                                    this.chartUserParam.yAxis,
+                                    ...tempaxis,
+                                ];
+                            }
                         }
                         else {
-                            Object.assign(this.chartUserParam.grid, {
-                                bottom: (length > 2 ? length - 1 : length) * 45,
-                            });
+                            if (this.chartUserParam.xAxis &&
+                                Array.isArray(this.chartUserParam.xAxis)) {
+                                this.chartUserParam.xAxis = [
+                                    ...this.chartUserParam.xAxis,
+                                    ...tempaxis,
+                                ];
+                            }
+                            else if (this.chartUserParam.xAxis) {
+                                this.chartUserParam.xAxis = [
+                                    this.chartUserParam.xAxis,
+                                    ...tempaxis,
+                                ];
+                            }
+                            if (!this.chartUserParam.grid) {
+                                this.chartUserParam.grid = {};
+                            }
+                            let { length } = tempCatalogFields;
+                            if (!labelshow) {
+                                length = 1;
+                            }
+                            if (!titleshow) {
+                                length -= 1;
+                            }
+                            if (length === 0) {
+                                Object.assign(this.chartUserParam.grid, {
+                                    bottom: 45,
+                                });
+                            }
+                            else {
+                                Object.assign(this.chartUserParam.grid, {
+                                    bottom: (length > 2 ? length - 1 : length) * 45,
+                                });
+                            }
                         }
                     }
                 }
             }
-            catch (_f) {
+            catch (_q) {
                 throw new Error(ibiz.i18n.t('runtime.control.chart.errorJson'));
             }
         }

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.d.ts

@@ -57,6 +57,13 @@ export declare class FormMDCtrlFormController extends FormMDCtrlController {
      * @type {string}
      */
     deName: string;
+    /**
+     * 数据集合
+     *
+     * @type {IData[]}
+     * @memberof FormMDCtrlFormController
+     */
+    items: IData[];
     /**
      * 初始化
      *
@@ -74,6 +81,13 @@ export declare class FormMDCtrlFormController extends FormMDCtrlController {
      * @return {*}  {Promise<void>}
      */
     fetchData(): Promise<void>;
+    /**
+     * 更新数据
+     * - 仅支持更新临时数据
+     * @return {*}  {Promise<void>}
+     * @memberof FormMDCtrlFormController
+     */
+    updateData(): Promise<void>;
     /**
      * 表单状态变更通知
      *

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-mdctrl-form.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE;;;;;;;;;GASG;AACH,qBAAa,wBAAyB,SAAQ,oBAAoB;IAChE;;;;;;OAMG;IACK,KAAK,EAAE,mBAAmB,CAAC;IAEnC;;;;OAIG;IACH,oBAAoB,UAAS;IAE7B,SAAS,CAAC,WAAW,IAAI,mBAAmB;IAI5C;;;;OAIG;IACH,OAAO,mCAA0C;IAEjD;;;;;;OAMG;IACH,YAAY,EAAG,gBAAgB,CAAC;IAEhC;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B;;;;;OAKG;IACH,MAAM,EAAG,MAAM,CAAC;IAEhB;;;;;;;;OAQG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB7B;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBhC;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAK5D;;;;;;OAMG;IACH,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,mBAAmB,GAAG,IAAI;IA6BpE;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IASlC;;;;;;OAMG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBvC;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAkB5B,OAAO,IAAI,IAAI;IAIT,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IActD;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,IAAI,IAAI;CAKvC"}
+{"version":3,"file":"form-mdctrl-form.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE;;;;;;;;;GASG;AACH,qBAAa,wBAAyB,SAAQ,oBAAoB;IAChE;;;;;;OAMG;IACK,KAAK,EAAE,mBAAmB,CAAC;IAEnC;;;;OAIG;IACH,oBAAoB,UAAS;IAE7B,SAAS,CAAC,WAAW,IAAI,mBAAmB;IAI5C;;;;OAIG;IACH,OAAO,mCAA0C;IAEjD;;;;;;OAMG;IACH,YAAY,EAAG,gBAAgB,CAAC;IAEhC;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B;;;;;OAKG;IACH,MAAM,EAAG,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;;;OAQG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB7B;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBhC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBjC;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAK5D;;;;;;OAMG;IACH,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,mBAAmB,GAAG,IAAI;IA6BpE;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IASlC;;;;;;OAMG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBvC;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAkB5B,OAAO,IAAI,IAAI;IAIT,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IActD;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,IAAI,IAAI;CAKvC"}

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.js

@@ -29,6 +29,13 @@ export class FormMDCtrlFormController extends FormMDCtrlController {
          * @date 2023-11-11 08:03:56
          */
         this.formMap = new Map();
+        /**
+         * 数据集合
+         *
+         * @type {IData[]}
+         * @memberof FormMDCtrlFormController
+         */
+        this.items = [];
     }
     createState() {
         var _a;
@@ -73,7 +80,8 @@ export class FormMDCtrlFormController extends FormMDCtrlController {
             .getApp(this.model.appId)
             .deService.exec(appDataEntityId, fetchAction, this.context, this.params);
         if (res.ok) {
-            this.state.items = res.data.map(item => {
+            this.items = res.data;
+            this.state.items = this.items.map(item => {
                 const context = this.context.clone();
                 context[this.deName] = item.srfkey;
                 const params = Object.assign({}, this.params);
@@ -85,6 +93,26 @@ export class FormMDCtrlFormController extends FormMDCtrlController {
             });
         }
     }
+    /**
+     * 更新数据
+     * - 仅支持更新临时数据
+     * @return {*}  {Promise<void>}
+     * @memberof FormMDCtrlFormController
+     */
+    async updateData() {
+        var _a;
+        const { appDataEntityId } = this.model.contentControl;
+        const fetchAction = 'update';
+        const deService = await ibiz.hub.getAppDEService(this.model.appId, appDataEntityId, this.context);
+        const data = (_a = this.state.items) === null || _a === void 0 ? void 0 : _a.map((item, index) => {
+            const _item = this.items.find(v => v.srfkey === item.id);
+            _item.srfordervalue = index + 1;
+            return _item;
+        });
+        if (deService.isLocalMode && data) {
+            await deService.exec(fetchAction, this.context, data);
+        }
+    }
     /**
      * 表单状态变更通知
      *

package/out/controller/notification/internal-message.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internal-message.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/notification/internal-message.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAEhB,SAAS,EACV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EACL,0BAA0B,EAC1B,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAQvD,qBAAa,yBAA0B,YAAW,0BAA0B;IAC1E,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAiB;IAE7D,KAAK,EAAE,MAAM,CAAK;IAElB,WAAW,EAAE,MAAM,CAAK;IAExB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAK;IAEjB,IAAI,EAAE,MAAM,CAAM;IAElB,QAAQ,EAAE,gBAAgB,EAAE,CAAM;IAElC,UAAU,UAAS;IAEnB,SAAS,CAAC,OAAO,yBAAgC;IAEjD,EAAE,EAAE,SAAS,GAAG,IAAI,CAAQ;IAE5B,QAAQ,EAAE,wBAAwB,GAAG,IAAI,CAAQ;IAE3C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IASzC;;;;;OAKG;IACH,gBAAgB,CAAC,GAAG,CAAC,EAAE,OAAO,GAAG,IAAI;cAUrB,KAAK,CAAC,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA6C/D;;;;;OAKG;IACH,SAAS,CAAC,UAAU,IAAI,IAAI;IA2BtB,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAcxD;;;;;OAKG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC;;;;;;OAMG;IACG,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAIjD"}
+{"version":3,"file":"internal-message.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/notification/internal-message.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAEhB,SAAS,EACV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EACL,0BAA0B,EAC1B,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAQvD,qBAAa,yBAA0B,YAAW,0BAA0B;IAC1E,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAiB;IAE7D,KAAK,EAAE,MAAM,CAAK;IAElB,WAAW,EAAE,MAAM,CAAK;IAExB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAK;IAEjB,IAAI,EAAE,MAAM,CAAM;IAElB,QAAQ,EAAE,gBAAgB,EAAE,CAAM;IAElC,UAAU,UAAS;IAEnB,SAAS,CAAC,OAAO,yBAAgC;IAEjD,EAAE,EAAE,SAAS,GAAG,IAAI,CAAQ;IAE5B,QAAQ,EAAE,wBAAwB,GAAG,IAAI,CAAQ;IAE3C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IASzC;;;;;OAKG;IACH,gBAAgB,CAAC,GAAG,CAAC,EAAE,OAAO,GAAG,IAAI;cAUrB,KAAK,CAAC,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA6C/D;;;;;OAKG;IACH,SAAS,CAAC,UAAU,IAAI,IAAI;IA2BtB,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBxD;;;;;OAKG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC;;;;;;OAMG;IACG,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAIjD"}

package/out/controller/notification/internal-message.controller.js

@@ -145,7 +145,13 @@ export class InternalMessageController {
         find.status = 'READ';
         this.unreadCount -= 1;
         this.evt.emit('unreadCountChange', this.unreadCount);
-        this.evt.emit('dataChange');
+        // 查询未读的消息时，标记信息已读需刷新数据
+        if (this.unreadOnly) {
+            this.load();
+        }
+        else {
+            this.evt.emit('dataChange');
+        }
     }
     /**
      * 把所有未读消息标记为已读

package/out/interface/controller/state/control/i-calendar.state.d.ts

@@ -24,6 +24,27 @@ export interface ICalendarState extends IMDControlState {
      * @memberof ICalendarState
      */
     selectedDate: Date;
+    /**
+     * 图例
+     *
+     * @type {IData[]}
+     * @memberof ICalendarStateEx
+     */
+    legends: IData[];
+    /**
+     * 日历名称
+     *
+     * @type {string}
+     * @memberof ICalendarState
+     */
+    calendarTitle: string;
+    /**
+     * 是否弹框显示详情
+     *
+     * @type {boolean}
+     * @memberof ICalendarState
+     */
+    showDetail: boolean;
 }
 /**
  * 日历项数据

package/out/interface/controller/state/control/i-calendar.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-calendar.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-calendar.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;GAOG;AAEH,MAAM,WAAW,cAAe,SAAQ,eAAe;IACrD;;;;;OAKG;IACH,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAE3B;;;;;;;OAOG;IACH,YAAY,EAAE,IAAI,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;;;OAOG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;;;OAOG;IACH,MAAM,EAAE,KAAK,CAAC;IAEd;;;;;;;OAOG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;;;;;OAOG;IACH,KAAK,EAAE,MAAM,CAAC;CACf"}
+{"version":3,"file":"i-calendar.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-calendar.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;GAOG;AAEH,MAAM,WAAW,cAAe,SAAQ,eAAe;IACrD;;;;;OAKG;IACH,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAE3B;;;;;;;OAOG;IACH,YAAY,EAAE,IAAI,CAAC;IAEnB;;;;;OAKG;IACH,OAAO,EAAE,KAAK,EAAE,CAAC;IAEjB;;;;;OAKG;IACH,aAAa,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;;;OAOG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;;;OAOG;IACH,MAAM,EAAE,KAAK,CAAC;IAEd;;;;;;;OAOG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;;;;;OAOG;IACH,KAAK,EAAE,MAAM,CAAC;CACf"}

package/out/interface/service/i-data-entity/i-data-entity.d.ts

@@ -73,6 +73,13 @@ export interface IDataEntity {
      * @type {string}
      */
     srfmajortext: string;
+    /**
+     * 前端排序
+     *
+     * @type {number}
+     * @memberof IDataEntity
+     */
+    srfordervalue: number;
     /**
      * 是否是新建数据，0为新建
      *

package/out/interface/service/i-data-entity/i-data-entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-data-entity.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/i-data-entity/i-data-entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC;;;;;;;GAOG;AACH,MAAM,WAAW,WAAW;IAE1B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;;OAMG;IACH,aAAa,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,aAAa,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;;OAMG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,CAAC;IAEb;;;;;;OAMG;IACH,KAAK,IAAI,WAAW,CAAC;IAErB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,GAAG,WAAW,CAAC;CAChD"}
+{"version":3,"file":"i-data-entity.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/i-data-entity/i-data-entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC;;;;;;;GAOG;AACH,MAAM,WAAW,WAAW;IAE1B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;;OAMG;IACH,aAAa,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,aAAa,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;;OAMG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;OAKG;IACH,aAAa,EAAE,MAAM,CAAC;IAEtB;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,CAAC;IAEb;;;;;;OAMG;IACH,KAAK,IAAI,WAAW,CAAC;IAErB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,GAAG,WAAW,CAAC;CAChD"}

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

@@ -20,6 +20,7 @@ export declare class AppDataEntity implements IDataEntity {
     srfkey: string;
     srfmajortext: string;
     tempsrfkey: string;
+    srfordervalue: number;
     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;IAE3B,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;IAMtB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,aAAa;IAgBlD;;;;;;;;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;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"}

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

@@ -148,6 +148,7 @@ export class AppDataEntity {
     clone() {
         const entity = new AppDataEntity(this._entity, this._data);
         entity.srfkey = this.srfkey;
+        entity.srfordervalue = this.srfordervalue;
         return entity;
     }
     /**
@@ -162,6 +163,7 @@ export class AppDataEntity {
         let _data = {};
         if (data instanceof AppDataEntity) {
             _data = data._data;
+            this.srfordervalue = data.srfordervalue;
         }
         else {
             _data = data;

package/out/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.d.ts

@@ -1,6 +1,21 @@
 import { IDEUIRawCodeLogic } from '@ibiz/model-core';
 import { UILogicContext } from '../../ui-logic-context';
 import { UILogicNode } from '../ui-logic-node';
+/**
+ * 直接脚本，同步执行方式写法
+ * 1）`return new Promise((resolve) => {
+ *       uiLogic.reportpanel.openReportDesignPage().then((result) =>{
+ *          resolve(result);
+ *       })
+ *     });`
+ * 2）`return await uiLogic.reportpanel.openReportDesignPage()`
+ *
+ * @author tony001
+ * @date 2024-06-25 14:06:02
+ * @export
+ * @class RawJSCodeNode
+ * @extends {UILogicNode}
+ */
 export declare class RawJSCodeNode extends UILogicNode {
     model: IDEUIRawCodeLogic;
     exec(ctx: UILogicContext): Promise<void>;

package/out/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"raw-js-code-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,aAAc,SAAQ,WAAW;IACpC,KAAK,EAAE,iBAAiB,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAkB/C"}
+{"version":3,"file":"raw-js-code-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C;;;;;;;;;;;;;;GAcG;AACH,qBAAa,aAAc,SAAQ,WAAW;IACpC,KAAK,EAAE,iBAAiB,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAiB/C"}

package/out/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.js

@@ -1,15 +1,30 @@
 import { ScriptFactory } from '../../../utils';
 import { UILogicNode } from '../ui-logic-node';
+/**
+ * 直接脚本，同步执行方式写法
+ * 1）`return new Promise((resolve) => {
+ *       uiLogic.reportpanel.openReportDesignPage().then((result) =>{
+ *          resolve(result);
+ *       })
+ *     });`
+ * 2）`return await uiLogic.reportpanel.openReportDesignPage()`
+ *
+ * @author tony001
+ * @date 2024-06-25 14:06:02
+ * @export
+ * @class RawJSCodeNode
+ * @extends {UILogicNode}
+ */
 export class RawJSCodeNode extends UILogicNode {
     async exec(ctx) {
         ibiz.log.debug(ibiz.i18n.t('runtime.uiLogic.interfaceLogicNodeDirectCode', {
             id: this.model.id,
         }), this.model.code);
-        ScriptFactory.execScriptFn({
+        await ScriptFactory.asyncExecScriptFn({
             view: ctx.view,
             context: ctx.context,
             params: ctx.viewParam,
             uiLogic: ctx.params,
-        }, this.model.code || '', { isAsync: false });
+        }, this.model.code || '');
     }
 }

package/out/utils/script/script-factory.d.ts

@@ -22,6 +22,18 @@ export declare class ScriptFactory {
      * @return {*}
      */
     static execScriptFn(args: IParams, scriptCode: string, options?: IScriptFunctionOpts): unknown;
+    /**
+     * 直接创建并同步执行脚本
+     *
+     * @author tony001
+     * @date 2024-06-25 14:06:25
+     * @static
+     * @param {IParams} args
+     * @param {string} scriptCode
+     * @param {IScriptFunctionOpts} [options={}]
+     * @return {*}  {Promise<unknown>}
+     */
+    static asyncExecScriptFn(args: IParams, scriptCode: string, options?: IScriptFunctionOpts): Promise<unknown>;
     /**
      * 执行单行脚本
      * @author lxm

package/out/utils/script/script-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"script-factory.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,aAAa;IACxB;;;;;;;;OAQG;IACH,MAAM,CAAC,cAAc,CACnB,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,cAAc;IAIjB;;;;;;;;;OASG;IACH,MAAM,CAAC,YAAY,CACjB,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO;IAMV;;;;;;;;OAQG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,GAAE,OAAY,GAAG,OAAO;CAMvE"}
+{"version":3,"file":"script-factory.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,aAAa;IACxB;;;;;;;;OAQG;IACH,MAAM,CAAC,cAAc,CACnB,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,mBAAmB,GAC5B,cAAc;IAIjB;;;;;;;;;OASG;IACH,MAAM,CAAC,YAAY,CACjB,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAwB,GAChC,OAAO;IAMV;;;;;;;;;;OAUG;WACU,iBAAiB,CAC5B,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,OAAO,CAAC;IAQnB;;;;;;;;OAQG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,GAAE,OAAY,GAAG,OAAO;CAMvE"}