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

package/out/controller/common/control/md-control.controller.js

@@ -518,13 +518,14 @@ export class MDControlController extends ControlController {
      * @return {*}  {void}
      */
     onDEDataChange(msg) {
+        var _a;
         // msg.triggerKey 不为空，且与当前控制器的triggerKey一致时，则不处理
         if (!isNil(msg.triggerKey) && msg.triggerKey === this.triggerKey) {
             return;
         }
         // 非这个实体的数据变更，则不处理
         if (!msg.data ||
-            msg.data.srfdecodename !== this.dataEntity.codeName) {
+            msg.data.srfdecodename !== ((_a = this.dataEntity) === null || _a === void 0 ? void 0 : _a.codeName)) {
             return;
         }
         let isRefresh = false;

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

@@ -49,6 +49,13 @@ export declare class CalendarController extends MDControlController<ISysCalendar
      * @memberof CalendarController
      */
     protected onCreated(): Promise<void>;
+    /**
+     * 初始化日历图例
+     *
+     * @protected
+     * @memberof CalendarController
+     */
+    protected initCalendarLegends(): void;
     /**
      * 初始化视图触发器
      *
@@ -56,6 +63,14 @@ export declare class CalendarController extends MDControlController<ISysCalendar
      * @memberof CalendarService
      */
     protected initViewScheduler(): void;
+    /**
+     * 销毁
+     *
+     * @protected
+     * @return {*}  {Promise<void>}
+     * @memberof LightCalendarController
+     */
+    protected onDestroyed(): Promise<void>;
     /**
      * 设置激活数据
      *

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

@@ -1 +1 @@
-{"version":3,"file":"calendar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EAEjB,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAG9D;;;;;;;;;GASG;AACH,qBAAa,kBACX,SAAQ,mBAAmB,CAAC,YAAY,EAAE,cAAc,EAAE,cAAc,CACxE,YAAW,mBAAmB;IAE9B;;;;;;;OAOG;IACK,OAAO,EAAE,eAAe,CAAC;IAEjC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,kBAAkB,CAAC;IAEnC;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAgBnC;;;;;;OAMG;IACG,SAAS,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAOvD;;;;;OAKG;IACG,QAAQ,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IAkCjE;;;;;OAKG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAoBhC;;;;;;;;OAQG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAwBrE;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAgB3B;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK;IAwBjD;;;;;;;;OAQG;IACG,cAAc,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAmCjE;;;;;;;;OAQG;IACG,UAAU,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBxD;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;CAGhC"}
+{"version":3,"file":"calendar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAoB,MAAM,kBAAkB,CAAC;AAGlE,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EAEjB,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAG9D;;;;;;;;;GASG;AACH,qBAAa,kBACX,SAAQ,mBAAmB,CAAC,YAAY,EAAE,cAAc,EAAE,cAAc,CACxE,YAAW,mBAAmB;IAE9B;;;;;;;OAOG;IACK,OAAO,EAAE,eAAe,CAAC;IAEjC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,kBAAkB,CAAC;IAEnC;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAU3B;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACH,SAAS,CAAC,mBAAmB,IAAI,IAAI;IAkBrC;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAgBnC;;;;;;OAMG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5C;;;;;;OAMG;IACG,SAAS,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUvD;;;;;OAKG;IACG,QAAQ,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IAkCjE;;;;;OAKG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAoBhC;;;;;;;;OAQG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAwBrE;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAgB3B;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK;IAqEjD;;;;;;;;OAQG;IACG,cAAc,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAmCjE;;;;;;;;OAQG;IACG,UAAU,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBxD;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;CAGhC"}

package/out/controller/control/calendar/calendar.controller.js

@@ -1,8 +1,8 @@
 import dayjs from 'dayjs';
-import { RuntimeModelError } from '@ibiz-template/core';
+import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
 import { MDControlController } from '../../common';
 import { CalendarService } from './calendar.service';
-import { calcDeCodeNameById } from '../../../model';
+import { calcDeCodeNameById, getViewLogics } from '../../../model';
 /**
  * 日历部件控制器
  *
@@ -23,9 +23,14 @@ export class CalendarController extends MDControlController {
      * @memberof CalendarController
      */
     initState() {
+        var _a, _b;
         super.initState();
         this.state.selectedDate = new Date();
         this.state.size = 1000;
+        this.state.legends = [];
+        this.state.calendarTitle = this.model.logicName || '';
+        this.state.showDetail =
+            ((_b = (_a = this.model.controlParam) === null || _a === void 0 ? void 0 : _a.ctrlParams) === null || _b === void 0 ? void 0 : _b.SHOWDETAIL) || false;
     }
     /**
      * 生命周期-创建完成
@@ -41,6 +46,28 @@ export class CalendarController extends MDControlController {
         this.service = new CalendarService(this.model);
         await this.service.init(this.context);
         this.initViewScheduler();
+        this.initCalendarLegends();
+    }
+    /**
+     * 初始化日历图例
+     *
+     * @protected
+     * @memberof CalendarController
+     */
+    initCalendarLegends() {
+        const { sysCalendarItems } = this.model;
+        if (!sysCalendarItems) {
+            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.calendar.noFoundModel'));
+        }
+        sysCalendarItems.forEach((calendarItem) => {
+            const { id, name, bkcolor, color } = calendarItem;
+            this.state.legends.push({
+                id,
+                name,
+                bkcolor,
+                color,
+            });
+        });
     }
     /**
      * 初始化视图触发器
@@ -49,7 +76,7 @@ export class CalendarController extends MDControlController {
      * @memberof CalendarService
      */
     initViewScheduler() {
-        const viewLogics = this.model.appViewLogics || [];
+        const viewLogics = getViewLogics(this.model);
         if (viewLogics.length !== 0) {
             this.viewScheduler = ibiz.scheduler.createViewScheduler(viewLogics);
             this.viewScheduler.defaultParamsCb = () => {
@@ -63,6 +90,19 @@ export class CalendarController extends MDControlController {
             }
         }
     }
+    /**
+     * 销毁
+     *
+     * @protected
+     * @return {*}  {Promise<void>}
+     * @memberof LightCalendarController
+     */
+    async onDestroyed() {
+        await super.onDestroyed();
+        if (this.viewScheduler) {
+            this.viewScheduler.destroy();
+        }
+    }
     /**
      * 设置激活数据
      *
@@ -71,10 +111,13 @@ export class CalendarController extends MDControlController {
      * @memberof CalendarService
      */
     async setActive(item) {
-        this.openData(item);
-        return this._evt.emit('onActive', {
-            data: [item],
+        this._evt.emit('onActive', {
+            data: item ? [item] : [],
         });
+        if (!item) {
+            return;
+        }
+        await this.openData(item);
     }
     /**
      * 打开编辑数据视图
@@ -83,13 +126,13 @@ export class CalendarController extends MDControlController {
      * @memberof CalendarService
      */
     async openData(item) {
-        var _a, _b;
+        var _a, _b, _c;
         // 添加选中数据的主键
         const context = this.context.clone();
-        const deName = ((_a = item.deData.srfdecodename) === null || _a === void 0 ? void 0 : _a.toLowerCase()) ||
+        const deName = ((_b = (_a = item.deData) === null || _a === void 0 ? void 0 : _a.srfdecodename) === null || _b === void 0 ? void 0 : _b.toLowerCase()) ||
             calcDeCodeNameById(this.model.appDataEntityId);
         context[deName.toLowerCase()] = item.deData.srfkey;
-        const result = await ((_b = this.viewScheduler) === null || _b === void 0 ? void 0 : _b.triggerCustom(`${item.itemType.toLowerCase()}_opendata`, {
+        const result = await ((_c = this.viewScheduler) === null || _c === void 0 ? void 0 : _c.triggerCustom(`${item.itemType.toLowerCase()}_opendata`, {
             context,
             params: this.params,
             data: [item.deData],
@@ -199,15 +242,37 @@ export class CalendarController extends MDControlController {
      */
     getCurSelectDate(param) {
         const { selectedDate } = this.state;
-        const { srfstartdate, srfenddate } = param;
+        const { calendarStyle } = this.model;
+        let { srfstartdate, srfenddate } = param;
         if (!srfstartdate || !srfenddate) {
-            // 获取当前月份的第一天
-            const firstDayOfMonth = new Date(selectedDate.getFullYear(), selectedDate.getMonth(), 1);
-            // 获取下个月的第一天，然后减去一天
-            const lastDayOfMonth = new Date(selectedDate.getFullYear(), selectedDate.getMonth() + 1, 1);
+            switch (calendarStyle) {
+                case 'DAY':
+                    srfstartdate = new Date(selectedDate.getFullYear(), selectedDate.getMonth(), selectedDate.getDate());
+                    srfenddate = new Date(new Date(selectedDate.getFullYear(), selectedDate.getMonth(), selectedDate.getDate() + 1).getTime() - 1);
+                    break;
+                case 'WEEK':
+                    // 获取当前日期是星期几（0表示星期日，1表示星期一，以此类推）
+                    const currentDayOfWeek = selectedDate.getDay();
+                    // 获取当前日期与当前周的第一天的偏移量（负数表示前面的日期，正数表示后面的日期）
+                    const offset = currentDayOfWeek > 0 ? -currentDayOfWeek + 1 : -6;
+                    // 获取当前周的起始时间
+                    srfstartdate = new Date(selectedDate.getFullYear(), selectedDate.getMonth(), selectedDate.getDate() + offset);
+                    // 获取当前周的终止时间
+                    srfenddate = new Date(new Date(srfstartdate.getFullYear(), srfstartdate.getMonth(), srfstartdate.getDate() + 7).getTime() - 1);
+                    break;
+                case 'MONTH':
+                    // 获取当前月份的第一天
+                    srfstartdate = new Date(selectedDate.getFullYear(), selectedDate.getMonth(), 1);
+                    // 获取下个月的第一天，然后减去一天
+                    srfenddate = new Date(new Date(selectedDate.getFullYear(), selectedDate.getMonth() + 1, 1).getTime() - 1);
+                    break;
+                default:
+                    ibiz.log.warn(`日历${calendarStyle}样式暂未支持`);
+                    break;
+            }
             return {
-                srfstartdate: dayjs(firstDayOfMonth).format('YYYY-MM-DD HH:mm:ss'),
-                srfenddate: dayjs(lastDayOfMonth).format('YYYY-MM-DD HH:mm:ss'),
+                srfstartdate: dayjs(srfstartdate).format('YYYY-MM-DD HH:mm:ss'),
+                srfenddate: dayjs(srfenddate).format('YYYY-MM-DD HH:mm:ss'),
             };
         }
         return { srfstartdate, srfenddate };
@@ -258,6 +323,10 @@ export class CalendarController extends MDControlController {
      * @memberof CalendarController
      */
     async onRowClick(data) {
+        if (!data) {
+            this.setSelection([]);
+            return;
+        }
         // 选中相关处理
         const { selectedData } = this.state;
         // 选中里没有则添加，有则删除

package/out/controller/control/calendar/calendar.service.d.ts

@@ -47,5 +47,15 @@ export declare class CalendarService extends MDControlService<ISysCalendar> {
      * @memberof CalendarService
      */
     private exec2;
+    /**
+     * 处理请求参数
+     *
+     * @private
+     * @param {ISysCalendarItem} item
+     * @param {IParams} params
+     * @return {*}  {IParams}
+     * @memberof CalendarService
+     */
+    private handleRequestParams;
 }
 //# sourceMappingURL=calendar.service.d.ts.map

package/out/controller/control/calendar/calendar.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calendar.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAoB,MAAM,kBAAkB,CAAC;AAEtE;;;;;;;;GAQG;AACH,qBAAa,eAAgB,SAAQ,gBAAgB,CAAC,YAAY,CAAC;IACjE;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAgC/B;;;;;;;;;OASG;IACH,OAAO,CAAC,qBAAqB;IAqB7B;;;;;;;;;;;;OAYG;YACW,KAAK;CAgBpB"}
+{"version":3,"file":"calendar.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAoB,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAoB,MAAM,kBAAkB,CAAC;AAEtE;;;;;;;;GAQG;AACH,qBAAa,eAAgB,SAAQ,gBAAgB,CAAC,YAAY,CAAC;IACjE;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAgC/B;;;;;;;;;OASG;IACH,OAAO,CAAC,qBAAqB;IAqB7B;;;;;;;;;;;;OAYG;YACW,KAAK;IAiBnB;;;;;;;;OAQG;IACH,OAAO,CAAC,mBAAmB;CAc5B"}

package/out/controller/control/calendar/calendar.service.js

@@ -29,7 +29,7 @@ export class CalendarService extends MDControlService {
         const promises = sysCalendarItems.map(async (item) => {
             const fetchAction = item.appDEDataSetId || 'fetchdefault';
             const tempContext = context.clone();
-            const tempParams = clone(params);
+            const tempParams = this.handleRequestParams(item, params);
             if (item.maxSize) {
                 tempParams.size = item.maxSize;
             }
@@ -82,4 +82,24 @@ export class CalendarService extends MDControlService {
         const res = await this.app.deService.exec(appDataEntityId, methodName, context, data, params);
         return res;
     }
+    /**
+     * 处理请求参数
+     *
+     * @private
+     * @param {ISysCalendarItem} item
+     * @param {IParams} params
+     * @return {*}  {IParams}
+     * @memberof CalendarService
+     */
+    handleRequestParams(item, params) {
+        const tempParams = clone(params);
+        const { srfstartdate, srfenddate } = tempParams;
+        Object.assign(tempParams, {
+            [`n_${item.beginTimeAppDEFieldId}_gtandeq`]: srfstartdate,
+            [`n_${item.endTimeAppDEFieldId}_ltandeq`]: srfenddate,
+        });
+        delete tempParams.srfstartdate;
+        delete tempParams.srfenddate;
+        return tempParams;
+    }
 }

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

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

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

@@ -308,7 +308,9 @@ export class BaseSeriesGenerator {
                 this.prepareChartData(groupData, item, catalog, group);
             }
             else {
-                this.prepareChartData(groupData, Object.assign(Object.assign({}, item), { [this.valueField]: groupData[group].get(catalog).value }), catalog, group);
+                this.prepareChartData(groupData, Object.assign(item, {
+                    [this.valueField]: groupData[group].get(catalog).value,
+                }), catalog, group);
             }
         });
         return groupData;

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

@@ -1 +1 @@
-{"version":3,"file":"chart-options-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/chart-options-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EAEf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,cAAc,EACd,WAAW,EACX,WAAW,EACX,QAAQ,EACR,cAAc,EACd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAmCrD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAmBzE;AAED,qBAAa,qBAAqB;IAoEb,KAAK,EAAE,QAAQ;IAnElC;;;;;OAKG;IACH,MAAM,EAAG,cAAc,CAAC;IAExB;;;;;OAKG;IACH,aAAa,EAAE,aAAa,CAI1B;IAEF;;;;;OAKG;IACH,OAAO,EAAE,aAAa,CAAM;IAE5B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAE/B;;;;;OAKG;IACH,gBAAgB,EAAE,mBAAmB,EAAE,CAAM;IAE7C;;;;;OAKG;IACH,QAAQ,gCAAuC;IAE/C;;;;OAIG;IACH,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAa;IAE/D;;;;;OAKG;IACH,uBAAuB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAa;gBAEnD,KAAK,EAAE,QAAQ;IAoClC,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAoCtC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;IAmB5E,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,cAAc,GAC1B,aAAa,CAAC,QAAQ,CAAC;IAe1B,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,GACzC,oBAAoB,EAAE,GAAG,oBAAoB,EAAE;IA2ClD;;;;;OAKG;IACG,qBAAqB,CACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC;IA2JhB;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D;;;;;;OAMG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKtC;;;;;;;;;OASG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA2CrE;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,aAAa;IAoE/C;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;CAkEhE"}
+{"version":3,"file":"chart-options-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/chart-options-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EAEf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,cAAc,EACd,WAAW,EACX,WAAW,EACX,QAAQ,EACR,cAAc,EACd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAmCrD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAmBzE;AAED,qBAAa,qBAAqB;IAoEb,KAAK,EAAE,QAAQ;IAnElC;;;;;OAKG;IACH,MAAM,EAAG,cAAc,CAAC;IAExB;;;;;OAKG;IACH,aAAa,EAAE,aAAa,CAI1B;IAEF;;;;;OAKG;IACH,OAAO,EAAE,aAAa,CAAM;IAE5B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAE/B;;;;;OAKG;IACH,gBAAgB,EAAE,mBAAmB,EAAE,CAAM;IAE7C;;;;;OAKG;IACH,QAAQ,gCAAuC;IAE/C;;;;OAIG;IACH,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAa;IAE/D;;;;;OAKG;IACH,uBAAuB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAa;gBAEnD,KAAK,EAAE,QAAQ;IAoClC,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAoCtC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;IAmB5E,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,cAAc,GAC1B,aAAa,CAAC,QAAQ,CAAC;IAe1B,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,GACzC,oBAAoB,EAAE,GAAG,oBAAoB,EAAE;IA2ClD;;;;;OAKG;IACG,qBAAqB,CACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC;IAgRhB;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D;;;;;;OAMG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKtC;;;;;;;;;OASG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA2CrE;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,aAAa;IAoE/C;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;CAkEhE"}