@ibiz-template/runtime 0.1.24 → 0.1.26

package/out/config/global-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../../src/config/global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,cAAc,CAAC;AAEtB;;;;;;;;GAQG;AACH,qBAAa,YAAa,YAAW,aAAa;IAEhD,IAAI,EAAE,iBAAiB,CAErB;IAGF,IAAI,EAAE,iBAAiB,CAGrB;IAGF,OAAO,EAAE,oBAAoB,CAE3B;IAGF,QAAQ,EAAE,qBAAqB,CAE7B;CACH"}
+{"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../../src/config/global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,cAAc,CAAC;AAEtB;;;;;;;;GAQG;AACH,qBAAa,YAAa,YAAW,aAAa;IAEhD,IAAI,EAAE,iBAAiB,CAGrB;IAGF,IAAI,EAAE,iBAAiB,CAGrB;IAGF,OAAO,EAAE,oBAAoB,CAE3B;IAGF,QAAQ,EAAE,qBAAqB,CAE7B;CACH"}

package/out/config/global-config.js

@@ -12,6 +12,7 @@ export class GlobalConfig {
         // 全局视图配置
         this.view = {
             enableDataInfoBar: true,
+            enableExpCache: true,
         };
         // 全局表格配置
         this.grid = {

package/out/controller/common/control/control.controller.d.ts

@@ -3,7 +3,7 @@ import { BaseController } from '..';
 import { CTX } from '../../ctx';
 import { EventBase, IControlController, IControlEvent, IControlState, IViewController, IViewLayoutPanelController } from '../../../interface/controller';
 import { ControllerEvent } from '../../utils';
-import { IControlProvider, IDataAbilityParams } from '../../../interface';
+import { IDataAbilityParams, IProvider } from '../../../interface';
 import { ControlLogicScheduler } from '../../../logic-scheduler';
 /**
  * 部件控制器
@@ -32,13 +32,13 @@ export declare class ControlController<T extends IControl = IControl, S extends
     controlPanel?: IViewLayoutPanel;
     layoutPanel?: IViewLayoutPanelController;
     /**
-     * 子部件适配器
+     * 子适配器
      * @author lxm
      * @date 2023-07-19 04:14:50
-     * @type {{ [key: string]: IControlProvider }}
+     * @type {{ [key: string]: IProvider }}
      */
     providers: {
-        [key: string]: IControlProvider;
+        [key: string]: IProvider;
     };
     /**
      * Creates an instance of ControlController.

package/out/controller/common/control/control.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAG7E,OAAO,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,aAAa,EACb,aAAa,EACb,eAAe,EACf,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAEnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAIjE;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,IAAI,IAAI,IAAI,eAAe,CAE1B;IAED;;;;;OAKG;IACH,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAEhC,WAAW,CAAC,EAAE,0BAA0B,CAAC;IAEzC;;;;;OAKG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;;;;OAQG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG;IAWlE;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAStD,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAc1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5C;;;;;OAKG;IACH,cAAc,IAAI,MAAM;IAIxB;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE,GAAG,IAAI;IAIzB;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC;;;;;;;OAOG;IACH,SAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG;QACzD,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;QAChB,IAAI,EAAE,KAAK,EAAE,CAAC;KACf;IAOD;;;;;OAKG;IACH,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;IAWvD;;;;;;OAMG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;IAUlE;;;;;;;OAOG;IACH,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GACjE,IAAI;CAqDR"}
+{"version":3,"file":"control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAG7E,OAAO,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,aAAa,EACb,aAAa,EACb,eAAe,EACf,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EACL,kBAAkB,EAClB,SAAS,EAEV,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAIjE;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,IAAI,IAAI,IAAI,eAAe,CAE1B;IAED;;;;;OAKG;IACH,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAEhC,WAAW,CAAC,EAAE,0BAA0B,CAAC;IAEzC;;;;;OAKG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAM;IAE7C;;;;;;;;OAQG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG;IAWlE;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAStD,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAc1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5C;;;;;OAKG;IACH,cAAc,IAAI,MAAM;IAIxB;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE,GAAG,IAAI;IAIzB;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC;;;;;;;OAOG;IACH,SAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG;QACzD,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;QAChB,IAAI,EAAE,KAAK,EAAE,CAAC;KACf;IAOD;;;;;OAKG;IACH,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;IAWvD;;;;;;OAMG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;IAUlE;;;;;;;OAOG;IACH,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GACjE,IAAI;CAqDR"}

package/out/controller/common/control/control.controller.js

@@ -30,10 +30,10 @@ export class ControlController extends BaseController {
     constructor(model, context, params, ctx) {
         super(model, context, params, ctx);
         /**
-         * 子部件适配器
+         * 子适配器
          * @author lxm
          * @date 2023-07-19 04:14:50
-         * @type {{ [key: string]: IControlProvider }}
+         * @type {{ [key: string]: IProvider }}
          */
         this.providers = {};
         this.registerToCtx();

package/out/controller/control/exp-bar/calendar-exp-bar.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calendar-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/calendar-exp-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAEf,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,yBAAyB,EACzB,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,wBACX,SAAQ,uBAAuB,CAC7B,eAAe,EACf,oBAAoB,EACpB,oBAAoB,CAEtB,YAAW,yBAAyB;IAEpC;;;;;;OAMG;IACH,UAAU,SAAW;IAErB,SAAS,CAAC,oBAAoB,CAC5B,YAAY,EAAE,MAAM,GACnB,gBAAgB,GAAG,SAAS;IAQ/B,IAAI,eAAe,IAAI,mBAAmB,CASzC;IAEM,kBAAkB,IAAI,IAAI;IAajC;;;;;;;;OAQG;IACI,aAAa,CAAC,IAAI,EAAE,iBAAiB,GAAG,WAAW;CAuB3D"}
+{"version":3,"file":"calendar-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/calendar-exp-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAEf,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,yBAAyB,EACzB,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,wBACX,SAAQ,uBAAuB,CAC7B,eAAe,EACf,oBAAoB,EACpB,oBAAoB,CAEtB,YAAW,yBAAyB;IAEpC;;;;;;OAMG;IACH,UAAU,SAAW;IAErB,SAAS,CAAC,oBAAoB,CAC5B,YAAY,EAAE,MAAM,GACnB,gBAAgB,GAAG,SAAS;IAQ/B,IAAI,eAAe,IAAI,mBAAmB,CASzC;IAEM,kBAAkB,IAAI,IAAI;IAajC;;;;;;;;OAQG;IACI,aAAa,CAAC,IAAI,EAAE,iBAAiB,GAAG,WAAW;CAwB3D"}

package/out/controller/control/exp-bar/calendar-exp-bar.controller.js

@@ -58,6 +58,7 @@ export class CalendarExpBarController extends ExpBarControlController {
         if (itemModel) {
             const { context, params } = this.prepareParams(itemModel, item.deData ? item.deData : item, this.context, this.params);
             context.currentSrfNav = item.navId;
+            this.state.srfnav = item.navId;
             return {
                 key: item.navId,
                 context,

package/out/controller/control/exp-bar/exp-bar.controller.d.ts

@@ -179,6 +179,16 @@ export declare class ExpBarControlController<T extends IExpBar = IExpBar, S exte
      */
     protected calcControlHeaderVisible(): boolean;
     setLayoutPanel(panel: IViewLayoutPanelController): void;
+    /**
+     * 路由变更处理回调
+     * @author lxm
+     * @date 2023-09-14 07:03:39
+     * @param {{ srfnav?: string; path: string }} info 当前系统的路由的从一级到最后一级的所有路径。
+     */
+    onRouterChange(info: {
+        srfnav: string;
+        path: string;
+    }): void;
 }
 export {};
 //# sourceMappingURL=exp-bar.controller.d.ts.map

package/out/controller/control/exp-bar/exp-bar.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,OAAO,EACP,WAAW,EACX,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACxB,oBAAoB,EACpB,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,WAAW,EACX,0BAA0B,EAC3B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,KAAK,iBAAiB,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,CAAC;AAEzD;;;;;;;;;;;;GAYG;AACH,qBAAa,uBAAuB,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,EACnD,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CAErD,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,wBAAwB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAE5C,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,mBAAmB,CAAC,CAEzD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;;;OAOG;IACH,SAAS,EAAG,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,UAAU,SAAY;IAEtB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;;OAOG;IACH,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAIxB;;;;;;;;OAQG;IACH,IAAI,eAAe,IAAI,oBAAoB,CAS1C;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,kBAAkB,GAAG,SAAS,CAKtD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,iBAAiB,GAAG,SAAS,CAO9C;IAED;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1C;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAaxC;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAgBpC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAYvC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAMnC;;;;;;;;OAQG;IACH,aAAa,CACX,UAAU,EAAE,YAAY,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,EACvD,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IA6BzC;;;;;;;OAOG;IACI,eAAe,IAAI,MAAM,GAAG,SAAS;IAS5C;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;IAWd;;;;;;OAMG;IACH,SAAS,CAAC,wBAAwB,IAAI,OAAO;IAe7C,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;CAaxD"}
+{"version":3,"file":"exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,OAAO,EACP,WAAW,EACX,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACxB,oBAAoB,EACpB,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,WAAW,EACX,0BAA0B,EAC3B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,KAAK,iBAAiB,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,CAAC;AAEzD;;;;;;;;;;;;GAYG;AACH,qBAAa,uBAAuB,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,EACnD,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CAErD,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,wBAAwB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAE5C,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,mBAAmB,CAAC,CAEzD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;;;OAOG;IACH,SAAS,EAAG,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,UAAU,SAAY;IAEtB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;;OAOG;IACH,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAIxB;;;;;;;;OAQG;IACH,IAAI,eAAe,IAAI,oBAAoB,CAS1C;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,kBAAkB,GAAG,SAAS,CAKtD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,iBAAiB,GAAG,SAAS,CAO9C;IAED;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1C;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAaxC;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,IAAI,IAAI;IA6BpC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAavC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAMnC;;;;;;;;OAQG;IACH,aAAa,CACX,UAAU,EAAE,YAAY,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,EACvD,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IA8BzC;;;;;;;OAOG;IACI,eAAe,IAAI,MAAM,GAAG,SAAS;IAS5C;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;IAWd;;;;;;OAMG;IACH,SAAS,CAAC,wBAAwB,IAAI,OAAO;IAe7C,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;IAcvD;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;CAM7D"}

package/out/controller/control/exp-bar/exp-bar.controller.js

@@ -191,15 +191,26 @@ export class ExpBarControlController extends ControlController {
         var _a;
         // 找到选中项，如果没有就模拟选中数据
         const selectItem = (_a = this.xDataController) === null || _a === void 0 ? void 0 : _a.state.items.find(item => item[this.navKeyName] === this.state.srfnav);
-        if (selectItem) {
-            // 在多数据部件里面选项设置回显。
+        // 是否是路由模式且有子路由
+        const routeAndHasSub = this.routeDepth &&
+            window.location.hash.split('/').length > this.routeDepth * 2 + 2;
+        console.log('routeAndHasSub', routeAndHasSub);
+        if (routeAndHasSub) {
+            if (selectItem) {
+                // 在多数据部件里面选项设置回显。
+                this.xDataController.setSelection([selectItem]);
+            }
+            // 此时不需要导航占位push路由，只要有个key触发绘制下级视图就行。
+            this._evt.emit('onNavViewChange', {
+                navViewMsg: { key: this.state.srfnav },
+                context: this.context,
+            });
+        }
+        else if (selectItem) {
+            // 非路由模式,或者有路由模式下有srfnav没有子路由时，需要在多数据部件里面选项设置回显。
+            this.xDataController.setActive(selectItem);
             this.xDataController.setSelection([selectItem]);
         }
-        // 此时不需要导航占位push路由，只要有个key触发绘制下级视图就行。
-        this._evt.emit('onNavViewChange', {
-            navViewMsg: { key: this.state.srfnav },
-            context: this.context,
-        });
     }
     /**
      * 导航页面首次打开且没有回显时，
@@ -213,6 +224,7 @@ export class ExpBarControlController extends ControlController {
         const data = this.xDataController.state.items[0];
         if (!data) {
             // 导航视图传空让他导航占位绘制空界面
+            this.state.srfnav = '';
             this._evt.emit('onNavViewChange', { navViewMsg: { key: '' } });
             return;
         }
@@ -261,6 +273,7 @@ export class ExpBarControlController extends ControlController {
         const tempContext = Object.assign(context.clone(), resultContext, {
             currentSrfNav: data[this.navKeyName],
         });
+        this.state.srfnav = data[this.navKeyName];
         const tempParams = Object.assign({}, resultParams);
         return { context: tempContext, params: tempParams };
     }
@@ -329,4 +342,16 @@ export class ExpBarControlController extends ControlController {
             }
         });
     }
+    /**
+     * 路由变更处理回调
+     * @author lxm
+     * @date 2023-09-14 07:03:39
+     * @param {{ srfnav?: string; path: string }} info 当前系统的路由的从一级到最后一级的所有路径。
+     */
+    onRouterChange(info) {
+        if (this.state.srfnav !== info.srfnav) {
+            this.state.srfnav = info.srfnav;
+            this.defaultNavBySrfnav();
+        }
+    }
 }

package/out/controller/control/exp-bar/tree-exp-bar.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/tree-exp-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,WAAW,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACrB,eAAe,EACf,UAAU,EACV,aAAa,EACb,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,oBACX,SAAQ,uBAAuB,CAC7B,WAAW,EACX,gBAAgB,EAChB,gBAAgB,CAElB,YAAW,qBAAqB;IAEhC;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE/B,IAAI,eAAe,IAAI,eAAe,CASrC;IAED;;;;;;OAMG;IACH,UAAU,OAAiB;IAE3B;;;;;OAKG;IACH,eAAe,EAAE,MAAM,EAAE,CAAM;IAE/B;;;;;;OAMG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAarD;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,IAAI;IAMzD;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;IAgBd,SAAS,CAAC,qBAAqB,IAAI,IAAI;cAwBvB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAyB3C"}
+{"version":3,"file":"tree-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/tree-exp-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,WAAW,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACrB,eAAe,EACf,UAAU,EACV,aAAa,EACb,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,oBACX,SAAQ,uBAAuB,CAC7B,WAAW,EACX,gBAAgB,EAChB,gBAAgB,CAElB,YAAW,qBAAqB;IAEhC;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE/B,IAAI,eAAe,IAAI,eAAe,CASrC;IAED;;;;;;OAMG;IACH,UAAU,OAAiB;IAE3B;;;;;OAKG;IACH,eAAe,EAAE,MAAM,EAAE,CAAM;IAE/B;;;;;;OAMG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAarD;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,IAAI;IAMzD;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;IAiBd,SAAS,CAAC,qBAAqB,IAAI,IAAI;cAwBvB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAyB3C"}

package/out/controller/control/exp-bar/tree-exp-bar.controller.js

@@ -84,6 +84,7 @@ export class TreeExpBarController extends ExpBarControlController {
         }
         const result = this.prepareParams(nodeModel, deData, context, params);
         result.context.currentSrfNav = nodeId;
+        this.state.srfnav = nodeId;
         return Object.assign({ key: nodeId, viewId: nodeModel.navAppViewId }, result);
     }
     defaultNavByFirstItem() {

package/out/de-logic/de-logic-node/end-node/end-node.js

@@ -21,7 +21,7 @@ export class EndNode extends DELogicNode {
                 ctx.result = null;
                 break;
             case 'SRCVALUE': // 直接值
-                ctx.result = rawValue;
+                ctx.result = ibiz.util.rawValue.format(rawValue);
                 break;
             case 'LOGICPARAM': // 逻辑参数对象
                 ctx.result = ctx.params[returnParamId];

package/out/de-logic/utils/handle-src-val.js

@@ -29,7 +29,7 @@ export function handleSrcVal(ctx, srcValParams) {
             return undefined;
         // 直接值
         case 'SRCVALUE':
-            return srcValue;
+            return ibiz.util.rawValue.format(srcValue);
         case 'WEBCONTEXT': // 网页请求上下文
         case 'VIEWPARAM': // 视图参数
             value = ctx.viewParams;

package/out/global/global-util/global-util.d.ts

@@ -1,5 +1,5 @@
 import { IExportExcelUtil } from '../../interface';
-import { TextUtil, LayoutPanelUtil, HandlebarsUtil } from '../../utils';
+import { TextUtil, LayoutPanelUtil, HandlebarsUtil, RawValueUtil } from '../../utils';
 /**
  * 全局工具方法或对象
  *
@@ -30,6 +30,13 @@ export declare class GlobalUtil {
      * @date 2023-08-28 23:08:59
      */
     readonly hbs: HandlebarsUtil;
+    /**
+     * 直接值工具
+     *
+     * @author zhujiamin
+     * @date 2023-08-24 11:08:28
+     */
+    readonly rawValue: RawValueUtil;
     /**
      * 获取导出Excel工具类对象
      * @author lxm

package/out/global/global-util/global-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global-util.d.ts","sourceRoot":"","sources":["../../../src/global/global-util/global-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAExE;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,kBAAyB;IAE7C;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,WAAkB;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,iBAAwB;IAEpC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IAOtB;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;CAQzB"}
+{"version":3,"file":"global-util.d.ts","sourceRoot":"","sources":["../../../src/global/global-util/global-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EACL,QAAQ,EACR,eAAe,EACf,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,kBAAyB;IAE7C;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,WAAkB;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,iBAAwB;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,eAAsB;IAEvC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IAOtB;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;CAQzB"}

package/out/global/global-util/global-util.js

@@ -1,4 +1,4 @@
-import { TextUtil, LayoutPanelUtil, HandlebarsUtil } from '../../utils';
+import { TextUtil, LayoutPanelUtil, HandlebarsUtil, RawValueUtil, } from '../../utils';
 /**
  * 全局工具方法或对象
  *
@@ -30,6 +30,13 @@ export class GlobalUtil {
          * @date 2023-08-28 23:08:59
          */
         this.hbs = new HandlebarsUtil();
+        /**
+         * 直接值工具
+         *
+         * @author zhujiamin
+         * @date 2023-08-24 11:08:28
+         */
+        this.rawValue = new RawValueUtil();
     }
     /**
      * 显示应用级别的加载提示

package/out/interface/common/i-global-config/i-global-view-config.d.ts

@@ -18,5 +18,13 @@ export interface IGlobalViewConfig {
      * @type {boolean}
      */
     enableDataInfoBar: boolean;
+    /**
+     * 全局导航是否启用缓存
+     *
+     * @author chitanda
+     * @date 2023-09-15 12:09:09
+     * @type {boolean}
+     */
+    enableExpCache: boolean;
 }
 //# sourceMappingURL=i-global-view-config.d.ts.map

package/out/interface/common/i-global-config/i-global-view-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-global-view-config.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-global-config/i-global-view-config.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;;;;;OASG;IACH,iBAAiB,EAAE,OAAO,CAAC;CAC5B"}
+{"version":3,"file":"i-global-view-config.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-global-config/i-global-view-config.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;;;;;OASG;IACH,iBAAiB,EAAE,OAAO,CAAC;IAE3B;;;;;;OAMG;IACH,cAAc,EAAE,OAAO,CAAC;CACzB"}

package/out/interface/controller/controller/control/i-exp-bar-control.controller.d.ts

@@ -51,5 +51,15 @@ export interface IExpBarControlController<T extends IExpBar = IExpBar, S extends
      * @memberof ITreeExpBarController
      */
     getNavViewMsg(data: IData, context: IContext, params: IParams): INavViewMsg;
+    /**
+     * 路由变更处理回调
+     * @author lxm
+     * @date 2023-09-14 07:03:39
+     * @param {{ srfnav?: string; path: string }} info 当前系统的路由的从一级到最后一级的所有路径。
+     */
+    onRouterChange(info: {
+        srfnav: string;
+        path: string;
+    }): void;
 }
 //# sourceMappingURL=i-exp-bar-control.controller.d.ts.map

package/out/interface/controller/controller/control/i-exp-bar-control.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-exp-bar-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-exp-bar-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;GAOG;AACH,MAAM,WAAW,wBAAwB,CACvC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,EACnD,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CACnD,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACnC;;;;;;;OAOG;IACH,eAAe,EAAE,oBAAoB,CAAC;IACtC;;;;;;;OAOG;IACH,iBAAiB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IAClD;;;;;;;OAOG;IACH,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAEzB;;;;;;;;OAQG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,WAAW,CAAC;CAC7E"}
+{"version":3,"file":"i-exp-bar-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-exp-bar-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;GAOG;AACH,MAAM,WAAW,wBAAwB,CACvC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,EACnD,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CACnD,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACnC;;;;;;;OAOG;IACH,eAAe,EAAE,oBAAoB,CAAC;IACtC;;;;;;;OAOG;IACH,iBAAiB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IAClD;;;;;;;OAOG;IACH,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAEzB;;;;;;;;OAQG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,WAAW,CAAC;IAE5E;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CAC9D"}

package/out/interface/provider/i-control.provider.d.ts

@@ -1,3 +1,6 @@
+import { IControl } from '@ibiz/model-core';
+import { CTX } from '../../controller';
+import { IControlController } from '../controller';
 /**
  * 部件适配器的接口
  *
@@ -15,5 +18,17 @@ export interface IControlProvider {
      * @type {unknown}
      */
     component: any;
+    /**
+     * 创建部件控制器
+     *
+     * @author lxm
+     * @date 2023-09-15 11:52:22
+     * @param {IControl} model 部件模型
+     * @param {IContext} context 上下文
+     * @param {IParams} [params] 视图参数
+     * @param {CTX} [ctx]
+     * @return {*}  {IControlController}
+     */
+    createController?(model: IControl, context: IContext, params: IParams, ctx: CTX): IControlController;
 }
 //# sourceMappingURL=i-control.provider.d.ts.map

package/out/interface/provider/i-control.provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-control.provider.d.ts","sourceRoot":"","sources":["../../../src/interface/provider/i-control.provider.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;;OAMG;IAEH,SAAS,EAAE,GAAG,CAAC;CAChB"}
+{"version":3,"file":"i-control.provider.d.ts","sourceRoot":"","sources":["../../../src/interface/provider/i-control.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD;;;;;;;GAOG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;;OAMG;IAEH,SAAS,EAAE,GAAG,CAAC;IAEf;;;;;;;;;;OAUG;IACH,gBAAgB,CAAC,CACf,KAAK,EAAE,QAAQ,EACf,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,GAAG,EAAE,GAAG,GACP,kBAAkB,CAAC;CACvB"}

package/out/interface/provider/i-view.provider.d.ts

@@ -1,3 +1,6 @@
+import { IAppView } from '@ibiz/model-core';
+import { CTX } from '../../controller';
+import { IViewController } from '../controller';
 /**
  * 视图适配器的接口
  *
@@ -15,5 +18,17 @@ export interface IViewProvider {
      * @type {unknown}
      */
     component: any;
+    /**
+     * 创建视图控制器
+     *
+     * @author lxm
+     * @date 2023-09-15 11:49:26
+     * @param {IAppView} model 视图模型
+     * @param {IContext} context 上下文
+     * @param {IParams} [params] 视图参数
+     * @param {CTX} [ctx]
+     * @return {*}  {IViewController}
+     */
+    createController?(model: IAppView, context: IContext, params?: IParams, ctx?: CTX): IViewController;
 }
 //# sourceMappingURL=i-view.provider.d.ts.map

package/out/interface/provider/i-view.provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-view.provider.d.ts","sourceRoot":"","sources":["../../../src/interface/provider/i-view.provider.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;;OAMG;IAEH,SAAS,EAAE,GAAG,CAAC;CAChB"}
+{"version":3,"file":"i-view.provider.d.ts","sourceRoot":"","sources":["../../../src/interface/provider/i-view.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;;OAMG;IAEH,SAAS,EAAE,GAAG,CAAC;IAEf;;;;;;;;;;OAUG;IACH,gBAAgB,CAAC,CACf,KAAK,EAAE,QAAQ,EACf,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,GAAG,GACR,eAAe,CAAC;CACpB"}

package/out/logic-scheduler/executor/app-ui-logic-executor.d.ts

@@ -25,6 +25,7 @@ export declare class AppUILogicExecutor extends LogicExecutor {
      * @param {IData} [opts] 额外参数，event是js原生事件
      */
     executeOpenDataAppUILogic(appUILogic: IAppUIOpenDataLogic, parameters: IUILogicParams): Promise<IModalData>;
+    protected calcOpenViewRef(appUILogic: IAppUIOpenDataLogic, parameters: IUILogicParams): Promise<IAppUILogicRefViewBase>;
     /**
      * 执行应用预置界面逻辑newdata
      *
@@ -50,6 +51,17 @@ export declare class AppUILogicExecutor extends LogicExecutor {
      * @return {*}  {(Promise<IAppUILogicRefViewBase | undefined>)}
      */
     protected getWizardNewViewRef(appUILogic: IAppUINewDataLogic, parameters: IUILogicParams): Promise<IAppUILogicRefViewBase | undefined>;
-    protected calcOpenViewRef(appUILogic: IAppUIOpenDataLogic, parameters: IUILogicParams): Promise<IAppUILogicRefViewBase>;
+    /**
+     * 拿选中的数据做批添加新建
+     * @author lxm
+     * @date 2023-09-15 05:20:02
+     * @protected
+     * @param {IAppUIOpenDataLogic} appUILogic
+     * @param {IData[]} selections
+     * @param {IContext} context
+     * @param {IAppUILogicRefViewBase} newViewRef
+     * @return {*}  {Promise<void>}
+     */
+    protected doBatchAdd(appUILogic: IAppUIOpenDataLogic, selections: IData[], context: IContext, newViewRef: IAppUILogicRefViewBase): Promise<void>;
 }
 //# sourceMappingURL=app-ui-logic-executor.d.ts.map

package/out/logic-scheduler/executor/app-ui-logic-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-ui-logic-executor.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/executor/app-ui-logic-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IAC3C,IAAI,EAAE,YAAY,CAAC;IAG3B,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,GAAG;IAiB3C;;;;;;;;;;;OAWG;IACG,yBAAyB,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IAqDtB;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IA8DtB;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;cAmC9B,eAAe,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,CAAC;CA0BnC"}
+{"version":3,"file":"app-ui-logic-executor.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/executor/app-ui-logic-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IAC3C,IAAI,EAAE,YAAY,CAAC;IAG3B,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,GAAG;IAiB3C;;;;;;;;;;;OAWG;IACG,yBAAyB,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;cAqDN,eAAe,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,CAAC;IA2BlC;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IAiFtB;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAmC9C;;;;;;;;;;OAUG;cACa,UAAU,CACxB,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,KAAK,EAAE,EACnB,OAAO,EAAE,QAAQ,EACjB,UAAU,EAAE,sBAAsB,GACjC,OAAO,CAAC,IAAI,CAAC;CA+DjB"}

package/out/logic-scheduler/executor/app-ui-logic-executor.js

@@ -12,7 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 import { ModelError, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
 import { notNilEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
-import { getFormTypeFieldName } from '../../model';
+import { calcDeCodeNameById, getFormTypeFieldName } from '../../model';
 import { convertNavData } from '../../utils';
 import { LogicExecutor } from './logic-executor';
 /**
@@ -82,6 +82,27 @@ export class AppUILogicExecutor extends LogicExecutor {
         // 打开视图
         return ibiz.commands.execute(OpenAppViewCommand.TAG, openView, tempContext, tempParams, rest);
     }
+    async calcOpenViewRef(appUILogic, parameters) {
+        const appDataEntityId = parameters.view.model.appDataEntityId;
+        // 表单类型属性
+        const formTypeName = await getFormTypeFieldName(appDataEntityId);
+        if (!formTypeName) {
+            throw new RuntimeModelError(appUILogic, `${appDataEntityId}实体缺少表单类型应用实体属性`);
+        }
+        const { data } = parameters;
+        // 表单类型值
+        const formTypeValue = data[0][formTypeName];
+        if (!formTypeValue) {
+            throw new RuntimeModelError(appUILogic, '数据源无表单类型应用实体属性值');
+        }
+        const openViewRefs = appUILogic.openDataAppViews;
+        // 根据表单类型值找到实际打开的视图
+        const findView = openViewRefs === null || openViewRefs === void 0 ? void 0 : openViewRefs.find(item => item.refMode === formTypeValue);
+        if (!findView) {
+            throw new RuntimeError(`没有找到与表单类型${formTypeValue}相关的实体的编辑视图`);
+        }
+        return findView;
+    }
     /**
      * 执行应用预置界面逻辑newdata
      *
@@ -96,7 +117,7 @@ export class AppUILogicExecutor extends LogicExecutor {
      */
     async executeNewDataAppUILogic(appUILogic, parameters) {
         const { context, params } = parameters, rest = __rest(parameters, ["context", "params"]);
-        const { data } = parameters;
+        const { data, view } = parameters;
         const { enableWizardAdd, enableBatchAdd, batchAddOnly, newDataAppView } = appUILogic;
         let newViewRef;
         if (enableWizardAdd) {
@@ -107,8 +128,15 @@ export class AppUILogicExecutor extends LogicExecutor {
             }
         }
         else if (enableBatchAdd) {
-            // todo 批添加
-            throw new ModelError(appUILogic, 'enableBatchAdd暂未支持');
+            // 查找批添加打开视图
+            const parentDeName = calcDeCodeNameById(view.parentView.model.appDataEntityId);
+            const batchViews = appUILogic.batchAddAppViews;
+            newViewRef = batchViews === null || batchViews === void 0 ? void 0 : batchViews.find(viewRef => {
+                return viewRef.refMode.toLowerCase() !== parentDeName;
+            });
+            if (!newViewRef) {
+                throw new RuntimeModelError(appUILogic, '没有找到批添加需要打开的选择视图');
+            }
         }
         else if (batchAddOnly) {
             // todo 只支持批添加
@@ -141,7 +169,12 @@ export class AppUILogicExecutor extends LogicExecutor {
             tempParams = Object.assign(tempParams, _data.$origin);
         }
         // 打开视图
-        return ibiz.commands.execute(OpenAppViewCommand.TAG, newViewRef.refAppViewId, tempContext, tempParams, rest);
+        const result = await ibiz.commands.execute(OpenAppViewCommand.TAG, newViewRef.refAppViewId, tempContext, tempParams, rest);
+        // 执行批添加新建逻辑
+        if (enableBatchAdd && result.data) {
+            await this.doBatchAdd(appUILogic, result.data, context, newViewRef);
+        }
+        return result;
     }
     /**
      * 获取向导新建视图引用
@@ -179,25 +212,74 @@ export class AppUILogicExecutor extends LogicExecutor {
         }
         return findView;
     }
-    async calcOpenViewRef(appUILogic, parameters) {
-        const appDataEntityId = parameters.view.model.appDataEntityId;
-        // 表单类型属性
-        const formTypeName = await getFormTypeFieldName(appDataEntityId);
-        if (!formTypeName) {
-            throw new RuntimeModelError(appUILogic, `${appDataEntityId}实体缺少表单类型应用实体属性`);
-        }
-        const { data } = parameters;
-        // 表单类型值
-        const formTypeValue = data[0][formTypeName];
-        if (!formTypeValue) {
-            throw new RuntimeModelError(appUILogic, '数据源无表单类型应用实体属性值');
-        }
-        const openViewRefs = appUILogic.openDataAppViews;
-        // 根据表单类型值找到实际打开的视图
-        const findView = openViewRefs === null || openViewRefs === void 0 ? void 0 : openViewRefs.find(item => item.refMode === formTypeValue);
-        if (!findView) {
-            throw new RuntimeError(`没有找到与表单类型${formTypeValue}相关的实体的编辑视图`);
+    /**
+     * 拿选中的数据做批添加新建
+     * @author lxm
+     * @date 2023-09-15 05:20:02
+     * @protected
+     * @param {IAppUIOpenDataLogic} appUILogic
+     * @param {IData[]} selections
+     * @param {IContext} context
+     * @param {IAppUILogicRefViewBase} newViewRef
+     * @return {*}  {Promise<void>}
+     */
+    async doBatchAdd(appUILogic, selections, context, newViewRef) {
+        var _a;
+        // 批添加新建选中数据后
+        if (selections === null || selections === void 0 ? void 0 : selections.length) {
+            const selfDe = await ibiz.hub.getAppDataEntity(appUILogic.appDataEntityId, context.srfappid);
+            const minorDERs = selfDe.minorAppDERSs;
+            const pickParentDeName = newViewRef.refMode.toLowerCase();
+            if (!minorDERs) {
+                throw new RuntimeModelError(selfDe, '实体没有从关系集合！');
+            }
+            // 获取选择视图对应父实体在当前实体里的外键属性名称。
+            let pickParentFieldName;
+            minorDERs === null || minorDERs === void 0 ? void 0 : minorDERs.forEach(item => {
+                const majorDeName = calcDeCodeNameById(item.majorAppDataEntityId);
+                if (pickParentDeName === majorDeName) {
+                    pickParentFieldName = item.parentAppDEFieldId;
+                }
+            });
+            // 获取key为keymapping的特殊视图参数
+            const openViewKeyParam = (_a = newViewRef.navigateParams) === null || _a === void 0 ? void 0 : _a.find(navParam => {
+                return navParam.key === 'keymapping';
+            });
+            let addData = [];
+            if (openViewKeyParam) {
+                const keyValuePairs = openViewKeyParam.value.split(';');
+                const keyMapping = {};
+                // 遍历键值对数组并添加到 keyMapping 映射对象中
+                for (const pair of keyValuePairs) {
+                    const [sourceKey, targetKey] = pair.split(':');
+                    if (sourceKey && targetKey) {
+                        keyMapping[sourceKey] = targetKey;
+                    }
+                }
+                addData = selections.map(item => {
+                    const tempData = {
+                        [pickParentFieldName]: item.srfkey,
+                    };
+                    // 遍历映射对象，将属性从 item 复制到 tempData
+                    for (const key in keyMapping) {
+                        if (Object.prototype.hasOwnProperty.call(keyMapping, key)) {
+                            const targetKey = keyMapping[key];
+                            if (Object.prototype.hasOwnProperty.call(item, key)) {
+                                tempData[targetKey] = item[key];
+                            }
+                        }
+                    }
+                    return tempData;
+                });
+            }
+            else {
+                addData = selections.map(item => ({
+                    [pickParentFieldName]: item.srfkey,
+                }));
+            }
+            // 获取实体服务并调用创建接口
+            const service = ibiz.hub.getApp(context.srfappid).deService;
+            await service.exec(selfDe.id, 'Create', context, addData);
         }
-        return findView;
     }
 }

package/out/service/service/control/control.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,qBAAa,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IACvD,GAAG,EAAG,WAAW,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;;OAOG;IACH,SAAS,0BAAiC;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAE/B;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,IAAI,GAAE,KAAU,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa;IAKjD;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,EAAE,KAAK,GAAG,SAAS;CAGvC"}
+{"version":3,"file":"control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,qBAAa,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IACvD,GAAG,EAAG,WAAW,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;;OAOG;IACH,SAAS,0BAAiC;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAE/B;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa;IAKjD;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,EAAE,KAAK,GAAG,SAAS;CAGvC"}

package/out/service/service/control/control.service.js

@@ -46,7 +46,7 @@ export class ControlService {
      * @param {IParams} [params={}] 视图参数或数据
      * @returns {*}  {Promise<IHttpResponse>}
      */
-    async exec(methodName, context, data = {}, params = {}) {
+    async exec(methodName, context, data, params) {
         const res = await this.app.deService.exec(this.model.appDataEntityId, methodName, context, data, params);
         return res;
     }

package/out/service/service/entity/de.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,aAAa,EAA4B,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,aAAa;IA6CjC,SAAS,CAAC,KAAK,EAAE,cAAc;IA5C3C;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE9D;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAiB;IAExC;;;;;;OAMG;gBACmB,KAAK,EAAE,cAAc;IAK3C;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAwBvC;;;;;;;;;;OAUG;IACH,IAAI,CACF,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,KAAU,EAClB,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC;CAO1B"}
+{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,aAAa,EAA4B,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,aAAa;IA6CjC,SAAS,CAAC,KAAK,EAAE,cAAc;IA5C3C;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE9D;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAiB;IAExC;;;;;;OAMG;gBACmB,KAAK,EAAE,cAAc;IAK3C;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAwBvC;;;;;;;;;;OAUG;IACH,IAAI,CACF,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAO1B"}

package/out/service/service/entity/de.service.js

@@ -83,7 +83,7 @@ export class DEService {
      * @param {IParams} [params2={}] 查询参数
      * @return {*}  {Promise<IHttpResponse>}
      */
-    exec(id, context, params = {}, params2 = {}) {
+    exec(id, context, params, params2) {
         const method = this.getMethod(id);
         if (method) {
             return method.exec(context, params, params2);

package/out/service/service/entity/method/de-action.d.ts

@@ -23,7 +23,7 @@ export declare class DEActionMethod extends Method {
      * @type {boolean}
      */
     protected get isLocalMode(): boolean;
-    exec(context: IParams, data: IData, params: IParams): Promise<HttpResponse<IData>>;
+    exec(context: IParams, data?: IData, params?: IParams): Promise<HttpResponse<IData>>;
     /**
      * 创建数据
      *