@ibiz-template/runtime 0.3.2 → 0.3.4

package/out/controller/control/chart/generator/pie-series-generator.js

@@ -17,15 +17,11 @@ export class PieSeriesGenerator extends BaseSeriesGenerator {
     calcSeriesData(catalogData) {
         const temData = [];
         catalogData.forEach((catalog, key) => {
-            var _a;
             temData.push({
                 name: key,
-                value: [catalog.value, (_a = catalog.deData) === null || _a === void 0 ? void 0 : _a.srfkey],
+                value: [catalog.value, catalog.chartData],
             });
         });
         return temData;
     }
-    getSrfkeyByParams(params) {
-        return params.value[1];
-    }
 }

package/out/controller/control/chart/generator/radar-series-generator.d.ts

@@ -1,5 +1,5 @@
 import { IChartSeriesRadar } from '@ibiz/model-core';
-import type { ECElementEvent, SeriesOption } from 'echarts';
+import type { SeriesOption } from 'echarts';
 import { BaseSeriesGenerator } from './base-series-generator';
 /**
  * 雷达序列生成器
@@ -19,6 +19,5 @@ export declare class RadarSeriesGenerator extends BaseSeriesGenerator<IChartSeri
      */
     calcRadarCoordSystem(data: IData[]): void;
     calcByData(_data: IData[]): SeriesOption | SeriesOption[];
-    getSrfkeyByParams(params: ECElementEvent): string;
 }
 //# sourceMappingURL=radar-series-generator.d.ts.map

package/out/controller/control/chart/generator/radar-series-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"radar-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/radar-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAqB,YAAY,EAAE,MAAM,SAAS,CAAC;AAE/E,OAAO,EAAE,mBAAmB,EAAiB,MAAM,yBAAyB,CAAC;AAG7E;;;;;;;GAOG;AACH,qBAAa,oBAAqB,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAC9E,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAM3C;;;;;OAKG;IACH,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAoBzC,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,GAAG,YAAY,EAAE;IA6BzD,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;CAGlD"}
+{"version":3,"file":"radar-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/radar-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAqB,YAAY,EAAE,MAAM,SAAS,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAiB,MAAM,yBAAyB,CAAC;AAG7E;;;;;;;GAOG;AACH,qBAAa,oBAAqB,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAC9E,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAM3C;;;;;OAKG;IACH,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAoBzC,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,GAAG,YAAY,EAAE;CA4B1D"}

package/out/controller/control/chart/generator/radar-series-generator.js

@@ -41,7 +41,7 @@ export class RadarSeriesGenerator extends BaseSeriesGenerator {
             const catalogData = groupData[group];
             const value = radar.indicatorKeys.map(key => {
                 if (catalogData.has(key)) {
-                    return catalogData.get(key);
+                    return catalogData.get(key).value;
                 }
                 return 0;
             });
@@ -58,7 +58,4 @@ export class RadarSeriesGenerator extends BaseSeriesGenerator {
         }
         return options;
     }
-    getSrfkeyByParams(params) {
-        return params.value[1];
-    }
 }

package/out/controller/control/exp-bar/chart-exp-bar.controller.d.ts

