@ibiz-template/runtime 0.6.4 → 0.6.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (32) hide show
  1. package/dist/index.esm.js +123 -33
  2. package/dist/index.system.min.js +1 -1
  3. package/out/controller/common/control/md-control.controller.d.ts.map +1 -1
  4. package/out/controller/common/control/md-control.controller.js +3 -0
  5. package/out/controller/control/report-panel/report-panel.service.d.ts.map +1 -1
  6. package/out/controller/control/report-panel/report-panel.service.js +1 -2
  7. package/out/controller/control/toolbar/toolbar.controllerr.d.ts.map +1 -1
  8. package/out/controller/control/toolbar/toolbar.controllerr.js +2 -1
  9. package/out/controller/utils/data-file-util/data-file-util.d.ts +2 -2
  10. package/out/controller/utils/data-file-util/data-file-util.d.ts.map +1 -1
  11. package/out/controller/utils/data-file-util/data-file-util.js +13 -4
  12. package/out/model/utils/util.d.ts +12 -1
  13. package/out/model/utils/util.d.ts.map +1 -1
  14. package/out/model/utils/util.js +37 -0
  15. package/out/service/service/authority/de-authority.service.d.ts.map +1 -1
  16. package/out/service/service/authority/de-authority.service.js +7 -2
  17. package/out/service/service/entity/de.service.js +3 -3
  18. package/out/service/service/entity/method/de-action.d.ts.map +1 -1
  19. package/out/service/service/entity/method/de-action.js +17 -12
  20. package/out/service/service/entity/method/method.d.ts +8 -1
  21. package/out/service/service/entity/method/method.d.ts.map +1 -1
  22. package/out/service/service/entity/method/method.js +11 -4
  23. package/out/service/service/file/file.service.js +1 -1
  24. package/out/service/utils/app-counter/app-counter.d.ts +10 -0
  25. package/out/service/utils/app-counter/app-counter.d.ts.map +1 -1
  26. package/out/service/utils/app-counter/app-counter.js +23 -0
  27. package/out/service/utils/util/util.d.ts +8 -0
  28. package/out/service/utils/util/util.d.ts.map +1 -1
  29. package/out/service/utils/util/util.js +19 -0
  30. package/out/ui-action/provider/front-ui-action-provider.d.ts.map +1 -1
  31. package/out/ui-action/provider/front-ui-action-provider.js +6 -6
  32. package/package.json +2 -3
