@ibiz-template/runtime 0.7.41-alpha.103 → 0.7.41-alpha.105

package/out/constant/index.d.ts

@@ -9,4 +9,5 @@ export { ViewMode } from './view-mode';
 export { ViewType } from './view-type';
 export { PresetIdentifier } from './preset-identifier';
 export { PredefinedControlRender } from './predefined-control-render';
+export { PredefinedAttributes } from './predefined-attributes';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/constant/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/constant/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC"}

package/out/constant/index.js

@@ -9,3 +9,4 @@ export { ViewMode } from './view-mode';
 export { ViewType } from './view-type';
 export { PresetIdentifier } from './preset-identifier';
 export { PredefinedControlRender } from './predefined-control-render';
+export { PredefinedAttributes } from './predefined-attributes';

package/out/constant/predefined-attributes.d.ts

@@ -0,0 +1,18 @@
+/**
+ * @description 预定义注入属性(后续注入属性需在此处声明)
+ * @author tony001
+ * @date 2026-06-09 17:06:26
+ * @export
+ * @enum {string}
+ */
+export declare enum PredefinedAttributes {
+    /**
+     * 样式类注入标识
+     */
+    CLASSNAMES = "classNames",
+    /**
+     * 样式注入标识
+     */
+    STYLES = "styles"
+}
+//# sourceMappingURL=predefined-attributes.d.ts.map

package/out/constant/predefined-attributes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"predefined-attributes.d.ts","sourceRoot":"","sources":["../../src/constant/predefined-attributes.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AACH,oBAAY,oBAAoB;IAC9B;;OAEG;IACH,UAAU,eAAe;IAEzB;;OAEG;IACH,MAAM,WAAW;CAClB"}

package/out/constant/predefined-attributes.js

@@ -0,0 +1,19 @@
+/* eslint-disable no-shadow */
+/**
+ * @description 预定义注入属性(后续注入属性需在此处声明)
+ * @author tony001
+ * @date 2026-06-09 17:06:26
+ * @export
+ * @enum {string}
+ */
+export var PredefinedAttributes;
+(function (PredefinedAttributes) {
+    /**
+     * 样式类注入标识
+     */
+    PredefinedAttributes["CLASSNAMES"] = "classNames";
+    /**
+     * 样式注入标识
+     */
+    PredefinedAttributes["STYLES"] = "styles";
+})(PredefinedAttributes || (PredefinedAttributes = {}));

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

@@ -64,6 +64,13 @@ export declare class CalendarController extends MDControlController<ISysCalendar
      * @memberof CalendarController
      */
     get groupTimeField(): 'beginTime' | 'endTime';
+    /**
+     * @description 时间范围模式
+     * @readonly
+     * @type {('custom' | 'quarter' | 'year' | 'halfYear')}
+     * @memberof CalendarController
+     */
+    get timeRangeMode(): 'custom' | 'quarter' | 'year' | 'halfYear';
     /**
      * 初始化状态
      *
@@ -83,6 +90,12 @@ export declare class CalendarController extends MDControlController<ISysCalendar
      * @memberof CalendarController
      */
     protected onCreated(): Promise<void>;
+    /**
+     * @description 初始化时间范围
+     * @protected
+     * @memberof CalendarController
+     */
+    protected initTimeRange(): void;
     /**
      * @description 执行行为
      * @param {string} uiActionId

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

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

@@ -1,3 +1,4 @@
+/* eslint-disable no-case-declarations */
 import dayjs from 'dayjs';
 import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
 import { MDControlController } from '../../common';
@@ -55,6 +56,17 @@ export class CalendarController extends MDControlController {
             return this.controlParams.grouptimefield;
         return 'beginTime';
     }