@@ -1,4 +1,4 @@
-import { IChartExpBar } from '@ibiz/model-core';
+import { IChartExpBar, INavigatable } from '@ibiz/model-core';
 import { IChartExpBarState, IChartExpBarEvent, IChartExpBarController, INavViewMsg } from '../../../interface';
 import { ExpBarControlController } from './exp-bar.controller';
 /**
@@ -10,6 +10,30 @@ import { ExpBarControlController } from './exp-bar.controller';
  * @implements {IChartExpBarController}
  */
 export declare class ChartExpBarController extends ExpBarControlController<IChartExpBar, IChartExpBarState, IChartExpBarEvent> implements IChartExpBarController {
+    /**
+     * 导航页面首次打开且没有回显时，
+     * 默认取第一条数据进行导航
+     * 对于不同的导航，第一条可导航的数据可能定义不同，可以重写改方法。
+     * @author lxm
+     * @date 2023-08-10 03:58:15
+     * @protected
+     */
+    protected navByFirstItem(): void;
+    /**
+     * 解析参数
+     *
+     * @author zk
+     * @date 2023-05-29 04:05:52
+     * @param {IDETabViewPanel} tabViewPanel
+     * @return {*}
+     * @memberof ExpBarControlController
+     */
+    prepareParams(XDataModel: INavigatable & {
+        appDataEntityId?: string;
+    }, data: IData, context: IContext, params: IParams): {
+        context: IContext;
+        params: IParams;
+    };
     /**
      * 获取导航视图
      *

package/out/controller/control/exp-bar/chart-exp-bar.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chart-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/chart-exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,uBAAuB,CAC7B,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;CAYf"}
+{"version":3,"file":"chart-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/chart-exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAI/D;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,uBAAuB,CAC7B,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,IAAI,IAAI;IAwBhC;;;;;;;;OAQG;IACH,aAAa,CACX,UAAU,EAAE,YAAY,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,EACvD,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAsCzC;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;CAmBf"}

package/out/controller/control/exp-bar/chart-exp-bar.controller.js

@@ -1,4 +1,5 @@
 import { ExpBarControlController } from './exp-bar.controller';
+import { convertNavData } from '../../../utils';
 /**
  * 图表导航栏控制器
  *
@@ -8,6 +9,65 @@ import { ExpBarControlController } from './exp-bar.controller';
  * @implements {IChartExpBarController}
  */
 export class ChartExpBarController extends ExpBarControlController {
+    /**
+     * 导航页面首次打开且没有回显时，
+     * 默认取第一条数据进行导航
+     * 对于不同的导航，第一条可导航的数据可能定义不同，可以重写改方法。
+     * @author lxm
+     * @date 2023-08-10 03:58:15
+     * @protected
+     */
+    navByFirstItem() {
+        const data = this.xDataController.state.items[0];
+        if (!data) {
+            // 导航视图传空让他导航占位绘制空界面
+            this.state.srfnav = '';
+            this._evt.emit('onNavViewChange', {
+                navViewMsg: {
+                    key: '',
+                    isCache: this.isCache,
+                },
+            });
+            return;
+        }
+        // 默认选中并激活第一项(这里的第一项是我们自己封装的chartData)
+        const activeSeriesGenerator = this.xDataController.generator.seriesGenerators.find(generator => {
+            return generator.chartDataArr.length > 0 && generator.model.navAppViewId;
+        });
+        if (activeSeriesGenerator) {
+            this.xDataController.setActive(activeSeriesGenerator.chartDataArr[0]);
+        }
+    }
+    /**
+     * 解析参数
+     *
+     * @author zk
+     * @date 2023-05-29 04:05:52
+     * @param {IDETabViewPanel} tabViewPanel
+     * @return {*}
+     * @memberof ExpBarControlController
+     */
+    prepareParams(XDataModel, data, context, params) {
+        var _a;
+        const { context: tempContext, params: tempParams } = super.prepareParams(XDataModel, data, context, params);
+        // 序列上或配置导航相关参数
+        if (data._seriesModelId) {
+            const seriesModel = (_a = XDataModel.dechartSerieses) === null || _a === void 0 ? void 0 : _a.find(series => {
+                return series.id === data._seriesModelId;
+            });
+            if (seriesModel) {
+                const { navigateContexts, navigateParams } = seriesModel;
+                // 序列上配的导航视图参数和上下文
+                const tempContext2 = convertNavData(navigateContexts, data, params, tempContext);
+                const tempParams2 = convertNavData(navigateParams, data, params, tempParams);
+                return {
+                    context: Object.assign(tempContext.clone(), tempContext2),
+                    params: tempParams2,
+                };
+            }
+        }
+        return { context: tempContext, params: tempParams };
+    }
     /**
      * 获取导航视图
      *
@@ -19,10 +79,16 @@ export class ChartExpBarController extends ExpBarControlController {
      */
     getNavViewMsg(data, context, params) {
         var _a;
-        const viewModelId = (_a = this.XDataModel.dechartSerieses) === null || _a === void 0 ? void 0 : _a[0].navAppViewId;
+        let viewModelId;
+        if (data._seriesModelId) {
+            const seriesModel = (_a = this.XDataModel.dechartSerieses) === null || _a === void 0 ? void 0 : _a.find(series => {
+                return series.id === data._seriesModelId;
+            });
+            viewModelId = seriesModel === null || seriesModel === void 0 ? void 0 : seriesModel.navAppViewId;
+        }
         const result = this.prepareParams(this.XDataModel, data, context, params);
         return {
-            key: data[this.navKeyName],
+            key: data._uuid,
             context: result.context,
             params: result.params,
             viewId: viewModelId,

package/out/controller/control/form/search-form/search-form.controller.d.ts

@@ -76,5 +76,14 @@ export declare class SearchFormController extends FormController<IDESearchForm,
      * @date 2022-09-27 16:48:47
      */
     onKeyUp(event: KeyboardEvent): Promise<void>;
+    /**
+     * 根据搜索表单的按钮位置和按钮样式
+     * 预处理部件布局面板模型
+     * @author lxm
+     * @date 2023-11-21 04:17:43
+     * @protected
+     * @return {*}
+     */
+    protected preprocessLayoutPanel(): void;
 }
 //# sourceMappingURL=search-form.controller.d.ts.map

package/out/controller/control/form/search-form/search-form.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/search-form/search-form.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;;;;;GASG;AACH,qBAAa,oBACX,SAAQ,cAAc,CAAC,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,CACxE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,OAAO,EAAG,iBAAiB,CAAC;cAEZ,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAS1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAwB5B;;;;;;OAMG;IACH,eAAe,IAAI,OAAO;IAY1B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAOnD"}
+{"version":3,"file":"search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/search-form/search-form.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;;;;;GASG;AACH,qBAAa,oBACX,SAAQ,cAAc,CAAC,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,CACxE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,OAAO,EAAG,iBAAiB,CAAC;cAEZ,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAU1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAwB5B;;;;;;OAMG;IACH,eAAe,IAAI,OAAO;IAY1B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAQlD;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;CAsDxC"}

package/out/controller/control/form/search-form/search-form.controller.js

@@ -15,6 +15,7 @@ import { SearchFormService } from './search-form.service';
 export class SearchFormController extends FormController {
     async onCreated() {
         await super.onCreated();
+        this.preprocessLayoutPanel();
         // 实例部件服务
         this.service = new SearchFormService(this.model);
         await this.service.init(this.context);
@@ -131,4 +132,62 @@ export class SearchFormController extends FormController {
             await this.onSearchButtonClick();
         }
     }
+    /**
+     * 根据搜索表单的按钮位置和按钮样式
+     * 预处理部件布局面板模型
+     * @author lxm
+     * @date 2023-11-21 04:17:43
+     * @protected
+     * @return {*}
+     */
+    preprocessLayoutPanel() {
+        if (!this.controlPanel) {
+            return;
+        }
+        const { searchButtonStyle } = this.model;
+        let deleteRight = false;
+        let deleteBottom = false;
+        const searchButtonPos = this.model.searchButtonPos || 'RIGHT';
+        deleteRight = searchButtonPos === 'BOTTOM';
+        deleteBottom = searchButtonPos !== 'BOTTOM';
+        if (searchButtonStyle === 'NONE') {
+            deleteRight = true;
+            deleteBottom = true;
+        }
+        /**
+         * 递归面板项
+         * @author lxm
+         * @date 2023-11-21 04:16:36
+         * @param {IData} parent
+         */
+        const recursivePanelItems = (parent) => {
+            let children;
+            let childrenKey = '';
+            ['rootPanelItems', 'panelItems'].find(key => {
+                if (parent[key]) {
+                    children = parent[key];
+                    childrenKey = key;
+                    return true;
+                }
+                return false;
+            });
+            if (children && children.length > 0) {
+                const newArr = [];
+                children.forEach((item) => {
+                    const isDelete = (deleteRight && item.id === 'control_buttons_right') ||
+                        (deleteBottom && item.id === 'control_buttons_bottom');
+                    if (!isDelete) {
+                        newArr.push(item);
+                        recursivePanelItems(item);
+                    }
+                });
+                if (newArr.length < children.length) {
+                    parent[childrenKey] = newArr;
+                }
+            }
+        };
+        if (deleteBottom || deleteRight) {
+            recursivePanelItems(this.controlPanel);
+        }
+    }
 }

package/out/controller/control/grid/grid/grid.controller.d.ts

@@ -1,10 +1,10 @@
-import { IDEGrid, IDEGridColumn } from '@ibiz/model-core';
+import { IDEGrid, IDEGridColumn, IDEDataExport } from '@ibiz/model-core';
 import { GridFieldColumnController } from '../grid-column/grid-field-column/grid-field-column.controller';
 import { GridColumnController } from './grid-column.controller';
 import { GridRowState } from './grid-row.state';
 import { GridService } from './grid.service';
 import { GridFieldEditColumnController, GridUAColumnController } from '../grid-column';
-import { IGridState, IGridEvent, IGridController, IGridColumnProvider, CodeListItem, MDCtrlLoadParams, IGridRowState } from '../../../../interface';
+import { IGridState, IGridEvent, IGridController, IGridColumnProvider, CodeListItem, MDCtrlLoadParams, IGridRowState, IExportColumn } from '../../../../interface';
 import { ControlVO } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
@@ -104,6 +104,20 @@ export declare class GridController extends MDControlController<IDEGrid, IGridSt
      * @type {string}
      */
     aggTitle: string;
+    /**
+     * 数据导出对象
+     * @author lxm
+     * @date 2023-08-07 04:11:00
+     * @type {IDEDataExport}
+     */
+    dataExport: IDEDataExport | undefined;
+    /**
+     * 数据导出列
+     * @author lxm
+     * @date 2023-08-07 04:11:00
+     * @type {IDEDataExport}
+     */
+    allExportColumns: IExportColumn[] | undefined;
     /**
      * 分组代码表项集合
      * @author lxm
@@ -306,6 +320,13 @@ export declare class GridController extends MDControlController<IDEGrid, IGridSt
      * @memberof GridController
      */
     loadData(args: MDCtrlLoadParams): Promise<ControlVO[]>;
+    /**
+     * 初始化数据导出列
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-11-21 18:54:16
+     */
+    findAllExportColumns(dataExport: IDEDataExport): Promise<IExportColumn[] | undefined>;
     /**
      * 数据导出
      *

package/out/controller/control/grid/grid/grid.controller.d.ts.map

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

package/out/controller/control/grid/grid/grid.controller.js

@@ -738,6 +738,30 @@ export class GridController extends MDControlController {
         }
         return res.data;
     }
+    /**
+     * 初始化数据导出列
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-11-21 18:54:16
+     */
+    async findAllExportColumns(dataExport) {
+        var _a;
+        const app = ibiz.hub.getApp(this.context.srfappid);
+        const exportColumnsPromises = (_a = dataExport.dedataExportItems) === null || _a === void 0 ? void 0 : _a.map(async (item) => {
+            const tempExportColumn = Object.assign({}, item);
+            if (item.codeListId) {
+                // 加载代码表模型
+                tempExportColumn.codeList = app.codeList.getCodeList(item.codeListId);
+                tempExportColumn.codeListItems = await app.codeList.get(item.codeListId);
+            }
+            return tempExportColumn;
+        });
+        // 使用 Promise.all 等待所有 Promise 解析
+        if (exportColumnsPromises) {
+            return Promise.all(exportColumnsPromises);
+        }
+        return undefined;
+    }
     /**
      * 数据导出
      *
@@ -746,32 +770,52 @@ export class GridController extends MDControlController {
      * @memberof MDControlController
      */
     async exportData(_args) {
-        // 前台导出
-        const items = this.fieldColumns;
+        var _a;
+        // 初始化导出对象
+        if (this.model.dedataExportId && !this.dataExport) {
+            this.dataExport = (_a = this.dataEntity.appDEDataExports) === null || _a === void 0 ? void 0 : _a.find(dataExport => {
+                return dataExport.id === this.model.dedataExportId;
+            });
+            if (this.dataExport) {
+                this.allExportColumns = await this.findAllExportColumns(this.dataExport);
+            }
+        }
         // 数据格式化
         const formatExcelData = (data) => {
-            // const codeListMap: Map<string, readonly CodeListItem[]> = new Map();
-            // Object.keys(items).forEach((key: string) => {
-            //   if (items[key].codeList) {
-            //     codeListMap.set(key, items[key].codeListItems!);
-            //   }
-            // });
+            var _a;
+            const codeListMap = new Map();
+            if (this.allExportColumns && this.allExportColumns.length > 0) {
+                (_a = this.allExportColumns) === null || _a === void 0 ? void 0 : _a.forEach((exportColumn) => {
+                    if (exportColumn.codeListItems) {
+                        codeListMap.set(exportColumn.appDEFieldId, exportColumn.codeListItems);
+                    }
+                });
+            }
+            else {
+                Object.keys(this.fieldColumns).forEach((key) => {
+                    if (this.fieldColumns[key].codeList) {
+                        codeListMap.set(key, this.fieldColumns[key].codeListItems);
+                    }
+                });
+            }
             const cloneData = clone(data.map(item => {
                 return item.getOrigin();
             }));
-            // cloneData.forEach(item => {
-            //   const fields = Object.keys(item);
-            //   fields.forEach((key: string) => {
-            //     if (codeListMap.get(key)) {
-            //       item[key] =
-            //         codeListMap.get(key)!.find(_item => {
-            //           return _item.value === item[key];
-            //         })?.text || item[key];
-            //     }
-            //   });
-            // });
+            cloneData.forEach(item => {
+                const fields = Object.keys(item);
+                fields.forEach((key) => {
+                    var _a;
+                    if (codeListMap.get(key)) {
+                        item[key] =
+                            ((_a = codeListMap.get(key).find(_item => {
+                                return _item.value === item[key];
+                            })) === null || _a === void 0 ? void 0 : _a.text) || item[key];
+                    }
+                });
+            });
             return cloneData;
         };
+        // 获取导出数据
         const getExportData = async () => {
             var _a;
             const type = (_a = _args.params) === null || _a === void 0 ? void 0 : _a.type;
@@ -808,9 +852,17 @@ export class GridController extends MDControlController {
             });
         };
         // 头部id数组
-        const filterVal = Object.keys(items).map((key) => items[key].model.id);
+        let filterVal = [];
         // 表头数组
-        const header = Object.keys(items).map((key) => items[key].model.caption);
+        let header = [];
+        if (this.allExportColumns && this.allExportColumns.length > 0) {
+            filterVal = this.allExportColumns.map((column) => column.appDEFieldId);
+            header = this.allExportColumns.map((column) => column.caption);
+        }
+        else {
+            filterVal = Object.keys(this.fieldColumns).map((key) => this.fieldColumns[key].model.id);
+            header = Object.keys(this.fieldColumns).map((key) => this.fieldColumns[key].model.caption);
+        }
         // 二维数组
         const data = formatArrayData(filterVal, await getExportData());
         await exportData(header, data, this.model.logicName);

package/out/controller/control/panel/panel/panel.controller.d.ts

@@ -1,9 +1,10 @@
 import { IControlLogic, IPanel, IPanelItem } from '@ibiz/model-core';
-import { IPanelState, IPanelEvent, IPanelController, IPanelItemController, IPanelItemProvider, IControlProvider, IPanelItemContainerController } from '../../../../interface';
+import { IPanelState, IPanelEvent, IPanelController, IPanelItemController, IPanelItemProvider, IControlProvider, IPanelItemContainerController, IController } from '../../../../interface';
 import { PanelData } from '../../../../service/vo';
 import { ControlController } from '../../../common';
 import { PanelNotifyState } from '../../../constant';
 import { ControllerEvent } from '../../../utils';
+import { CTX } from '../../../ctx';
 /**
  * 面板部件控制器
  *
@@ -44,6 +45,7 @@ export declare class PanelController<T extends IPanel = IPanel, S extends IPanel
      * @memberof PanelController
      */
     inputData: IData | undefined;
+    container?: IController;
     /**
      * 面板数据
      *
@@ -53,6 +55,7 @@ export declare class PanelController<T extends IPanel = IPanel, S extends IPanel
      * @memberof PanelController
      */
     get data(): IData;
+    constructor(model: T, context: IContext, params: IParams, ctx: CTX, container?: IController);
     protected initState(): void;
     setInputData(data: IData | undefined): void;
     getData(): IData[];

package/out/controller/control/panel/panel/panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,MAAM,EAEN,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,WAAW,EACX,WAAW,EACX,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,6BAA6B,EAC9B,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,eAAe,CACxB,CAAC,SAAS,MAAM,GAAG,MAAM,EACzB,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,WAAW,GAAG,WAAW,CAErC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEpC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;;OAMG;IACH,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEzD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEzE;;;;;;;OAOG;IACH,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC;IAE7B;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAI3C,OAAO,IAAI,KAAK,EAAE;cAIF,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAgB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAI1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5C;;;;;;OAMG;cACa,wBAAwB,CACtC,UAAU,GAAE,UAAU,EAAE,GAAG,SAAqC,EAChE,KAAK,GAAE,eAAsB,EAC7B,MAAM,GAAE,6BAA6B,GAAG,SAAqB,GAC5D,OAAO,CAAC,IAAI,CAAC;IAyChB;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAe3B;;;;;;;OAOG;IACG,WAAW,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAiB/C;;;;;;;;OAQG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS;IAcnC;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAMvC;;;;;OAKG;IACH,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAM/C;;;;;OAKG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAcnE"}
+{"version":3,"file":"panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,MAAM,EAEN,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,WAAW,EACX,WAAW,EACX,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,6BAA6B,EAC7B,WAAW,EACZ,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC;;;;;;;;GAQG;AACH,qBAAa,eAAe,CACxB,CAAC,SAAS,MAAM,GAAG,MAAM,EACzB,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,WAAW,GAAG,WAAW,CAErC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEpC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;;OAMG;IACH,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEzD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEzE;;;;;;;OAOG;IACH,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC;IAE7B,SAAS,CAAC,EAAE,WAAW,CAAC;IAExB;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;gBAGC,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,WAAW;IAMzB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAI3C,OAAO,IAAI,KAAK,EAAE;cAIF,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAgB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAI1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5C;;;;;;OAMG;cACa,wBAAwB,CACtC,UAAU,GAAE,UAAU,EAAE,GAAG,SAAqC,EAChE,KAAK,GAAE,eAAsB,EAC7B,MAAM,GAAE,6BAA6B,GAAG,SAAqB,GAC5D,OAAO,CAAC,IAAI,CAAC;IAyChB;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAe3B;;;;;;;OAOG;IACG,WAAW,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAiB/C;;;;;;;;OAQG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS;IAcnC;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAMvC;;;;;OAKG;IACH,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAM/C;;;;;OAKG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAcnE"}

package/out/controller/control/panel/panel/panel.controller.js

@@ -15,8 +15,22 @@ import { PanelNotifyState } from '../../../constant';
  * @extends {ControlController<PanelModel>}
  */
 export class PanelController extends ControlController {
-    constructor() {
-        super(...arguments);
+    get _evt() {
+        return this.evt;
+    }
+    /**
+     * 面板数据
+     *
+     * @author lxm
+     * @date 2023-02-10 07:21:09
+     * @readonly
+     * @memberof PanelController
+     */
+    get data() {
+        return this.state.data;
+    }
+    constructor(model, context, params, ctx, container) {
+        super(model, context, params, ctx);
         /**
          * 所有面板成员的控制器
          *
@@ -33,20 +47,7 @@ export class PanelController extends ControlController {
          * @type {{ [key: string]: IPanelItemProvider  | IControlProvider}}
          */
         this.providers = {};
-    }
-    get _evt() {
-        return this.evt;
-    }
-    /**
-     * 面板数据
-     *
-     * @author lxm
-     * @date 2023-02-10 07:21:09
-     * @readonly
-     * @memberof PanelController
-     */
-    get data() {
-        return this.state.data;
+        this.container = container;
     }
     initState() {
         super.initState();

package/out/controller/utils/data-file-util/data-file-util.d.ts

@@ -1,4 +1,4 @@
-import { IAppDataEntity } from '@ibiz/model-core';
+import { IAppDEDataImport, IAppDataEntity } from '@ibiz/model-core';
 export type ImportDataResult = {
     total: number;
     success: number;
@@ -18,7 +18,7 @@ export type IExportDataResult = {
  * @param {IAppDataEntity} appDataEntity
  * @return {*}  {Promise<IData>}
  */
-export declare function asyncImportData(file: File, appDataEntity: IAppDataEntity): Promise<void>;
+export declare function asyncImportData(file: File, appDataEntity: IAppDataEntity, dataImport?: IAppDEDataImport): Promise<void>;
 /**
  * 标准导入方法
  *
@@ -29,7 +29,7 @@ export declare function asyncImportData(file: File, appDataEntity: IAppDataEntit
  * @param {IAppDataEntity} appDataEntity
  * @return {*}  {Promise<IData>}
  */
-export declare function importData(file: File, appDataEntity: IAppDataEntity): Promise<ImportDataResult>;
+export declare function importData(file: File, appDataEntity: IAppDataEntity, dataImport?: IAppDEDataImport): Promise<ImportDataResult>;
 /**
  * 标准导出方法
  *

package/out/controller/utils/data-file-util/data-file-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-file-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/data-file-util/data-file-util.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AASlD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAE9B,EAAE,EAAE,OAAO,CAAC;IAEZ,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AA6BF;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,GAC5B,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,GAC5B,OAAO,CAAC,gBAAgB,CAAC,CAW3B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EAAE,EAChB,IAAI,EAAE,KAAK,EAAE,EAAE,EACf,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,iBAAiB,CAAC,CAmB5B"}
+{"version":3,"file":"data-file-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/data-file-util/data-file-util.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AASpE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAE9B,EAAE,EAAE,OAAO,CAAC;IAEZ,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AA6BF;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,EAC7B,UAAU,CAAC,EAAE,gBAAgB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAkBf;AAED;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,EAC7B,UAAU,CAAC,EAAE,gBAAgB,GAC5B,OAAO,CAAC,gBAAgB,CAAC,CAc3B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EAAE,EAChB,IAAI,EAAE,KAAK,EAAE,EAAE,EACf,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,iBAAiB,CAAC,CAmB5B"}

package/out/controller/utils/data-file-util/data-file-util.js

@@ -39,10 +39,13 @@ function listenAsyncAction(id) {
  * @param {IAppDataEntity} appDataEntity
  * @return {*}  {Promise<IData>}
  */
-export async function asyncImportData(file, appDataEntity) {
+export async function asyncImportData(file, appDataEntity, dataImport) {
     const data = new FormData();
     data.append('file', file);
-    const url = `${appDataEntity.codeName2.toLowerCase()}/${asyncImportUrl}`;
+    let url = `${appDataEntity.codeName2.toLowerCase()}/${asyncImportUrl}`;
+    if (dataImport === null || dataImport === void 0 ? void 0 : dataImport.codeName) {
+        url += `?srfimporttag=${dataImport.codeName}`;
+    }
     const res = await ibiz.net.request(url, {
         method: 'post',
         data,
@@ -62,10 +65,13 @@ export async function asyncImportData(file, appDataEntity) {
  * @param {IAppDataEntity} appDataEntity
  * @return {*}  {Promise<IData>}
  */
-export async function importData(file, appDataEntity) {
+export async function importData(file, appDataEntity, dataImport) {
     const data = new FormData();
     data.append('file', file);
-    const url = `${appDataEntity.codeName2.toLowerCase()}/${importUrl}`;
+    let url = `${appDataEntity.codeName2.toLowerCase()}/${importUrl}`;
+    if (dataImport === null || dataImport === void 0 ? void 0 : dataImport.codeName) {
+        url += `?srfimporttag=${dataImport.codeName}`;
+    }
     const res = await ibiz.net.request(url, {
         method: 'post',
         data,

package/out/engine/md-view.engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,SAAS,EACT,eAAe,EAChB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsDhC;;;;;;;OAOG;cACa,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAsCrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,eAAe,CAAC;IA4B5B;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,eAAe,CAAC;IAgC5B;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAapC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}
+{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,SAAS,EACT,eAAe,EAChB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsDhC;;;;;;;OAOG;cACa,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IA8CrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,eAAe,CAAC;IA4B5B;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,eAAe,CAAC;IAgC5B;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAapC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}