@@ -1 +1 @@
1
- {"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"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"}
@@ -477,7 +477,10 @@ export class MDControlController extends ControlController {
477
477
  }
478
478
  const modal = ibiz.overlay.createModal(importName, {
479
479
  dismiss: () => modal.dismiss(),
480
+ dataImport,
480
481
  appDataEntity,
482
+ context: this.context,
483
+ params: this.params,
481
484
  }, {
482
485
  width: 'auto',
483
486
  placement: 'center',
@@ -1 +1 @@
1
- {"version":3,"file":"report-panel.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/report-panel/report-panel.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7D,qBAAa,kBAAkB,CAC7B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;;OAMG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;CAerC"}
1
+ {"version":3,"file":"report-panel.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/report-panel/report-panel.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7D,qBAAa,kBAAkB,CAC7B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;;OAMG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;CAarC"}
@@ -8,9 +8,8 @@ export class ReportPanelService extends ControlService {
8
8
  * @returns {*} {Promise<IHttpResponse>}
9
9
  */
10
10
  async fetch(context, params = {}) {
11
- var _a;
12
11
  this.dataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId, this.model.appId);
13
- const url = `${(_a = this.dataEntity.codeName2) === null || _a === void 0 ? void 0 : _a.toLowerCase()}/report?srfreporttag=${this.model.codeName}`;
12
+ const url = `${this.dataEntity.deapicodeName2}/report?srfreporttag=${this.model.codeName}`;
14
13
  let res = await ibiz.net.request(url, {
15
14
  method: 'post',
16
15
  data: params,
@@ -1 +1 @@
1
- {"version":3,"file":"toolbar.controllerr.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controllerr.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,cAAc,EAEd,aAAa,EAEd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,eAAe,EAGhB,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;;;;;;OAWG;cACa,UAAU,CACxB,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,KAAK,GAAE,KAAU,GAChB,OAAO,CAAC,IAAI,CAAC;cAwCA,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA4C1C;;;;;;;;;;OAUG;IACG,WAAW,CACf,IAAI,EAAE,cAAc,GAAG,YAAY,EACnC,KAAK,EAAE,UAAU,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC;IAcV,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgDpE,eAAe,CACb,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,EACrC,OAAO,EAAE,YAAY,EAAE,GACtB,IAAI;IAOP,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI;IAS/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;IAelE;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAqB3C"}
1
+ {"version":3,"file":"toolbar.controllerr.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controllerr.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,cAAc,EAEd,aAAa,EAEd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,eAAe,EAGhB,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;;;;;;OAWG;cACa,UAAU,CACxB,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,KAAK,GAAE,KAAU,GAChB,OAAO,CAAC,IAAI,CAAC;cAwCA,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA6C1C;;;;;;;;;;OAUG;IACG,WAAW,CACf,IAAI,EAAE,cAAc,GAAG,YAAY,EACnC,KAAK,EAAE,UAAU,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC;IAcV,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgDpE,eAAe,CACb,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,EACrC,OAAO,EAAE,YAAY,EAAE,GACtB,IAAI;IAOP,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI;IAS/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;IAelE;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAqB3C"}
@@ -80,7 +80,8 @@ export class ToolbarController extends ControlController {
80
80
  const controlLogic = item.controlLogics[i];
81
81
  const itemState = this.state.buttonsState[item.id];
82
82
  if (controlLogic.itemName === item.id &&
83
- controlLogic.triggerType === 'ITEMVISIBLE') {
83
+ controlLogic.triggerType === 'ITEMVISIBLE' &&
84
+ itemState) {
84
85
  itemState.visible = false;
85
86
  break;
86
87
  }
@@ -18,7 +18,7 @@ export type IExportDataResult = {
18
18
  * @param {IAppDataEntity} appDataEntity
19
19
  * @return {*} {Promise<IData>}
20
20
  */
21
- export declare function asyncImportData(file: File, appDataEntity: IAppDataEntity, dataImport?: IAppDEDataImport): Promise<void>;
21
+ export declare function asyncImportData(file: File, appDataEntity: IAppDataEntity, dataImport?: IAppDEDataImport, context?: IContext): Promise<void>;
22
22
  /**
23
23
  * 标准导入方法
24
24
  *
@@ -29,7 +29,7 @@ export declare function asyncImportData(file: File, appDataEntity: IAppDataEntit
29
29
  * @param {IAppDataEntity} appDataEntity
30
30
  * @return {*} {Promise<IData>}
31
31
  */
32
- export declare function importData(file: File, appDataEntity: IAppDataEntity, dataImport?: IAppDEDataImport): Promise<ImportDataResult>;
32
+ export declare function importData(file: File, appDataEntity: IAppDataEntity, dataImport?: IAppDEDataImport, context?: IContext): Promise<ImportDataResult>;
33
33
  /**
34
34
  * 标准导出方法
35
35
  *
@@ -1 +1 @@
1
- {"version":3,"file":"data-file-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/data-file-util/data-file-util.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AASpE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAE9B,EAAE,EAAE,OAAO,CAAC;IAEZ,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AA6BF;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,EAC7B,UAAU,CAAC,EAAE,gBAAgB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAkBf;AAED;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,EAC7B,UAAU,CAAC,EAAE,gBAAgB,GAC5B,OAAO,CAAC,gBAAgB,CAAC,CAc3B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EAAE,EAChB,IAAI,EAAE,KAAK,EAAE,EAAE,EACf,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,iBAAiB,CAAC,CAmB5B"}
1
+ {"version":3,"file":"data-file-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/data-file-util/data-file-util.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAUpE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAE9B,EAAE,EAAE,OAAO,CAAC;IAEZ,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AA6BF;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,EAC7B,UAAU,CAAC,EAAE,gBAAgB,EAC7B,OAAO,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,IAAI,CAAC,CAsBf;AAED;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,EAC7B,UAAU,CAAC,EAAE,gBAAgB,EAC7B,OAAO,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,gBAAgB,CAAC,CAkB3B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EAAE,EAChB,IAAI,EAAE,KAAK,EAAE,EAAE,EACf,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,iBAAiB,CAAC,CAmB5B"}
@@ -1,4 +1,5 @@
1
1
  import { RuntimeError, } from '@ibiz-template/core';
2
+ import { calcResPath } from '../../../service';
2
3
  // 异步导入URL
3
4
  const asyncImportUrl = 'asyncimportdata2';
4
5
  // 标准导入url
@@ -39,13 +40,17 @@ function listenAsyncAction(id) {
39
40
  * @param {IAppDataEntity} appDataEntity
40
41
  * @return {*} {Promise<IData>}
41
42
  */
42
- export async function asyncImportData(file, appDataEntity, dataImport) {
43
+ export async function asyncImportData(file, appDataEntity, dataImport, context) {
43
44
  const data = new FormData();
44
45
  data.append('file', file);
45
- let url = `${appDataEntity.codeName2.toLowerCase()}/${asyncImportUrl}`;
46
+ let url = `/${appDataEntity.deapicodeName2}/${asyncImportUrl}`;
46
47
  if (dataImport === null || dataImport === void 0 ? void 0 : dataImport.codeName) {
47
48
  url += `?srfimporttag=${dataImport.codeName}`;
48
49
  }
50
+ if (context) {
51
+ const resPath = calcResPath(context, appDataEntity);
52
+ url = resPath + url;
53
+ }
49
54
  const res = await ibiz.net.request(url, {
50
55
  method: 'post',
51
56
  data,
@@ -65,13 +70,17 @@ export async function asyncImportData(file, appDataEntity, dataImport) {
65
70
  * @param {IAppDataEntity} appDataEntity
66
71
  * @return {*} {Promise<IData>}
67
72
  */
68
- export async function importData(file, appDataEntity, dataImport) {
73
+ export async function importData(file, appDataEntity, dataImport, context) {
69
74
  const data = new FormData();
70
75
  data.append('file', file);
71
- let url = `${appDataEntity.codeName2.toLowerCase()}/${importUrl}`;
76
+ let url = `/${appDataEntity.deapicodeName2}/${importUrl}`;
72
77
  if (dataImport === null || dataImport === void 0 ? void 0 : dataImport.codeName) {
73
78
  url += `?srfimporttag=${dataImport.codeName}`;
74
79
  }
80
+ if (context) {
81
+ const resPath = calcResPath(context, appDataEntity);
82
+ url = resPath + url;
83
+ }
75
84
  const res = await ibiz.net.request(url, {
76
85
  method: 'post',
77
86
  data,
@@ -1,4 +1,4 @@
1
- import { IAppView, IAppViewRef, IControl, IControlRender, IModelObject, IPanel, ISysPFPlugin } from '@ibiz/model-core';
1
+ import { IAppDEMethod, IAppDataEntity, IAppView, IAppViewRef, IControl, IControlRender, IModelObject, IPanel, ISysPFPlugin } from '@ibiz/model-core';
2
2
  /**
3
3
  * 在数据模型中查找对应 id 模型
4
4
  *
@@ -64,4 +64,15 @@ export declare function getPFPlugin(id: string, appId: string): ISysPFPlugin;
64
64
  export declare function getControlPanel(control: {
65
65
  controlRenders?: IControlRender[];
66
66
  }): IPanel | undefined;
67
+ /**
68
+ * 在应用实体模型中查找对应 id 应用方法
69
+ * 解决应用实体方法名和行为,数据集方法不一致的问题
70
+ * @author lionlau
71
+ * @date 2024-03-09 18:04:21
72
+ * @export
73
+ * @param {IAppDataEntity} appDataEntity
74
+ * @param {string} id
75
+ * @return {*} {(IAppDEMethod | null)}
76
+ */
77
+ export declare function findAppDEMethod(appDataEntity: IAppDataEntity, id: string): IAppDEMethod | null;
67
78
  //# sourceMappingURL=util.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/model/utils/util.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,MAAM,EACN,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EAAE,EACtB,EAAE,EAAE,MAAM,GACT,YAAY,GAAG,IAAI,CAarB;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAQ5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,QAAQ,EACd,GAAG,EAAE,MAAM,GACV,WAAW,GAAG,SAAS,CAQzB;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IACnE,gBAAgB,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,OAAO,CAAC;CAChB,CAyBA;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAgBnE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC;CACnC,GAAG,MAAM,GAAG,SAAS,CASrB"}
1
+ {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/model/utils/util.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,MAAM,EACN,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EAAE,EACtB,EAAE,EAAE,MAAM,GACT,YAAY,GAAG,IAAI,CAarB;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAQ5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,QAAQ,EACd,GAAG,EAAE,MAAM,GACV,WAAW,GAAG,SAAS,CAQzB;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IACnE,gBAAgB,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,OAAO,CAAC;CAChB,CAyBA;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAgBnE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC;CACnC,GAAG,MAAM,GAAG,SAAS,CASrB;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAC7B,aAAa,EAAE,cAAc,EAC7B,EAAE,EAAE,MAAM,GACT,YAAY,GAAG,IAAI,CA0BrB"}
@@ -134,3 +134,40 @@ export function getControlPanel(control) {
134
134
  }
135
135
  return layoutPanel;
136
136
  }
137
+ /**
138
+ * 在应用实体模型中查找对应 id 应用方法
139
+ * 解决应用实体方法名和行为,数据集方法不一致的问题
140
+ * @author lionlau
141
+ * @date 2024-03-09 18:04:21
142
+ * @export
143
+ * @param {IAppDataEntity} appDataEntity
144
+ * @param {string} id
145
+ * @return {*} {(IAppDEMethod | null)}
146
+ */
147
+ export function findAppDEMethod(appDataEntity, id) {
148
+ const models = appDataEntity.appDEMethods;
149
+ if (models && id) {
150
+ const model = findModelChild(models, id);
151
+ if (model) {
152
+ return model;
153
+ }
154
+ const model2 = models.find(item => {
155
+ switch (item.methodType) {
156
+ case 'DEACTION': {
157
+ const { actionTag } = item;
158
+ return (actionTag === null || actionTag === void 0 ? void 0 : actionTag.toLowerCase()) === id.toLowerCase();
159
+ }
160
+ case 'FETCH': {
161
+ const { dataSetTag } = item;
162
+ return `fetch${dataSetTag === null || dataSetTag === void 0 ? void 0 : dataSetTag.toLowerCase()}` === id.toLowerCase();
163
+ }
164
+ default:
165
+ return false;
166
+ }
167
+ });
168
+ if (model2) {
169
+ return model2;
170
+ }
171
+ }
172
+ return null;
173
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"de-authority.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/authority/de-authority.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAG5D,qBAAa,kBAAmB,YAAW,sBAAsB;IACnD,SAAS,CAAC,WAAW,EAAE,cAAc;gBAA3B,WAAW,EAAE,cAAc;IAEjD;;;;;;;;OAQG;IACG,sBAAsB,CAC1B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,OAAO,CAAC;IAkBnB;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,OAAO,CAAC;CAiCpB"}
1
+ {"version":3,"file":"de-authority.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/authority/de-authority.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAI5D,qBAAa,kBAAmB,YAAW,sBAAsB;IACnD,SAAS,CAAC,WAAW,EAAE,cAAc;gBAA3B,WAAW,EAAE,cAAc;IAEjD;;;;;;;;OAQG;IACG,sBAAsB,CAC1B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,OAAO,CAAC;IAsBnB;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,OAAO,CAAC;CAiCpB"}
@@ -1,4 +1,5 @@
1
1
  import { matchMainState, calcMainStateOPPrivsStrs } from '../../../model';
2
+ import { convertToObject } from '../../utils/util/util';
2
3
  export class DeAuthorityService {
3
4
  constructor(entityModel) {
4
5
  this.entityModel = entityModel;
@@ -14,8 +15,12 @@ export class DeAuthorityService {
14
15
  */
15
16
  async calcByDataAccessAction(dataAccessAction, data) {
16
17
  // 判断实体数据带回来的权限,不通过就返回false
17
- if (data.srfopprivs && !data.srfopprivs.includes(dataAccessAction)) {
18
- return false;
18
+ // 返回格式(srfdataaccaction:"DELETE:0,UPDATE:1")
19
+ if (data.srfdataaccaction) {
20
+ const dataAccactions = convertToObject(data.srfdataaccaction);
21
+ if (!dataAccactions[dataAccessAction]) {
22
+ return false;
23
+ }
19
24
  }
20
25
  // 判断主状态的权限
21
26
  const mainStateResult = await this.calcByDeMainState(dataAccessAction, data);
@@ -2,7 +2,7 @@ import { ModelError, RuntimeError, RuntimeModelError, } from '@ibiz-template/cor
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';
5
- import { findModelChild } from '../../../model';
5
+ import { findAppDEMethod } from '../../../model';
6
6
  import { ConfigService } from '../config/config.service';
7
7
  import { getDEMethodProvider } from '../../../register';
8
8
  import { AppDataEntity } from '../../app-data-entity/app-data-entity';
@@ -64,7 +64,7 @@ export class DEService {
64
64
  if (this.methodMap.has(cacheId)) {
65
65
  return this.methodMap.get(cacheId);
66
66
  }
67
- const model = findModelChild(this.model.appDEMethods, id);
67
+ const model = findAppDEMethod(this.model, id);
68
68
  if (!model) {
69
69
  throw new RuntimeModelError(this.model, `未找到服务方法: ${id}`);
70
70
  }
@@ -214,7 +214,7 @@ export class DEService {
214
214
  */
215
215
  calcSsePath(context, isHistories = false) {
216
216
  const srfkey = context[this.model.codeName.toLowerCase()];
217
- const curPath = `/${this.model.codeName2.toLowerCase()}/ssechatcompletion${isHistories ? '/histories' : ''}${srfkey ? `/${srfkey}` : ''}`;
217
+ const curPath = `/${this.model.deapicodeName2}/ssechatcompletion${isHistories ? '/histories' : ''}${srfkey ? `/${srfkey}` : ''}`;
218
218
  const resPath = calcResPath(context, this.model);
219
219
  return resPath + curPath;
220
220
  }
@@ -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;AAIhD,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,EAChB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAkF/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAkBtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,MAAM,GAAE,KAAU,GACjB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IActC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GACb,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;IA4BtC;;;;;;;;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;IA+BtC;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,IAAI,CAAC;IAuGhB;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IA+BtC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAmBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;IAczB;;;;;;;;;OASG;IACH,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,GAAG,WAAW;CAqBpE"}
1
+ {"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"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"}
@@ -48,35 +48,38 @@ export class DEActionMethod extends Method {
48
48
  if (data && !this.isLocalMode) {
49
49
  data = await this.inputHandle(context, data);
50
50
  }
51
- switch (this.method.codeName) {
52
- case 'Create':
51
+ const methodTag = this.method.actionTag
52
+ ? this.method.actionTag.toUpperCase()
53
+ : this.method.codeName.toUpperCase();
54
+ switch (methodTag) {
55
+ case 'CREATE':
53
56
  result = await this.create(context, data, params || {}, header);
54
57
  break;
55
- case 'Get':
58
+ case 'GET':
56
59
  result = await this.get(context, params, header);
57
60
  break;
58
- case 'GetDraft':
61
+ case 'GETDRAFT':
59
62
  result = await this.getDraft(context, params, header);
60
63
  break;
61
- case 'Remove':
64
+ case 'REMOVE':
62
65
  result = await this.remove(context, params);
63
66
  break;
64
- case 'Update':
67
+ case 'UPDATE':
65
68
  result = await this.update(context, data, params, header);
66
69
  break;
67
- case 'CreateTemp':
70
+ case 'CREATETEMP':
68
71
  result = await this.createTemp(context, data);
69
72
  break;
70
- case 'GetTemp':
73
+ case 'GETTEMP':
71
74
  result = await this.getTemp(context, data);
72
75
  break;
73
- case 'GetDraftTemp':
76
+ case 'GETDRAFTTEMP':
74
77
  result = await this.getDraftTemp(context, params);
75
78
  break;
76
- case 'RemoveTemp':
79
+ case 'REMOVETEMP':
77
80
  result = await this.removeTemp(context, data);
78
81
  break;
79
- case 'UpdateTemp':
82
+ case 'UPDATETEMP':
80
83
  result = await this.updateTemp(context, data);
81
84
  break;
82
85
  default: {
@@ -194,7 +197,9 @@ export class DEActionMethod extends Method {
194
197
  return this.getDraftTemp(context, params);
195
198
  }
196
199
  const path = this.calcPath(context);
197
- const res = await this.app.net.get(`${path}/getdraft`, params, header);
200
+ // const res = await this.app.net.get(`${path}/getdraft`, params, header);
201
+ // 讲固定请求方法调整为指定的请求路径
202
+ const res = await this.app.net.get(this.mergeRequestPath(path, this.method.requestPath), params, header);
198
203
  res.data = await this.result.handle(context, res.data);
199
204
  return res;
200
205
  }
@@ -70,7 +70,14 @@ export declare abstract class Method {
70
70
  * @return {*} {Promise<HttpResponse<any>>}
71
71
  */
72
72
  protected request(path: string, context: IContext, data?: IData | IData[], params?: IParams, header?: IData): Promise<HttpResponse<any>>;
73
- protected mergeRequestPath(path: string, methodName: string): string;
73
+ /**
74
+ * 合并请求路径
75
+ * @author lionlau
76
+ * @param path
77
+ * @param methodName 方法名,以 / 开始
78
+ * @returns
79
+ */
80
+ protected mergeRequestPath(path: string, methodName?: string): string;
74
81
  /**
75
82
  * 根据上下文计算当前请求路径
76
83
  *
@@ -1 +1 @@
1
- {"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEhF;;;;;;;GAOG;AACH,8BAAsB,MAAM;IAiCxB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,WAAW,EAAE,OAAO;IAnChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;;OAQG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY,EACpB,WAAW,GAAE,OAAe;IAOxC;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAEb,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAiD7B,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAIpE;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM;IAM7C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CACpB,IAAI,EAAE,KAAK,EAAE,GAAG,WAAW,EAAE,GAAG,KAAK,GAAG,WAAW,GAClD,WAAW,GAAG,WAAW,EAAE;CAG/B"}
1
+ {"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEhF;;;;;;;GAOG;AACH,8BAAsB,MAAM;IAiCxB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,WAAW,EAAE,OAAO;IAnChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;;OAQG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY,EACpB,WAAW,GAAE,OAAe;IAOxC;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAEb,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAkD7B;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;IAIrE;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM;IAM7C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CACpB,IAAI,EAAE,KAAK,EAAE,GAAG,WAAW,EAAE,GAAG,KAAK,GAAG,WAAW,GAClD,WAAW,GAAG,WAAW,EAAE;CAG/B"}
@@ -45,11 +45,11 @@ export class Method {
45
45
  async request(path, context, data, params, header) {
46
46
  const { actionType, requestMethod } = this.method;
47
47
  if (actionType === 'REMOTE') {
48
- const methodName = this.method.codeName.toLowerCase();
48
+ const methodName = this.method.requestPath;
49
49
  let res = null;
50
50
  switch (requestMethod) {
51
51
  case 'POST':
52
- res = await this.app.net.post(this.mergeRequestPath(path, methodName), data || params || {}, header);
52
+ res = await this.app.net.post(this.mergeRequestPath(path, methodName), data || params || {}, {}, header);
53
53
  break;
54
54
  case 'GET':
55
55
  res = await this.app.net.get(this.mergeRequestPath(path, methodName), data || params, header);
@@ -73,8 +73,15 @@ export class Method {
73
73
  }
74
74
  throw new RuntimeModelError(this.method, `未支持的行为类型[${actionType}]`);
75
75
  }
76
+ /**
77
+ * 合并请求路径
78
+ * @author lionlau
79
+ * @param path
80
+ * @param methodName 方法名,以 / 开始
81
+ * @returns
82
+ */
76
83
  mergeRequestPath(path, methodName) {
77
- return `${path}/${methodName}`;
84
+ return methodName ? `${path}${methodName}` : `${path}`;
78
85
  }
79
86
  /**
80
87
  * 根据上下文计算当前请求路径
@@ -86,7 +93,7 @@ export class Method {
86
93
  * @return {*} {string} 拼接结果说明: /祖父实体/祖父实体主键/爷爷实体/爷爷实体主键/父实体/父实体主键/当前实体
87
94
  */
88
95
  calcPath(context) {
89
- const curPath = `/${this.entity.codeName2.toLowerCase()}`;
96
+ const curPath = `/${this.entity.deapicodeName2}`;
90
97
  const resPath = calcResPath(context, this.entity);
91
98
  return resPath + curPath;
92
99
  }
@@ -22,7 +22,7 @@ export class FileService {
22
22
  */
23
23
  exportData(dataExport, fetchAction, context, params) {
24
24
  const resPath = calcResPath(context, this.model);
25
- const exportUrl = `${resPath}/${this.model.codeName2.toLowerCase()}/exportdata/${fetchAction.toLowerCase()}/?srfexporttag=${dataExport.codeName}`;
25
+ const exportUrl = `${resPath}/${this.model.deapicodeName2}/exportdata/${fetchAction.toLowerCase()}/?srfexporttag=${dataExport.codeName}`;
26
26
  return ibiz.net.request(exportUrl, {
27
27
  method: 'post',
28
28
  data: params,
@@ -1,3 +1,4 @@
1
+ import { IPortalMessage } from '@ibiz-template/core';
1
2
  import { IAppCounter } from '@ibiz/model-core';
2
3
  import { QXEvent } from 'qx-util';
3
4
  import { Application } from '../../../application';
@@ -54,6 +55,15 @@ export declare class AppCounter {
54
55
  * @param {IParams} [params]
55
56
  */
56
57
  init(context?: IContext, params?: IParams): Promise<void>;
58
+ /**
59
+ * 接受计数器实体数据变更,刷新计数器
60
+ *
61
+ * @author chitanda
62
+ * @date 2024-03-07 14:03:00
63
+ * @protected
64
+ * @param {IPortalMessage} msg
65
+ */
66
+ protected countChange(msg: IPortalMessage): void;
57
67
  /**
58
68
  * 设置上下文以及查询参数
59
69
  *
@@ -1 +1 @@
1
- {"version":3,"file":"app-counter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/app-counter/app-counter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAe,OAAO,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,UAAU;IA0CF,KAAK,EAAE,WAAW;IAzCrC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC;IAEjC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;IAErC;;;;;;;OAOG;IACH,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAwB;IAEnD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,CAAC,CAAiB;IAE1E;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;gBACgB,KAAK,EAAE,WAAW;IAErC;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS/D;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,IAAI,IAAI;IAU1B;;;;;;OAMG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAOjC;;;;;;;OAOG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAItC;;;;;;;;OAQG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAK7D;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE,SAAS,GAAE,OAAc,GAAG,IAAI;IAOpE;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI1C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAI/B;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAMhB"}
1
+ {"version":3,"file":"app-counter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/app-counter/app-counter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,cAAc,EAAgB,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAe,OAAO,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD;;;;;;;GAOG;AACH,qBAAa,UAAU;IA0CF,KAAK,EAAE,WAAW;IAzCrC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC;IAEjC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;IAErC;;;;;;;OAOG;IACH,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAwB;IAEnD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,CAAC,CAAiB;IAE1E;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;gBACgB,KAAK,EAAE,WAAW;IAIrC;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/D;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAUhD;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS/D;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,IAAI,IAAI;IAU1B;;;;;;OAMG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAOjC;;;;;;;OAOG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAItC;;;;;;;;OAQG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAK7D;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE,SAAS,GAAE,OAAc,GAAG,IAAI;IAOpE;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI1C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAI/B;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAOhB"}
@@ -1,6 +1,7 @@
1
1
  import { IBizContext, RuntimeError } from '@ibiz-template/core';
2
2
  import { notNilEmpty, QXEvent } from 'qx-util';
3
3
  import { clone } from 'ramda';
4
+ import { calcDeCodeNameById } from '../../../model';
4
5
  /**
5
6
  * 应用计数器基类
6
7
  *
@@ -43,6 +44,7 @@ export class AppCounter {
43
44
  * @type {IData}
44
45
  */
45
46
  this.data = {};
47
+ this.countChange = this.countChange.bind(this);
46
48
  }
47
49
  /**
48
50
  * 计数器初始化
@@ -56,6 +58,26 @@ export class AppCounter {
56
58
  this.setParams(context, params);
57
59
  this.interval();
58
60
  await this.load();
61
+ if (this.model.appDataEntityId) {
62
+ ibiz.mc.command.change.on(this.countChange);
63
+ }
64
+ }
65
+ /**
66
+ * 接受计数器实体数据变更,刷新计数器
67
+ *
68
+ * @author chitanda
69
+ * @date 2024-03-07 14:03:00
70
+ * @protected
71
+ * @param {IPortalMessage} msg
72
+ */
73
+ countChange(msg) {
74
+ const data = msg.data;
75
+ if (this.model.appDataEntityId) {
76
+ const codeName = calcDeCodeNameById(this.model.appDataEntityId);
77
+ if (data && data.srfdecodename === codeName) {
78
+ this.refresh();
79
+ }
80
+ }
59
81
  }
60
82
  /**
61
83
  * 设置上下文以及查询参数
@@ -173,5 +195,6 @@ export class AppCounter {
173
195
  this.context.destroy();
174
196
  this.destroyInterval();
175
197
  this.evt.reset();
198
+ ibiz.mc.command.change.on(this.countChange);
176
199
  }
177
200
  }
@@ -11,4 +11,12 @@
11
11
  * @return {*} {boolean}
12
12
  */
13
13
  export declare function fieldValueToBoolean(value: unknown): boolean;
14
+ /**
15
+ * 将输入的字符串转化为对象
16
+ * @param input 输入字符串,如:DELETE:0,UPDATE:1
17
+ * @returns {"DELETE":0,"UPDATE":1}
18
+ */
19
+ export declare function convertToObject(input: string): {
20
+ [key: string]: number;
21
+ };
14
22
  //# sourceMappingURL=util.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/util/util.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAsB3D"}
1
+ {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/util/util.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAsB3D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAaxE"}
@@ -34,3 +34,22 @@ export function fieldValueToBoolean(value) {
34
34
  return !!value;
35
35
  }
36
36
  }
37
+ /**
38
+ * 将输入的字符串转化为对象
39
+ * @param input 输入字符串,如:DELETE:0,UPDATE:1
40
+ * @returns {"DELETE":0,"UPDATE":1}
41
+ */
42
+ export function convertToObject(input) {
43
+ const result = {};
44
+ if (!input) {
45
+ return result;
46
+ }
47
+ const pairs = input.split(',');
48
+ if (pairs && pairs.length > 0) {
49
+ pairs.forEach(pair => {
50
+ const [key, value] = pair.split(':');
51
+ result[key] = parseInt(value, 10);
52
+ });
53
+ }
54
+ return result;
55
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAiE3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAiEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA4C3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;CAqDjB"}
1
+ {"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAiE3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAiEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA4C3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;CAmDjB"}
@@ -87,7 +87,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
87
87
  * @return {*}
88
88
  */
89
89
  async executePrint(action, args) {
90
- var _a, _b, _c;
90
+ var _a, _b;
91
91
  // 处理参数
92
92
  const { resultContext, resultParams } = await this.handleParams(action, args.context, args.data, args.params);
93
93
  const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
@@ -99,7 +99,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
99
99
  if (resultContext &&
100
100
  resultContext[appDataEntity.codeName.toLowerCase()]) {
101
101
  // TODO 临时写死printdata, 非标准,后续优化
102
- requestUrl += `/${(_b = appDataEntity.codeName2) === null || _b === void 0 ? void 0 : _b.toLowerCase()}/printdata/${resultContext[appDataEntity.codeName.toLowerCase()]}`;
102
+ requestUrl += `/${appDataEntity.deapicodeName2}/printdata/${resultContext[appDataEntity.codeName.toLowerCase()]}`;
103
103
  }
104
104
  else {
105
105
  throw new RuntimeError('没有找到数据主键');
@@ -114,9 +114,9 @@ export class FrontUIActionProvider extends UIActionProviderBase {
114
114
  if (resultParams && resultParams.srfcontenttype) {
115
115
  // 获取文件
116
116
  const disposition = res.headers['content-disposition'];
117
- const filename = (_c = disposition
117
+ const filename = (_b = disposition
118
118
  .split(';')
119
- .find((str) => str.indexOf('filename=') !== -1)) === null || _c === void 0 ? void 0 : _c.slice(9);
119
+ .find((str) => str.indexOf('filename=') !== -1)) === null || _b === void 0 ? void 0 : _b.slice(9);
120
120
  const href = URL.createObjectURL(res.data);
121
121
  const a = document.createElement('a');
122
122
  a.href = href;
@@ -184,7 +184,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
184
184
  * @return {*}
185
185
  */
186
186
  async executeDataExport(action, args) {
187
- var _a, _b;
187
+ var _a;
188
188
  // 处理参数
189
189
  const { resultParams } = await this.handleParams(action, args.context, args.data, args.params);
190
190
  const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
@@ -193,7 +193,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
193
193
  });
194
194
  if (appDEDataExport) {
195
195
  // TODO 临时写死fetchdefault,应该从appDEDataExport的主表格上获取加载行为,但现在缺主表格模型,后续优化
196
- const url = `/${(_b = appDataEntity.codeName2) === null || _b === void 0 ? void 0 : _b.toLowerCase()}/exportdata/fetchdefault?srfexporttag=${appDEDataExport.codeName}`;
196
+ const url = `/${appDataEntity.deapicodeName2}/exportdata/fetchdefault?srfexporttag=${appDEDataExport.codeName}`;
197
197
  // 参数
198
198
  const params = Object.assign(Object.assign({ page: 0, size: appDEDataExport.maxRowCount ? appDEDataExport.maxRowCount : 1000 }, args.params), resultParams);
199
199
  const res = await ibiz.net.request(url, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ibiz-template/runtime",
3
- "version": "0.6.4",
3
+ "version": "0.6.7",
4
4
  "description": "控制器包",
5
5
  "type": "module",
6
6
  "main": "out/index.js",
@@ -65,6 +65,5 @@
65
65
  "qs": "^6.11.0",
66
66
  "qx-util": "^0.4.8",
67
67
  "ramda": "^0.29.0"
68
- },
69
- "gitHead": "6c0b4a0d37d3faf7fdb7e482fcb2601c1e3f9c72"
68
+ }
70
69
  }