@ibiz-template/runtime 0.7.41-alpha.4 → 0.7.41-alpha.6

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.
Files changed (39) hide show
  1. package/dist/index.esm.js +219 -66
  2. package/dist/index.system.min.js +1 -1
  3. package/out/controller/common/control/control.controller.d.ts +12 -1
  4. package/out/controller/common/control/control.controller.d.ts.map +1 -1
  5. package/out/controller/common/control/control.controller.js +19 -0
  6. package/out/controller/control/chart/generator/base-series-generator.d.ts +12 -5
  7. package/out/controller/control/chart/generator/base-series-generator.d.ts.map +1 -1
  8. package/out/controller/control/chart/generator/base-series-generator.js +55 -24
  9. package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.d.ts +18 -6
  10. package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.d.ts.map +1 -1
  11. package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.js +57 -25
  12. package/out/controller/control/form/form-detail/form-item/form-item.controller.js +2 -1
  13. package/out/controller/utils/util/util.d.ts +15 -0
  14. package/out/controller/utils/util/util.d.ts.map +1 -1
  15. package/out/controller/utils/util/util.js +57 -5
  16. package/out/engine/md-view.engine.d.ts +1 -1
  17. package/out/engine/md-view.engine.d.ts.map +1 -1
  18. package/out/engine/md-view.engine.js +13 -1
  19. package/out/interface/api/controller/common/i-api-mask-option.d.ts +20 -0
  20. package/out/interface/api/controller/common/i-api-mask-option.d.ts.map +1 -0
  21. package/out/interface/api/controller/common/i-api-mask-option.js +1 -0
  22. package/out/interface/api/controller/common/index.d.ts +1 -0
  23. package/out/interface/api/controller/common/index.d.ts.map +1 -1
  24. package/out/interface/api/controller/control/i-api-chart.controller.d.ts +1 -0
  25. package/out/interface/api/controller/control/i-api-chart.controller.d.ts.map +1 -1
  26. package/out/interface/api/controller/control/i-api-control.controller.d.ts +12 -0
  27. package/out/interface/api/controller/control/i-api-control.controller.d.ts.map +1 -1
  28. package/out/interface/api/state/control/i-api-control.state.d.ts +14 -0
  29. package/out/interface/api/state/control/i-api-control.state.d.ts.map +1 -1
  30. package/out/interface/api/util/i-api-file-util.d.ts +65 -4
  31. package/out/interface/api/util/i-api-file-util.d.ts.map +1 -1
  32. package/out/interface/controller/event/argument/data-change.event.d.ts +4 -5
  33. package/out/interface/controller/event/argument/data-change.event.d.ts.map +1 -1
  34. package/out/service/vo/code-list-data-item/code-list-data-item.d.ts.map +1 -1
  35. package/out/service/vo/code-list-data-item/code-list-data-item.js +8 -1
  36. package/out/utils/file-util/file-util.d.ts +20 -3
  37. package/out/utils/file-util/file-util.d.ts.map +1 -1
  38. package/out/utils/file-util/file-util.js +43 -12
  39. package/package.json +2 -2
@@ -4,6 +4,7 @@ import { IApiControlState } from '../../state';
4
4
  import { IApiViewController } from '../view';
5
5
  import { IApiViewLayoutPanelController } from './i-api-view-layout-panel.controller';
6
6
  import { IApiController } from '../common/i-api.controller';
7
+ import { IApiMaskOption } from '../common';
7
8
  /**
8
9
  * @primary
9
10
  * @description 部件控制器基类
@@ -62,6 +63,17 @@ export interface IApiControlController<T extends IControl = IControl, S extends
62
63
  * @memberof IApiControlController
63
64
  */
64
65
  getControlType(): string;