+    /**
+     * @description 时间范围模式
+     * @readonly
+     * @type {('custom' | 'quarter' | 'year' | 'halfYear')}
+     * @memberof CalendarController
+     */
+    get timeRangeMode() {
+        if (this.controlParams.timerangemode)
+            return this.controlParams.timerangemode;
+        return 'year';
+    }
     /**
      * 初始化状态
      *
@@ -76,6 +88,7 @@ export class CalendarController extends MDControlController {
         this.state.size = 1000;
         this.state.legends = [];
         this.state.groups = [];
+        this.state.timeRange = [];
         this.state.calendarTitle = this.model.logicName || '';
         this.state.showDetail = false;
     }
@@ -106,6 +119,7 @@ export class CalendarController extends MDControlController {
                 false;
         this.service = new CalendarService(this.model);
         await this.service.init(this.context);
+        this.initTimeRange();
         this.initViewScheduler();
         this.initCalendarLegends();
         (_e = this.model.sysCalendarItems) === null || _e === void 0 ? void 0 : _e.forEach((item) => {
@@ -117,6 +131,63 @@ export class CalendarController extends MDControlController {
         // 上下文菜单控制器初始化
         await Promise.all(Object.values(this.contextMenus).map(menu => menu.created()));
     }
+    /**
+     * @description 初始化时间范围
+     * @protected
+     * @memberof CalendarController
+     */
+    initTimeRange() {
+        const { calendarStyle } = this.model;
+        if (calendarStyle !== 'USER2')
+            return;
+        switch (this.timeRangeMode) {
+            case 'year':
+                this.state.timeRange = [
+                    dayjs().startOf('year').toDate(),
+                    dayjs().endOf('year').toDate(),
+                ];
+                break;
+            case 'halfYear':
+                const year = dayjs().year();
+                const isFirstHalf = dayjs().month() < 6;
+                if (isFirstHalf) {
+                    // 上半年：1月1日 至 6月30日
+                    this.state.timeRange = [
+                        dayjs(`${year}-01-01`).toDate(),
+                        dayjs(`${year}-06-30`).toDate(),
+                    ];
+                }
+                else {
+                    // 下半年：7月1日 至 12月31日
+                    this.state.timeRange = [
+                        dayjs(`${year}-07-01`).toDate(),
+                        dayjs(`${year}-12-31`).toDate(),
+                    ];
+                }
+                break;
+            case 'quarter':
+                this.state.timeRange = [
+                    dayjs().startOf('quarter').toDate(),
+                    dayjs().endOf('quarter').toDate(),
+                ];
+                break;
+            case 'custom':
+                const { begintime } = this.controlParams;
+                const { endtime } = this.controlParams;
+                if (!begintime ||
+                    !dayjs(begintime).isValid() ||
+                    !endtime ||
+                    !dayjs(endtime).isValid())
+                    throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.calendar.illegalTime'));
+                this.state.timeRange = [
+                    dayjs(begintime).toDate(),
+                    dayjs(endtime).toDate(),
+                ];
+                break;
+            default:
+                break;
+        }
+    }
     /**
      * @description 执行行为
      * @param {string} uiActionId
@@ -145,17 +216,16 @@ export class CalendarController extends MDControlController {
      */
     initCalendarLegends() {
         const { sysCalendarItems } = this.model;
-        if (!sysCalendarItems) {
+        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,
+        this.state.legends = sysCalendarItems.map(item => {
+            const { itemType = '', name = '', bkcolor, color } = item;
+            return {
                 name,
-                bkcolor,
                 color,
-            });
+                bkcolor,
+                id: itemType,
+            };
         });
     }
     /**
@@ -428,7 +498,7 @@ export class CalendarController extends MDControlController {
      * @memberof CalendarController
      */
     getCurSelectDate(param) {
-        const { selectedDate } = this.state;
+        const { selectedDate, timeRange } = this.state;
         const { calendarStyle } = this.model;
         let { srfstartdate, srfenddate } = param;
         if (!srfstartdate || !srfenddate) {
@@ -454,8 +524,11 @@ export class CalendarController extends MDControlController {
                     // 获取下个月的第一天，然后减去一天
                     srfenddate = new Date(new Date(selectedDate.getFullYear(), selectedDate.getMonth() + 1, 1).getTime() - 1);
                     break;
+                case 'USER2':
+                    srfstartdate = dayjs(timeRange[0]).format('YYYY-MM-DD');
+                    srfenddate = dayjs(timeRange[1]).format('YYYY-MM-DD');
+                    break;
                 default:
-                    ibiz.log.warn(`日历${calendarStyle}样式暂未支持`);
                     break;
             }
             return {

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

@@ -9,6 +9,7 @@ import { IApiMDControlController } from './i-api-md-control.controller';
  *  - 在配置日历部件样式为【周】时，可一次性显示一周的时间以及每天的事件数据；
  *  - 在配置日历部件样式为【天】时，可一次性显示一天24小时的时间以及各时间段内的事件数据；
  *  - 当在配置日历部件样式为【用户自定义1】时，该模式是以只读模式的周视图进行展示；
+ *  - 当在配置日历部件样式为【用户自定义2】时，该模式是以只读模式的平铺月视图进行展示；
  * @primary
  * @export
  * @interface ICalendarController
@@ -18,6 +19,9 @@ import { IApiMDControlController } from './i-api-md-control.controller';
  * @ctrlparams {"name":"mdctrlrefreshmode","title":"刷新模式","defaultvalue":"'cache'","parameterType":"'nocache' | 'cache'","description":"多数据部件刷新模式，当值为 'cache'，部件刷新时保留选中数据；当值为 'nocache'，部件刷新时清空选中数据","effectPlatform":"web"}
  * @ctrlparams {"name":"timelinecaptionformat","title":"时光轴标题格式","defaultvalue":"'YYYY-MM-DD'","parameterType":"string","description":"时光轴标题格式，默认为 'YYYY-MM-DD'"}
  * @ctrlparams {"name":"grouptimefield","title":"分组时间属性","defaultvalue":"'beginTime'","parameterType":"'beginTime' | 'endTime'","description":"指定时间轴样式日历的分组字段，只能为开始时间或结束时间，并以该字段倒序查询数据，默认为 'beginTime'"}
+ * @ctrlparams {"name":"timerangemode","title":"时间范围模式","defaultvalue":"'year'","parameterType":"'custom' | 'quarter' | 'year' | 'halfYear'","description":"日历【用户自定义2】的平铺月视图的时间范围，分别表示：自定义，当前时间季度，当前时间年度，当前时间半年，当值为自定义时，必须配置begintime和endtime动态控件参数"}
+ * @ctrlparams {"name":"begintime","title":"起始时间","defaultvalue":"-","parameterType":"string","description":"日历【用户自定义2】为自定义模式时必须配置该参数，这个参数的值可以是动态值，使用%xxxx%的格式"}
+ * @ctrlparams {"name":"endtime","title":"结束时间","defaultvalue":"-","parameterType":"string","description":"日历【用户自定义2】为自定义模式时必须配置该参数，这个参数的值可以是动态值，使用%xxxx%的格式"}
  * @extends {IApiMDControlController<T, S>}
  * @template T
  * @template S

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

@@ -1 +1 @@
-{"version":3,"file":"i-api-calendar.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-calendar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,WAAW,sBAAsB,CACrC,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,CAC/C,SAAQ,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC;IACrC;;;;OAIG;IACH,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;CACjC"}
+{"version":3,"file":"i-api-calendar.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-calendar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,WAAW,sBAAsB,CACrC,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,CAC/C,SAAQ,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC;IACrC;;;;OAIG;IACH,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;CACjC"}

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

@@ -11,13 +11,13 @@ export interface IApiLegend {
      * @type {string}
      * @memberof IApiLegend
      */
-    id?: string;
+    id: string;
     /**
      * @description 名称
      * @type {string}
      * @memberof IApiLegend
      */
-    name?: string;
+    name: string;
     /**
      * @description 背景色
      * @type {string}
@@ -202,5 +202,11 @@ export interface IApiCalendarState extends IApiMDControlState {
      * @memberof IApiCalendarState
      */
     calendarTitle: string;
+    /**
+     * @description 时间范围
+     * @type {Date[]}
+     * @memberof IApiCalendarState
+     */
+    timeRange: Date[];
 }
 //# sourceMappingURL=i-api-calendar.state.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"i-api-calendar.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/state/control/i-api-calendar.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB;;;;OAIG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,MAAM,EAAE,QAAQ,CAAC;IAEjB;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;OAIG;IACH,QAAQ,EAAE,oBAAoB,EAAE,CAAC;CAClC;AAED;;;;;;GAMG;AACH,MAAM,WAAW,iBAAkB,SAAQ,kBAAkB;IAC3D;;;;;OAKG;IACH,KAAK,EAAE,oBAAoB,EAAE,CAAC;IAE9B;;;;;OAKG;IACH,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAE5B;;;;;OAKG;IACH,YAAY,EAAE,IAAI,CAAC;IAEnB;;;;;OAKG;IACH,OAAO,EAAE,UAAU,EAAE,CAAC;IAEtB;;;;;OAKG;IACH,aAAa,EAAE,MAAM,CAAC;CACvB"}
+{"version":3,"file":"i-api-calendar.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/state/control/i-api-calendar.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB;;;;OAIG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,MAAM,EAAE,QAAQ,CAAC;IAEjB;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;OAIG;IACH,QAAQ,EAAE,oBAAoB,EAAE,CAAC;CAClC;AAED;;;;;;GAMG;AACH,MAAM,WAAW,iBAAkB,SAAQ,kBAAkB;IAC3D;;;;;OAKG;IACH,KAAK,EAAE,oBAAoB,EAAE,CAAC;IAE9B;;;;;OAKG;IACH,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAE5B;;;;;OAKG;IACH,YAAY,EAAE,IAAI,CAAC;IAEnB;;;;;OAKG;IACH,OAAO,EAAE,UAAU,EAAE,CAAC;IAEtB;;;;;OAKG;IACH,aAAa,EAAE,MAAM,CAAC;IAEtB;;;;OAIG;IACH,SAAS,EAAE,IAAI,EAAE,CAAC;CACnB"}

package/out/interface/api/state/control/index.d.ts

@@ -6,14 +6,14 @@ export type { IApiControlState } from './i-api-control.state';
 export type { IApiPanelState } from './i-api-panel.state';
 export type { IApiViewLayoutPanelState } from './i-api-view-layout-panel.state';
 export type { IApiMDControlState, IApiMDControlGroupState, } from './i-api-md-control.state';
-export type { IApiGridRowState, IApiColumnState, IApiStorageColumnStates, IApiGridState, } from './i-api-grid.state';
+export type { IApiGridState, IApiColumnState, IApiGridRowState, IApiStorageColumnStates, } from './i-api-grid.state';
 export type { IApiEditFormState } from './i-api-edit-form.state';
 export type { IApiFormState } from './i-api-form.state';
 export type { IApiAppMenuState } from './i-api-app-menu.state';
 export type { IApiExpBarControlState } from './i-api-exp-bar-control.state';
-export type { IApiToolbarState, IApiExtraButtons, IApiExtraButton, } from './i-api-toolbar.state';
+export type { IApiExtraButton, IApiToolbarState, IApiExtraButtons, } from './i-api-toolbar.state';
 export type { IApiCalendarExpBarState } from './i-api-calendar-exp-bar.state';
-export type { IApiCalendarState, IApiCalendarGroup, IApiCalendarItemData, } from './i-api-calendar.state';
+export type { IApiLegend, IApiCalendarState, IApiCalendarGroup, IApiCalendarItemData, } from './i-api-calendar.state';
 export type { IApiCaptionBarState } from './i-api-caption-bar.state';
 export type { IApiChartExpBarState } from './i-api-chart-exp-bar.state';
 export type { IApiChartState, IApiChartData } from './i-api-chart.state';

package/out/interface/api/state/control/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/state/control/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,YAAY,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAChF,YAAY,EACV,kBAAkB,EAClB,uBAAuB,GACxB,MAAM,0BAA0B,CAAC;AAClC,YAAY,EACV,gBAAgB,EAChB,eAAe,EACf,uBAAuB,EACvB,aAAa,GACd,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,YAAY,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,YAAY,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,YAAY,EACV,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,GAChB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,YAAY,EACV,iBAAiB,EACjB,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,YAAY,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzE,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,YAAY,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAChF,YAAY,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/E,YAAY,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC/E,YAAY,EACV,eAAe,EACf,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACnE,YAAY,EACV,uBAAuB,EACvB,eAAe,GAChB,MAAM,gCAAgC,CAAC;AACxC,YAAY,EACV,kBAAkB,EAClB,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAChF,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,YAAY,EACV,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,yBAAyB,EACzB,oBAAoB,GACrB,MAAM,6BAA6B,CAAC;AACrC,YAAY,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC1E,YAAY,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,YAAY,EACV,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,4BAA4B,CAAC;AACpC,YAAY,EACV,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,qBAAqB,GACtB,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/state/control/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,YAAY,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAChF,YAAY,EACV,kBAAkB,EAClB,uBAAuB,GACxB,MAAM,0BAA0B,CAAC;AAClC,YAAY,EACV,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,uBAAuB,GACxB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,YAAY,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,YAAY,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,YAAY,EACV,eAAe,EACf,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,YAAY,EACV,UAAU,EACV,iBAAiB,EACjB,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,YAAY,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzE,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,YAAY,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAChF,YAAY,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/E,YAAY,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC/E,YAAY,EACV,eAAe,EACf,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACnE,YAAY,EACV,uBAAuB,EACvB,eAAe,GAChB,MAAM,gCAAgC,CAAC;AACxC,YAAY,EACV,kBAAkB,EAClB,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAChF,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,YAAY,EACV,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,yBAAyB,EACzB,oBAAoB,GACrB,MAAM,6BAA6B,CAAC;AACrC,YAAY,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC1E,YAAY,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,YAAY,EACV,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,4BAA4B,CAAC;AACpC,YAAY,EACV,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,qBAAqB,GACtB,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC"}

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

@@ -1,4 +1,5 @@
-import { IApiCalendarGroup, IApiCalendarItemData, IApiCalendarState } from '../../../api';
+import { IApiCalendarGroup, IApiCalendarState, IApiCalendarItemData } from '../../../api';
+import { IApiLegend } from '../../../api/state/control/i-api-calendar.state';
 import { IMDControlState } from './i-md-control.state';
 /**
  * @description 日历分组数据接口
@@ -8,6 +9,14 @@ import { IMDControlState } from './i-md-control.state';
  */
 export interface ICalendarGroup extends IApiCalendarGroup {
 }
+/**
+ * @description 图例项数据接口
+ * @export
+ * @interface ILegend
+ * @extends {IApiLegend}
+ */
+export interface ILegend extends IApiLegend {
+}
 /**
  * @description  日历部件状态接口
  * @export
@@ -21,19 +30,25 @@ export interface ICalendarState extends IMDControlState, IApiCalendarState {
      * @type {IApiCalendarItemData[]}
      * @memberof ICalendarState
      */
-    items: IApiCalendarItemData[];
+    items: ICalendarItemData[];
     /**
      * @description 日历分组数据
-     * @type {IApiCalendarGroup[]}
+     * @type {ICalendarGroup[]}
      * @memberof ICalendarState
      */
-    groups: IApiCalendarGroup[];
+    groups: ICalendarGroup[];
     /**
      * @description 是否弹框显示详情
      * @type {boolean}
      * @memberof ICalendarState
      */
     showDetail: boolean;
+    /**
+     * @description 图例项
+     * @type {ILegend[]}
+     * @memberof ICalendarState
+     */
+    legends: ILegend[];
 }
 /**
  * @description 日历项数据接口

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,EACL,iBAAiB,EACjB,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;GAKG;AACH,MAAM,WAAW,cAAe,SAAQ,iBAAiB;CAAG;AAE5D;;;;;;GAMG;AACH,MAAM,WAAW,cAAe,SAAQ,eAAe,EAAE,iBAAiB;IACxE;;;;OAIG;IACH,KAAK,EAAE,oBAAoB,EAAE,CAAC;IAE9B;;;;OAIG;IACH,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAE5B;;;;OAIG;IACH,UAAU,EAAE,OAAO,CAAC;CACrB;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAkB,SAAQ,oBAAoB;CAAG"}
+{"version":3,"file":"i-calendar.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-calendar.state.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,iDAAiD,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;GAKG;AACH,MAAM,WAAW,cAAe,SAAQ,iBAAiB;CAAG;AAE5D;;;;;GAKG;AACH,MAAM,WAAW,OAAQ,SAAQ,UAAU;CAAG;AAE9C;;;;;;GAMG;AACH,MAAM,WAAW,cAAe,SAAQ,eAAe,EAAE,iBAAiB;IACxE;;;;OAIG;IACH,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAE3B;;;;OAIG;IACH,MAAM,EAAE,cAAc,EAAE,CAAC;IAEzB;;;;OAIG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;OAIG;IACH,OAAO,EAAE,OAAO,EAAE,CAAC;CACpB;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAkB,SAAQ,oBAAoB;CAAG"}

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

@@ -68,6 +68,7 @@ export declare const en: {
                 };
                 calendar: {
                     noFoundModel: string;
+                    illegalTime: string;
                 };
                 chart: {
                     noConfiguredX: string;

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

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

package/out/locale/en/index.js

@@ -69,6 +69,7 @@ export const en = {
                 },
                 calendar: {
                     noFoundModel: 'Calendar item model not found',
+                    illegalTime: '[USER2] Calendar style with time range type [custom] does not have valid control dynamic parameters [begintime] and [endtime] configured',
                 },
                 chart: {
                     noConfiguredX: 'Sequence is not configured with X-axis',

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

@@ -68,6 +68,7 @@ export declare const zhCn: {
                 };
                 calendar: {
                     noFoundModel: string;
+                    illegalTime: string;
                 };
                 chart: {
                     noConfiguredX: string;

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

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

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

@@ -69,6 +69,7 @@ export const zhCn = {
                 },
                 calendar: {
                     noFoundModel: '未找到日历项模型',
+                    illegalTime: '[USER2]日历样式时间范围类型为[custom]的日历未配置合法的控件动态参数 [begintime] 和 [endtime]',
                 },
                 chart: {
                     noConfiguredX: '序列没有配置X坐标轴',

package/out/ui-action/provider/ui-action-provider-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-action-provider-base.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/ui-action-provider-base.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAgC,MAAM,kBAAkB,CAAC;AAChF,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAMzB;;;;;;;GAOG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IACrE;;;;;;;OAOG;IACG,IAAI,CACR,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA8G3B;;;;;;;;OAQG;IACH,SAAS,CAAC,iBAAiB,CACzB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,eAAe,GACtB,cAAc;IASjB;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CACnB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,eAAe,GACpB,eAAe;IAUlB;;;;;;;OAOG;IACG,SAAS,CACb,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,OAAO,CAAC;IAWnB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAOvC;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,EACb,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,QAAQ,CAAC;QACxB,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;IA+HF;;;;;;;;;OASG;IACH,SAAS,CAAC,WAAW,CACnB,IAAI,EAAE,SAAS,GAAG,SAAS,EAC3B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,MAAM,GAAG,SAAS;IA4CrB;;;;;;;;OAQG;IACH,sBAAsB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;CAc5C"}
+{"version":3,"file":"ui-action-provider-base.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/ui-action-provider-base.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAgC,MAAM,kBAAkB,CAAC;AAChF,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAMzB;;;;;;;GAOG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IACrE;;;;;;;OAOG;IACG,IAAI,CACR,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA8G3B;;;;;;;;OAQG;IACH,SAAS,CAAC,iBAAiB,CACzB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,eAAe,GACtB,cAAc;IASjB;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CACnB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,eAAe,GACpB,eAAe;IAUlB;;;;;;;OAOG;IACG,SAAS,CACb,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,OAAO,CAAC;IAWnB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAOvC;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,EACb,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,QAAQ,CAAC;QACxB,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;IAkIF;;;;;;;;;OASG;IACH,SAAS,CAAC,WAAW,CACnB,IAAI,EAAE,SAAS,GAAG,SAAS,EAC3B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,MAAM,GAAG,SAAS;IA4CrB;;;;;;;;OAQG;IACH,sBAAsB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;CAc5C"}

package/out/ui-action/provider/ui-action-provider-base.js

@@ -243,12 +243,14 @@ export class UIActionProviderBase {
         // 是否是多数据
         const isMultiData = ['MULTIKEY', 'MULTIDATA'].includes(action.actionTarget) &&
             data.length > 0;
+        // 非多数据场景：数据目标为NONE时传空对象，否则取第一条数据
+        const singleNavData = action.actionTarget === 'NONE' ? {} : data[0] || {};
         // 处理自定义导航上下文
-        const tempContext = convertNavData(navContexts, isMultiData ? formatMultiData(navContexts, data) : data[0] || {}, params, context);
+        const tempContext = convertNavData(navContexts, isMultiData ? formatMultiData(navContexts, data) : singleNavData, params, context);
         Object.assign(resultContext, tempContext);
         // 处理自定义导航视图参数
         const navParams = action.navigateParams;
-        const resultParams = convertNavData(navParams, isMultiData ? formatMultiData(navParams, data) : data[0] || {}, params, resultContext);
+        const resultParams = convertNavData(navParams, isMultiData ? formatMultiData(navParams, data) : singleNavData, params, resultContext);
         // 添加触发源
         ibiz.util.record.addTriggerLogic(context.srfviewid, {
             navContexts,

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

@@ -1,7 +1,14 @@
-import { IAppMenu } from '@ibiz/model-core';
+import { IAppMenu, IControlAttribute } from '@ibiz/model-core';
 /**
  * @description 计算动态菜单
  * @param {IAppMenu} menu
  */
 export declare function calcDynamicMenu(menu: IAppMenu, context: IContext, params: IParams): Promise<void>;
+/**
+ * @description 过滤预置注入属性
+ * @export
+ * @param {(IControlAttribute[] | undefined)} controlAttributes
+ * @returns {*}  {IControlAttribute[]}
+ */
+export declare function filterPresetAttrs(controlAttributes: IControlAttribute[] | undefined): IControlAttribute[];
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/model/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAgB,MAAM,kBAAkB,CAAC;AAG1D;;;GAGG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAqFf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/model/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAgB,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAI7E;;;GAGG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAqFf;AAOD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,iBAAiB,EAAE,iBAAiB,EAAE,GAAG,SAAS,GACjD,iBAAiB,EAAE,CAMrB"}

package/out/utils/model/index.js

@@ -1,4 +1,5 @@
 import { isBase64, isBase64Image, isSvg } from '@ibiz-template/core';
+import { PredefinedAttributes } from '../../constant';
 import { ScriptFactory } from '../script';
 /**
  * @description 计算动态菜单
@@ -63,3 +64,21 @@ export async function calcDynamicMenu(menu, context, params) {
         ibiz.log.error(error);
     }
 }
+/**
+ * @description 预置属性数组
+ */
+const PREDEFINED_ATTR_NAMES = Object.values(PredefinedAttributes);
+/**
+ * @description 过滤预置注入属性
+ * @export
+ * @param {(IControlAttribute[] | undefined)} controlAttributes
+ * @returns {*}  {IControlAttribute[]}
+ */
+export function filterPresetAttrs(controlAttributes) {
+    const targetAttrs = controlAttributes || [];
+    if (targetAttrs.length === 0)
+        return targetAttrs;
+    return targetAttrs.filter(item => {
+        return item.attrName && !PREDEFINED_ATTR_NAMES.includes(item.attrName);
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.41-alpha.103",
+  "version": "0.7.41-alpha.105",
   "description": "运行时逻辑库",
   "type": "module",
   "main": "out/index.js",
@@ -68,5 +68,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "69d11ac5a136c14b996815c2d9d7249bed5345ff"
+  "gitHead": "b87ee12f17f4e9c30406998e6a78616fd6cc129c"
 }