@ibiz-template/runtime 0.1.34 → 0.1.35
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 +128 -101
- package/dist/index.system.min.js +1 -1
- package/dist/index.system.min.js.map +1 -1
- package/out/de-logic/de-logic-context.d.ts +25 -5
- package/out/de-logic/de-logic-context.d.ts.map +1 -1
- package/out/de-logic/de-logic-context.js +27 -5
- package/out/de-logic/de-logic-node/data-set-node/data-set-node.d.ts.map +1 -1
- package/out/de-logic/de-logic-node/data-set-node/data-set-node.js +2 -2
- package/out/de-logic/de-logic-node/de-action-node/de-action-node.js +1 -1
- package/out/de-logic/de-logic-param/de-logic-param.js +1 -1
- package/out/de-logic/utils/handle-src-val.js +2 -2
- package/out/interface/service/service/i-app-de.service.d.ts +3 -3
- package/out/interface/service/service/i-app-de.service.d.ts.map +1 -1
- package/out/service/service/entity/de.service.d.ts +5 -4
- package/out/service/service/entity/de.service.d.ts.map +1 -1
- package/out/service/service/entity/de.service.js +9 -5
- package/out/ui-logic/ui-logic-context.d.ts +1 -11
- package/out/ui-logic/ui-logic-context.d.ts.map +1 -1
- package/out/ui-logic/ui-logic-context.js +7 -11
- package/out/ui-logic/ui-logic-node/data-set-node/data-set-node.d.ts.map +1 -1
- package/out/ui-logic/ui-logic-node/data-set-node/data-set-node.js +6 -2
- package/out/ui-logic/ui-logic-node/de-action-node/de-action-node.js +1 -1
- package/out/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.d.ts.map +1 -1
- package/out/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.js +1 -1
- package/out/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.d.ts.map +1 -1
- package/out/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.js +1 -2
- package/out/ui-logic/ui-logic-param/ui-logic-param.d.ts.map +1 -1
- package/out/ui-logic/ui-logic-param/ui-logic-param.js +3 -2
- package/out/ui-logic/utils/handle-src-val.d.ts.map +1 -1
- package/out/ui-logic/utils/handle-src-val.js +3 -7
- package/package.json +2 -2
- package/src/de-logic/de-logic-context.ts +42 -5
- package/src/de-logic/de-logic-node/data-set-node/data-set-node.ts +2 -3
- package/src/de-logic/de-logic-node/de-action-node/de-action-node.ts +1 -1
- package/src/de-logic/de-logic-param/de-logic-param.ts +1 -1
- package/src/de-logic/utils/handle-src-val.ts +2 -2
- package/src/interface/service/service/i-app-de.service.ts +3 -3
- package/src/service/service/entity/de.service.ts +15 -6
- package/src/ui-logic/ui-logic-context.ts +7 -11
- package/src/ui-logic/ui-logic-node/data-set-node/data-set-node.ts +6 -3
- package/src/ui-logic/ui-logic-node/de-action-node/de-action-node.ts +1 -1
- package/src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts +2 -0
- package/src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts +3 -4
- package/src/ui-logic/ui-logic-param/ui-logic-param.ts +3 -2
- package/src/ui-logic/utils/handle-src-val.ts +3 -7
|
@@ -9,9 +9,6 @@ import { DELogicParam } from './de-logic-param/de-logic-param';
|
|
|
9
9
|
*/
|
|
10
10
|
export declare class DELogicContext {
|
|
11
11
|
private deLogicParams;
|
|
12
|
-
context: IParams;
|
|
13
|
-
data: IData;
|
|
14
|
-
viewParams: IParams;
|
|
15
12
|
/**
|
|
16
13
|
* 上一次返回值
|
|
17
14
|
* @author lxm
|
|
@@ -19,6 +16,29 @@ export declare class DELogicContext {
|
|
|
19
16
|
* @type {unknown}
|
|
20
17
|
*/
|
|
21
18
|
lastReturn: unknown;
|
|
19
|
+
/**
|
|
20
|
+
* 实体逻辑执行参数
|
|
21
|
+
* @author lxm
|
|
22
|
+
* @date 2023-10-16 02:22:31
|
|
23
|
+
* @type {{ context: IParams; data: IData; params: IParams }}
|
|
24
|
+
*/
|
|
25
|
+
parameters: {
|
|
26
|
+
context: IParams;
|
|
27
|
+
data: IData;
|
|
28
|
+
params: IParams;
|
|
29
|
+
};
|
|
30
|
+
/**
|
|
31
|
+
* 上下文
|
|
32
|
+
*/
|
|
33
|
+
get context(): IParams;
|
|
34
|
+
/**
|
|
35
|
+
* 数据
|
|
36
|
+
*/
|
|
37
|
+
get data(): IData;
|
|
38
|
+
/**
|
|
39
|
+
* 视图参数
|
|
40
|
+
*/
|
|
41
|
+
get viewParam(): IParams;
|
|
22
42
|
/**
|
|
23
43
|
* Creates an instance of DELogicContext.
|
|
24
44
|
* @author lxm
|
|
@@ -26,9 +46,9 @@ export declare class DELogicContext {
|
|
|
26
46
|
* @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
|
|
27
47
|
* @param {IParams} context 上下文
|
|
28
48
|
* @param {IData} data 数据对象
|
|
29
|
-
* @param {IParams}
|
|
49
|
+
* @param {IParams} params 视图参数
|
|
30
50
|
*/
|
|
31
|
-
constructor(deLogicParams: Map<string, DELogicParam>, context: IParams, data: IData,
|
|
51
|
+
constructor(deLogicParams: Map<string, DELogicParam>, context: IParams, data: IData, params: IParams);
|
|
32
52
|
/**
|
|
33
53
|
* 重置实体逻辑参数
|
|
34
54
|
* @author lxm
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"de-logic-context.d.ts","sourceRoot":"","sources":["../../src/de-logic/de-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"de-logic-context.d.ts","sourceRoot":"","sources":["../../src/de-logic/de-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;IAsDvB,OAAO,CAAC,aAAa;IArDvB;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,KAAK,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC;IAE/D;;OAEG;IACH,IAAI,OAAO,IAAI,OAAO,CAKrB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAKvB;IAED;;;;;;;;OAQG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EAChD,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO;IAKjB;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;OAKG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;OAMG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}
|
|
@@ -7,6 +7,30 @@
|
|
|
7
7
|
* @class DELogicContext
|
|
8
8
|
*/
|
|
9
9
|
export class DELogicContext {
|
|
10
|
+
/**
|
|
11
|
+
* 上下文
|
|
12
|
+
*/
|
|
13
|
+
get context() {
|
|
14
|
+
if (Object.prototype.hasOwnProperty.call(this.params, 'context')) {
|
|
15
|
+
return this.params.context;
|
|
16
|
+
}
|
|
17
|
+
return this.parameters.context;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* 数据
|
|
21
|
+
*/
|
|
22
|
+
get data() {
|
|
23
|
+
return this.parameters.data;
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* 视图参数
|
|
27
|
+
*/
|
|
28
|
+
get viewParam() {
|
|
29
|
+
if (Object.prototype.hasOwnProperty.call(this.params, 'viewParam')) {
|
|
30
|
+
return this.params.viewParam;
|
|
31
|
+
}
|
|
32
|
+
return this.parameters.params;
|
|
33
|
+
}
|
|
10
34
|
/**
|
|
11
35
|
* Creates an instance of DELogicContext.
|
|
12
36
|
* @author lxm
|
|
@@ -14,13 +38,10 @@ export class DELogicContext {
|
|
|
14
38
|
* @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
|
|
15
39
|
* @param {IParams} context 上下文
|
|
16
40
|
* @param {IData} data 数据对象
|
|
17
|
-
* @param {IParams}
|
|
41
|
+
* @param {IParams} params 视图参数
|
|
18
42
|
*/
|
|
19
|
-
constructor(deLogicParams, context, data,
|
|
43
|
+
constructor(deLogicParams, context, data, params) {
|
|
20
44
|
this.deLogicParams = deLogicParams;
|
|
21
|
-
this.context = context;
|
|
22
|
-
this.data = data;
|
|
23
|
-
this.viewParams = viewParams;
|
|
24
45
|
/**
|
|
25
46
|
* 实体逻辑参数
|
|
26
47
|
*
|
|
@@ -55,6 +76,7 @@ export class DELogicContext {
|
|
|
55
76
|
* @type {string}
|
|
56
77
|
*/
|
|
57
78
|
this.defaultParamName = 'Default';
|
|
79
|
+
this.parameters = { context, data, params };
|
|
58
80
|
}
|
|
59
81
|
/**
|
|
60
82
|
* 重置实体逻辑参数
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-set-node.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-node/data-set-node/data-set-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,WAAW;IAClC,KAAK,EAAE,iBAAiB,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"data-set-node.d.ts","sourceRoot":"","sources":["../../../../src/de-logic/de-logic-node/data-set-node/data-set-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,WAAW;IAClC,KAAK,EAAE,iBAAiB,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAmB/C"}
|
|
@@ -11,9 +11,9 @@ import { DELogicNode } from '../de-logic-node';
|
|
|
11
11
|
export class DataSetNode extends DELogicNode {
|
|
12
12
|
async exec(ctx) {
|
|
13
13
|
const { dstAppDEDataSetId, dstAppDataEntityId, dstDELogicParamId, retDELogicParamId, } = this.model;
|
|
14
|
-
const
|
|
14
|
+
const queryParams = ctx.params[dstDELogicParamId];
|
|
15
15
|
const app = ibiz.hub.getApp(ctx.context.srfappid);
|
|
16
|
-
const res = await app.deService.exec(dstAppDataEntityId, dstAppDEDataSetId, ctx.context,
|
|
16
|
+
const res = await app.deService.exec(dstAppDataEntityId, dstAppDEDataSetId, ctx.context, queryParams);
|
|
17
17
|
if (res.ok) {
|
|
18
18
|
ctx.params[retDELogicParamId] = res.data;
|
|
19
19
|
}
|
|
@@ -20,7 +20,7 @@ export class DEActionNode extends DELogicNode {
|
|
|
20
20
|
}
|
|
21
21
|
const requestData = ctx.params[dstDELogicParamId];
|
|
22
22
|
const app = ibiz.hub.getApp(ctx.context.srfappid);
|
|
23
|
-
const res = await app.deService.exec(dstAppDataEntityId, dstAppDEActionId, ctx.context, requestData, ctx.
|
|
23
|
+
const res = await app.deService.exec(dstAppDataEntityId, dstAppDEActionId, ctx.context, requestData, ctx.viewParam);
|
|
24
24
|
if (res.ok) {
|
|
25
25
|
ctx.params[retDELogicParamId] = res.data;
|
|
26
26
|
}
|
|
@@ -37,13 +37,13 @@ export function handleSrcVal(ctx, srcValParams) {
|
|
|
37
37
|
return ibiz.util.rawValue.format(srcValue);
|
|
38
38
|
case 'WEBCONTEXT': // 网页请求上下文
|
|
39
39
|
case 'VIEWPARAM': // 视图参数
|
|
40
|
-
value = ctx.
|
|
40
|
+
value = ctx.parameters.params;
|
|
41
41
|
break;
|
|
42
42
|
case 'APPLICATION': // 系统全局对象
|
|
43
43
|
case 'SESSION': // 用户全局对象
|
|
44
44
|
case 'APPDATA': // 应用上下文
|
|
45
45
|
case 'DATACONTEXT': // 数据上下文
|
|
46
|
-
value = ctx.context;
|
|
46
|
+
value = ctx.parameters.context;
|
|
47
47
|
break;
|
|
48
48
|
// 当前环境参数
|
|
49
49
|
case 'ENVPARAM':
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IHttpResponse } from '@ibiz-template/core';
|
|
1
|
+
import { IHttpResponse, IPortalAsyncAction } from '@ibiz-template/core';
|
|
2
2
|
import { DECache } from '../../../service/utils';
|
|
3
3
|
import { IFileService } from './i-file.service';
|
|
4
4
|
import { IWorkFlowService } from './i-wf.service';
|
|
@@ -73,12 +73,12 @@ export interface IAppDEService {
|
|
|
73
73
|
*
|
|
74
74
|
* @author chitanda
|
|
75
75
|
* @date 2023-10-12 16:10:03
|
|
76
|
-
* @param {(data:
|
|
76
|
+
* @param {(data: IPortalAsyncAction) => void} onmessage
|
|
77
77
|
* @param {IParams} context
|
|
78
78
|
* @param {IParams} [params]
|
|
79
79
|
* @param {IData} [data]
|
|
80
80
|
* @return {*} {Promise<void>}
|
|
81
81
|
*/
|
|
82
|
-
aiChatSse(onmessage: (data:
|
|
82
|
+
aiChatSse(onmessage: (data: IPortalAsyncAction) => void, context: IParams, params?: IParams, data?: IData): Promise<void>;
|
|
83
83
|
}
|
|
84
84
|
//# sourceMappingURL=i-app-de.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-app-de.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-app-de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"i-app-de.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-app-de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,cAAc,CAAC;IAErC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,gBAAgB,CAAC;IAE9B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAE5B;;;;;;;;;;OAUG;IACH,IAAI,CACF,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC;IAE1B;;;;;;;;;;OAUG;IACH,MAAM,CACJ,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC;IAE1B;;;;;;;;;;OAUG;IACH,SAAS,CACP,SAAS,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,EAC7C,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IAppDataEntity } from '@ibiz/model-core';
|
|
2
|
-
import { IHttpResponse } from '@ibiz-template/core';
|
|
2
|
+
import { IHttpResponse, IPortalAsyncAction } from '@ibiz-template/core';
|
|
3
3
|
import { DECache } from '../../utils';
|
|
4
4
|
import { WorkFlowService } from '../work-flow/work-flow.service';
|
|
5
5
|
import { Method } from './method/method';
|
|
@@ -104,13 +104,14 @@ export declare class DEService implements IAppDEService {
|
|
|
104
104
|
* 实体级别 AI 聊天会话
|
|
105
105
|
*
|
|
106
106
|
* @author chitanda
|
|
107
|
-
* @date 2023-10-
|
|
107
|
+
* @date 2023-10-16 16:10:16
|
|
108
|
+
* @param {(data: IPortalAsyncAction) => void} onmessage
|
|
108
109
|
* @param {IParams} context
|
|
109
110
|
* @param {IParams} [params={}]
|
|
110
|
-
* @param {
|
|
111
|
+
* @param {IData} [data={}]
|
|
111
112
|
* @return {*} {Promise<void>}
|
|
112
113
|
*/
|
|
113
|
-
aiChatSse(onmessage: (data:
|
|
114
|
+
aiChatSse(onmessage: (data: IPortalAsyncAction) => void, context: IParams, params?: IParams, data?: IData): Promise<void>;
|
|
114
115
|
/**
|
|
115
116
|
* 计算请求路径
|
|
116
117
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,
|
|
1
|
+
{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EACL,aAAa,EACb,kBAAkB,EAGnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAe,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,aAAa;IAsDjC,SAAS,CAAC,KAAK,EAAE,cAAc;IArD3C;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAEpC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE9D;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAiB;IAExC;;;;;;OAMG;gBACmB,KAAK,EAAE,cAAc;IAU3C;;;;;;;;;OASG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,GAAE,OAAe,GAAG,MAAM;IA6BhE;;;;;;;;;;OAUG;IACH,IAAI,CACF,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;IAQzB;;;;;;;;;;OAUG;IACH,MAAM,CACJ,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,EACd,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC;IAQzB;;;;;;;;;;OAUG;IACH,SAAS,CACP,SAAS,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,EAC7C,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;CAQhD"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ModelError, RuntimeError } from '@ibiz-template/core';
|
|
1
|
+
import { ModelError, RuntimeError, } from '@ibiz-template/core';
|
|
2
2
|
import { DECache, calcResPath } from '../../utils';
|
|
3
3
|
import { WorkFlowService } from '../work-flow/work-flow.service';
|
|
4
4
|
import { FileService } from '../file/file.service';
|
|
@@ -122,10 +122,11 @@ export class DEService {
|
|
|
122
122
|
* 实体级别 AI 聊天会话
|
|
123
123
|
*
|
|
124
124
|
* @author chitanda
|
|
125
|
-
* @date 2023-10-
|
|
125
|
+
* @date 2023-10-16 16:10:16
|
|
126
|
+
* @param {(data: IPortalAsyncAction) => void} onmessage
|
|
126
127
|
* @param {IParams} context
|
|
127
128
|
* @param {IParams} [params={}]
|
|
128
|
-
* @param {
|
|
129
|
+
* @param {IData} [data={}]
|
|
129
130
|
* @return {*} {Promise<void>}
|
|
130
131
|
*/
|
|
131
132
|
aiChatSse(onmessage, context, params = {}, data = {}) {
|
|
@@ -137,8 +138,11 @@ export class DEService {
|
|
|
137
138
|
'Content-Type': 'application/json',
|
|
138
139
|
},
|
|
139
140
|
body: JSON.stringify(data),
|
|
140
|
-
onmessage:
|
|
141
|
-
|
|
141
|
+
onmessage: e => {
|
|
142
|
+
if (e.data) {
|
|
143
|
+
const json = JSON.parse(e.data);
|
|
144
|
+
onmessage(json);
|
|
145
|
+
}
|
|
142
146
|
},
|
|
143
147
|
onclose: () => {
|
|
144
148
|
resolve();
|
|
@@ -29,17 +29,7 @@ export declare class UILogicContext {
|
|
|
29
29
|
/**
|
|
30
30
|
* 视图参数
|
|
31
31
|
*/
|
|
32
|
-
get
|
|
33
|
-
/**
|
|
34
|
-
* Creates an instance of DELogicContext.
|
|
35
|
-
* @author lxm
|
|
36
|
-
* @date 2023-03-24 09:15:14
|
|
37
|
-
* @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
|
|
38
|
-
* @param {IParams} context 上下文
|
|
39
|
-
* @param {IData} data 数据对象
|
|
40
|
-
* @param {IParams} viewParams 视图参数
|
|
41
|
-
* @param {IParams} [opt] 额外参数
|
|
42
|
-
*/
|
|
32
|
+
get viewParam(): IParams;
|
|
43
33
|
/**
|
|
44
34
|
* Creates an instance of UILogicContext.
|
|
45
35
|
* @author lxm
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;IA4CvB,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IA5CnC;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAKtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAKvB;IAED;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;OAKG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;OAMG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}
|
|
@@ -11,6 +11,9 @@ export class UILogicContext {
|
|
|
11
11
|
* 上下文
|
|
12
12
|
*/
|
|
13
13
|
get context() {
|
|
14
|
+
if (Object.prototype.hasOwnProperty.call(this.params, 'context')) {
|
|
15
|
+
return this.params.context;
|
|
16
|
+
}
|
|
14
17
|
return this.parameters.context;
|
|
15
18
|
}
|
|
16
19
|
/**
|
|
@@ -22,19 +25,12 @@ export class UILogicContext {
|
|
|
22
25
|
/**
|
|
23
26
|
* 视图参数
|
|
24
27
|
*/
|
|
25
|
-
get
|
|
28
|
+
get viewParam() {
|
|
29
|
+
if (Object.prototype.hasOwnProperty.call(this.params, 'viewParam')) {
|
|
30
|
+
return this.params.viewParam;
|
|
31
|
+
}
|
|
26
32
|
return this.parameters.params;
|
|
27
33
|
}
|
|
28
|
-
/**
|
|
29
|
-
* Creates an instance of DELogicContext.
|
|
30
|
-
* @author lxm
|
|
31
|
-
* @date 2023-03-24 09:15:14
|
|
32
|
-
* @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
|
|
33
|
-
* @param {IParams} context 上下文
|
|
34
|
-
* @param {IData} data 数据对象
|
|
35
|
-
* @param {IParams} viewParams 视图参数
|
|
36
|
-
* @param {IParams} [opt] 额外参数
|
|
37
|
-
*/
|
|
38
34
|
/**
|
|
39
35
|
* Creates an instance of UILogicContext.
|
|
40
36
|
* @author lxm
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-set-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/data-set-node/data-set-node.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"data-set-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/data-set-node/data-set-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,WAAW;IAClC,KAAK,EAAE,mBAAmB,CAAC;IAE7B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAsB/C"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { RuntimeModelError } from '@ibiz-template/core';
|
|
1
2
|
import { UILogicNode } from '../ui-logic-node';
|
|
2
3
|
/**
|
|
3
4
|
* 数据集合节点
|
|
@@ -11,9 +12,12 @@ import { UILogicNode } from '../ui-logic-node';
|
|
|
11
12
|
export class DataSetNode extends UILogicNode {
|
|
12
13
|
async exec(ctx) {
|
|
13
14
|
const { dstAppDEDataSetId, dstAppDataEntityId, dstDEUILogicParamId, retDEUILogicParamId, } = this.model;
|
|
14
|
-
|
|
15
|
+
if (!dstDEUILogicParamId) {
|
|
16
|
+
throw new RuntimeModelError(this.model, '缺少配置过滤参数');
|
|
17
|
+
}
|
|
18
|
+
const queryParams = ctx.params[dstDEUILogicParamId];
|
|
15
19
|
const app = ibiz.hub.getApp(ctx.context.srfappid);
|
|
16
|
-
const res = await app.deService.exec(dstAppDataEntityId, dstAppDEDataSetId, ctx.context,
|
|
20
|
+
const res = await app.deService.exec(dstAppDataEntityId, dstAppDEDataSetId, ctx.context, queryParams);
|
|
17
21
|
if (res.ok) {
|
|
18
22
|
ctx.params[retDEUILogicParamId] = res.data;
|
|
19
23
|
}
|
|
@@ -20,7 +20,7 @@ export class DEActionNode extends UILogicNode {
|
|
|
20
20
|
}
|
|
21
21
|
const requestData = ctx.params[dstDEUILogicParamId];
|
|
22
22
|
const app = ibiz.hub.getApp(ctx.context.srfappid);
|
|
23
|
-
const res = await app.deService.exec(dstAppDataEntityId, dstAppDEActionId, ctx.context, requestData, ctx.
|
|
23
|
+
const res = await app.deService.exec(dstAppDataEntityId, dstAppDEActionId, ctx.context, requestData, ctx.viewParam);
|
|
24
24
|
if (res.ok) {
|
|
25
25
|
ctx.params[retDEUILogicParamId] = res.data;
|
|
26
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"de-ui-action-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,WAAW;IACrC,KAAK,EAAE,gBAAgB,CAAC;IAE1B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"de-ui-action-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,WAAW;IACrC,KAAK,EAAE,gBAAgB,CAAC;IAE1B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAuB/C"}
|
|
@@ -27,6 +27,6 @@ export class DEUIActionNode extends UILogicNode {
|
|
|
27
27
|
actionData = [param];
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
|
-
await UIActionUtil.execAndResolved(dstAppDEUIActionId, Object.assign(Object.assign({}, parameters), { data: actionData }));
|
|
30
|
+
await UIActionUtil.execAndResolved(dstAppDEUIActionId, Object.assign(Object.assign({}, parameters), { context: ctx.context, params: ctx.viewParam, data: actionData }));
|
|
31
31
|
}
|
|
32
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-de-logic-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,WAAW;IACzC,KAAK,EAAE,iBAAiB,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"execute-de-logic-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,WAAW;IACzC,KAAK,EAAE,iBAAiB,CAAC;IAE3B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAqC/C"}
|
|
@@ -27,8 +27,7 @@ export class ExecuteDELogicNode extends UILogicNode {
|
|
|
27
27
|
if (!dstParam) {
|
|
28
28
|
throw new RuntimeError(`没有找到传入参数${dstDEUILogicParamId}`);
|
|
29
29
|
}
|
|
30
|
-
|
|
31
|
-
const result = await execDELogicById(dstAppDELogicId, dstAppDataEntityId, dstParam.context, dstParam.data, dstParam.params);
|
|
30
|
+
const result = await execDELogicById(dstAppDELogicId, dstAppDataEntityId, ctx.context, dstParam, ctx.params);
|
|
32
31
|
// 如果有返回值参数返回值填入。
|
|
33
32
|
if (retDEUILogicParamId) {
|
|
34
33
|
ctx.params[retDEUILogicParamId] = result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ui-logic-param.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-param/ui-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,eAAe;IAPzC;;;;;;OAMG;gBACgB,KAAK,EAAE,eAAe;IAEzC;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"ui-logic-param.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-param/ui-logic-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAQJ,KAAK,EAAE,eAAe;IAPzC;;;;;;OAMG;gBACgB,KAAK,EAAE,eAAe;IAEzC;;;;;;OAMG;IACH,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAsE/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAWjC"}
|
|
@@ -28,7 +28,8 @@ export class UILogicParam {
|
|
|
28
28
|
calc(ctx) {
|
|
29
29
|
const tag = this.model.id;
|
|
30
30
|
const m = this.model;
|
|
31
|
-
const {
|
|
31
|
+
const { parameters } = ctx;
|
|
32
|
+
const { context, params, data } = parameters;
|
|
32
33
|
const app = ibiz.hub.getApp(context.srfappid);
|
|
33
34
|
// 特殊变量的特殊处理
|
|
34
35
|
if (m.codeName === 'layoutPanel') {
|
|
@@ -103,7 +104,7 @@ export class UILogicParam {
|
|
|
103
104
|
}
|
|
104
105
|
else if (m.viewNavDataParam) {
|
|
105
106
|
// 视图导航数据
|
|
106
|
-
ctx.params[tag] =
|
|
107
|
+
ctx.params[tag] = params;
|
|
107
108
|
}
|
|
108
109
|
else if (m.viewSessionParam) {
|
|
109
110
|
throw new ModelError(m, `未支持的逻辑参数类型: 当前视图会话`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,
|
|
1
|
+
{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CAyDT"}
|
|
@@ -15,16 +15,12 @@ export function handleSrcVal(ctx, srcValParams) {
|
|
|
15
15
|
// 没有源值类型就是逻辑参数
|
|
16
16
|
const srcValueType = srcValParams.srcValueType || 'SRCDLPARAM';
|
|
17
17
|
// 取属性值
|
|
18
|
-
|
|
18
|
+
const srcField = srcFieldName;
|
|
19
19
|
let value;
|
|
20
20
|
switch (srcValueType) {
|
|
21
21
|
// 源逻辑参数
|
|
22
22
|
case 'SRCDLPARAM':
|
|
23
23
|
value = ctx.params[srcDEUILogicParamId];
|
|
24
|
-
// 如果是实体参数对象则转换成小写。
|
|
25
|
-
if (ctx.isEntityParam(srcDEUILogicParamId)) {
|
|
26
|
-
srcField = srcField === null || srcField === void 0 ? void 0 : srcField.toLowerCase();
|
|
27
|
-
}
|
|
28
24
|
break;
|
|
29
25
|
// 空值类型
|
|
30
26
|
case 'NULLVALUE':
|
|
@@ -37,13 +33,13 @@ export function handleSrcVal(ctx, srcValParams) {
|
|
|
37
33
|
return ibiz.util.rawValue.format(srcValue);
|
|
38
34
|
case 'WEBCONTEXT': // 网页请求上下文
|
|
39
35
|
case 'VIEWPARAM': // 视图参数
|
|
40
|
-
value = ctx.
|
|
36
|
+
value = ctx.parameters.params;
|
|
41
37
|
break;
|
|
42
38
|
case 'APPLICATION': // 系统全局对象
|
|
43
39
|
case 'SESSION': // 用户全局对象
|
|
44
40
|
case 'APPDATA': // 应用上下文
|
|
45
41
|
case 'DATACONTEXT': // 数据上下文
|
|
46
|
-
value = ctx.context;
|
|
42
|
+
value = ctx.parameters.context;
|
|
47
43
|
break;
|
|
48
44
|
// 当前环境参数
|
|
49
45
|
case 'ENVPARAM':
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibiz-template/runtime",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.35",
|
|
4
4
|
"description": "控制器包",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "out/index.js",
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
"qx-util": "^0.4.8",
|
|
58
58
|
"ramda": "^0.29.0"
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "b2dfac469067544cc9a5e527cc7c4f581d603bc9"
|
|
61
61
|
}
|
|
@@ -17,6 +17,41 @@ export class DELogicContext {
|
|
|
17
17
|
*/
|
|
18
18
|
lastReturn: unknown;
|
|
19
19
|
|
|
20
|
+
/**
|
|
21
|
+
* 实体逻辑执行参数
|
|
22
|
+
* @author lxm
|
|
23
|
+
* @date 2023-10-16 02:22:31
|
|
24
|
+
* @type {{ context: IParams; data: IData; params: IParams }}
|
|
25
|
+
*/
|
|
26
|
+
parameters: { context: IParams; data: IData; params: IParams };
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* 上下文
|
|
30
|
+
*/
|
|
31
|
+
get context(): IParams {
|
|
32
|
+
if (Object.prototype.hasOwnProperty.call(this.params, 'context')) {
|
|
33
|
+
return this.params.context;
|
|
34
|
+
}
|
|
35
|
+
return this.parameters.context;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* 数据
|
|
40
|
+
*/
|
|
41
|
+
get data(): IData {
|
|
42
|
+
return this.parameters.data;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/**
|
|
46
|
+
* 视图参数
|
|
47
|
+
*/
|
|
48
|
+
get viewParam(): IParams {
|
|
49
|
+
if (Object.prototype.hasOwnProperty.call(this.params, 'viewParam')) {
|
|
50
|
+
return this.params.viewParam;
|
|
51
|
+
}
|
|
52
|
+
return this.parameters.params;
|
|
53
|
+
}
|
|
54
|
+
|
|
20
55
|
/**
|
|
21
56
|
* Creates an instance of DELogicContext.
|
|
22
57
|
* @author lxm
|
|
@@ -24,14 +59,16 @@ export class DELogicContext {
|
|
|
24
59
|
* @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
|
|
25
60
|
* @param {IParams} context 上下文
|
|
26
61
|
* @param {IData} data 数据对象
|
|
27
|
-
* @param {IParams}
|
|
62
|
+
* @param {IParams} params 视图参数
|
|
28
63
|
*/
|
|
29
64
|
constructor(
|
|
30
65
|
private deLogicParams: Map<string, DELogicParam>,
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
) {
|
|
66
|
+
context: IParams,
|
|
67
|
+
data: IData,
|
|
68
|
+
params: IParams,
|
|
69
|
+
) {
|
|
70
|
+
this.parameters = { context, data, params };
|
|
71
|
+
}
|
|
35
72
|
|
|
36
73
|
/**
|
|
37
74
|
* 重置实体逻辑参数
|
|
@@ -21,14 +21,13 @@ export class DataSetNode extends DELogicNode {
|
|
|
21
21
|
dstDELogicParamId,
|
|
22
22
|
retDELogicParamId,
|
|
23
23
|
} = this.model;
|
|
24
|
-
const
|
|
24
|
+
const queryParams = ctx.params[dstDELogicParamId!];
|
|
25
25
|
const app = ibiz.hub.getApp(ctx.context.srfappid);
|
|
26
26
|
const res = await app.deService.exec(
|
|
27
27
|
dstAppDataEntityId!,
|
|
28
28
|
dstAppDEDataSetId!,
|
|
29
29
|
ctx.context,
|
|
30
|
-
|
|
31
|
-
ctx.viewParams,
|
|
30
|
+
queryParams,
|
|
32
31
|
);
|
|
33
32
|
if (res.ok) {
|
|
34
33
|
ctx.params[retDELogicParamId!] = res.data;
|
|
@@ -62,13 +62,13 @@ export function handleSrcVal(
|
|
|
62
62
|
return ibiz.util.rawValue.format(srcValue);
|
|
63
63
|
case 'WEBCONTEXT': // 网页请求上下文
|
|
64
64
|
case 'VIEWPARAM': // 视图参数
|
|
65
|
-
value = ctx.
|
|
65
|
+
value = ctx.parameters.params;
|
|
66
66
|
break;
|
|
67
67
|
case 'APPLICATION': // 系统全局对象
|
|
68
68
|
case 'SESSION': // 用户全局对象
|
|
69
69
|
case 'APPDATA': // 应用上下文
|
|
70
70
|
case 'DATACONTEXT': // 数据上下文
|
|
71
|
-
value = ctx.context;
|
|
71
|
+
value = ctx.parameters.context;
|
|
72
72
|
break;
|
|
73
73
|
// 当前环境参数
|
|
74
74
|
case 'ENVPARAM':
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IHttpResponse } from '@ibiz-template/core';
|
|
1
|
+
import { IHttpResponse, IPortalAsyncAction } from '@ibiz-template/core';
|
|
2
2
|
import { DECache } from '../../../service/utils';
|
|
3
3
|
import { IFileService } from './i-file.service';
|
|
4
4
|
import { IWorkFlowService } from './i-wf.service';
|
|
@@ -90,14 +90,14 @@ export interface IAppDEService {
|
|
|
90
90
|
*
|
|
91
91
|
* @author chitanda
|
|
92
92
|
* @date 2023-10-12 16:10:03
|
|
93
|
-
* @param {(data:
|
|
93
|
+
* @param {(data: IPortalAsyncAction) => void} onmessage
|
|
94
94
|
* @param {IParams} context
|
|
95
95
|
* @param {IParams} [params]
|
|
96
96
|
* @param {IData} [data]
|
|
97
97
|
* @return {*} {Promise<void>}
|
|
98
98
|
*/
|
|
99
99
|
aiChatSse(
|
|
100
|
-
onmessage: (data:
|
|
100
|
+
onmessage: (data: IPortalAsyncAction) => void,
|
|
101
101
|
context: IParams,
|
|
102
102
|
params?: IParams,
|
|
103
103
|
data?: IData,
|