@ibiz-template/runtime 0.5.0-beta.5 → 0.5.0
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 +117 -29
- package/dist/index.system.min.js +1 -1
- package/out/app-hub.d.ts +1 -0
- package/out/app-hub.d.ts.map +1 -1
- package/out/app-hub.js +5 -0
- package/out/controller/control/grid/grid/grid.controller.d.ts +3 -1
- package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
- package/out/controller/control/grid/grid/grid.controller.js +8 -5
- package/out/controller/control/tree/tree.controller.js +1 -1
- package/out/controller/control/tree-grid/tree-grid.controller.d.ts +35 -2
- package/out/controller/control/tree-grid/tree-grid.controller.d.ts.map +1 -1
- package/out/controller/control/tree-grid/tree-grid.controller.js +60 -0
- package/out/interface/common/i-app-hub-service/i-app-hub-service.d.ts +6 -0
- package/out/interface/common/i-app-hub-service/i-app-hub-service.d.ts.map +1 -1
- package/out/interface/controller/controller/control/i-grid.controller.d.ts +1 -1
- package/out/interface/controller/controller/control/i-grid.controller.d.ts.map +1 -1
- package/out/interface/controller/controller/control/i-tree-grid.controller.d.ts +11 -1
- package/out/interface/controller/controller/control/i-tree-grid.controller.d.ts.map +1 -1
- package/out/interface/controller/state/control/i-tree-grid.state.d.ts +5 -0
- package/out/interface/controller/state/control/i-tree-grid.state.d.ts.map +1 -1
- package/out/interface/service/service/i-auth.service.d.ts +23 -0
- package/out/interface/service/service/i-auth.service.d.ts.map +1 -1
- package/out/interface/service/service/index.d.ts +1 -1
- package/out/interface/service/service/index.d.ts.map +1 -1
- package/out/service/service/auth/v7-auth.service.d.ts +3 -1
- package/out/service/service/auth/v7-auth.service.d.ts.map +1 -1
- package/out/service/service/auth/v7-auth.service.js +26 -3
- package/out/service/service/entity/method/de-action.d.ts.map +1 -1
- package/out/service/service/entity/method/de-action.js +4 -3
- package/package.json +3 -3
- package/src/app-hub.ts +6 -0
- package/src/controller/control/grid/grid/grid.controller.ts +17 -8
- package/src/controller/control/tree/tree.controller.ts +1 -1
- package/src/controller/control/tree-grid/tree-grid.controller.ts +79 -4
- package/src/interface/common/i-app-hub-service/i-app-hub-service.ts +7 -0
- package/src/interface/controller/controller/control/i-grid.controller.ts +5 -2
- package/src/interface/controller/controller/control/i-tree-grid.controller.ts +16 -1
- package/src/interface/controller/state/control/i-tree-grid.state.ts +7 -1
- package/src/interface/service/service/i-auth.service.ts +26 -0
- package/src/interface/service/service/index.ts +1 -1
- package/src/service/service/auth/v7-auth.service.ts +31 -2
- package/src/service/service/entity/method/de-action.ts +4 -3
package/out/app-hub.d.ts
CHANGED
package/out/app-hub.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-hub.d.ts","sourceRoot":"","sources":["../src/app-hub.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE1E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C;;;;;;;GAOG;AACH,qBAAa,MAAO,YAAW,cAAc;IAC3C;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAiB;IAE1C;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,gBAAuB;IAE1C;;;;;;OAMG;IACH,WAAW,EAAG,aAAa,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAa;IAEnD;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAa;IAE7E;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAEpD;;;;OAIG;IACH,MAAM,mBAA0B;IAEhC;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAW;IAE1C;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAW5C;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI;IAIhE;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAItC;;;;;;;OAOG;IACH,qBAAqB,CACnB,KAAK,EAAE,cAAc,EACrB,KAAK,GAAE,MAAuB,GAC7B,IAAI;IAQP;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,GAAE,MAAuB,GAAG,IAAI;IAK7D;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAKhC;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAOxD;;;;;;;OAOG;IACG,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAiBhD;;;;;;;;OAQG;IACG,gBAAgB,CACpB,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,MAAuB,GAC7B,OAAO,CAAC,cAAc,CAAC;IAuB1B;;;;;;;OAOG;cACa,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAsB3D;;;;;;;OAOG;IACG,WAAW,CAAC,GAAG,GAAE,MAAuB,GAAG,OAAO,CAAC,WAAW,CAAC;IAIrE;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW;IAchD;;;;;;OAMG;IACH,UAAU,IAAI,WAAW,EAAE;
|
|
1
|
+
{"version":3,"file":"app-hub.d.ts","sourceRoot":"","sources":["../src/app-hub.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE1E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C;;;;;;;GAOG;AACH,qBAAa,MAAO,YAAW,cAAc;IAC3C;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAiB;IAE1C;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,gBAAuB;IAE1C;;;;;;OAMG;IACH,WAAW,EAAG,aAAa,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAa;IAEnD;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAa;IAE7E;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAEpD;;;;OAIG;IACH,MAAM,mBAA0B;IAEhC;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAW;IAE1C;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAW5C;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI;IAIhE;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAItC;;;;;;;OAOG;IACH,qBAAqB,CACnB,KAAK,EAAE,cAAc,EACrB,KAAK,GAAE,MAAuB,GAC7B,IAAI;IAQP;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,GAAE,MAAuB,GAAG,IAAI;IAK7D;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAKhC;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAOxD;;;;;;;OAOG;IACG,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAiBhD;;;;;;;;OAQG;IACG,gBAAgB,CACpB,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,MAAuB,GAC7B,OAAO,CAAC,cAAc,CAAC;IAuB1B;;;;;;;OAOG;cACa,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAsB3D;;;;;;;OAOG;IACG,WAAW,CAAC,GAAG,GAAE,MAAuB,GAAG,OAAO,CAAC,WAAW,CAAC;IAIrE;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW;IAchD;;;;;;OAMG;IACH,UAAU,IAAI,WAAW,EAAE;IAO3B,KAAK,IAAI,IAAI;CAKd"}
|
package/out/app-hub.js
CHANGED
|
@@ -8,6 +8,7 @@ import { IGridState, IGridEvent, IGridController, IGridColumnProvider, CodeListI
|
|
|
8
8
|
import { ControlVO } from '../../../../service';
|
|
9
9
|
import { MDControlController } from '../../../common';
|
|
10
10
|
import { GridNotifyState } from '../../../constant';
|
|
11
|
+
import { ControllerEvent } from '../../../utils';
|
|
11
12
|
/**
|
|
12
13
|
* 表格控制器
|
|
13
14
|
*
|
|
@@ -17,7 +18,7 @@ import { GridNotifyState } from '../../../constant';
|
|
|
17
18
|
* @class GridController
|
|
18
19
|
* @extends {MDControlController<GridModel>}
|
|
19
20
|
*/
|
|
20
|
-
export declare class GridController extends
|
|
21
|
+
export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGridState = IGridState, E extends IGridEvent = IGridEvent> extends MDControlController<T, S, E> implements IGridController<T, S, E> {
|
|
21
22
|
/**
|
|
22
23
|
* 表格部件服务
|
|
23
24
|
*
|
|
@@ -26,6 +27,7 @@ export declare class GridController extends MDControlController<IDEGrid, IGridSt
|
|
|
26
27
|
* @type {EntityService}
|
|
27
28
|
*/
|
|
28
29
|
service: GridService;
|
|
30
|
+
protected get _evt(): ControllerEvent<IGridEvent>;
|
|
29
31
|
/**
|
|
30
32
|
* 是否有配置宽度自适应列
|
|
31
33
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,OAAO,EAEP,aAAa,EACb,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,YAAY,EACZ,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAS,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,6 +92,9 @@ export class GridController extends MDControlController {
|
|
|
92
92
|
*/
|
|
93
93
|
this.aggTitle = '合计';
|
|
94
94
|
}
|
|
95
|
+
get _evt() {
|
|
96
|
+
return this.evt;
|
|
97
|
+
}
|
|
95
98
|
/**
|
|
96
99
|
* 分组代码表项集合
|
|
97
100
|
* @author lxm
|
|
@@ -450,7 +453,7 @@ export class GridController extends MDControlController {
|
|
|
450
453
|
: await this.service.update(tempContext, data);
|
|
451
454
|
}
|
|
452
455
|
catch (error) {
|
|
453
|
-
await this.
|
|
456
|
+
await this._evt.emit('onSaveError', undefined);
|
|
454
457
|
this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}ERROR`, {
|
|
455
458
|
error: error,
|
|
456
459
|
data: rowState.data,
|
|
@@ -463,7 +466,7 @@ export class GridController extends MDControlController {
|
|
|
463
466
|
rowState.data = res.data;
|
|
464
467
|
rowState.modified = false;
|
|
465
468
|
this.gridStateNotify(rowState, GridNotifyState.SAVE);
|
|
466
|
-
await this.
|
|
469
|
+
await this._evt.emit('onSaveSuccess', undefined);
|
|
467
470
|
}
|
|
468
471
|
async saveAll() {
|
|
469
472
|
const needSaveData = this.state.rows
|
|
@@ -590,7 +593,7 @@ export class GridController extends MDControlController {
|
|
|
590
593
|
row.processing = true;
|
|
591
594
|
try {
|
|
592
595
|
await this.dataChangeNotify(row, [name]);
|
|
593
|
-
await this.
|
|
596
|
+
await this._evt.emit('onGridDataChange', {
|
|
594
597
|
data: this.state.rows.map(_row => {
|
|
595
598
|
return _row.data;
|
|
596
599
|
}),
|
|
@@ -670,7 +673,7 @@ export class GridController extends MDControlController {
|
|
|
670
673
|
else if (row.data.srfuf === Srfuf.CREATE) {
|
|
671
674
|
// 新建的行取消时删除这一行的数据
|
|
672
675
|
row.showRowEdit = false;
|
|
673
|
-
this.
|
|
676
|
+
this._evt.emit('onRowEditChange', { row });
|
|
674
677
|
return this.remove({ data: [row.data], silent: true });
|
|
675
678
|
}
|
|
676
679
|
else if (row.cacheData) {
|
|
@@ -699,7 +702,7 @@ export class GridController extends MDControlController {
|
|
|
699
702
|
Object.values(this.editColumns).forEach(column => {
|
|
700
703
|
row.editColStates[column.fieldName].editable = toState;
|
|
701
704
|
});
|
|
702
|
-
this.
|
|
705
|
+
this._evt.emit('onRowEditChange', { row });
|
|
703
706
|
}
|
|
704
707
|
/**
|
|
705
708
|
* 获取部件默认排序模型
|
|
@@ -1,5 +1,38 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { IDETreeGrid } from '@ibiz/model-core';
|
|
2
|
+
import { ITreeGridController, ITreeGridEvent, ITreeGridState } from '../../../interface';
|
|
2
3
|
import { GridController } from '../grid';
|
|
3
|
-
export declare class TreeGridController extends GridController implements ITreeGridController {
|
|
4
|
+
export declare class TreeGridController<T extends IDETreeGrid = IDETreeGrid, S extends ITreeGridState = ITreeGridState, E extends ITreeGridEvent = ITreeGridEvent> extends GridController<T, S, E> implements ITreeGridController<T, S, E> {
|
|
5
|
+
/**
|
|
6
|
+
* 树表格值属性名称
|
|
7
|
+
*
|
|
8
|
+
*/
|
|
9
|
+
treeGridValueField: string;
|
|
10
|
+
/**
|
|
11
|
+
* 树表格父属性名称
|
|
12
|
+
*
|
|
13
|
+
*/
|
|
14
|
+
treeGridParentField: string;
|
|
15
|
+
protected initState(): void;
|
|
16
|
+
/**
|
|
17
|
+
* 初始化方法
|
|
18
|
+
*
|
|
19
|
+
* @author lxm
|
|
20
|
+
* @date 2022-08-18 22:08:17
|
|
21
|
+
* @protected
|
|
22
|
+
* @returns {*} {Promise<void>}
|
|
23
|
+
*/
|
|
24
|
+
protected onCreated(): Promise<void>;
|
|
25
|
+
/**
|
|
26
|
+
* 初始化树表格字段
|
|
27
|
+
* @return {*}
|
|
28
|
+
* @author: zhujiamin
|
|
29
|
+
*/
|
|
30
|
+
protected initTreeGridField(): void;
|
|
31
|
+
/**
|
|
32
|
+
* 切换树表格显示
|
|
33
|
+
* @return {*}
|
|
34
|
+
* @author: zhujiamin
|
|
35
|
+
*/
|
|
36
|
+
switchTreeGridShow(): void;
|
|
4
37
|
}
|
|
5
38
|
//# sourceMappingURL=tree-grid.controller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree-grid.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid/tree-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"tree-grid.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid/tree-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEnE,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,cAAc,EACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,qBAAa,kBAAkB,CAC3B,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,cAAc,GAAG,cAAc,EACzC,CAAC,SAAS,cAAc,GAAG,cAAc,CAE3C,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEvC;;;OAGG;IACH,kBAAkB,EAAE,MAAM,CAAM;IAEhC;;;OAGG;IACH,mBAAmB,EAAE,MAAM,CAAM;IAEjC,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAmBnC;;;;OAIG;IACH,kBAAkB,IAAI,IAAI;CAG3B"}
|
|
@@ -1,3 +1,63 @@
|
|
|
1
|
+
import { RuntimeModelError } from '@ibiz-template/core';
|
|
1
2
|
import { GridController } from '../grid';
|
|
2
3
|
export class TreeGridController extends GridController {
|
|
4
|
+
constructor() {
|
|
5
|
+
super(...arguments);
|
|
6
|
+
/**
|
|
7
|
+
* 树表格值属性名称
|
|
8
|
+
*
|
|
9
|
+
*/
|
|
10
|
+
this.treeGridValueField = '';
|
|
11
|
+
/**
|
|
12
|
+
* 树表格父属性名称
|
|
13
|
+
*
|
|
14
|
+
*/
|
|
15
|
+
this.treeGridParentField = '';
|
|
16
|
+
}
|
|
17
|
+
initState() {
|
|
18
|
+
super.initState();
|
|
19
|
+
this.state.showTreeGrid = true;
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* 初始化方法
|
|
23
|
+
*
|
|
24
|
+
* @author lxm
|
|
25
|
+
* @date 2022-08-18 22:08:17
|
|
26
|
+
* @protected
|
|
27
|
+
* @returns {*} {Promise<void>}
|
|
28
|
+
*/
|
|
29
|
+
async onCreated() {
|
|
30
|
+
await super.onCreated();
|
|
31
|
+
this.initTreeGridField();
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* 初始化树表格字段
|
|
35
|
+
* @return {*}
|
|
36
|
+
* @author: zhujiamin
|
|
37
|
+
*/
|
|
38
|
+
initTreeGridField() {
|
|
39
|
+
var _a, _b;
|
|
40
|
+
const treeGridParent = (_a = this.model.degridColumns) === null || _a === void 0 ? void 0 : _a.find((item) => {
|
|
41
|
+
return item.treeColumnMode === 4 || item.treeColumnMode === 12;
|
|
42
|
+
});
|
|
43
|
+
const treeGridValue = (_b = this.model.degridColumns) === null || _b === void 0 ? void 0 : _b.find((item) => {
|
|
44
|
+
return item.treeColumnMode === 2 || item.treeColumnMode === 3;
|
|
45
|
+
});
|
|
46
|
+
if (!treeGridParent) {
|
|
47
|
+
throw new RuntimeModelError(this.model, '树表格无值列模式');
|
|
48
|
+
}
|
|
49
|
+
if (!treeGridValue) {
|
|
50
|
+
throw new RuntimeModelError(this.model, '树表格无父值列模式');
|
|
51
|
+
}
|
|
52
|
+
this.treeGridValueField = treeGridValue.appDEFieldId.toLowerCase();
|
|
53
|
+
this.treeGridParentField = treeGridParent.appDEFieldId.toLowerCase();
|
|
54
|
+
}
|
|
55
|
+
/**
|
|
56
|
+
* 切换树表格显示
|
|
57
|
+
* @return {*}
|
|
58
|
+
* @author: zhujiamin
|
|
59
|
+
*/
|
|
60
|
+
switchTreeGridShow() {
|
|
61
|
+
this.state.showTreeGrid = !this.state.showTreeGrid;
|
|
62
|
+
}
|
|
3
63
|
}
|
|
@@ -149,5 +149,11 @@ export interface IAppHubService {
|
|
|
149
149
|
* @return {*} {IAppService[]}
|
|
150
150
|
*/
|
|
151
151
|
getAllApps(): IAppService[];
|
|
152
|
+
/**
|
|
153
|
+
* 重置清空基座
|
|
154
|
+
* @author lxm
|
|
155
|
+
* @date 2024-01-03 06:46:57
|
|
156
|
+
*/
|
|
157
|
+
reset(): void;
|
|
152
158
|
}
|
|
153
159
|
//# sourceMappingURL=i-app-hub-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-app-hub-service.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-app-hub-service/i-app-hub-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IAEpC;;;;;;OAMG;IACH,WAAW,EAAE,cAAc,CAAC;IAE5B;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAC;IAEhC;;;;OAIG;IACH,MAAM,EAAE,iBAAiB,CAAC;IAE1B;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAEjE;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;IAEvC;;;;;;;OAOG;IACH,qBAAqB,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAElE;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE9C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAEjC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEnD;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3C;;;;;;;;OAQG;IACH,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtE;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAElD;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW,CAAC;IAEjD;;;;;;OAMG;IACH,UAAU,IAAI,WAAW,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"i-app-hub-service.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-app-hub-service/i-app-hub-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IAEpC;;;;;;OAMG;IACH,WAAW,EAAE,cAAc,CAAC;IAE5B;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAC;IAEhC;;;;OAIG;IACH,MAAM,EAAE,iBAAiB,CAAC;IAE1B;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAEjE;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;IAEvC;;;;;;;OAOG;IACH,qBAAqB,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAElE;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE9C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAEjC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEnD;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3C;;;;;;;;OAQG;IACH,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtE;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAElD;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW,CAAC;IAEjD;;;;;;OAMG;IACH,UAAU,IAAI,WAAW,EAAE,CAAC;IAE5B;;;;OAIG;IACH,KAAK,IAAI,IAAI,CAAC;CACf"}
|
|
@@ -12,7 +12,7 @@ import { CodeListItem } from '../../../service';
|
|
|
12
12
|
* @interface IGridController
|
|
13
13
|
* @extends {IMDControlController}
|
|
14
14
|
*/
|
|
15
|
-
export interface IGridController extends
|
|
15
|
+
export interface IGridController<T extends IDEGrid = IDEGrid, S extends IGridState = IGridState, E extends IGridEvent = IGridEvent> extends IMDControlController<T, S, E> {
|
|
16
16
|
/**
|
|
17
17
|
* 新建行
|
|
18
18
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"i-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe,CAC9B,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CACjC,SAAQ,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACrC;;;;;;OAMG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAExB;;;;;;OAMG;IACH,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAErC;;;;;;OAMG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB;;;;;OAKG;IACH,aAAa,IAAI,IAAI,CAAC;IAEtB;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,KAAK,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvE;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE/C;;;;;;OAMG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC;CACnC;AAED,UAAU,oBAAoB;IAC5B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;CACzC;AAED;;;;;GAKG;AACH,MAAM,WAAW,aACf,SAAQ,iBAAiB,EACvB,oBAAoB;CAAG"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
+
import { IDETreeGrid } from '@ibiz/model-core';
|
|
1
2
|
import { IGridController } from './i-grid.controller';
|
|
3
|
+
import { ITreeGridState } from '../../state';
|
|
4
|
+
import { ITreeGridEvent } from '../../event';
|
|
2
5
|
/**
|
|
3
6
|
* 树表格部件控制器
|
|
4
7
|
*
|
|
@@ -8,6 +11,13 @@ import { IGridController } from './i-grid.controller';
|
|
|
8
11
|
* @interface ITreeGridController
|
|
9
12
|
* @extends {IMDControlController<IDETreeGrid, ITreeGridState, ITreeGridEvent>}
|
|
10
13
|
*/
|
|
11
|
-
export interface ITreeGridController extends IGridController {
|
|
14
|
+
export interface ITreeGridController<T extends IDETreeGrid = IDETreeGrid, S extends ITreeGridState = ITreeGridState, E extends ITreeGridEvent = ITreeGridEvent> extends IGridController<T, S, E> {
|
|
15
|
+
/**
|
|
16
|
+
* 切换树表格显示
|
|
17
|
+
* @return {*}
|
|
18
|
+
* @author: zhujiamin
|
|
19
|
+
*
|
|
20
|
+
*/
|
|
21
|
+
switchTreeGridShow(): void;
|
|
12
22
|
}
|
|
13
23
|
//# sourceMappingURL=i-tree-grid.controller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-tree-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-tree-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"i-tree-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-tree-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C;;;;;;;;GAQG;AACH,MAAM,WAAW,mBAAmB,CAClC,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,cAAc,GAAG,cAAc,EACzC,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAChC;;;;;OAKG;IACH,kBAAkB,IAAI,IAAI,CAAC;CAC5B"}
|
|
@@ -9,5 +9,10 @@ import { IGridState } from './i-grid.state';
|
|
|
9
9
|
* @extends {IMDControlState}
|
|
10
10
|
*/
|
|
11
11
|
export interface ITreeGridState extends IGridState {
|
|
12
|
+
/**
|
|
13
|
+
* 树表格是否显示树形结构(默认为true)
|
|
14
|
+
*
|
|
15
|
+
*/
|
|
16
|
+
showTreeGrid: boolean;
|
|
12
17
|
}
|
|
13
18
|
//# sourceMappingURL=i-tree-grid.state.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-tree-grid.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-tree-grid.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;;GAQG;AACH,MAAM,WAAW,cAAe,SAAQ,UAAU;
|
|
1
|
+
{"version":3,"file":"i-tree-grid.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-tree-grid.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;;GAQG;AACH,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD;;;OAGG;IACH,YAAY,EAAE,OAAO,CAAC;CACvB"}
|
|
@@ -1,3 +1,19 @@
|
|
|
1
|
+
export interface IAuthInfo {
|
|
2
|
+
/**
|
|
3
|
+
* 是否是匿名账户登录
|
|
4
|
+
* @author lxm
|
|
5
|
+
* @date 2024-01-03 05:25:31
|
|
6
|
+
* @type {boolean}
|
|
7
|
+
*/
|
|
8
|
+
isAnonymous: boolean;
|
|
9
|
+
/**
|
|
10
|
+
* 访问令牌
|
|
11
|
+
* @author lxm
|
|
12
|
+
* @date 2024-01-03 05:30:43
|
|
13
|
+
* @type {string}
|
|
14
|
+
*/
|
|
15
|
+
token: string;
|
|
16
|
+
}
|
|
1
17
|
/**
|
|
2
18
|
* 认证服务
|
|
3
19
|
*
|
|
@@ -51,5 +67,12 @@ export interface IAuthService {
|
|
|
51
67
|
* @return {*} {Promise<void>}
|
|
52
68
|
*/
|
|
53
69
|
extendLogin(): Promise<void>;
|
|
70
|
+
/**
|
|
71
|
+
* 获取当前环境的权限信息(无登录则返回undefined)
|
|
72
|
+
* @author lxm
|
|
73
|
+
* @date 2024-01-03 05:31:48
|
|
74
|
+
* @return {*} {(Promise<IAuthInfo | undefined>)}
|
|
75
|
+
*/
|
|
76
|
+
getAuthInfo(): IAuthInfo | undefined;
|
|
54
77
|
}
|
|
55
78
|
//# sourceMappingURL=i-auth.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-auth.service.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;OAOG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;;OAMG;IACH,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAEnC;;;;;;;;;OASG;IACH,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;OAMG;IACH,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3B;;;;;;OAMG;IACH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"i-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-auth.service.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAS;IACxB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;OAOG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;;OAMG;IACH,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAEnC;;;;;;;;;OASG;IACH,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;OAMG;IACH,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3B;;;;;;OAMG;IACH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7B;;;;;OAKG;IACH,WAAW,IAAI,SAAS,GAAG,SAAS,CAAC;CACtC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export type { IAppDeAuthorityService } from './i-app-de-authority.service';
|
|
2
2
|
export type { IConfigService } from './i-config.service';
|
|
3
3
|
export type { IAppDEService } from './i-app-de.service';
|
|
4
|
-
export type { IAuthService } from './i-auth.service';
|
|
4
|
+
export type { IAuthService, IAuthInfo } from './i-auth.service';
|
|
5
5
|
export type { IFileService } from './i-file.service';
|
|
6
6
|
export type { IWorkFlowService } from './i-wf.service';
|
|
7
7
|
export type { IAsyncActionService } from './i-async-action.service';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,YAAY,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAChE,YAAY,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,YAAY,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { IAuthService } from '../../../interface';
|
|
2
|
+
import { IAuthInfo } from '../../../interface/service/service/i-auth.service';
|
|
2
3
|
/**
|
|
3
4
|
* 认证服务
|
|
4
5
|
*
|
|
@@ -8,10 +9,11 @@ import { IAuthService } from '../../../interface';
|
|
|
8
9
|
* @class AuthService
|
|
9
10
|
*/
|
|
10
11
|
export declare class V7AuthService implements IAuthService {
|
|
11
|
-
isAnonymous: boolean;
|
|
12
|
+
get isAnonymous(): boolean;
|
|
12
13
|
anonymousLogin(): Promise<boolean>;
|
|
13
14
|
login(loginName: string, password: string, remember?: boolean): Promise<boolean>;
|
|
14
15
|
logout(): Promise<boolean>;
|
|
15
16
|
extendLogin(): Promise<void>;
|
|
17
|
+
getAuthInfo(): IAuthInfo | undefined;
|
|
16
18
|
}
|
|
17
19
|
//# sourceMappingURL=v7-auth.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,mDAAmD,CAAC;AAE9E;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,YAAY;IAChD,IAAI,WAAW,IAAI,OAAO,CAEzB;IAEK,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAqBlC,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC;IAkCb,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAiB1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAiClC,WAAW,IAAI,SAAS,GAAG,SAAS;CAUrC"}
|
|
@@ -9,8 +9,8 @@ import { clearCookie, getCookie, setCookie } from 'qx-util';
|
|
|
9
9
|
* @class AuthService
|
|
10
10
|
*/
|
|
11
11
|
export class V7AuthService {
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
get isAnonymous() {
|
|
13
|
+
return getCookie(CoreConst.IS_ANONYMOUS) === '1';
|
|
14
14
|
}
|
|
15
15
|
async anonymousLogin() {
|
|
16
16
|
const { anonymousUser, anonymousPwd } = ibiz.env;
|
|
@@ -20,7 +20,14 @@ export class V7AuthService {
|
|
|
20
20
|
}
|
|
21
21
|
const result = await this.login(anonymousUser, anonymousPwd);
|
|
22
22
|
if (result) {
|
|
23
|
-
|
|
23
|
+
setCookie(CoreConst.IS_ANONYMOUS, '1', 0, true);
|
|
24
|
+
// 全部改成session级别的
|
|
25
|
+
const token = getCookie(CoreConst.TOKEN);
|
|
26
|
+
const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
|
|
27
|
+
const remember = getCookie(CoreConst.TOKEN_REMEMBER);
|
|
28
|
+
setCookie(CoreConst.TOKEN, token, 0, true);
|
|
29
|
+
setCookie(CoreConst.TOKEN_EXPIRES, expirein, 0, true);
|
|
30
|
+
setCookie(CoreConst.TOKEN_REMEMBER, remember, 0, true);
|
|
24
31
|
}
|
|
25
32
|
return result;
|
|
26
33
|
}
|
|
@@ -40,6 +47,7 @@ export class V7AuthService {
|
|
|
40
47
|
setCookie(CoreConst.TOKEN, data.token, remember ? 7 : 0, true);
|
|
41
48
|
const expiredDate = new Date().getTime() + (data.expirein || 7199) * 1000;
|
|
42
49
|
setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, remember ? 7 : 0, true);
|
|
50
|
+
clearCookie(CoreConst.IS_ANONYMOUS);
|
|
43
51
|
}
|
|
44
52
|
return true;
|
|
45
53
|
}
|
|
@@ -57,6 +65,7 @@ export class V7AuthService {
|
|
|
57
65
|
clearCookie(CoreConst.TOKEN);
|
|
58
66
|
clearCookie(CoreConst.TOKEN_EXPIRES);
|
|
59
67
|
clearCookie(CoreConst.TOKEN_REMEMBER);
|
|
68
|
+
clearCookie(CoreConst.IS_ANONYMOUS);
|
|
60
69
|
return true;
|
|
61
70
|
}
|
|
62
71
|
catch (err) {
|
|
@@ -68,6 +77,10 @@ export class V7AuthService {
|
|
|
68
77
|
return false;
|
|
69
78
|
}
|
|
70
79
|
async extendLogin() {
|
|
80
|
+
if (this.isAnonymous) {
|
|
81
|
+
// 匿名登录不需要延长都是会话级的
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
71
84
|
const token = getCookie(CoreConst.TOKEN);
|
|
72
85
|
const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
|
|
73
86
|
const remember = getCookie(CoreConst.TOKEN_REMEMBER);
|
|
@@ -88,4 +101,14 @@ export class V7AuthService {
|
|
|
88
101
|
}, wait);
|
|
89
102
|
}
|
|
90
103
|
}
|
|
104
|
+
getAuthInfo() {
|
|
105
|
+
const token = getCookie(CoreConst.TOKEN);
|
|
106
|
+
const isAnonymous = !!getCookie(CoreConst.IS_ANONYMOUS);
|
|
107
|
+
return token
|
|
108
|
+
? {
|
|
109
|
+
token,
|
|
110
|
+
isAnonymous,
|
|
111
|
+
}
|
|
112
|
+
: undefined;
|
|
113
|
+
}
|
|
91
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;OAOG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GAAG,KAAK,EAAE,GACpB,OAAO,CAAC,KAAK,GAAG,KAAK,EAAE,CAAC;IAQrB,IAAI,CACR,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAsF/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAiBtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAuBtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAmBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IA0BtC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;IAezB;;;;;;;;;OASG;IACH,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,GAAG,WAAW;
|
|
1
|
+
{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;OAOG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GAAG,KAAK,EAAE,GACpB,OAAO,CAAC,KAAK,GAAG,KAAK,EAAE,CAAC;IAQrB,IAAI,CACR,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAsF/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAiBtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAuBtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAmBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IA0BtC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;IAezB;;;;;;;;;OASG;IACH,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,GAAG,WAAW;CAkBpE"}
|
|
@@ -257,7 +257,7 @@ export class DEActionMethod extends Method {
|
|
|
257
257
|
try {
|
|
258
258
|
let key = null;
|
|
259
259
|
if (params) {
|
|
260
|
-
|
|
260
|
+
key = params[this.entity.keyAppDEFieldId.toLowerCase()];
|
|
261
261
|
}
|
|
262
262
|
if (!key && context) {
|
|
263
263
|
key = context[this.entity.codeName.toLowerCase()];
|
|
@@ -313,7 +313,7 @@ export class DEActionMethod extends Method {
|
|
|
313
313
|
try {
|
|
314
314
|
let key = null;
|
|
315
315
|
if (params) {
|
|
316
|
-
|
|
316
|
+
key = params[this.entity.keyAppDEFieldId.toLowerCase()];
|
|
317
317
|
}
|
|
318
318
|
if (!key && context) {
|
|
319
319
|
key = context[this.entity.codeName.toLowerCase()];
|
|
@@ -370,7 +370,8 @@ export class DEActionMethod extends Method {
|
|
|
370
370
|
const majorLowerCodeName = majorDECodeName.toLowerCase();
|
|
371
371
|
const pickupLowerDEFName = pickupDEFName.toLowerCase();
|
|
372
372
|
const majorkey = context[majorLowerCodeName];
|
|
373
|
-
|
|
373
|
+
// 父主键不能是自身,否则自关系的时候就改错了
|
|
374
|
+
if (majorkey && majorkey !== data.srfkey) {
|
|
374
375
|
data[pickupLowerDEFName] = majorkey;
|
|
375
376
|
}
|
|
376
377
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibiz-template/runtime",
|
|
3
|
-
"version": "0.5.0
|
|
3
|
+
"version": "0.5.0",
|
|
4
4
|
"description": "控制器包",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "out/index.js",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"author": "chitanda",
|
|
30
30
|
"license": "MIT",
|
|
31
31
|
"devDependencies": {
|
|
32
|
-
"@ibiz-template/core": "^0.5.0
|
|
32
|
+
"@ibiz-template/core": "^0.5.0",
|
|
33
33
|
"@ibiz/model-core": "^0.1.0",
|
|
34
34
|
"@types/path-browserify": "^1.0.2",
|
|
35
35
|
"@types/qs": "^6.9.11",
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"qx-util": "^0.4.8",
|
|
60
60
|
"ramda": "^0.29.0"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "84126d4a93b6641962d688ef6d92fce3bea7c2d1"
|
|
63
63
|
}
|
package/src/app-hub.ts
CHANGED