@ibiz-template/runtime 0.6.4 → 0.6.5

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.
@@ -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',
@@ -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.codeName2.toLowerCase()}/${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.codeName2.toLowerCase()}/${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 +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);
@@ -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,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"}
@@ -49,7 +49,7 @@ export class Method {
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);
@@ -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
+ }
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.5",
4
4
  "description": "控制器包",
5
5
  "type": "module",
6
6
  "main": "out/index.js",
@@ -66,5 +66,5 @@
66
66
  "qx-util": "^0.4.8",
67
67
  "ramda": "^0.29.0"
68
68
  },
69
- "gitHead": "6c0b4a0d37d3faf7fdb7e482fcb2601c1e3f9c72"
69
+ "gitHead": "cce7f66fe82ec7d7e111deef965c619b0cc0a16b"
70
70
  }