@ibiz-template/runtime 0.7.41-alpha.134 → 0.7.41-alpha.136

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 (33) hide show
  1. package/dist/index.esm.js +51262 -51169
  2. package/dist/index.system.min.js +1 -1
  3. package/out/app-hub.d.ts +9 -3
  4. package/out/app-hub.d.ts.map +1 -1
  5. package/out/app-hub.js +39 -8
  6. package/out/controller/control/calendar/calendar.service.d.ts.map +1 -1
  7. package/out/controller/control/calendar/calendar.service.js +22 -0
  8. package/out/controller/control/form/edit-form/edit-form.controller.d.ts.map +1 -1
  9. package/out/controller/control/form/edit-form/edit-form.controller.js +2 -0
  10. package/out/controller/control/grid/grid/grid.controller.d.ts +7 -0
  11. package/out/controller/control/grid/grid/grid.controller.d.ts.map +1 -1
  12. package/out/controller/control/grid/grid/grid.controller.js +16 -1
  13. package/out/interface/api/app/i-api-app-hub-service.d.ts +8 -2
  14. package/out/interface/api/app/i-api-app-hub-service.d.ts.map +1 -1
  15. package/out/interface/api/state/control/i-api-tree.state.d.ts +1 -1
  16. package/out/locale/en/index.js +1 -1
  17. package/out/locale/zh-CN/index.js +1 -1
  18. package/out/register/helper/tree-node-register.d.ts.map +1 -1
  19. package/out/register/helper/tree-node-register.js +4 -1
  20. package/out/ui-logic/index.d.ts +1 -0
  21. package/out/ui-logic/index.d.ts.map +1 -1
  22. package/out/ui-logic/index.js +1 -0
  23. package/package.json +2 -2
  24. package/src/app-hub.ts +41 -8
  25. package/src/controller/control/calendar/calendar.service.ts +22 -0
  26. package/src/controller/control/form/edit-form/edit-form.controller.ts +2 -1
  27. package/src/controller/control/grid/grid/grid.controller.ts +17 -1
  28. package/src/interface/api/app/i-api-app-hub-service.ts +9 -2
  29. package/src/interface/api/state/control/i-api-tree.state.ts +1 -1
  30. package/src/locale/en/index.ts +1 -1
  31. package/src/locale/zh-CN/index.ts +1 -1
  32. package/src/register/helper/tree-node-register.ts +4 -1
  33. package/src/ui-logic/index.ts +2 -0
