@ibiz-template/runtime 0.7.41-alpha.103 → 0.7.41-alpha.104
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.esm.js +85 -14
- package/dist/index.system.min.js +1 -1
- package/out/controller/control/calendar/calendar.controller.d.ts +13 -0
- package/out/controller/control/calendar/calendar.controller.d.ts.map +1 -1
- package/out/controller/control/calendar/calendar.controller.js +83 -10
- package/out/interface/api/controller/control/i-api-calendar.controller.d.ts +4 -0
- package/out/interface/api/controller/control/i-api-calendar.controller.d.ts.map +1 -1
- package/out/interface/api/state/control/i-api-calendar.state.d.ts +8 -2
- package/out/interface/api/state/control/i-api-calendar.state.d.ts.map +1 -1
- package/out/interface/api/state/control/index.d.ts +3 -3
- package/out/interface/api/state/control/index.d.ts.map +1 -1
- package/out/interface/controller/state/control/i-calendar.state.d.ts +19 -4
- package/out/interface/controller/state/control/i-calendar.state.d.ts.map +1 -1
- package/out/locale/en/index.d.ts +1 -0
- package/out/locale/en/index.d.ts.map +1 -1
- package/out/locale/en/index.js +1 -0
- package/out/locale/zh-CN/index.d.ts +1 -0
- package/out/locale/zh-CN/index.d.ts.map +1 -1
- package/out/locale/zh-CN/index.js +1 -0
- package/out/ui-action/provider/ui-action-provider-base.d.ts.map +1 -1
- package/out/ui-action/provider/ui-action-provider-base.js +4 -2
- package/package.json +2 -2
|
@@ -64,6 +64,13 @@ export declare class CalendarController extends MDControlController<ISysCalendar
|
|
|
64
64
|
* @memberof CalendarController
|
|
65
65
|
*/
|
|
66
66
|
get groupTimeField(): 'beginTime' | 'endTime';
|
|
67
|
+
/**
|
|
68
|
+
* @description 时间范围模式
|
|
69
|
+
* @readonly
|
|
70
|
+
* @type {('custom' | 'quarter' | 'year' | 'halfYear')}
|
|
71
|
+
* @memberof CalendarController
|
|
72
|
+
*/
|
|
73
|
+
get timeRangeMode(): 'custom' | 'quarter' | 'year' | 'halfYear';
|
|
67
74
|
/**
|
|
68
75
|
* 初始化状态
|
|
69
76
|
*
|
|
@@ -83,6 +90,12 @@ export declare class CalendarController extends MDControlController<ISysCalendar
|
|
|
83
90
|
* @memberof CalendarController
|
|
84
91
|
*/
|
|
85
92
|
protected onCreated(): Promise<void>;
|
|
93
|
+
/**
|
|
94
|
+
* @description 初始化时间范围
|
|
95
|
+
* @protected
|
|
96
|
+
* @memberof CalendarController
|
|
97
|
+
*/
|
|
98
|
+
protected initTimeRange(): void;
|
|
86
99
|
/**
|
|
87
100
|
* @description 执行行为
|
|
88
101
|
* @param {string} uiActionId
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calendar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"calendar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/* eslint-disable no-case-declarations */
|
|
1
2
|
import dayjs from 'dayjs';
|
|
2
3
|
import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
|
|
3
4
|
import { MDControlController } from '../../common';
|
|
@@ -55,6 +56,17 @@ export class CalendarController extends MDControlController {
|
|
|
55
56
|
return this.controlParams.grouptimefield;
|
|
56
57
|
return 'beginTime';
|
|
57
58
|
}
|
|
59
|
+
/**
|
|
60
|
+
* @description 时间范围模式
|
|
61
|
+
* @readonly
|
|
62
|
+
* @type {('custom' | 'quarter' | 'year' | 'halfYear')}
|
|
63
|
+
* @memberof CalendarController
|
|
64
|
+
*/
|
|
65
|
+
get timeRangeMode() {
|
|
66
|
+
if (this.controlParams.timerangemode)
|
|
67
|
+
return this.controlParams.timerangemode;
|
|
68
|
+
return 'year';
|
|
69
|
+
}
|
|
58
70
|
/**
|
|
59
71
|
* 初始化状态
|
|
60
72
|
*
|
|
@@ -76,6 +88,7 @@ export class CalendarController extends MDControlController {
|
|
|
76
88
|
this.state.size = 1000;
|
|
77
89
|
this.state.legends = [];
|
|
78
90
|
this.state.groups = [];
|
|
91
|
+
this.state.timeRange = [];
|
|
79
92
|
this.state.calendarTitle = this.model.logicName || '';
|
|
80
93
|
this.state.showDetail = false;
|
|
81
94
|
}
|
|
@@ -106,6 +119,7 @@ export class CalendarController extends MDControlController {
|
|
|
106
119
|
false;
|
|
107
120
|
this.service = new CalendarService(this.model);
|
|
108
121
|
await this.service.init(this.context);
|
|
122
|
+
this.initTimeRange();
|
|
109
123
|
this.initViewScheduler();
|
|
110
124
|
this.initCalendarLegends();
|
|
111
125
|
(_e = this.model.sysCalendarItems) === null || _e === void 0 ? void 0 : _e.forEach((item) => {
|
|
@@ -117,6 +131,63 @@ export class CalendarController extends MDControlController {
|
|
|
117
131
|
// 上下文菜单控制器初始化
|
|
118
132
|
await Promise.all(Object.values(this.contextMenus).map(menu => menu.created()));
|
|
119
133
|
}
|
|
134
|
+
/**
|
|
135
|
+
* @description 初始化时间范围
|
|
136
|
+
* @protected
|
|
137
|
+
* @memberof CalendarController
|
|
138
|
+
*/
|
|
139
|
+
initTimeRange() {
|
|
140
|
+
const { calendarStyle } = this.model;
|
|
141
|
+
if (calendarStyle !== 'USER2')
|
|
142
|
+
return;
|
|
143
|
+
switch (this.timeRangeMode) {
|
|
144
|
+
case 'year':
|
|
145
|
+
this.state.timeRange = [
|
|
146
|
+
dayjs().startOf('year').toDate(),
|
|
147
|
+
dayjs().endOf('year').toDate(),
|
|
148
|
+
];
|
|
149
|
+
break;
|
|
150
|
+
case 'halfYear':
|
|
151
|
+
const year = dayjs().year();
|
|
152
|
+
const isFirstHalf = dayjs().month() < 6;
|
|
153
|
+
if (isFirstHalf) {
|
|
154
|
+
// 上半年：1月1日 至 6月30日
|
|
155
|
+
this.state.timeRange = [
|
|
156
|
+
dayjs(`${year}-01-01`).toDate(),
|
|
157
|
+
dayjs(`${year}-06-30`).toDate(),
|
|
158
|
+
];
|
|
159
|
+
}
|
|
160
|
+
else {
|
|
161
|
+
// 下半年：7月1日 至 12月31日
|
|
162
|
+
this.state.timeRange = [
|
|
163
|
+
dayjs(`${year}-07-01`).toDate(),
|
|
164
|
+
dayjs(`${year}-12-31`).toDate(),
|
|
165
|
+
];
|
|
166
|
+
}
|
|
167
|
+
break;
|
|
168
|
+
case 'quarter':
|
|
169
|
+
this.state.timeRange = [
|
|
170
|
+
dayjs().startOf('quarter').toDate(),
|
|
171
|
+
dayjs().endOf('quarter').toDate(),
|
|
172
|
+
];
|
|
173
|
+
break;
|
|
174
|
+
case 'custom':
|
|
175
|
+
const { begintime } = this.controlParams;
|
|
176
|
+
const { endtime } = this.controlParams;
|
|
177
|
+
if (!begintime ||
|
|
178
|
+
!dayjs(begintime).isValid() ||
|
|
179
|
+
!endtime ||
|
|
180
|
+
!dayjs(endtime).isValid())
|
|
181
|
+
throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.calendar.illegalTime'));
|
|
182
|
+
this.state.timeRange = [
|
|
183
|
+
dayjs(begintime).toDate(),
|
|
184
|
+
dayjs(endtime).toDate(),
|
|
185
|
+
];
|
|
186
|
+
break;
|
|
187
|
+
default:
|
|
188
|
+
break;
|
|
189
|
+
}
|
|
190
|
+
}
|
|
120
191
|
/**
|
|
121
192
|
* @description 执行行为
|
|
122
193
|
* @param {string} uiActionId
|
|
@@ -145,17 +216,16 @@ export class CalendarController extends MDControlController {
|
|
|
145
216
|
*/
|
|
146
217
|
initCalendarLegends() {
|
|
147
218
|
const { sysCalendarItems } = this.model;
|
|
148
|
-
if (!sysCalendarItems)
|
|
219
|
+
if (!sysCalendarItems)
|
|
149
220
|
throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.calendar.noFoundModel'));
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
this.state.legends.push({
|
|
154
|
-
id,
|
|
221
|
+
this.state.legends = sysCalendarItems.map(item => {
|
|
222
|
+
const { itemType = '', name = '', bkcolor, color } = item;
|
|
223
|
+
return {
|
|
155
224
|
name,
|
|
156
|
-
bkcolor,
|
|
157
225
|
color,
|
|
158
|
-
|
|
226
|
+
bkcolor,
|
|
227
|
+
id: itemType,
|
|
228
|
+
};
|
|
159
229
|
});
|
|
160
230
|
}
|
|
161
231
|
/**
|
|
@@ -428,7 +498,7 @@ export class CalendarController extends MDControlController {
|
|
|
428
498
|
* @memberof CalendarController
|
|
429
499
|
*/
|
|
430
500
|
getCurSelectDate(param) {
|
|
431
|
-
const { selectedDate } = this.state;
|
|
501
|
+
const { selectedDate, timeRange } = this.state;
|
|
432
502
|
const { calendarStyle } = this.model;
|
|
433
503
|
let { srfstartdate, srfenddate } = param;
|
|
434
504
|
if (!srfstartdate || !srfenddate) {
|
|
@@ -454,8 +524,11 @@ export class CalendarController extends MDControlController {
|
|
|
454
524
|
// 获取下个月的第一天，然后减去一天
|
|
455
525
|
srfenddate = new Date(new Date(selectedDate.getFullYear(), selectedDate.getMonth() + 1, 1).getTime() - 1);
|
|
456
526
|
break;
|
|
527
|
+
case 'USER2':
|
|
528
|
+
srfstartdate = dayjs(timeRange[0]).format('YYYY-MM-DD');
|
|
529
|
+
srfenddate = dayjs(timeRange[1]).format('YYYY-MM-DD');
|
|
530
|
+
break;
|
|
457
531
|
default:
|
|
458
|
-
ibiz.log.warn(`日历${calendarStyle}样式暂未支持`);
|
|
459
532
|
break;
|
|
460
533
|
}
|
|
461
534
|
return {
|
|
@@ -9,6 +9,7 @@ import { IApiMDControlController } from './i-api-md-control.controller';
|
|
|
9
9
|
* - 在配置日历部件样式为【周】时，可一次性显示一周的时间以及每天的事件数据；
|
|
10
10
|
* - 在配置日历部件样式为【天】时，可一次性显示一天24小时的时间以及各时间段内的事件数据；
|
|
11
11
|
* - 当在配置日历部件样式为【用户自定义1】时，该模式是以只读模式的周视图进行展示；
|
|
12
|
+
* - 当在配置日历部件样式为【用户自定义2】时，该模式是以只读模式的平铺月视图进行展示；
|
|
12
13
|
* @primary
|
|
13
14
|
* @export
|
|
14
15
|
* @interface ICalendarController
|
|
@@ -18,6 +19,9 @@ import { IApiMDControlController } from './i-api-md-control.controller';
|
|
|
18
19
|
* @ctrlparams {"name":"mdctrlrefreshmode","title":"刷新模式","defaultvalue":"'cache'","parameterType":"'nocache' | 'cache'","description":"多数据部件刷新模式，当值为 'cache'，部件刷新时保留选中数据；当值为 'nocache'，部件刷新时清空选中数据","effectPlatform":"web"}
|
|
19
20
|
* @ctrlparams {"name":"timelinecaptionformat","title":"时光轴标题格式","defaultvalue":"'YYYY-MM-DD'","parameterType":"string","description":"时光轴标题格式，默认为 'YYYY-MM-DD'"}
|
|
20
21
|
* @ctrlparams {"name":"grouptimefield","title":"分组时间属性","defaultvalue":"'beginTime'","parameterType":"'beginTime' | 'endTime'","description":"指定时间轴样式日历的分组字段，只能为开始时间或结束时间，并以该字段倒序查询数据，默认为 'beginTime'"}
|
|
22
|
+
* @ctrlparams {"name":"timerangemode","title":"时间范围模式","defaultvalue":"'year'","parameterType":"'custom' | 'quarter' | 'year' | 'halfYear'","description":"日历【用户自定义2】的平铺月视图的时间范围，分别表示：自定义，当前时间季度，当前时间年度，当前时间半年，当值为自定义时，必须配置begintime和endtime动态控件参数"}
|
|
23
|
+
* @ctrlparams {"name":"begintime","title":"起始时间","defaultvalue":"-","parameterType":"string","description":"日历【用户自定义2】为自定义模式时必须配置该参数，这个参数的值可以是动态值，使用%xxxx%的格式"}
|
|
24
|
+
* @ctrlparams {"name":"endtime","title":"结束时间","defaultvalue":"-","parameterType":"string","description":"日历【用户自定义2】为自定义模式时必须配置该参数，这个参数的值可以是动态值，使用%xxxx%的格式"}
|
|
21
25
|
* @extends {IApiMDControlController<T, S>}
|
|
22
26
|
* @template T
|
|
23
27
|
* @template S
|
|
@@ -1 +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
|
|
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;;;;;;;;;;;;;;;;;;;;;;;;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"}
|
|
@@ -11,13 +11,13 @@ export interface IApiLegend {
|
|
|
11
11
|
* @type {string}
|
|
12
12
|
* @memberof IApiLegend
|
|
13
13
|
*/
|
|
14
|
-
id
|
|
14
|
+
id: string;
|
|
15
15
|
/**
|
|
16
16
|
* @description 名称
|
|
17
17
|
* @type {string}
|
|
18
18
|
* @memberof IApiLegend
|
|
19
19
|
*/
|
|
20
|
-
name
|
|
20
|
+
name: string;
|
|
21
21
|
/**
|
|
22
22
|
* @description 背景色
|
|
23
23
|
* @type {string}
|
|
@@ -202,5 +202,11 @@ export interface IApiCalendarState extends IApiMDControlState {
|
|
|
202
202
|
* @memberof IApiCalendarState
|
|
203
203
|
*/
|
|
204
204
|
calendarTitle: string;
|
|
205
|
+
/**
|
|
206
|
+
* @description 时间范围
|
|
207
|
+
* @type {Date[]}
|
|
208
|
+
* @memberof IApiCalendarState
|
|
209
|
+
*/
|
|
210
|
+
timeRange: Date[];
|
|
205
211
|
}
|
|
206
212
|
//# sourceMappingURL=i-api-calendar.state.d.ts.map
|
|
@@ -1 +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,
|
|
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,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"}
|
|
@@ -6,14 +6,14 @@ export type { IApiControlState } from './i-api-control.state';
|
|
|
6
6
|
export type { IApiPanelState } from './i-api-panel.state';
|
|
7
7
|
export type { IApiViewLayoutPanelState } from './i-api-view-layout-panel.state';
|
|
8
8
|
export type { IApiMDControlState, IApiMDControlGroupState, } from './i-api-md-control.state';
|
|
9
|
-
export type {
|
|
9
|
+
export type { IApiGridState, IApiColumnState, IApiGridRowState, IApiStorageColumnStates, } from './i-api-grid.state';
|
|
10
10
|
export type { IApiEditFormState } from './i-api-edit-form.state';
|
|
11
11
|
export type { IApiFormState } from './i-api-form.state';
|
|
12
12
|
export type { IApiAppMenuState } from './i-api-app-menu.state';
|
|
13
13
|
export type { IApiExpBarControlState } from './i-api-exp-bar-control.state';
|
|
14
|
-
export type { IApiToolbarState, IApiExtraButtons,
|
|
14
|
+
export type { IApiExtraButton, IApiToolbarState, IApiExtraButtons, } from './i-api-toolbar.state';
|
|
15
15
|
export type { IApiCalendarExpBarState } from './i-api-calendar-exp-bar.state';
|
|
16
|
-
export type { IApiCalendarState, IApiCalendarGroup, IApiCalendarItemData, } from './i-api-calendar.state';
|
|
16
|
+
export type { IApiLegend, IApiCalendarState, IApiCalendarGroup, IApiCalendarItemData, } from './i-api-calendar.state';
|
|
17
17
|
export type { IApiCaptionBarState } from './i-api-caption-bar.state';
|
|
18
18
|
export type { IApiChartExpBarState } from './i-api-chart-exp-bar.state';
|
|
19
19
|
export type { IApiChartState, IApiChartData } from './i-api-chart.state';
|
|
@@ -1 +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,
|
|
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,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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { IApiCalendarGroup,
|
|
1
|
+
import { IApiCalendarGroup, IApiCalendarState, IApiCalendarItemData } from '../../../api';
|
|
2
|
+
import { IApiLegend } from '../../../api/state/control/i-api-calendar.state';
|
|
2
3
|
import { IMDControlState } from './i-md-control.state';
|
|
3
4
|
/**
|
|
4
5
|
* @description 日历分组数据接口
|
|
@@ -8,6 +9,14 @@ import { IMDControlState } from './i-md-control.state';
|
|
|
8
9
|
*/
|
|
9
10
|
export interface ICalendarGroup extends IApiCalendarGroup {
|
|
10
11
|
}
|
|
12
|
+
/**
|
|
13
|
+
* @description 图例项数据接口
|
|
14
|
+
* @export
|
|
15
|
+
* @interface ILegend
|
|
16
|
+
* @extends {IApiLegend}
|
|
17
|
+
*/
|
|
18
|
+
export interface ILegend extends IApiLegend {
|
|
19
|
+
}
|
|
11
20
|
/**
|
|
12
21
|
* @description 日历部件状态接口
|
|
13
22
|
* @export
|
|
@@ -21,19 +30,25 @@ export interface ICalendarState extends IMDControlState, IApiCalendarState {
|
|
|
21
30
|
* @type {IApiCalendarItemData[]}
|
|
22
31
|
* @memberof ICalendarState
|
|
23
32
|
*/
|
|
24
|
-
items:
|
|
33
|
+
items: ICalendarItemData[];
|
|
25
34
|
/**
|
|
26
35
|
* @description 日历分组数据
|
|
27
|
-
* @type {
|
|
36
|
+
* @type {ICalendarGroup[]}
|
|
28
37
|
* @memberof ICalendarState
|
|
29
38
|
*/
|
|
30
|
-
groups:
|
|
39
|
+
groups: ICalendarGroup[];
|
|
31
40
|
/**
|
|
32
41
|
* @description 是否弹框显示详情
|
|
33
42
|
* @type {boolean}
|
|
34
43
|
* @memberof ICalendarState
|
|
35
44
|
*/
|
|
36
45
|
showDetail: boolean;
|
|
46
|
+
/**
|
|
47
|
+
* @description 图例项
|
|
48
|
+
* @type {ILegend[]}
|
|
49
|
+
* @memberof ICalendarState
|
|
50
|
+
*/
|
|
51
|
+
legends: ILegend[];
|
|
37
52
|
}
|
|
38
53
|
/**
|
|
39
54
|
* @description 日历项数据接口
|
|
@@ -1 +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,
|
|
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,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
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/locale/en/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,EAAE
|
|
1
|
+
{"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
CHANGED
|
@@ -69,6 +69,7 @@ export const en = {
|
|
|
69
69
|
},
|
|
70
70
|
calendar: {
|
|
71
71
|
noFoundModel: 'Calendar item model not found',
|
|
72
|
+
illegalTime: '[USER2] Calendar style with time range type [custom] does not have valid control dynamic parameters [begintime] and [endtime] configured',
|
|
72
73
|
},
|
|
73
74
|
chart: {
|
|
74
75
|
noConfiguredX: 'Sequence is not configured with X-axis',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/locale/zh-CN/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/locale/zh-CN/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmuBhB,CAAC"}
|
|
@@ -1 +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;
|
|
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;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"}
|
|
@@ -243,12 +243,14 @@ export class UIActionProviderBase {
|
|
|
243
243
|
// 是否是多数据
|
|
244
244
|
const isMultiData = ['MULTIKEY', 'MULTIDATA'].includes(action.actionTarget) &&
|
|
245
245
|
data.length > 0;
|
|
246
|
+
// 非多数据场景：数据目标为NONE时传空对象，否则取第一条数据
|
|
247
|
+
const singleNavData = action.actionTarget === 'NONE' ? {} : data[0] || {};
|
|
246
248
|
// 处理自定义导航上下文
|
|
247
|
-
const tempContext = convertNavData(navContexts, isMultiData ? formatMultiData(navContexts, data) :
|
|
249
|
+
const tempContext = convertNavData(navContexts, isMultiData ? formatMultiData(navContexts, data) : singleNavData, params, context);
|
|
248
250
|
Object.assign(resultContext, tempContext);
|
|
249
251
|
// 处理自定义导航视图参数
|
|
250
252
|
const navParams = action.navigateParams;
|
|
251
|
-
const resultParams = convertNavData(navParams, isMultiData ? formatMultiData(navParams, data) :
|
|
253
|
+
const resultParams = convertNavData(navParams, isMultiData ? formatMultiData(navParams, data) : singleNavData, params, resultContext);
|
|
252
254
|
// 添加触发源
|
|
253
255
|
ibiz.util.record.addTriggerLogic(context.srfviewid, {
|
|
254
256
|
navContexts,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibiz-template/runtime",
|
|
3
|
-
"version": "0.7.41-alpha.
|
|
3
|
+
"version": "0.7.41-alpha.104",
|
|
4
4
|
"description": "运行时逻辑库",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "out/index.js",
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
"qx-util": "^0.4.8",
|
|
69
69
|
"ramda": "^0.29.0"
|
|
70
70
|
},
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "3a1581988ec0b935985641d63c536e20a2f1f29c"
|
|
72
72
|
}
|