66
+ /**
67
+ * @description 取消部件禁用
68
+ * @memberof IApiControlController
69
+ */
70
+ enable(): void;
71
+ /**
72
+ * @description 设置部件禁用
73
+ * @param {IApiMaskOption} [options] 部件禁用参数,主要包含遮罩层相关参数
74
+ * @memberof IApiControlController
75
+ */
76
+ disabled(options?: IApiMaskOption): void;
65
77
  /**
66
78
  * @description 触发实体数据变更的通知
67
79
  * @param {('create' | 'update' | 'remove')} type
@@ -1 +1 @@
1
- {"version":3,"file":"i-api-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D;;;;;;;;GAQG;AACH,MAAM,WAAW,qBAAqB,CACpC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAC7C,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;IAC5B;;;;OAIG;IACH,IAAI,EAAE,kBAAkB,GAAG,QAAQ,CAAC;IAEpC;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;OAIG;IACH,aAAa,EAAE,UAAU,CAAC;IAE1B;;;;OAIG;IACH,WAAW,CAAC,EAAE,6BAA6B,GAAG,QAAQ,CAAC;IAEvD;;;;OAIG;IACH,OAAO,EAAE,QAAQ,GAAG,SAAS,CAAC;IAE9B;;;;OAIG;IACH,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9B;;;;OAIG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;;;OAIG;IACH,cAAc,IAAI,MAAM,CAAC;IAEzB;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;CAC9E"}
1
+ {"version":3,"file":"i-api-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C;;;;;;;;GAQG;AACH,MAAM,WAAW,qBAAqB,CACpC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAC7C,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;IAC5B;;;;OAIG;IACH,IAAI,EAAE,kBAAkB,GAAG,QAAQ,CAAC;IAEpC;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;OAIG;IACH,aAAa,EAAE,UAAU,CAAC;IAE1B;;;;OAIG;IACH,WAAW,CAAC,EAAE,6BAA6B,GAAG,QAAQ,CAAC;IAEvD;;;;OAIG;IACH,OAAO,EAAE,QAAQ,GAAG,SAAS,CAAC;IAE9B;;;;OAIG;IACH,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9B;;;;OAIG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;;;OAIG;IACH,cAAc,IAAI,MAAM,CAAC;IAEzB;;;OAGG;IACH,MAAM,IAAI,IAAI,CAAC;IAEf;;;;OAIG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IAEzC;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;CAC9E"}
@@ -1,3 +1,4 @@
1
+ import { IApiMaskOption } from '../../controller';
1
2
  import { IApiControllerState } from '../common/i-api-controller.state';
2
3
  /**
3
4
  * @primary
@@ -35,5 +36,18 @@ export interface IApiControlState extends IApiControllerState {
35
36
  * @memberof IApiControlState
36
37
  */
37
38
  loadDefault: boolean;
39
+ /**
40
+ * @description 部件禁用状态
41
+ * @type {boolean}
42
+ * @default false
43
+ * @memberof IApiControlState
44
+ */
45
+ disabled: boolean;
46
+ /**
47
+ * @description 部件遮罩参数
48
+ * @type {IApiMaskOption}
49
+ * @memberof IApiControlState
50
+ */
51
+ maskOption: IApiMaskOption;
38
52
  }
39
53
  //# sourceMappingURL=i-api-control.state.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"i-api-control.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/state/control/i-api-control.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEvE;;;;;;GAMG;AACH,MAAM,WAAW,gBAAiB,SAAQ,mBAAmB;IAC3D;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;CACtB"}
1
+ {"version":3,"file":"i-api-control.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/state/control/i-api-control.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEvE;;;;;;GAMG;AACH,MAAM,WAAW,gBAAiB,SAAQ,mBAAmB;IAC3D;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;OAIG;IACH,UAAU,EAAE,cAAc,CAAC;CAC5B"}
@@ -5,6 +5,49 @@ import { IApiContext, IApiData, IApiParams } from '@ibiz-template/core';
5
5
  * @interface IApiFileUtil
6
6
  */
