@ibiz-template/runtime 0.1.24 → 0.1.25

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/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/service/vo/control.vo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control.vo.d.ts","sourceRoot":"","sources":["../../../src/service/vo/control.vo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;;OAOG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;OAOG;IACK,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACH,IAAI,KAAK,IAAI,KAAK,CAKjB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;IACH,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;gBAED,OAAO,GAAE,KAAU,EACnB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAa;IAiCjD;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;IA8CpB;;;;;;OAMG;IACH,SAAS,IAAI,KAAK;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAIxC;;;;;;OAMG;IACH,KAAK,IAAI,SAAS;CAQnB"}
+{"version":3,"file":"control.vo.d.ts","sourceRoot":"","sources":["../../../src/service/vo/control.vo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;;OAOG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;OAOG;IACK,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACH,IAAI,KAAK,IAAI,KAAK,CAKjB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;IACH,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;;;;OAMG;gBAED,OAAO,GAAE,KAAU,EACnB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAa;IA8BjD;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,YAAY;IA6CpB;;;;;;OAMG;IACH,SAAS,IAAI,KAAK;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAIxC;;;;;;OAMG;IACH,KAAK,IAAI,SAAS;CAQnB"}

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

@@ -1,4 +1,3 @@
-import { DataTypes } from '@ibiz-template/core';
 import { clone, isNil } from 'ramda';
 import { Srfuf } from '../constant';
 /**
@@ -105,9 +104,7 @@ export class ControlVO {
         this.$dataUIMap.forEach((mapField, key) => {
             const value = mapField.dataKey;
             // 关联映射属性
-            const forceNumber = mapField.dataType !== undefined &&
-                DataTypes.isNumber(mapField.dataType);
-            this.linkProperty(key, value, mapField.isOriginField, forceNumber);
+            this.linkProperty(key, value, mapField);
         });
         // 映射属性里没有涉及到的建立直接关联，用于使用实体属性也要取到值的场景。
         Object.keys($origin).forEach(value => {
@@ -129,7 +126,8 @@ export class ControlVO {
      * @param {boolean} [forceNumber=false] 是否强制转换成数值，是的话set的时候转成数值
      * @returns {*}
      */
-    linkProperty(uiKey, dataKey, isOriginField = true, forceNumber = false) {
+    linkProperty(uiKey, dataKey, mapField) {
+        const isOriginField = mapField ? mapField.isOriginField : true;
         // srfuf和srfkey不做处理
         if (uiKey === 'srfuf') {
             return;
@@ -147,15 +145,14 @@ export class ControlVO {
                         : this.$origin[dataKey];
                 },
                 set(val) {
-                    // 非空且强制转数值时，转换值的类型
-                    let val2 = forceNumber && !isNil(val) && val !== '' ? Number(val) : val;
-                    if (Number.isNaN(val2)) {
-                        val2 = val; // NaN时还原值
-                        ibiz.log.error(`${val}不能转换成数字`);
-                    }
-                    this.$origin[dataKey] = val2;
+                    // 有mapField的走它的转换
+                    this.$origin[dataKey] = mapField ? mapField.convertVal(val) : val;
                 },
             });
+            // 一开始初始化的时候先把值转换一下。
+            if (mapField) {
+                this[uiKey] = mapField.convertVal(this.$origin[dataKey]);
+            }
         }
         else {
             Object.defineProperty(this, uiKey, {

package/out/service/vo/ui-map-field.d.ts

@@ -50,5 +50,12 @@ export declare class UIMapField {
         isOriginField?: boolean;
         dataType?: number;
     });
+    /**
+     * 值转换
+     * @author lxm
+     * @date 2023-09-14 06:45:44
+     * @param {unknown} value 原值
+     */
+    convertVal(value: unknown): unknown;
 }
 //# sourceMappingURL=ui-map-field.d.ts.map

package/out/service/vo/ui-map-field.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-map-field.d.ts","sourceRoot":"","sources":["../../../src/service/vo/ui-map-field.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAS;IAE/B;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAQ;gBAG5B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,IAAI,GAAE;QACJ,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACd;CAWT"}
+{"version":3,"file":"ui-map-field.d.ts","sourceRoot":"","sources":["../../../src/service/vo/ui-map-field.ts"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAS;IAE/B;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAQ;gBAG5B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,IAAI,GAAE;QACJ,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACd;IAYR;;;;;OAKG;IACH,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO;CAoBpC"}

package/out/service/vo/ui-map-field.js

@@ -1,3 +1,4 @@
+import { DataTypes } from '@ibiz-template/core';
 import { isNil } from 'ramda';
 /**
  * 界面映射字段信息
@@ -34,4 +35,27 @@ export class UIMapField {
             this.dataType = opts.dataType;
         }
     }
+    /**
+     * 值转换
+     * @author lxm
+     * @date 2023-09-14 06:45:44
+     * @param {unknown} value 原值
+     */
+    convertVal(value) {
+        // 没有数据类型的给原值
+        if (!this.dataType) {
+            return value;
+        }
+        // 数值转换
+        if (DataTypes.isNumber(this.dataType)) {
+            const numVal = !isNil(value) && value !== '' ? Number(value) : value;
+            if (Number.isNaN(numVal)) {
+                // 不能转换的给原值
+                ibiz.log.debug(`${value}不能转换成数字`);
+                return value;
+            }
+            return numVal;
+        }
+        return value;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "b1d394ad9b4d7e81e607054c31f056e8299855b9"
+  "gitHead": "bfc52e088d9eb1548c4c22cd783ec22d76499ee1"
 }

package/src/config/global-config.ts

@@ -19,6 +19,7 @@ export class GlobalConfig implements IGlobalConfig {
   // 全局视图配置
   view: IGlobalViewConfig = {
     enableDataInfoBar: true,
+    enableExpCache: true,
   };
 
   // 全局表格配置

package/src/controller/common/control/control.controller.ts

@@ -13,8 +13,8 @@ import {
 } from '../../../interface/controller';
 import { ControllerEvent } from '../../utils';
 import {
-  IControlProvider,
   IDataAbilityParams,
+  IProvider,
   IUILogicParams,
 } from '../../../interface';
 import { ControlLogicScheduler } from '../../../logic-scheduler';
@@ -64,12 +64,12 @@ export class ControlController<
   layoutPanel?: IViewLayoutPanelController;
 
   /**
-   * 子部件适配器
+   * 子适配器
    * @author lxm
    * @date 2023-07-19 04:14:50
-   * @type {{ [key: string]: IControlProvider }}
+   * @type {{ [key: string]: IProvider }}
    */
-  providers: { [key: string]: IControlProvider } = {};
+  providers: { [key: string]: IProvider } = {};
 
   /**
    * Creates an instance of ControlController.

package/src/controller/control/exp-bar/calendar-exp-bar.controller.ts

@@ -92,6 +92,7 @@ export class CalendarExpBarController
         this.params,
       );
       context.currentSrfNav = item.navId;
+      this.state.srfnav = item.navId;
       return {
         key: item.navId,
         context,

package/src/controller/control/exp-bar/exp-bar.controller.ts

@@ -256,15 +256,28 @@ export class ExpBarControlController<
     const selectItem = this.xDataController?.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,
-    });
   }
 
   /**
@@ -279,6 +292,7 @@ export class ExpBarControlController<
     const data = this.xDataController.state.items[0];
     if (!data) {
       // 导航视图传空让他导航占位绘制空界面
+      this.state.srfnav = '';
       this._evt.emit('onNavViewChange', { navViewMsg: { key: '' } });
       return;
     }
@@ -340,6 +354,7 @@ export class ExpBarControlController<
     const tempContext = Object.assign(context.clone(), resultContext, {
       currentSrfNav: data[this.navKeyName],
     });
+    this.state.srfnav = data[this.navKeyName];
     const tempParams = { ...resultParams };
     return { context: tempContext, params: tempParams };
   }
@@ -420,4 +435,17 @@ export class ExpBarControlController<
       }
     });
   }
+
+  /**
+   * 路由变更处理回调
+   * @author lxm
+   * @date 2023-09-14 07:03:39
+   * @param {{ srfnav?: string; path: string }} info 当前系统的路由的从一级到最后一级的所有路径。
+   */
+  onRouterChange(info: { srfnav: string; path: string }): void {
+    if (this.state.srfnav !== info.srfnav) {
+      this.state.srfnav = info.srfnav;
+      this.defaultNavBySrfnav();
+    }
+  }
 }

package/src/controller/control/exp-bar/tree-exp-bar.controller.ts

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

package/src/interface/common/i-global-config/i-global-view-config.ts

@@ -18,4 +18,13 @@ export interface IGlobalViewConfig {
    * @type {boolean}
    */
   enableDataInfoBar: boolean;
+
+  /**
+   * 全局导航是否启用缓存
+   *
+   * @author chitanda
+   * @date 2023-09-15 12:09:09
+   * @type {boolean}
+   */
+  enableExpCache: boolean;
 }

package/src/interface/controller/controller/control/i-exp-bar-control.controller.ts

@@ -57,4 +57,12 @@ export interface IExpBarControlController<
    * @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;
 }

package/src/interface/provider/i-control.provider.ts

@@ -1,3 +1,7 @@
+import { IControl } from '@ibiz/model-core';
+import { CTX } from '../../controller';
+import { IControlController } from '../controller';
+
 /**
  * 部件适配器的接口
  *
@@ -16,4 +20,22 @@ export interface IControlProvider {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   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;
 }