package/out/app-hub.d.ts CHANGED
@@ -476,13 +476,19 @@ export declare class AppHub implements IAppHubService {
476
476
  */
477
477
  getSubAppCodeList(id: string, appId?: string): IAppCodeList | undefined;
478
478
  /**
479
- * @description 加载扩展插件
479
+ * @description 加载主应用扩展插件
480
480
  * @public
481
- * @param {string} appId
482
481
  * @returns {*} {Promise<void>}
483
482
  * @memberof AppHub
484
483
  */
485
- loadExtensionPlugin(appId: string): Promise<void>;
484
+ loadMainExtensionPlugin(): Promise<void>;
485
+ /**
486
+ * @description 加载指定子应用扩展插件
487
+ * @param {string} appId 应用标识
488
+ * @returns {*} {Promise<void>}
489
+ * @memberof AppHub
490
+ */
491
+ loadSubExtensionPlugin(appId: string): Promise<void>;
486
492
  /**
487
493
  * 新建 hub 应用
488
494
  *
@@ -1 +1 @@
1
- {"version":3,"file":"app-hub.d.ts","sourceRoot":"","sources":["../src/app-hub.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,OAAO,EAEP,QAAQ,EACR,YAAY,EAEb,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EACL,aAAa,EACb,cAAc,EACd,WAAW,EACX,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG7D;;;;;;;GAOG;AACH,qBAAa,MAAO,YAAW,cAAc;IAC3C;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAiB;IAE1C;;;;OAIG;IACH,QAAQ,CAAC,oBAAoB,EAAE,qBAAqB,CACvB;IAE7B;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,gBAAuB;IAE1C;;;;;;OAMG;IACH,WAAW,EAAG,aAAa,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEvD;;;;;OAKG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE/D;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAa;IAEnD;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAa;IAExD;;OAEG;IACH,SAAS,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAa;IAEhE;;;;;;;OAOG;IACH,SAAS,CAAC,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAa;IAEpE;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAa;IAE9D;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAa;IAE5D;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAa;IAE7E;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAEpD;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAa;IAEhE;;;;;;OAMG;IACH,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAa;IAExE;;;;OAIG;IACH,MAAM,mBAA0B;IAEhC,MAAM,mBAA0B;IAEhC;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAW;IAE1C;;;;;;OAMG;IACH,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB;;;;OAIG;IACH,gBAAgB,EAAE,MAAM,CAAM;IAE9B;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAwB/B;;;;;;OAMG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IASpC;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,GAAG,GAAE,MAAW,GAAG,MAAM;IAWjD;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI;IAIhE;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAItC;;;;;;;OAOG;IACH,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAQ5D;;;;OAIG;IACH,yBAAyB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAQ7D;;;;;;;OAOG;IACH,8BAA8B,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAQlE;;;;;;;OAOG;IACH,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAQ5D;;;;;;;OAOG;IACH,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAQ1D;;;;;;;OAOG;IACH,qBAAqB,CACnB,KAAK,EAAE,cAAc,EACrB,KAAK,GAAE,MAAuB,GAC7B,IAAI;IAQP;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,GAAE,MAAuB,GAAG,IAAI;IA0B/D;;;;;;;;OAQG;IACH,SAAS,CACP,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,MAAuB,GAC7B,MAAM,GAAG,SAAS;IAIrB;;;;;OAKG;IACH,UAAU,CAAC,KAAK,GAAE,MAAuB,GAAG,MAAM,EAAE;IAQpD;;;;;;OAMG;IACH,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI;IAQhE;;;;;;;;OAQG;IACH,UAAU,CACR,GAAG,EAAE,MAAM,EACX,KAAK,GAAE,MAAuB,EAC9B,QAAQ,GAAE,MAAW,GACpB,IAAI;IAkBP;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAKhC;;;;;;OAMG;IACG,YAAY,CAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAO1B;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAOxD;;;;;;;;OAQG;IACG,eAAe,CACnB,GAAG,GAAE,MAAM,EAAO,EAClB,KAAK,GAAE,MAAuB,GAC7B,OAAO,CAAC,YAAY,EAAE,CAAC;IAO1B;;;;;;;;OAQG;IACG,gBAAgB,CACpB,GAAG,EAAE,MAAM,EAAE,EACb,KAAK,GAAE,MAAuB,GAC7B,OAAO,CAAC,UAAU,EAAE,CAAC;IAOxB;;;;;;;;OAQG;IACG,eAAe,CACnB,GAAG,EAAE,MAAM,EAAE,EACb,KAAK,GAAE,MAAuB,GAC7B,OAAO,CAAC,YAAY,EAAE,CAAC;IAO1B;;;;;;;OAOG;IACG,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAiBhD;;;;;;;;OAQG;IACH,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAalE;;;;OAIG;IACH,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAUpE;;;;;;;;OAQG;IACH,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAUzE;;;;;;;;OAQG;IACH,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAUlE;;;;;;;;OAQG;IACH,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAWhE;;;;;;;;;OASG;IACG,WAAW,CACf,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,QAAQ,CAAC;IAcpB;;;;;;;;OAQG;IACG,gBAAgB,CACpB,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,MAAuB,GAC7B,OAAO,CAAC,cAAc,CAAC;IAkC1B;;;;;;;OAOG;IACH,iBAAiB,CACf,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,MAAuB,GAC7B,YAAY,GAAG,SAAS;IAK3B;;;;;;OAMG;IACU,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB9D;;;;;;;OAOG;IACG,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAgCjD;;;;;;;OAOG;IACG,WAAW,CAAC,GAAG,GAAE,MAAuB,GAAG,OAAO,CAAC,WAAW,CAAC;IAIrE;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW;IAchD;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAW/C;;;;;;OAMG;IACH,UAAU,IAAI,WAAW,EAAE;IAO3B;;;;;;;;;OASG;IACG,eAAe,CACnB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,aAAa,CAAC;IAKnB,qBAAqB,CACzB,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,WAAW,GAC1C,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAM9B,KAAK,IAAI,IAAI;IAMb,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAInD,iBAAiB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,MAAM;IActD;;;;;OAKG;IACH,OAAO,IAAI,IAAI;IAMf;;;OAGG;IACH,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;CAMlD"}
1
+ {"version":3,"file":"app-hub.d.ts","sourceRoot":"","sources":["../src/app-hub.ts"],"names":[],"mappings":"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"}
package/out/app-hub.js CHANGED
@@ -699,23 +699,54 @@ export class AppHub {
699
699
  return targetCodeListMap === null || targetCodeListMap === void 0 ? void 0 : targetCodeListMap.get(id);
700
700
  }
701
701
  /**
702
- * @description 加载扩展插件
702
+ * @description 加载主应用扩展插件
703
703
  * @public
704
- * @param {string} appId
705
704
  * @returns {*} {Promise<void>}
706
705
  * @memberof AppHub
707
706
  */
708
- async loadExtensionPlugin(appId) {
707
+ async loadMainExtensionPlugin() {
708
+ // 从 1 开始递增加载扩展插件,加载失败时终止
709
+ // 第一组为 ExtensionPlugin/ext,之后为 ExtensionPlugin1/ext2、ExtensionPlugin2/ext3 ...
710
+ let index = 1;
711
+ let success = true;
712
+ do {
713
+ const suffix = index === 1 ? '' : `${index}`;
714
+ const targetUrl = `${ibiz.env.baseUrl}/${ibiz.env.appId}${ibiz.env.remoteModelUrl}/ext${suffix}`;
715
+ try {
716
+ await ibiz.plugin.loadPlugin({
717
+ runtimeObject: true,
718
+ rtobjectName: `ExtensionPlugin${suffix}`,
719
+ rtobjectRepo: targetUrl,
720
+ });
721
+ index += 1;
722
+ success = true;
723
+ }
724
+ catch (error) {
725
+ ibiz.log.warn(ibiz.i18n.t('runtime.hub.noExtensionPlugin', {
726
+ targetUrl,
727
+ }));
728
+ success = false;
729
+ }
730
+ } while (success);
731
+ }
732
+ /**
733
+ * @description 加载指定子应用扩展插件
734
+ * @param {string} appId 应用标识
735
+ * @returns {*} {Promise<void>}
736
+ * @memberof AppHub
737
+ */
738
+ async loadSubExtensionPlugin(appId) {
739
+ const targetUrl = `${ibiz.env.baseUrl}/${ibiz.env.appId}${ibiz.env.remoteModelUrl}/subapps/${appId}/ext`;
709
740
  try {
710
741
  await ibiz.plugin.loadPlugin({
711
742
  runtimeObject: true,
712
- rtobjectName: 'ExtensionPlugin',
713
- rtobjectRepo: `${ibiz.env.baseUrl}/${appId}${ibiz.env.remoteModelUrl}/ext`,
743
+ rtobjectName: `${appId}_ExtensionPlugin`,
744
+ rtobjectRepo: targetUrl,
714
745
  });
715
746
  }
716
747
  catch (error) {
717
- ibiz.log.warn(ibiz.i18n.t('runtime.application.noExtensionPlugin', {
718
- appId: ibiz.env.appId,
748
+ ibiz.log.warn(ibiz.i18n.t('runtime.hub.noExtensionPlugin', {
749
+ targetUrl,
719
750
  }));
720
751
  }
721
752
  }
@@ -736,7 +767,7 @@ export class AppHub {
736
767
  }
737
768
  // 加载子应用扩展插件
738
769
  if (id !== ibiz.env.appId) {
739
- await this.loadExtensionPlugin(id);
770
+ await this.loadSubExtensionPlugin(id);
740
771
  }
741
772
  const appModel = await this.modelLoaderProvider.getApp(id);
742
773
  const subAppRef = await this.modelLoaderProvider.getSubAppRef(id);
@@ -1 +1 @@
1
- {"version":3,"file":"calendar.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAoB,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qDAAqD,CAAC;AAEvF;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,KAAK,EAAE,iBAAiB,EAAE,CAAC;CAC5B;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;OAIG;IACH,SAAS,EAAE,WAAW,GAAG,SAAS,CAAC;CACpC;AAED;;;;;;;;GAQG;AACH,qBAAa,eAAgB,SAAQ,gBAAgB,CAAC,YAAY,CAAC;IACjE;;;;;;OAMG;IACH,QAAQ,EAAE;QACR,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC;KAClC,CAAM;IAEP;;;;;;;;OAQG;IACG,UAAU,CACd,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,mBAAmB,GAAE,MAAiB,GACrC,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,iBAAiB,GACvB,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAqC/B;;;;;;;;;OASG;IACH,OAAO,CAAC,qBAAqB;IAuC7B;;;;;;;;;;;;OAYG;YACW,KAAK;IAiBnB;;;;;;;;OAQG;IACH,OAAO,CAAC,cAAc;IAkEtB;;;;;;;;OAQG;IACH,OAAO,CAAC,mBAAmB;CA+B5B"}
1
+ {"version":3,"file":"calendar.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAoB,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qDAAqD,CAAC;AAEvF;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,KAAK,EAAE,iBAAiB,EAAE,CAAC;CAC5B;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;OAIG;IACH,SAAS,EAAE,WAAW,GAAG,SAAS,CAAC;CACpC;AAED;;;;;;;;GAQG;AACH,qBAAa,eAAgB,SAAQ,gBAAgB,CAAC,YAAY,CAAC;IACjE;;;;;;OAMG;IACH,QAAQ,EAAE;QACR,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC;KAClC,CAAM;IAEP;;;;;;;;OAQG;IACG,UAAU,CACd,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,mBAAmB,GAAE,MAAiB,GACrC,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,iBAAiB,GACvB,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAqC/B;;;;;;;;;OASG;IACH,OAAO,CAAC,qBAAqB;IAuC7B;;;;;;;;;;;;OAYG;YACW,KAAK;IAiBnB;;;;;;;;OAQG;IACH,OAAO,CAAC,cAAc;IAwFtB;;;;;;;;OAQG;IACH,OAAO,CAAC,mBAAmB;CA+B5B"}
@@ -133,6 +133,28 @@ export class CalendarService extends MDControlService {
133
133
  */
134
134
  getSearchConds(item, params) {
135
135
  const { srfstartdate, srfenddate } = params;
136
+ // 如果开始和结束时间字段相同,则条件为大于等于开始时间,小于等于结束时间
137
+ if (item.beginTimeAppDEFieldId === item.endTimeAppDEFieldId)
138
+ return [
139
+ {
140
+ condop: 'AND',
141
+ condtype: 'GROUP',
142
+ searchconds: [
143
+ {
144
+ condtype: 'DEFIELD',
145
+ fieldname: item.beginTimeAppDEFieldId,
146
+ value: srfstartdate,
147
+ condop: 'GTANDEQ',
148
+ },
149
+ {
150
+ condtype: 'DEFIELD',
151
+ fieldname: item.beginTimeAppDEFieldId,
152
+ value: srfenddate,
153
+ condop: 'LTANDEQ',
154
+ },
155
+ ],
156
+ },
157
+ ];
136
158
  return [
137
159
  {
138
160
  condop: 'OR',
@@ -1 +1 @@
1
- {"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"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"}
@@ -70,6 +70,8 @@ export class EditFormController extends FormController {
70
70
  // 实例部件服务
71
71
  this.service = new EditFormService(this.model);
72
72
  await this.service.init(this.context);
73
+ // 重新构造当前数据data
74
+ this.state.data = this.service.toUIData({});
73
75
  // 自动保存防抖,只有最后一次执行
74
76
  this.autoSave = debounce(this.autoSave.bind(this), 500, {
75
77
  trailing: true,
@@ -28,6 +28,13 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
28
28
  */
29
29
  service: GridService;
30
30
  protected get _evt(): ControllerEvent<IGridEvent>;
31
+ /**
32
+ * @description 行状态索引缓存
33
+ * @protected
34
+ * @type {Map<string, number>}
35
+ * @memberof GridController
36
+ */
37
+ protected rowStateIndexMap: Map<string, number>;
31
38
  /**
32
39
  * 单元格超出呈现模式
33
40
  *
@@ -1 +1 @@
1
- {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,OAAO,EACP,aAAa,EACb,aAAa,EACb,aAAa,EAEb,gBAAgB,EAIjB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,sBAAsB,EACtB,6BAA6B,EAC9B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EACV,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EAEnB,qBAAqB,EACrB,gBAAgB,EAEjB,MAAM,uBAAuB,CAAC;AAM/B,OAAO,EAAE,SAAS,EAAS,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAKL,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAcxB;;;;;;;;GAQG;AACH,qBAAa,cAAc,CACvB,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACnC,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC;;;;;;OAMG;IACK,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,UAAU,CAKtC;IAED;;;;;;OAMG;IACH,IAAI,eAAe,IAAI,OAAO,CAQ7B;IAED;;;;;OAKG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,KAAK,GAAG,KAAK,CAUzC;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,WAAW,GAAG,MAAM,GAAG,QAAQ,CAKlD;IAED;;;;;;;OAOG;IACH,IAAI,mBAAmB,IAAI,SAAS,GAAG,OAAO,CAK7C;IAED;;;;;OAKG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,OAAO,GAAG,QAAQ,CAG7C;IAED;;;;;OAKG;IACH,iBAAiB,EAAE,OAAO,CAAS;IAEnC;;;;;OAKG;IACH,kBAAkB,EAAE,OAAO,CAAS;IAEpC;;;;;OAKG;IACH,eAAe,EAAE,OAAO,CAAS;IAEjC;;;;;;OAMG;IACH,gBAAgB,EAAE,OAAO,CAAM;IAE/B;;;;;OAKG;IACH,WAAW,EAAE,MAAM,EAAE,CAAM;IAE3B;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEtD;;;;;;OAMG;IACH,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAA;KAAE,CAAM;IAEhE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAM;IAE1D;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,6BAA6B,CAAA;KAAE,CAAM;IAEnE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;IAE7C;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,CAAwD;IAExE;;;;;OAKG;IACH,UAAU,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAEzC;;;;;OAKG;IACH,gBAAgB,EAAE,aAAa,EAAE,CAAM;IAEvC;;;;;OAKG;IACH,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,CAAC,CAAa;IAEvE;;;;OAIG;IACH,gBAAgB,EAAE,aAAa,EAAE,CAAM;IAEvC;;;;;OAKG;IACH,IAAI,kBAAkB,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAE7D;IAED;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;OAMG;IACH,IAAI,kBAAkB,IAAI,OAAO,CAEhC;IAED;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IAElC,SAAS,CAAC,SAAS,IAAI,IAAI;IAkB3B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC1C;;;;OAIG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB9C;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IASnC;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAOtC;;;;;OAKG;IAEH,YAAY,CAAC,SAAS,EAAE,KAAK,GAAG,IAAI;IA4BpC;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqCzC;;;;;;OAMG;cACa,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC/C;;;;;;OAMG;cACa,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BtD;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAoDpC,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC;IAoCvB;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAMzD;;;OAGG;IACG,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBtD;;;;;;OAMG;IACG,SAAS,CAAC,GAAG,EAAE,iBAAiB,EAAE,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B3E;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAuC7C;;;;;;OAMG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BxC,cAAc,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAQjE;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAMnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAmB9B;;;;;OAKG;IACG,MAAM,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuDxD;;;;;;;OAOG;IACG,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAkEpC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAe9B;;;;;;OAMG;cACa,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAqC3E;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;IAelE;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAmDlC;;;;;;OAMG;IACH,SAAS,CAAC,qBAAqB,CAC7B,IAAI,EAAE,YAAY,EAAE,EACpB,KAAK,EAAE,YAAY,EAAE,GACpB,YAAY,EAAE;IAiBjB;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAqBjC;;;;;;OAMG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhD;;;;;;;;;OASG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,IAAI,CAAC;IA+BhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI;IAOhE;;;;;;;OAOG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IASnD;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAS/B,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IASpC;;;;;;OAMG;IACG,aAAa,CACjB,GAAG,EAAE,YAAY,EACjB,QAAQ,CAAC,EAAE,OAAO,EAClB,MAAM,GAAE,OAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAwDhB;;;;;OAKG;IACH,YAAY,IAAI;QACd,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;IAOD;;;;;;;OAOG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAWvD;;;;;;;OAOG;IACG,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgD5E;;;;;;;;;OASG;IACG,QAAQ,CACZ,IAAI,EAAE,gBAAgB,EACtB,SAAS,GAAE,OAAY,GACtB,OAAO,CAAC,SAAS,EAAE,CAAC;IAiBvB;;;;;OAKG;IACG,oBAAoB,CACxB,UAAU,EAAE,aAAa,GACxB,OAAO,CAAC,aAAa,EAAE,CAAC;IA2B3B;;;;;OAKG;IACH,WAAW,WACD,OAAO,gBACD,MAAM,UACb,OAAO,KACb,MAAM,CAWP;IAEF;;;OAGG;IACH,iBAAiB,IAAI;QACnB,MAAM,EAAE,MAAM,EAAE,CAAC;QACjB,MAAM,EAAE,MAAM,EAAE,CAAC;QACjB,aAAa,EAAE,KAAK,EAAE,CAAC;QACvB,SAAS,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;KAC9B;IA6CD;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE;IAmDzD;;;;;OAKG;IACG,aAAa,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA0C/D;;;OAGG;IACG,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkElE;;;;;OAKG;IACG,UAAU,CAAC,IAAI,EAAE;QACrB,MAAM,EAAE,gBAAgB,CAAC;QACzB,KAAK,CAAC,EAAE,UAAU,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwDjB;;;;;;;;OAQG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,KAAK;IAsBvD;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM;IAwBtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,SAAS;IAKpD;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5C;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAuB1C;;;;;;OAMG;IACH,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,IAAI;IASjD;;;;;;OAMG;IACH,cAAc,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IA8C5C;;;;;OAKG;IACH,qBAAqB,CACnB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,IAAI;IAcP;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IAoBxB;;;;;;;OAOG;IACH,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QACL,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,CAAC;QACvB,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,QAAQ,CAAC,EAAE,aAAa,CAAC;KAC1B,GACA,IAAI;IAqBP;;;;;OAKG;IACG,YAAY,CAChB,QAAQ,EAAE,aAAa,EACvB,IAAI,EAAE,aAAa,EACnB,QAAQ,EAAE,MAAM,GAAG,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC;IAwBhB;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAoBrB;;;;;OAKG;IACH,cAAc,CAAC,MAAM,GAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,IAAI;IAoBrE;;;;;OAKG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI;IAWlD;;;;;;;OAOG;IACH,aAAa,CAAC,CAAC,SAAS,MAAM,qBAAqB,EACjD,IAAI,EAAE,CAAC,EACP,EAAE,EAAE,MAAM,GACT,qBAAqB,CAAC,CAAC,CAAC;IAI3B;;;;;OAKG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAI7C"}
1
+ {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}
@@ -28,6 +28,13 @@ import { PredefinedAttributes } from '../../../../constant';
28
28
  export class GridController extends MDControlController {
29
29
  constructor() {
30
30
  super(...arguments);
31
+ /**
32
+ * @description 行状态索引缓存
33
+ * @protected
34
+ * @type {Map<string, number>}
35
+ * @memberof GridController
36
+ */
37
+ this.rowStateIndexMap = new Map();
31
38
  /**
32
39
  * 是否有配置宽度自适应列
33
40
  *
@@ -576,6 +583,7 @@ export class GridController extends MDControlController {
576
583
  * @param rows
577
584
  */
578
585
  async updateRows(rows) {
586
+ this.rowStateIndexMap.clear();
579
587
  for (const row of rows) {
580
588
  await Promise.all([
581
589
  ...Object.values(row.uaColStates).map(uaState => uaState.update(this.context, row.data.getOrigin(), this.model.appDataEntityId)),
@@ -1578,11 +1586,14 @@ export class GridController extends MDControlController {
1578
1586
  findRowStateIndex(data) {
1579
1587
  const isCreate = data.srfuf === Srfuf.CREATE;
1580
1588
  const compareKey = isCreate ? 'tempsrfkey' : 'srfkey';
1589
+ if (data[compareKey] && this.rowStateIndexMap.has(data[compareKey])) {
1590
+ return this.rowStateIndexMap.get(data[compareKey]);
1591
+ }
1581
1592
  // 识别联合主键场景,unionkeys参数以|分割,同一条数据关联多个版本情况
1582
1593
  const unionKeys = this.controlParams.unionkeys
1583
1594
  ? this.controlParams.unionkeys.split('|')
1584
1595
  : undefined;
1585
- return this.state.rows.findIndex(item => {
1596
+ const index = this.state.rows.findIndex(item => {
1586
1597
  if (unionKeys) {
1587
1598
  let result = item.data[compareKey] === data[compareKey];
1588
1599
  if (!result)
@@ -1598,6 +1609,10 @@ export class GridController extends MDControlController {
1598
1609
  }
1599
1610
  return item.data[compareKey] === data[compareKey];
1600
1611
  });
1612
+ if (data[compareKey]) {
1613
+ this.rowStateIndexMap.set(data[compareKey], index);
1614
+ }
1615
+ return index;
1601
1616
  }
1602
1617
  /**
1603
1618
  * 查找rowState
@@ -86,12 +86,18 @@ export interface IApiAppHubService {
86
86
  */
87
87
  getAppDEService(appId: string, entityId: string, context: IApiContext): Promise<IApiAppDEService>;
88
88
  /**
89
- * @description 加载指定应用扩展插件
89
+ * @description 加载主应用扩展插件
90
+ * @returns {*} {Promise<void>}
91
+ * @memberof IApiAppHubService
92
+ */
93
+ loadMainExtensionPlugin(): Promise<void>;
94
+ /**
95
+ * @description 加载指定子应用扩展插件
90
96
  * @param {string} appId 应用标识
91
97
  * @returns {*} {Promise<void>}
92
98
  * @memberof IApiAppHubService
93
99
  */
94
- loadExtensionPlugin(appId: string): Promise<void>;
100
+ loadSubExtensionPlugin(appId: string): Promise<void>;
95
101
  /**
96
102
  * @description 重置清空应用中心
97
103
  * @memberof IApiAppHubService
@@ -1 +1 @@
1
- {"version":3,"file":"i-api-app-hub-service.d.ts","sourceRoot":"","sources":["../../../../src/interface/api/app/i-api-app-hub-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;OAIG;IACH,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAE1C;;;;OAIG;IACH,QAAQ,CAAC,oBAAoB,EAAE,qBAAqB,CAAC;IAErD;;;;OAIG;IACH,uBAAuB,EAAE,MAAM,CAAC;IAEhC;;;;OAIG;IACH,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC;;;;;OAKG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3C;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtE;;;;;OAKG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAErD;;;;;OAKG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,cAAc,CAAC;IAEpD;;;;OAIG;IACH,UAAU,IAAI,cAAc,EAAE,CAAC;IAE/B;;;;;OAKG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAAC;IAEnD;;;;;;;OAOG;IACH,eAAe,CACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE7B;;;;;OAKG;IACH,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAElD;;;OAGG;IACH,KAAK,IAAI,IAAI,CAAC;IAEd;;;OAGG;IACH,OAAO,IAAI,IAAI,CAAC;CACjB"}
1
+ {"version":3,"file":"i-api-app-hub-service.d.ts","sourceRoot":"","sources":["../../../../src/interface/api/app/i-api-app-hub-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;OAIG;IACH,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAE1C;;;;OAIG;IACH,QAAQ,CAAC,oBAAoB,EAAE,qBAAqB,CAAC;IAErD;;;;OAIG;IACH,uBAAuB,EAAE,MAAM,CAAC;IAEhC;;;;OAIG;IACH,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC;;;;;OAKG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3C;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtE;;;;;OAKG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAErD;;;;;OAKG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,cAAc,CAAC;IAEpD;;;;OAIG;IACH,UAAU,IAAI,cAAc,EAAE,CAAC;IAE/B;;;;;OAKG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAAC;IAEnD;;;;;;;OAOG;IACH,eAAe,CACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE7B;;;;OAIG;IACH,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzC;;;;;OAKG;IACH,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAErD;;;OAGG;IACH,KAAK,IAAI,IAAI,CAAC;IAEd;;;OAGG;IACH,OAAO,IAAI,IAAI,CAAC;CACjB"}
@@ -81,7 +81,7 @@ export interface IApiTreeNodeData {
81
81
  */
82
82
  _parent?: IApiTreeNodeData;
83
83
  /**
84
- * @description 实体数据
84
+ * @description 实体数据(实体动态代码表树节点/实体数据集树节点类型存在该属性,静态树节点类型不存在该属性)
85
85
  * @type {IApiData}
86
86
  * @memberof IApiTreeNodeData
87
87
  */
@@ -358,7 +358,7 @@ export const en = {
358
358
  hub: {
359
359
  failedParse: 'View parameter {paramsName} failed to parse: {error}',
360
360
  noExist: 'View [{id}] does not exist',
361
- noExtensionPlugin: 'Attempted to load application [{appId}] extension plugin, but no extension plugin was found',
361
+ noExtensionPlugin: 'Attempted to load the extension plugin from path [{targetUrl}], but no extension plugin was found',
362
362
  },
363
363
  logicScheduler: {
364
364
  executor: {
@@ -357,7 +357,7 @@ export const zhCn = {
357
357
  hub: {
358
358
  failedParse: '视图参数 {paramsName} 解析失败:{error}',
359
359
  noExist: '视图[{id}]不存在',
360
- noExtensionPlugin: '尝试加载应用[{appId}]扩展插件,暂未找到扩展插件',
360
+ noExtensionPlugin: '尝试加载路径[{targetUrl}]扩展插件,暂未找到扩展插件',
361
361
  },
362
362
  logicScheduler: {
363
363
  executor: {
@@ -1 +1 @@
1
- {"version":3,"file":"tree-node-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/tree-node-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAIpD,eAAe;AACf,eAAO,MAAM,yBAAyB,cAAc,CAAC;AAErD;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,iBAAiB,GAChC,IAAI,CAEN;AAQD;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAwCxC"}
1
+ {"version":3,"file":"tree-node-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/tree-node-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAIpD,eAAe;AACf,eAAO,MAAM,yBAAyB,cAAc,CAAC;AAErD;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,iBAAiB,GAChC,IAAI,CAEN;AAQD;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CA2CxC"}
@@ -53,7 +53,10 @@ export async function getTreeNodeProvider(model, tree) {
53
53
  return provider;
54
54
  }
55
55
  }
56
- // 找树节点类型适配器
56
+ // 找树节点类型适配器,未找到则找默认适配器
57
57
  provider = getProvider(treeNodeType);
58
+ if (!provider) {
59
+ provider = getProvider('DEFAULT');
60
+ }
58
61
  return provider;
59
62
  }
@@ -1,4 +1,5 @@
1
1
  import { IUILogicParams } from '../interface';
2
+ export * from './ui-logic-node';
2
3
  /**
3
4
  * @description 执行界面逻辑
4
5
  * @export
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ui-logic/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAoB,MAAM,cAAc,CAAC;AAQhE;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC/B,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,OAAO,CAAC,CAmClB"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ui-logic/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAoB,MAAM,cAAc,CAAC;AAGhE,cAAc,iBAAiB,CAAC;AAOhC;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC/B,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,OAAO,CAAC,CAmClB"}
@@ -1,5 +1,6 @@
1
1
  import { RuntimeError } from '@ibiz-template/core';
2
2
  import { getUILogicProvider } from '../register';
3
+ export * from './ui-logic-node';
3
4
  /**
4
5
  * 界面逻辑实例缓存
5
6
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ibiz-template/runtime",
3
- "version": "0.7.41-alpha.134",
3
+ "version": "0.7.41-alpha.136",
4
4
  "description": "运行时逻辑库",
5
5
  "type": "module",
6
6
  "main": "out/index.js",
@@ -70,5 +70,5 @@
70
70
  "qx-util": "^0.4.8",
71
71
  "ramda": "^0.29.0"
72
72
  },
73
- "gitHead": "e78bf67edd338c57931386b644794510729a9fa8"
73
+ "gitHead": "1b93abc0b7ace1087581e25717564d4f35a8056d"
74
74
  }
package/src/app-hub.ts CHANGED
@@ -850,23 +850,56 @@ export class AppHub implements IAppHubService {
850
850
  }
851
851
 
852
852
  /**
853
- * @description 加载扩展插件
853
+ * @description 加载主应用扩展插件
854
854
  * @public
855
- * @param {string} appId
856
855
  * @returns {*} {Promise<void>}
857
856
  * @memberof AppHub
858
857
  */
859
- public async loadExtensionPlugin(appId: string): Promise<void> {
858
+ public async loadMainExtensionPlugin(): Promise<void> {
859
+ // 从 1 开始递增加载扩展插件,加载失败时终止
860
+ // 第一组为 ExtensionPlugin/ext,之后为 ExtensionPlugin1/ext2、ExtensionPlugin2/ext3 ...
861
+ let index = 1;
862
+ let success = true;
863
+ do {
864
+ const suffix = index === 1 ? '' : `${index}`;
865
+ const targetUrl = `${ibiz.env.baseUrl}/${ibiz.env.appId}${ibiz.env.remoteModelUrl}/ext${suffix}`;
866
+ try {
867
+ await ibiz.plugin.loadPlugin({
868
+ runtimeObject: true,
869
+ rtobjectName: `ExtensionPlugin${suffix}`,
870
+ rtobjectRepo: targetUrl,
871
+ } as IAppPFPluginRef);
872
+ index += 1;
873
+ success = true;
874
+ } catch (error) {
875
+ ibiz.log.warn(
876
+ ibiz.i18n.t('runtime.hub.noExtensionPlugin', {
877
+ targetUrl,
878
+ }),
879
+ );
880
+ success = false;
881
+ }
882
+ } while (success);
883
+ }
884
+
885
+ /**
886
+ * @description 加载指定子应用扩展插件
887
+ * @param {string} appId 应用标识
888
+ * @returns {*} {Promise<void>}
889
+ * @memberof AppHub
890
+ */
891
+ public async loadSubExtensionPlugin(appId: string): Promise<void> {
892
+ const targetUrl = `${ibiz.env.baseUrl}/${ibiz.env.appId}${ibiz.env.remoteModelUrl}/subapps/${appId}/ext`;
860
893
  try {
861
894
  await ibiz.plugin.loadPlugin({
862
895
  runtimeObject: true,
863
- rtobjectName: 'ExtensionPlugin',
864
- rtobjectRepo: `${ibiz.env.baseUrl}/${appId}${ibiz.env.remoteModelUrl}/ext`,
896
+ rtobjectName: `${appId}_ExtensionPlugin`,
897
+ rtobjectRepo: targetUrl,
865
898
  } as IAppPFPluginRef);
866
899
  } catch (error) {
867
900
  ibiz.log.warn(
868
- ibiz.i18n.t('runtime.application.noExtensionPlugin', {
869
- appId: ibiz.env.appId,
901
+ ibiz.i18n.t('runtime.hub.noExtensionPlugin', {
902
+ targetUrl,
870
903
  }),
871
904
  );
872
905
  }
@@ -889,7 +922,7 @@ export class AppHub implements IAppHubService {
889
922
  }
890
923
  // 加载子应用扩展插件
891
924
  if (id !== ibiz.env.appId) {
892
- await this.loadExtensionPlugin(id);
925
+ await this.loadSubExtensionPlugin(id);
893
926
  }
894
927
  const appModel: IApplication = await this.modelLoaderProvider.getApp(id);
895
928
  const subAppRef: ISubAppRef | undefined =
@@ -239,6 +239,28 @@ export class CalendarService extends MDControlService<ISysCalendar> {
239
239
  */
240
240
  private getSearchConds(item: ISysCalendarItem, params: IParams): IParams[] {
241
241
  const { srfstartdate, srfenddate } = params;
242
+ // 如果开始和结束时间字段相同,则条件为大于等于开始时间,小于等于结束时间
243
+ if (item.beginTimeAppDEFieldId === item.endTimeAppDEFieldId)
244
+ return [
245
+ {
246
+ condop: 'AND',
247
+ condtype: 'GROUP',
248
+ searchconds: [
249
+ {
250
+ condtype: 'DEFIELD',
251
+ fieldname: item.beginTimeAppDEFieldId,
252
+ value: srfstartdate,
253
+ condop: 'GTANDEQ',
254
+ },
255
+ {
256
+ condtype: 'DEFIELD',
257
+ fieldname: item.beginTimeAppDEFieldId,
258
+ value: srfenddate,
259
+ condop: 'LTANDEQ',
260
+ },
261
+ ],
262
+ },
263
+ ];
242
264
  return [
243
265
  {
244
266
  condop: 'OR',
@@ -117,7 +117,8 @@ export class EditFormController
117
117
  // 实例部件服务
118
118
  this.service = new EditFormService(this.model);
119
119
  await this.service.init(this.context);
120
-
120
+ // 重新构造当前数据data
121
+ this.state.data = this.service.toUIData({});
121
122
  // 自动保存防抖,只有最后一次执行
122
123
  this.autoSave = debounce(this.autoSave.bind(this), 500, {
123
124
  trailing: true,
@@ -109,6 +109,14 @@ export class GridController<
109
109
  return this.evt;
110
110
  }
111
111
 
112
+ /**
113
+ * @description 行状态索引缓存
114
+ * @protected
115
+ * @type {Map<string, number>}
116
+ * @memberof GridController
117
+ */
118
+ protected rowStateIndexMap: Map<string, number> = new Map();
119
+
112
120
  /**
113
121
  * 单元格超出呈现模式
114
122
  *
@@ -763,6 +771,7 @@ export class GridController<
763
771
  * @param rows
764
772
  */
765
773
  async updateRows(rows: IGridRowState[]): Promise<void> {
774
+ this.rowStateIndexMap.clear();
766
775
  for (const row of rows) {
767
776
  await Promise.all([
768
777
  ...Object.values(row.uaColStates).map(uaState =>
@@ -1988,11 +1997,14 @@ export class GridController<
1988
1997
  findRowStateIndex(data: IData): number {
1989
1998
  const isCreate = data.srfuf === Srfuf.CREATE;
1990
1999
  const compareKey = isCreate ? 'tempsrfkey' : 'srfkey';
2000
+ if (data[compareKey] && this.rowStateIndexMap.has(data[compareKey])) {
2001
+ return this.rowStateIndexMap.get(data[compareKey])!;
2002
+ }
1991
2003
  // 识别联合主键场景,unionkeys参数以|分割,同一条数据关联多个版本情况
1992
2004
  const unionKeys = this.controlParams.unionkeys
1993
2005
  ? this.controlParams.unionkeys.split('|')
1994
2006
  : undefined;
1995
- return this.state.rows.findIndex(item => {
2007
+ const index = this.state.rows.findIndex(item => {
1996
2008
  if (unionKeys) {
1997
2009
  let result = item.data[compareKey] === data[compareKey];
1998
2010
  if (!result) return false;
@@ -2007,6 +2019,10 @@ export class GridController<
2007
2019
  }
2008
2020
  return item.data[compareKey] === data[compareKey];
2009
2021
  });
2022
+ if (data[compareKey]) {
2023
+ this.rowStateIndexMap.set(data[compareKey], index);
2024
+ }
2025
+ return index;
2010
2026
  }
2011
2027
 
2012
2028
  /**
@@ -102,12 +102,19 @@ export interface IApiAppHubService {
102
102
  ): Promise<IApiAppDEService>;
103
103
 
104
104
  /**
105
- * @description 加载指定应用扩展插件
105
+ * @description 加载主应用扩展插件
106
+ * @returns {*} {Promise<void>}
107
+ * @memberof IApiAppHubService
108
+ */
109
+ loadMainExtensionPlugin(): Promise<void>;
110
+
111
+ /**
112
+ * @description 加载指定子应用扩展插件
106
113
  * @param {string} appId 应用标识
107
114
  * @returns {*} {Promise<void>}
108
115
  * @memberof IApiAppHubService
109
116
  */
110
- loadExtensionPlugin(appId: string): Promise<void>;
117
+ loadSubExtensionPlugin(appId: string): Promise<void>;
111
118
 
112
119
  /**
113
120
  * @description 重置清空应用中心
@@ -94,7 +94,7 @@ export interface IApiTreeNodeData {
94
94
  _parent?: IApiTreeNodeData;
95
95
 
96
96
  /**
97
- * @description 实体数据
97
+ * @description 实体数据(实体动态代码表树节点/实体数据集树节点类型存在该属性,静态树节点类型不存在该属性)
98
98
  * @type {IApiData}
99
99
  * @memberof IApiTreeNodeData
100
100
  */
@@ -448,7 +448,7 @@ export const en = {
448
448
  failedParse: 'View parameter {paramsName} failed to parse: {error}',
449
449
  noExist: 'View [{id}] does not exist',
450
450
  noExtensionPlugin:
451
- 'Attempted to load application [{appId}] extension plugin, but no extension plugin was found',
451
+ 'Attempted to load the extension plugin from path [{targetUrl}], but no extension plugin was found',
452
452
  },
453
453
  logicScheduler: {
454
454
  executor: {
@@ -374,7 +374,7 @@ export const zhCn = {
374
374
  hub: {
375
375
  failedParse: '视图参数 {paramsName} 解析失败:{error}',
376
376
  noExist: '视图[{id}]不存在',
377
- noExtensionPlugin: '尝试加载应用[{appId}]扩展插件,暂未找到扩展插件',
377
+ noExtensionPlugin: '尝试加载路径[{targetUrl}]扩展插件,暂未找到扩展插件',
378
378
  },
379
379
  logicScheduler: {
380
380
  executor: {
@@ -72,7 +72,10 @@ export async function getTreeNodeProvider(
72
72
  }
73
73
  }
74
74
 
75
- // 找树节点类型适配器
75
+ // 找树节点类型适配器,未找到则找默认适配器
76
76
  provider = getProvider(treeNodeType);
77
+ if (!provider) {
78
+ provider = getProvider('DEFAULT');
79
+ }
77
80
  return provider;
78
81
  }