7
7
  export interface IApiFileUtil {
8
+ /**
9
+ * @description 设置文件上传请求头数据
10
+ * @param {Record<string, string>} args
11
+ * @memberof IApiFileUtil
12
+ */
13
+ setUploadHeaders(args: Record<string, string>): void;
14
+ /**
15
+ * @description 获取文件上传请求头数据
16
+ * @returns {*} {Record<string, string>}
17
+ * @memberof IApiFileUtil
18
+ */
19
+ getUploadHeaders(): Record<string, string>;
20
+ /**
21
+ * @description 计算文件的上传路径和下载路径,下载路径文件id用%fileId%占位,替换即可;配置编辑器参数uploadParams和exportParams时,会像导航参数一样动态添加对应的参数到url上
22
+ * @param {IContext} context 应用上下文对象
23
+ * @param {IParams} params 视图参数对象
24
+ * @param {IApiData} [data] 业务数据对象,默认给{}
25
+ * @param {{
26
+ * uploadParams?: IApiData;
27
+ * exportParams?: IApiData;
28
+ * osscat?: string;
29
+ * }} [extraParams] 上传附件参数;下载附加参数;自定义oss分类名称
30
+ * @returns {*} {{
31
+ * uploadUrl: string;
32
+ * downloadUrl: string;
33
+ * }}
34
+ * @memberof IApiFileUtil
35
+ */
36
+ calcFileUpDownUrl(context: IContext, params: IParams, data?: IApiData, extraParams?: {
37
+ uploadParams?: IApiData;
38
+ exportParams?: IApiData;
39
+ osscat?: string;
40
+ }): {
41
+ uploadUrl: string;
42
+ downloadUrl: string;
43
+ };
44
+ /**
45
+ * @description 获取响应文件名
46
+ * @param {IApiData} response 响应对象
47
+ * @returns {*} {string}
48
+ * @memberof IApiFileUtil
49
+ */
50
+ getFileName(response: IApiData): string;
8
51
  /**
9
52
  * @description 文件下载
10
53
  * @param {string} url
@@ -27,15 +70,33 @@ export interface IApiFileUtil {
27
70
  * @param {IApiContext} context
28
71
  * @param {IApiParams} params
29
72
  * @param {IApiData} data
30
- * @param {IApiData} [option={}]
73
+ * @param {{
74
+ * accept: string;
75
+ * multiple?: boolean;
76
+ * showUploadManager?: boolean;
77
+ * extraParams?: {
78
+ * uploadParams?: IApiData;
79
+ * exportParams?: IApiData;
80
+ * osscat?: string;
81
+ * };
82
+ * }} [option] {上传文件类型,是否多选,是否展示文件管理器,扩展参数(包含上传附件参数、下载附加参数、自定义oss分类名称)}
31
83
  * @returns {*} {Promise<IApiData[]>}
32
84
  * @memberof IApiFileUtil
33
85
  */
34
- chooseFileAndUpload(context: IApiContext, params: IApiParams, data: IApiData, option?: IApiData): Promise<IApiData[]>;
86
+ chooseFileAndUpload(context: IApiContext, params: IApiParams, data: IApiData, option?: {
87
+ accept: string;
88
+ multiple?: boolean;
89
+ showUploadManager?: boolean;
90
+ extraParams?: {
91
+ uploadParams?: IApiData;
92
+ exportParams?: IApiData;
93
+ osscat?: string;
94
+ };
95
+ }): Promise<IApiData[]>;
35
96
  /**
36
97
  * @description 选择文件
37
- * @param {string} [accept]
38
- * @param {boolean} [multiple] 默认为false
98
+ * @param {string} [accept] 选择文件类型
99
+ * @param {boolean} [multiple] 是否多选,默认为false
39
100
  * @returns {*} {Promise<FileList>}
40
101
  * @memberof IApiFileUtil
41
102
  */
@@ -1 +1 @@
1
- {"version":3,"file":"i-api-file-util.d.ts","sourceRoot":"","sources":["../../../../src/interface/api/util/i-api-file-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAExE;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;OAMG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;;;;;;OAOG;IACH,UAAU,CACR,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,QAAQ,CAAC,CAAC;IAErB;;;;;;;;OAQG;IACH,mBAAmB,CACjB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,QAAQ,EACd,MAAM,CAAC,EAAE,QAAQ,GAChB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEvB;;;;;;OAMG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACnE"}
1
+ {"version":3,"file":"i-api-file-util.d.ts","sourceRoot":"","sources":["../../../../src/interface/api/util/i-api-file-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAExE;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;OAIG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAErD;;;;OAIG;IACH,gBAAgB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE3C;;;;;;;;;;;;;;;OAeG;IACH,iBAAiB,CACf,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,QAAQ,EACf,WAAW,CAAC,EAAE;QACZ,YAAY,CAAC,EAAE,QAAQ,CAAC;QACxB,YAAY,CAAC,EAAE,QAAQ,CAAC;QACxB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,GACA;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IAEF;;;;;OAKG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC;IAExC;;;;;;OAMG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;;;;;;OAOG;IACH,UAAU,CACR,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,QAAQ,CAAC,CAAC;IAErB;;;;;;;;;;;;;;;;;OAiBG;IACH,mBAAmB,CACjB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,QAAQ,EACd,MAAM,CAAC,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B,WAAW,CAAC,EAAE;YACZ,YAAY,CAAC,EAAE,QAAQ,CAAC;YACxB,YAAY,CAAC,EAAE,QAAQ,CAAC;YACxB,MAAM,CAAC,EAAE,MAAM,CAAC;SACjB,CAAC;KACH,GACA,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEvB;;;;;;OAMG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACnE"}
@@ -1,11 +1,10 @@
1
1
  import { EventBase } from './base.event';
2
2
  export interface DataChangeEvent extends EventBase {
3
3
  /**
4
- * 变更行为类型
5
- * @author lxm
6
- * @date 2023-03-26 01:24:06
7
- * @type {('LOAD' | 'LOADDRAFT' | 'REMOVE' | 'SAVE' | string)}
4
+ * @description 变更行为类型
5
+ * @type {('LOAD' | 'LOADDRAFT' | 'REMOVE' | 'SAVE' | 'NEW' | 'EDIT')}
6
+ * @memberof DataChangeEvent
8
7
  */
9
- actionType: 'LOAD' | 'LOADDRAFT' | 'REMOVE' | 'SAVE';
8
+ actionType: 'LOAD' | 'LOADDRAFT' | 'REMOVE' | 'SAVE' | 'NEW' | 'EDIT';
10
9
  }
11
10
  //# sourceMappingURL=data-change.event.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"data-change.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/argument/data-change.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,WAAW,eAAgB,SAAQ,SAAS;IAChD;;;;;OAKG;IACH,UAAU,EAAE,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,MAAM,CAAC;CACtD"}
1
+ {"version":3,"file":"data-change.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/argument/data-change.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,WAAW,eAAgB,SAAQ,SAAS;IAChD;;;;OAIG;IACH,UAAU,EAAE,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,CAAC;CACvE"}
@@ -1 +1 @@
1
- {"version":3,"file":"code-list-data-item.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/code-list-data-item/code-list-data-item.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKlD,qBAAa,gBAAiB,YAAW,YAAY;IACnD,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,EAAG,MAAM,GAAG,MAAM,CAAC;IAExB,IAAI,EAAG,MAAM,CAAC;IAEd,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAE1B,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;;OAIG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;;;OASG;gBAED,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,KAAK,EACX,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf;CAkNJ"}
1
+ {"version":3,"file":"code-list-data-item.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/code-list-data-item/code-list-data-item.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKlD,qBAAa,gBAAiB,YAAW,YAAY;IACnD,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,EAAG,MAAM,GAAG,MAAM,CAAC;IAExB,IAAI,EAAG,MAAM,CAAC;IAEd,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAE1B,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;;OAIG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;;;OASG;gBAED,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,KAAK,EACX,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf;CA0NJ"}
@@ -118,7 +118,9 @@ export class CodeListDataItem {
118
118
  // 数据属性
119
119
  if (dataAppDEFieldId && this.$origin[dataAppDEFieldId]) {
120
120
  try {
121
- this.data = ScriptFactory.execSingleLine(dataAppDEFieldId, this.$origin);
121
+ this.data = ScriptFactory.execSingleLine(dataAppDEFieldId, this.$origin instanceof AppDataEntity
122
+ ? clone(this.$origin._data)
123
+ : clone(this.$origin));
122
124
  }
123
125
  catch (error) {
124
126
  ibiz.log.error(ibiz.i18n.t('runtime.service.dynamicCodeTable'));
@@ -170,6 +172,11 @@ export class CodeListDataItem {
170
172
  enumerable: true,
171
173
  configurable: true,
172
174
  });
175
+ // 其它未处理字段
176
+ this.children = undefined;
177
+ this.cls = undefined;
178
+ this.tooltip = undefined;
179
+ this.userData = undefined;
173
180
  // 关联其它属性,用于使用实体属性也要取到值的场景。
174
181
  Object.keys(data instanceof AppDataEntity ? clone(data._data) : clone(data)).forEach(key => {
175
182
  if (!Object.prototype.hasOwnProperty.call(this, key))
@@ -7,6 +7,25 @@ import { IApiFileUtil } from '../../interface';
7
7
  * @implements {IApiFileUtil}
8
8
  */
9
9
  export declare class FileUtil implements IApiFileUtil {
10
+ /**
11
+ * @description 自定义文件上传请求头数据
12
+ * @protected
13
+ * @type {Record<string, string>}
14
+ * @memberof FileUtil
15
+ */
16
+ protected customUploadHeaders: Record<string, string>;
17
+ /**
18
+ * @description 设置文件上传请求头数据
19
+ * @param {Record<string, string>} args
20
+ * @memberof FileUtil
21
+ */
22
+ setUploadHeaders(args: Record<string, string>): void;
23
+ /**
24
+ * @description 获取文件上传请求头数据
25
+ * @returns {*} {Record<string, string>}
26
+ * @memberof IApiFileUtil
27
+ */
28
+ getUploadHeaders(): Record<string, string>;
10
29
  /**
11
30
  * @description 计算OSSCat参数
12
31
  * @protected
@@ -18,9 +37,7 @@ export declare class FileUtil implements IApiFileUtil {
18
37
  */
19
38
  protected calcOSSCatUrl(url: string, context: IContext, OSSCatName?: string): string;
20
39
  /**
21
- * @description 计算文件的上传路径和下载路径
22
- * 下载路径文件id用%fileId%占位,替换即可
23
- * 配置编辑器参数uploadParams和exportParams时,会像导航参数一样动态添加对应的参数到url上
40
+ * @description 计算文件的上传路径和下载路径,下载路径文件id用%fileId%占位,替换即可;配置编辑器参数uploadParams和exportParams时,会像导航参数一样动态添加对应的参数到url上
24
41
  * @param {IContext} context
25
42
  * @param {IParams} params
26
43
  * @param {IData} [data={}]
@@ -1 +1 @@
1
- {"version":3,"file":"file-util.d.ts","sourceRoot":"","sources":["../../../src/utils/file-util/file-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EAId,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;GAKG;AACH,qBAAa,QAAS,YAAW,YAAY;IAC3C;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CACrB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM;IAWT;;;;;;;;;;;;;OAaG;IACH,iBAAiB,CACf,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,EAChB,WAAW,GAAE,KAAU,GACtB;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB;IA0BD;;;;;;OAMG;IACG,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB7D;;;;;;;OAOG;IACG,UAAU,CACd,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,GACb,OAAO,CAAC,KAAK,CAAC;IAiBjB;;;;;OAKG;IACH,WAAW,CAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,MAAM;IAmBnD;;;;;;;;OAQG;IACG,mBAAmB,CACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,KAAU,GACjB,OAAO,CAAC,KAAK,EAAE,CAAC;IA+BnB;;;;;;OAMG;IACH,UAAU,CACR,MAAM,GAAE,MAAW,EACnB,QAAQ,GAAE,OAAe,GACxB,OAAO,CAAC,QAAQ,CAAC;CAuBrB"}
1
+ {"version":3,"file":"file-util.d.ts","sourceRoot":"","sources":["../../../src/utils/file-util/file-util.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,aAAa,EAId,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;GAKG;AACH,qBAAa,QAAS,YAAW,YAAY;IAC3C;;;;;OAKG;IACH,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAE3D;;;;OAIG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAIpD;;;;OAIG;IACH,gBAAgB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAqB1C;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CACrB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM;IAWT;;;;;;;;;;;OAWG;IACH,iBAAiB,CACf,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,EAChB,WAAW,GAAE,KAAU,GACtB;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB;IA0BD;;;;;;OAMG;IACG,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB7D;;;;;;;OAOG;IACG,UAAU,CACd,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,GACb,OAAO,CAAC,KAAK,CAAC;IAiBjB;;;;;OAKG;IACH,WAAW,CAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,MAAM;IAmBnD;;;;;;;;OAQG;IACG,mBAAmB,CACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,KAAU,GACjB,OAAO,CAAC,KAAK,EAAE,CAAC;IA8BnB;;;;;;OAMG;IACH,UAAU,CACR,MAAM,GAAE,MAAW,EACnB,QAAQ,GAAE,OAAe,GACxB,OAAO,CAAC,QAAQ,CAAC;CAuBrB"}
@@ -1,3 +1,4 @@
1
+ /* eslint-disable @typescript-eslint/no-unused-vars */
1
2
  import { CoreConst, RuntimeError, downloadFileFromBlob, getAppCookie, } from '@ibiz-template/core';
2
3
  import qs from 'qs';
3
4
  import { convertNavData } from '../nav-params/nav-params';
@@ -8,6 +9,44 @@ import { convertNavData } from '../nav-params/nav-params';
8
9
  * @implements {IApiFileUtil}
9
10
  */
10
11
  export class FileUtil {
12
+ constructor() {
13
+ /**
14
+ * @description 自定义文件上传请求头数据
15
+ * @protected
16
+ * @type {Record<string, string>}
17
+ * @memberof FileUtil
18
+ */
19
+ this.customUploadHeaders = {};
20
+ }
21
+ /**
22
+ * @description 设置文件上传请求头数据
23
+ * @param {Record<string, string>} args
24
+ * @memberof FileUtil
25
+ */
26
+ setUploadHeaders(args) {
27
+ Object.assign(this.customUploadHeaders, args);
28
+ }
29
+ /**
30
+ * @description 获取文件上传请求头数据
31
+ * @returns {*} {Record<string, string>}
32
+ * @memberof IApiFileUtil
33
+ */
34
+ getUploadHeaders() {
35
+ const uploadHeaders = {};
36
+ // 预定义请求头数据
37
+ const token = getAppCookie(CoreConst.TOKEN);
38
+ if (token) {
39
+ Object.assign(uploadHeaders, {
40
+ [`${ibiz.env.tokenHeader}Authorization`]: `${ibiz.env.tokenPrefix}Bearer ${token}`,
41
+ });
42
+ }
43
+ // 自定义请求头数据
44
+ if (this.customUploadHeaders &&
45
+ Object.keys(this.customUploadHeaders).length > 0) {
46
+ Object.assign(uploadHeaders, Object.assign({}, this.customUploadHeaders));
47
+ }
48
+ return uploadHeaders;
49
+ }
11
50
  /**
12
51
  * @description 计算OSSCat参数
13
52
  * @protected
@@ -28,9 +67,7 @@ export class FileUtil {
28
67
  return uploadUrl;
29
68
  }
30
69
  /**
31
- * @description 计算文件的上传路径和下载路径
32
- * 下载路径文件id用%fileId%占位,替换即可
33
- * 配置编辑器参数uploadParams和exportParams时,会像导航参数一样动态添加对应的参数到url上
70
+ * @description 计算文件的上传路径和下载路径,下载路径文件id用%fileId%占位,替换即可;配置编辑器参数uploadParams和exportParams时,会像导航参数一样动态添加对应的参数到url上
34
71
  * @param {IContext} context
35
72
  * @param {IParams} params
36
73
  * @param {IData} [data={}]
@@ -144,17 +181,11 @@ export class FileUtil {
144
181
  * @memberof FileUtil
145
182
  */
146
183
  async chooseFileAndUpload(context, params, data, option = {}) {
147
- const { accept, multiple, showUploadManager } = option;
148
- const urls = ibiz.util.file.calcFileUpDownUrl(context, params, data);
184
+ const { accept, multiple, showUploadManager, extraParams } = option;
185
+ const urls = ibiz.util.file.calcFileUpDownUrl(context, params, data, extraParams);
149
186
  const files = await ibiz.util.file.chooseFile(accept, multiple);
150
187
  let promises = [];
151
- const headers = {};
152
- const token = getAppCookie(CoreConst.TOKEN);
153
- if (token) {
154
- Object.assign(headers, {
155
- [`${ibiz.env.tokenHeader}Authorization`]: `${ibiz.env.tokenPrefix}Bearer ${token}`,
156
- });
157
- }
188
+ const headers = this.getUploadHeaders();
158
189
  if (showUploadManager) {
159
190
  promises = await ibiz.notification.uploadManager({
160
191
  uploadUrl: urls.uploadUrl,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ibiz-template/runtime",
3
- "version": "0.7.41-alpha.4",
3
+ "version": "0.7.41-alpha.6",
4
4
  "description": "运行时逻辑库",
5
5
  "type": "module",
6
6
  "main": "out/index.js",
@@ -68,5 +68,5 @@
68
68
  "qx-util": "^0.4.8",
69
69
  "ramda": "^0.29.0"
70
70
  },
71
- "gitHead": "a955f789ed730edef91eb1b98eda471a35cf82eb"
71
+ "gitHead": "3dc00c15d9f7721680f275880724f0a823385faf"
72
72
  }