@ibiz-template/runtime 0.5.7-alpha.5 → 0.5.7-alpha.7
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 +212 -89
- package/dist/index.system.min.js +1 -1
- package/out/controller/control/calendar/calendar.service.d.ts.map +1 -1
- package/out/controller/control/calendar/calendar.service.js +7 -1
- package/out/controller/control/grid/grid/grid.controller.d.ts +1 -0
- package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
- package/out/controller/control/grid/grid/grid.controller.js +6 -0
- package/out/controller/notification/internal-message.controller.d.ts +7 -0
- package/out/controller/notification/internal-message.controller.d.ts.map +1 -1
- package/out/controller/notification/internal-message.controller.js +17 -0
- package/out/engine/md-view.engine.d.ts +28 -0
- package/out/engine/md-view.engine.d.ts.map +1 -1
- package/out/engine/md-view.engine.js +53 -11
- package/out/engine/view-base.engine.d.ts +38 -0
- package/out/engine/view-base.engine.d.ts.map +1 -1
- package/out/engine/view-base.engine.js +100 -52
- package/out/interface/common/i-drawer-options/i-drawer-options.d.ts +2 -2
- package/out/interface/common/i-modal-options/i-modal-options.d.ts +2 -2
- package/out/interface/common/i-popover-options/i-popover-options.d.ts +10 -10
- package/out/interface/common/i-popover-options/i-popover-options.d.ts.map +1 -1
- package/out/interface/util/i-notification-util/i-notification-util.d.ts +7 -0
- package/out/interface/util/i-notification-util/i-notification-util.d.ts.map +1 -1
- package/package.json +4 -3
- package/src/controller/control/calendar/calendar.service.ts +8 -2
- package/src/controller/control/grid/grid/grid.controller.ts +7 -0
- package/src/controller/notification/internal-message.controller.ts +20 -1
- package/src/engine/md-view.engine.ts +59 -11
- package/src/engine/view-base.engine.ts +109 -49
- package/src/interface/common/i-drawer-options/i-drawer-options.ts +2 -2
- package/src/interface/common/i-modal-options/i-modal-options.ts +2 -2
- package/src/interface/common/i-popover-options/i-popover-options.ts +10 -10
- package/src/interface/util/i-notification-util/i-notification-util.ts +8 -0
|
@@ -1 +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;
|
|
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;IAiB7B;;;;;;;;;;;;OAYG;YACW,KAAK;CAgBpB"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { RuntimeError } from '@ibiz-template/core';
|
|
2
|
+
import { clone } from 'ramda';
|
|
2
3
|
import { MDControlService, CalendarItemData } from '../../../service';
|
|
3
4
|
/**
|
|
4
5
|
* 日历部件服务
|
|
@@ -27,7 +28,12 @@ export class CalendarService extends MDControlService {
|
|
|
27
28
|
}
|
|
28
29
|
const promises = sysCalendarItems.map(async (item) => {
|
|
29
30
|
const fetchAction = item.appDEDataSetId || 'fetchdefault';
|
|
30
|
-
|
|
31
|
+
const tempContext = context.clone();
|
|
32
|
+
const tempParams = clone(params);
|
|
33
|
+
if (item.maxSize) {
|
|
34
|
+
tempParams.size = item.maxSize;
|
|
35
|
+
}
|
|
36
|
+
return this.exec2(fetchAction, tempContext, tempParams, undefined, item.appDataEntityId);
|
|
31
37
|
});
|
|
32
38
|
const resArray = await Promise.all(promises);
|
|
33
39
|
// 二维数组
|
|
@@ -200,6 +200,7 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
|
|
|
200
200
|
* @return {*} {Promise<void>}
|
|
201
201
|
*/
|
|
202
202
|
protected loadRemoteAgg(): Promise<void>;
|
|
203
|
+
getFetchParams(extraParams?: IParams): Promise<IParams>;
|
|
203
204
|
/**
|
|
204
205
|
* 计算当前页的聚合数据
|
|
205
206
|
* @author lxm
|
|
@@ -1 +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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
|
|
1
|
+
{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -329,6 +329,12 @@ export class GridController extends MDControlController {
|
|
|
329
329
|
[this.state.remoteAggResult] = res.data;
|
|
330
330
|
}
|
|
331
331
|
}
|
|
332
|
+
async getFetchParams(extraParams = {}) {
|
|
333
|
+
if (this.model.enableItemPrivilege === true) {
|
|
334
|
+
extraParams.srfdataaccessaction = true;
|
|
335
|
+
}
|
|
336
|
+
return super.getFetchParams(extraParams);
|
|
337
|
+
}
|
|
332
338
|
/**
|
|
333
339
|
* 计算当前页的聚合数据
|
|
334
340
|
* @author lxm
|
|
@@ -19,5 +19,12 @@ export declare class InternalMessageController implements IInternalMessageContro
|
|
|
19
19
|
load(): Promise<void>;
|
|
20
20
|
loadMore(): Promise<void>;
|
|
21
21
|
protected fetch(loadMore?: boolean): Promise<void>;
|
|
22
|
+
/**
|
|
23
|
+
* 监听mqtt消息
|
|
24
|
+
* @author lxm
|
|
25
|
+
* @date 2024-01-30 01:53:44
|
|
26
|
+
* @protected
|
|
27
|
+
*/
|
|
28
|
+
protected listenMqtt(): void;
|
|
22
29
|
}
|
|
23
30
|
//# sourceMappingURL=internal-message.controller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-message.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/notification/internal-message.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"internal-message.controller.d.ts","sourceRoot":"","sources":["../../../src/controller/notification/internal-message.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAkB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEvD,qBAAa,yBAA0B,YAAW,0BAA0B;IAC1E,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAE5D,KAAK,EAAE,MAAM,CAAK;IAElB;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAK;IAEjB,IAAI,EAAE,MAAM,CAAM;IAElB,QAAQ,EAAE,gBAAgB,EAAE,CAAM;IAElC,SAAS,CAAC,OAAO,yBAAgC;IAE3C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;cAIf,KAAK,CAAC,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB/D;;;;;OAKG;IACH,SAAS,CAAC,UAAU,IAAI,IAAI;CAW7B"}
|
|
@@ -17,6 +17,7 @@ export class InternalMessageController {
|
|
|
17
17
|
}
|
|
18
18
|
async init() {
|
|
19
19
|
this.load();
|
|
20
|
+
this.listenMqtt();
|
|
20
21
|
}
|
|
21
22
|
async load() {
|
|
22
23
|
await this.fetch(false);
|
|
@@ -47,4 +48,20 @@ export class InternalMessageController {
|
|
|
47
48
|
}
|
|
48
49
|
this.evt.emit('dataChange');
|
|
49
50
|
}
|
|
51
|
+
/**
|
|
52
|
+
* 监听mqtt消息
|
|
53
|
+
* @author lxm
|
|
54
|
+
* @date 2024-01-30 01:53:44
|
|
55
|
+
* @protected
|
|
56
|
+
*/
|
|
57
|
+
listenMqtt() {
|
|
58
|
+
ibiz.mc.command.internalMessage.on(async (msg) => {
|
|
59
|
+
ibiz.log.debug('mqtt internalMessage: ', msg);
|
|
60
|
+
if (msg.subtype !== 'INTERNALMESSAGE') {
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
// todo 目前会有一种情况，不带data，弹右下角消息提示
|
|
64
|
+
ibiz.notification.info({ desc: msg.content, position: 'bottom-right' });
|
|
65
|
+
});
|
|
66
|
+
}
|
|
50
67
|
}
|
|
@@ -148,7 +148,26 @@ export declare class MDViewEngine extends ViewEngineBase {
|
|
|
148
148
|
data: IData[];
|
|
149
149
|
event?: MouseEvent;
|
|
150
150
|
}): Promise<void>;
|
|
151
|
+
/**
|
|
152
|
+
* 计算头部显示
|
|
153
|
+
*
|
|
154
|
+
* @author zk
|
|
155
|
+
* @date 2024-01-29 05:01:30
|
|
156
|
+
* @protected
|
|
157
|
+
* @return {*} {boolean}
|
|
158
|
+
* @memberof MDViewEngine
|
|
159
|
+
*/
|
|
151
160
|
protected calcViewHeaderVisible(): boolean;
|
|
161
|
+
/**
|
|
162
|
+
* 计算搜索栏显示
|
|
163
|
+
*
|
|
164
|
+
* @author zk
|
|
165
|
+
* @date 2024-01-29 05:01:36
|
|
166
|
+
* @protected
|
|
167
|
+
* @return {*} {boolean}
|
|
168
|
+
* @memberof MDViewEngine
|
|
169
|
+
*/
|
|
170
|
+
protected calcViewSearchBarVisible(): boolean;
|
|
152
171
|
/**
|
|
153
172
|
* 切换搜索表单的显示与否
|
|
154
173
|
* @author lxm
|
|
@@ -156,5 +175,14 @@ export declare class MDViewEngine extends ViewEngineBase {
|
|
|
156
175
|
* @protected
|
|
157
176
|
*/
|
|
158
177
|
protected toggleFilter(): void;
|
|
178
|
+
/**
|
|
179
|
+
* 计算移除的模型名称
|
|
180
|
+
*
|
|
181
|
+
* @author zk
|
|
182
|
+
* @date 2024-01-29 03:01:42
|
|
183
|
+
* @return {*} {string[]}
|
|
184
|
+
* @memberof MDViewEngine
|
|
185
|
+
*/
|
|
186
|
+
calcRemoveLayoutModel(): string[];
|
|
159
187
|
}
|
|
160
188
|
//# sourceMappingURL=md-view.engine.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { RuntimeModelError } from '@ibiz-template/core';
|
|
2
2
|
import { clone } from 'ramda';
|
|
3
3
|
import { SysUIActionTag, ViewCallTag } from '../constant';
|
|
4
|
-
import { calcDeCodeNameById } from '../model';
|
|
4
|
+
import { calcDeCodeNameById, getControl } from '../model';
|
|
5
5
|
import { ViewEngineBase } from './view-base.engine';
|
|
6
6
|
/**
|
|
7
7
|
* 多数据视图引擎
|
|
@@ -333,19 +333,42 @@ export class MDViewEngine extends ViewEngineBase {
|
|
|
333
333
|
async copy(args) {
|
|
334
334
|
this.newData(Object.assign(args, { copyMode: true }));
|
|
335
335
|
}
|
|
336
|
+
/**
|
|
337
|
+
* 计算头部显示
|
|
338
|
+
*
|
|
339
|
+
* @author zk
|
|
340
|
+
* @date 2024-01-29 05:01:30
|
|
341
|
+
* @protected
|
|
342
|
+
* @return {*} {boolean}
|
|
343
|
+
* @memberof MDViewEngine
|
|
344
|
+
*/
|
|
336
345
|
calcViewHeaderVisible() {
|
|
337
|
-
|
|
346
|
+
const showHeader = super.calcViewHeaderVisible();
|
|
338
347
|
// 搜索栏
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
348
|
+
const visible = this.calcViewSearchBarVisible();
|
|
349
|
+
return visible || showHeader;
|
|
350
|
+
}
|
|
351
|
+
/**
|
|
352
|
+
* 计算搜索栏显示
|
|
353
|
+
*
|
|
354
|
+
* @author zk
|
|
355
|
+
* @date 2024-01-29 05:01:36
|
|
356
|
+
* @protected
|
|
357
|
+
* @return {*} {boolean}
|
|
358
|
+
* @memberof MDViewEngine
|
|
359
|
+
*/
|
|
360
|
+
calcViewSearchBarVisible() {
|
|
361
|
+
const { model } = this.view;
|
|
362
|
+
// 搜索栏
|
|
363
|
+
const has = this.isExistAndInLayout('searchbar');
|
|
364
|
+
if (!has) {
|
|
365
|
+
return has;
|
|
347
366
|
}
|
|
348
|
-
|
|
367
|
+
const searchBar = getControl(model, 'searchbar');
|
|
368
|
+
const visible = !!(searchBar.enableQuickSearch ||
|
|
369
|
+
searchBar.enableGroup ||
|
|
370
|
+
searchBar.enableFilter === true);
|
|
371
|
+
return visible;
|
|
349
372
|
}
|
|
350
373
|
/**
|
|
351
374
|
* 切换搜索表单的显示与否
|
|
@@ -361,4 +384,23 @@ export class MDViewEngine extends ViewEngineBase {
|
|
|
361
384
|
}
|
|
362
385
|
}
|
|
363
386
|
}
|
|
387
|
+
/**
|
|
388
|
+
* 计算移除的模型名称
|
|
389
|
+
*
|
|
390
|
+
* @author zk
|
|
391
|
+
* @date 2024-01-29 03:01:42
|
|
392
|
+
* @return {*} {string[]}
|
|
393
|
+
* @memberof MDViewEngine
|
|
394
|
+
*/
|
|
395
|
+
calcRemoveLayoutModel() {
|
|
396
|
+
const { model } = this.view;
|
|
397
|
+
const names = super.calcRemoveLayoutModel();
|
|
398
|
+
if (!getControl(model, 'searchform')) {
|
|
399
|
+
names.push('searchform');
|
|
400
|
+
}
|
|
401
|
+
if (!this.calcViewSearchBarVisible()) {
|
|
402
|
+
names.push('view_searchbar');
|
|
403
|
+
}
|
|
404
|
+
return names;
|
|
405
|
+
}
|
|
364
406
|
}
|
|
@@ -62,6 +62,34 @@ export declare class ViewEngineBase implements IViewEngine {
|
|
|
62
62
|
*/
|
|
63
63
|
constructor(view: IViewController);
|
|
64
64
|
onCreated(): Promise<void>;
|
|
65
|
+
/**
|
|
66
|
+
* 计算动态布局模型
|
|
67
|
+
*
|
|
68
|
+
* @author zk
|
|
69
|
+
* @date 2024-01-29 02:01:47
|
|
70
|
+
* @memberof ViewEngineBase
|
|
71
|
+
*/
|
|
72
|
+
protected calcDynamicLayout(): void;
|
|
73
|
+
/**
|
|
74
|
+
* 计算移除的模型名称
|
|
75
|
+
*
|
|
76
|
+
* @author zk
|
|
77
|
+
* @date 2024-01-29 02:01:21
|
|
78
|
+
* @return {*} {string[]}
|
|
79
|
+
* @memberof ViewEngineBase
|
|
80
|
+
*/
|
|
81
|
+
protected calcRemoveLayoutModel(): string[];
|
|
82
|
+
/**
|
|
83
|
+
* 删除布局模型
|
|
84
|
+
*
|
|
85
|
+
* @author zk
|
|
86
|
+
* @date 2024-01-29 02:01:29
|
|
87
|
+
* @param {string[]} names
|
|
88
|
+
* @param {(IPanelContainer | undefined)} [container=this.view.model.viewLayoutPanel]
|
|
89
|
+
* @return {*} {void}
|
|
90
|
+
* @memberof ViewEngineBase
|
|
91
|
+
*/
|
|
92
|
+
private removeLayoutModel;
|
|
65
93
|
onMounted(): Promise<void>;
|
|
66
94
|
onDestroyed(): Promise<void>;
|
|
67
95
|
call(key: string, _args?: IData): Promise<IData | null | undefined>;
|
|
@@ -88,6 +116,16 @@ export declare class ViewEngineBase implements IViewEngine {
|
|
|
88
116
|
* @protected
|
|
89
117
|
*/
|
|
90
118
|
protected calcViewHeaderVisible(): boolean;
|
|
119
|
+
/**
|
|
120
|
+
* 是否存在模型 并且 布局中有占位
|
|
121
|
+
*
|
|
122
|
+
* @author zk
|
|
123
|
+
* @date 2024-01-30 11:01:33
|
|
124
|
+
* @param {string} name
|
|
125
|
+
* @return {*} {(IData | undefined)}
|
|
126
|
+
* @memberof ViewEngineBase
|
|
127
|
+
*/
|
|
128
|
+
isExistAndInLayout(name: string): boolean;
|
|
91
129
|
/**
|
|
92
130
|
* 计算底部的显示与否
|
|
93
131
|
* @author lxm
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view-base.engine.d.ts","sourceRoot":"","sources":["../../src/engine/view-base.engine.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"view-base.engine.d.ts","sourceRoot":"","sources":["../../src/engine/view-base.engine.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGlD;;;;;;GAMG;AACH,qBAAa,cAAe,YAAW,WAAW;IAmEpC,SAAS,CAAC,IAAI,EAAE,eAAe;IAlE3C;;;;;;;OAOG;IACH,SAAS,KAAK,OAAO,IAAI,kBAAkB,GAAG,SAAS,CAEtD;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAE1D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,YAAY,IAAI,kBAAkB,GAAG,SAAS,CAE3D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,aAAa,IAAI,kBAAkB,GAAG,SAAS,CAE5D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,eAAe,IAAI,0BAA0B,GAAG,SAAS,CAEtE;IAED;;;;;OAKG;gBACmB,IAAI,EAAE,eAAe;IAIrC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAMhC;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAMnC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,MAAM,EAAE;IA4B3C;;;;;;;;;OASG;IACH,OAAO,CAAC,iBAAiB;IAqBnB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAOzE;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAsB1C;;;;;;;;OAQG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAczC;;;;;;OAMG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAU1C;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAuBtC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { RuntimeError } from '@ibiz-template/core';
|
|
1
|
+
import { RuntimeError, findRecursiveChild } from '@ibiz-template/core';
|
|
2
2
|
import { ViewCallTag } from '../constant';
|
|
3
|
+
import { getControl } from '../model';
|
|
3
4
|
/**
|
|
4
5
|
* 视图引擎基类
|
|
5
6
|
* @author lxm
|
|
@@ -76,29 +77,83 @@ export class ViewEngineBase {
|
|
|
76
77
|
async onCreated() {
|
|
77
78
|
const { childNames } = this.view;
|
|
78
79
|
childNames.push('captionbar', 'toolbar');
|
|
80
|
+
this.calcDynamicLayout();
|
|
79
81
|
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
82
|
+
/**
|
|
83
|
+
* 计算动态布局模型
|
|
84
|
+
*
|
|
85
|
+
* @author zk
|
|
86
|
+
* @date 2024-01-29 02:01:47
|
|
87
|
+
* @memberof ViewEngineBase
|
|
88
|
+
*/
|
|
89
|
+
calcDynamicLayout() {
|
|
90
|
+
const names = this.calcRemoveLayoutModel();
|
|
91
|
+
ibiz.log.debug(`${this.view.model.codeName}删除模型：${names.join(';')}`);
|
|
92
|
+
this.removeLayoutModel(names);
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* 计算移除的模型名称
|
|
96
|
+
*
|
|
97
|
+
* @author zk
|
|
98
|
+
* @date 2024-01-29 02:01:21
|
|
99
|
+
* @return {*} {string[]}
|
|
100
|
+
* @memberof ViewEngineBase
|
|
101
|
+
*/
|
|
102
|
+
calcRemoveLayoutModel() {
|
|
103
|
+
const { model } = this.view;
|
|
104
|
+
const names = [];
|
|
105
|
+
if (model.showCaptionBar === false) {
|
|
106
|
+
names.push('view_captionbar');
|
|
107
|
+
}
|
|
108
|
+
if (!getControl(model, 'toolbar')) {
|
|
109
|
+
names.push('view_toolbar', 'toolbar');
|
|
110
|
+
}
|
|
111
|
+
const toolBarList = ['lefttoolbar', 'righttoolbar', 'footertoolbar'];
|
|
112
|
+
toolBarList.forEach(name => {
|
|
113
|
+
if (!getControl(model, name)) {
|
|
114
|
+
names.push(name);
|
|
90
115
|
}
|
|
116
|
+
});
|
|
117
|
+
if (!this.calcViewHeaderVisible()) {
|
|
118
|
+
names.push('view_header');
|
|
91
119
|
}
|
|
92
120
|
if (ibiz.env.isMob) {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
if (!showFooter) {
|
|
96
|
-
const controller = (_b = this.viewLayoutPanel) === null || _b === void 0 ? void 0 : _b.panelItems.view_footer;
|
|
97
|
-
if (controller) {
|
|
98
|
-
controller.state.visible = false;
|
|
99
|
-
}
|
|
121
|
+
if (!this.calcViewFooterVisible()) {
|
|
122
|
+
names.push('view_footer');
|
|
100
123
|
}
|
|
101
124
|
}
|
|
125
|
+
return names;
|
|
126
|
+
}
|
|
127
|
+
/**
|
|
128
|
+
* 删除布局模型
|
|
129
|
+
*
|
|
130
|
+
* @author zk
|
|
131
|
+
* @date 2024-01-29 02:01:29
|
|
132
|
+
* @param {string[]} names
|
|
133
|
+
* @param {(IPanelContainer | undefined)} [container=this.view.model.viewLayoutPanel]
|
|
134
|
+
* @return {*} {void}
|
|
135
|
+
* @memberof ViewEngineBase
|
|
136
|
+
*/
|
|
137
|
+
removeLayoutModel(names, container = this.view.model.viewLayoutPanel) {
|
|
138
|
+
if (!container) {
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
const items = container.rootPanelItems || container.panelItems || [];
|
|
142
|
+
const index = items.findIndex(item => names.includes(item.id));
|
|
143
|
+
if (index !== -1) {
|
|
144
|
+
items.splice(index, 1);
|
|
145
|
+
}
|
|
146
|
+
// 过滤深层的子成员
|
|
147
|
+
items.forEach(item => {
|
|
148
|
+
if (item.itemType === 'CONTAINER') {
|
|
149
|
+
this.removeLayoutModel(names, item);
|
|
150
|
+
}
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
async onMounted() {
|
|
154
|
+
// 子类重写
|
|
155
|
+
const { model, childNames } = this.view;
|
|
156
|
+
ibiz.log.debug(`${model.id}的子组件：${childNames.join(';')}都已mounted`);
|
|
102
157
|
}
|
|
103
158
|
async onDestroyed() {
|
|
104
159
|
// 子类重写
|
|
@@ -136,54 +191,47 @@ export class ViewEngineBase {
|
|
|
136
191
|
* @protected
|
|
137
192
|
*/
|
|
138
193
|
calcViewHeaderVisible() {
|
|
139
|
-
var _a, _b, _c, _d;
|
|
140
194
|
let showHeader = false;
|
|
141
195
|
const { model } = this.view;
|
|
142
196
|
// 标题栏
|
|
143
|
-
if (model.showCaptionBar
|
|
144
|
-
// 隐藏标题栏容器
|
|
145
|
-
const controller = (_a = this.viewLayoutPanel) === null || _a === void 0 ? void 0 : _a.panelItems.view_captionbar;
|
|
146
|
-
if (controller) {
|
|
147
|
-
controller.state.visible = false;
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
else {
|
|
197
|
+
if (model.showCaptionBar) {
|
|
151
198
|
showHeader = true;
|
|
152
199
|
}
|
|
153
200
|
if (ibiz.env.isMob) {
|
|
154
|
-
if (
|
|
155
|
-
// 隐藏左工具栏
|
|
156
|
-
const controller = (_b = this.viewLayoutPanel) === null || _b === void 0 ? void 0 : _b.panelItems.lefttoolbar;
|
|
157
|
-
if (controller) {
|
|
158
|
-
controller.state.visible = false;
|
|
159
|
-
}
|
|
160
|
-
}
|
|
161
|
-
else {
|
|
201
|
+
if (this.isExistAndInLayout('lefttoolbar')) {
|
|
162
202
|
showHeader = true;
|
|
163
203
|
}
|
|
164
|
-
if (
|
|
165
|
-
// 隐藏右工具栏
|
|
166
|
-
const controller = (_c = this.viewLayoutPanel) === null || _c === void 0 ? void 0 : _c.panelItems.righttoolbar;
|
|
167
|
-
if (controller) {
|
|
168
|
-
controller.state.visible = false;
|
|
169
|
-
}
|
|
170
|
-
}
|
|
171
|
-
else {
|
|
204
|
+
if (this.isExistAndInLayout('righttoolbar')) {
|
|
172
205
|
showHeader = true;
|
|
173
206
|
}
|
|
174
207
|
}
|
|
175
|
-
else if (
|
|
176
|
-
// 隐藏工具栏容器
|
|
177
|
-
const controller = (_d = this.viewLayoutPanel) === null || _d === void 0 ? void 0 : _d.panelItems.view_toolbar;
|
|
178
|
-
if (controller) {
|
|
179
|
-
controller.state.visible = false;
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
else {
|
|
208
|
+
else if (this.isExistAndInLayout('toolbar')) {
|
|
183
209
|
showHeader = true;
|
|
184
210
|
}
|
|
185
211
|
return showHeader;
|
|
186
212
|
}
|
|
213
|
+
/**
|
|
214
|
+
* 是否存在模型 并且 布局中有占位
|
|
215
|
+
*
|
|
216
|
+
* @author zk
|
|
217
|
+
* @date 2024-01-30 11:01:33
|
|
218
|
+
* @param {string} name
|
|
219
|
+
* @return {*} {(IData | undefined)}
|
|
220
|
+
* @memberof ViewEngineBase
|
|
221
|
+
*/
|
|
222
|
+
isExistAndInLayout(name) {
|
|
223
|
+
const layout = this.view.model.viewLayoutPanel;
|
|
224
|
+
if (!layout) {
|
|
225
|
+
return false;
|
|
226
|
+
}
|
|
227
|
+
const ins = findRecursiveChild(layout, name, {
|
|
228
|
+
compareField: 'id',
|
|
229
|
+
childrenFields: ['panelItems', 'rootPanelItems'],
|
|
230
|
+
});
|
|
231
|
+
const { model } = this.view;
|
|
232
|
+
const has = getControl(model, name);
|
|
233
|
+
return !!(ins && has);
|
|
234
|
+
}
|
|
187
235
|
/**
|
|
188
236
|
* 计算底部的显示与否
|
|
189
237
|
* @author lxm
|
|
@@ -194,7 +242,7 @@ export class ViewEngineBase {
|
|
|
194
242
|
calcViewFooterVisible() {
|
|
195
243
|
let showFooter = false;
|
|
196
244
|
// 工具栏
|
|
197
|
-
if (this.
|
|
245
|
+
if (this.isExistAndInLayout('footertoolbar')) {
|
|
198
246
|
showFooter = true;
|
|
199
247
|
}
|
|
200
248
|
return showFooter;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export interface IDrawerOptions {
|
|
2
2
|
/**
|
|
3
3
|
* 抽屉宽度
|
|
4
|
-
*
|
|
4
|
+
* 左、右方向时可用。0-100的时候算百分比，100以上算像素px
|
|
5
5
|
*
|
|
6
6
|
* @author lxm
|
|
7
7
|
* @date 2022-09-12 20:09:20
|
|
@@ -10,7 +10,7 @@ export interface IDrawerOptions {
|
|
|
10
10
|
width?: number;
|
|
11
11
|
/**
|
|
12
12
|
* 抽屉高度
|
|
13
|
-
*
|
|
13
|
+
* 上、下方向时可用。0-100的时候算百分比，100以上算像素px
|
|
14
14
|
*
|
|
15
15
|
* @author lxm
|
|
16
16
|
* @date 2022-09-12 20:09:22
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export interface IModalOptions {
|
|
2
2
|
/**
|
|
3
|
-
* 宽度
|
|
3
|
+
* 宽度 数字0-100的时候算百分比，100以上算像素px，字符串原样设置
|
|
4
4
|
*
|
|
5
5
|
* @author lxm
|
|
6
6
|
* @date 2022-09-12 20:09:20
|
|
@@ -8,7 +8,7 @@ export interface IModalOptions {
|
|
|
8
8
|
*/
|
|
9
9
|
width?: string | number;
|
|
10
10
|
/**
|
|
11
|
-
* 高度
|
|
11
|
+
* 高度 数字0-100的时候算百分比，100以上算像素px，字符串原样设置
|
|
12
12
|
*
|
|
13
13
|
* @author lxm
|
|
14
14
|
* @date 2022-09-12 20:09:22
|
|
@@ -31,21 +31,21 @@ interface AxesOffsets {
|
|
|
31
31
|
*/
|
|
32
32
|
export interface IPopoverOptions<O = unknown> {
|
|
33
33
|
/**
|
|
34
|
-
* 宽度
|
|
34
|
+
* 宽度 数字0-100的时候算百分比，100以上算像素px，字符串原样设置
|
|
35
35
|
*
|
|
36
|
-
* @author
|
|
37
|
-
* @date 2022-
|
|
38
|
-
* @type {string}
|
|
36
|
+
* @author lxm
|
|
37
|
+
* @date 2022-09-12 20:09:20
|
|
38
|
+
* @type {string | number}
|
|
39
39
|
*/
|
|
40
|
-
width?: string;
|
|
40
|
+
width?: string | number;
|
|
41
41
|
/**
|
|
42
|
-
* 高度
|
|
42
|
+
* 高度 数字0-100的时候算百分比，100以上算像素px，字符串原样设置
|
|
43
43
|
*
|
|
44
|
-
* @author
|
|
45
|
-
* @date 2022-
|
|
46
|
-
* @type {string}
|
|
44
|
+
* @author lxm
|
|
45
|
+
* @date 2022-09-12 20:09:22
|
|
46
|
+
* @type {string | number}
|
|
47
47
|
*/
|
|
48
|
-
height?: string;
|
|
48
|
+
height?: string | number;
|
|
49
49
|
/**
|
|
50
50
|
* 展示方向
|
|
51
51
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-popover-options.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-popover-options/i-popover-options.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,MAAM,SAAS,GAAG,OAAO,GAAG,KAAK,CAAC;AAChD,MAAM,CAAC,OAAO,MAAM,IAAI,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;AAC/D,MAAM,CAAC,OAAO,MAAM,gBAAgB,GAAG,GAAG,IAAI,IAAI,SAAS,EAAE,CAAC;AAC9D,MAAM,CAAC,OAAO,MAAM,SAAS,GAAG,IAAI,GAAG,gBAAgB,CAAC;AACxD,UAAU,WAAW;IACnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,OAAO;IAC1C;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"i-popover-options.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-popover-options/i-popover-options.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,MAAM,SAAS,GAAG,OAAO,GAAG,KAAK,CAAC;AAChD,MAAM,CAAC,OAAO,MAAM,IAAI,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;AAC/D,MAAM,CAAC,OAAO,MAAM,gBAAgB,GAAG,GAAG,IAAI,IAAI,SAAS,EAAE,CAAC;AAC9D,MAAM,CAAC,OAAO,MAAM,SAAS,GAAG,IAAI,GAAG,gBAAgB,CAAC;AACxD,UAAU,WAAW;IACnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,OAAO;IAC1C;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,WAAW,GAAG,MAAM,CAAC;IAElC;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,CAAC,CAAC;CACb"}
|
|
@@ -32,6 +32,13 @@ export interface NotificationParams {
|
|
|
32
32
|
* @type {number}
|
|
33
33
|
*/
|
|
34
34
|
duration?: number;
|
|
35
|
+
/**
|
|
36
|
+
* 位置
|
|
37
|
+
* @author lxm
|
|
38
|
+
* @date 2024-01-30 11:43:21
|
|
39
|
+
* @type {('top-right' | 'top-left' | 'bottom-right' | 'bottom-left')}
|
|
40
|
+
*/
|
|
41
|
+
position?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left';
|
|
35
42
|
}
|
|
36
43
|
/**
|
|
37
44
|
* 在界面右上角显示可关闭的全局通知
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-notification-util.d.ts","sourceRoot":"","sources":["../../../../src/interface/util/i-notification-util/i-notification-util.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"i-notification-util.d.ts","sourceRoot":"","sources":["../../../../src/interface/util/i-notification-util/i-notification-util.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,WAAW,GAAG,UAAU,GAAG,cAAc,GAAG,aAAa,CAAC;CACtE;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACvC;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC1C;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC1C;;;;;;OAMG;IACH,KAAK,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACzC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibiz-template/runtime",
|
|
3
|
-
"version": "0.5.7-alpha.
|
|
3
|
+
"version": "0.5.7-alpha.7",
|
|
4
4
|
"description": "控制器包",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "out/index.js",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"author": "chitanda",
|
|
31
31
|
"license": "MIT",
|
|
32
32
|
"devDependencies": {
|
|
33
|
-
"@ibiz-template/core": "^0.5.7-alpha.
|
|
33
|
+
"@ibiz-template/core": "^0.5.7-alpha.6",
|
|
34
34
|
"@ibiz/model-core": "^0.1.9",
|
|
35
35
|
"@types/animejs": "^3.1.12",
|
|
36
36
|
"@types/path-browserify": "^1.0.2",
|
|
@@ -63,5 +63,6 @@
|
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
65
|
"animejs": "^3.2.2"
|
|
66
|
-
}
|
|
66
|
+
},
|
|
67
|
+
"gitHead": "6434755a777ebe0d50c8206563779ef47bc72dc0"
|
|
67
68
|
}
|