@ibiz-template/runtime 0.1.23 → 0.1.25

package/out/command/app/app-func/app-func.js

@@ -33,8 +33,8 @@ export class AppFuncCommand {
         // 导航参数转换
         const { navigateContexts, navigateParams, appFuncType } = appFunc;
         const _context = context.clone();
-        Object.assign(_context, convertNavData(navigateContexts, context, params));
-        const _params = convertNavData(navigateParams, context, params);
+        Object.assign(_context, convertNavData(navigateContexts, params, context));
+        const _params = convertNavData(navigateParams, params, context);
         switch (appFuncType) {
             case 'APPVIEW':
                 return this.openAppView(appFunc, _context, _params, opts);

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;CAoDR"}
+{"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();
@@ -217,6 +217,7 @@ export class ControlController extends BaseController {
             return;
         }
         if (opts === null || opts === void 0 ? void 0 : opts.error) {
+            ibiz.log.error(opts.error);
             // 报错时抛错误
             throw new NoticeError(message, duration);
         }

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

@@ -1,4 +1,4 @@
-import { IMDControl } from '@ibiz/model-core';
+import { IAppDataEntity, IMDControl } from '@ibiz/model-core';
 import { IMDControlController, IMDControlEvent, IMDControlState, MDCtrlLoadParams, MDCtrlRemoveParams } from '../../../interface';
 import { MDControlService } from '../../../service';
 import { ControllerEvent } from '../../utils';
@@ -31,7 +31,26 @@ export declare class MDControlController<T extends IMDControl = IMDControl, S ex
      * @protected
      */
     protected fieldIdNameMap: Map<string, string>;
+    /**
+     * 当前多数据部件对应的应用实体对象
+     *
+     * @author chitanda
+     * @date 2023-09-13 17:09:32
+     * @protected
+     * @type {IAppDataEntity}
+     */
+    protected dataEntity: IAppDataEntity;
     protected onCreated(): Promise<void>;
+    protected onDestroyed(): Promise<void>;
+    /**
+     * 当数据放生变更时，若为当前应用实体数据。则多数据部件进行刷新
+     *
+     * @author chitanda
+     * @date 2023-09-13 17:09:04
+     * @protected
+     * @param {IData} msg
+     */
+    protected onDataChange(msg: IData): void;
     /**
      * 设置排序
      * 无参数时设置的是默认排序。

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

@@ -1 +1 @@
-{"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAgB3B;;;;;OAKG;IACH,SAAS,CAAC,cAAc,sBAA6B;cAErC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAe1C;;;;;;;;OAQG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAMnD;;;;;;OAMG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B7D;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAgDzD;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIzE;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiEtD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAU9B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5C;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9C;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAkC9D"}
+{"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAgB3B;;;;;OAKG;IACH,SAAS,CAAC,cAAc,sBAA6B;IAErD;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;cAEtB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1C,SAAS,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtC;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI;IAMxC;;;;;;;;OAQG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAMnD;;;;;;OAMG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B7D;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAgDzD;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIzE;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiEtD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAU9B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5C;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9C;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAkC9D"}

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

@@ -46,13 +46,32 @@ export class MDControlController extends ControlController {
         var _a;
         await super.onCreated();
         // 初始化实体属性id和name的映射
-        const dataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId);
-        (_a = dataEntity.appDEFields) === null || _a === void 0 ? void 0 : _a.forEach(field => {
+        this.dataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId);
+        (_a = this.dataEntity.appDEFields) === null || _a === void 0 ? void 0 : _a.forEach(field => {
             this.fieldIdNameMap.set(field.id, field.name);
         });
+        this.onDataChange = this.onDataChange.bind(this);
+        ibiz.mc.command.change.on(this.onDataChange);
         // 设置默认排序
         this.setSort();
     }
+    onDestroyed() {
+        ibiz.mc.command.change.off(this.onDataChange);
+        return super.onDestroyed();
+    }
+    /**
+     * 当数据放生变更时，若为当前应用实体数据。则多数据部件进行刷新
+     *
+     * @author chitanda
+     * @date 2023-09-13 17:09:04
+     * @protected
+     * @param {IData} msg
+     */
+    onDataChange(msg) {
+        if (msg.data && msg.data.srfdecodename === this.dataEntity.codeName) {
+            this.refresh();
+        }
+    }
     /**
      * 设置排序
      * 无参数时设置的是默认排序。

package/out/controller/common/editor/editor.controller.js

@@ -103,12 +103,12 @@ export class EditorController {
             .model;
         let selfContext = {};
         if (navigateContexts && data) {
-            selfContext = convertNavData(navigateContexts, context, params, data);
+            selfContext = convertNavData(navigateContexts, data, params, context);
         }
         const _context = Object.assign(context.clone(), selfContext);
         let selfParams = {};
         if (navigateParams && data) {
-            selfParams = convertNavData(navigateParams, context, params, data);
+            selfParams = convertNavData(navigateParams, data, params, context);
         }
         const _params = Object.assign(Object.assign({}, params), selfParams);
         return { context: _context, params: _params };

package/out/controller/common/view/view.controller.js

@@ -242,14 +242,14 @@ export class ViewController extends BaseController {
         const navContexts = this.model.appViewNavContexts;
         let context = {};
         if (notNilEmpty(navContexts)) {
-            context = convertNavData(navContexts, this.context, this.params);
+            context = convertNavData(navContexts, this.params, this.context);
         }
         Object.assign(this.context, context);
         // 处理自定义视图参数
         const navParams = this.model.appViewNavParams;
         let params = {};
         if (notNilEmpty(navParams)) {
-            params = convertNavData(navParams, this.context, this.params);
+            params = convertNavData(navParams, this.params, this.context);
         }
         Object.assign(this.params, params);
         if (this.state.isMounted) {

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/controller/control/form/edit-form/edit-form.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAY1C;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,KAAK,CAAC;IAiCjC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAqC5B;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAyC5B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAuChC;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C7D;;;;;;;OAOG;IACG,OAAO,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BvD;;;;;;;OAOG;IACG,QAAQ,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAUhC"}
+{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAY1C;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,KAAK,CAAC;IAiCjC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAqC5B;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA+C5B;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IA2ChC;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C7D;;;;;;;OAOG;IACG,OAAO,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BvD;;;;;;;OAOG;IACG,QAAQ,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAUhC"}

package/out/controller/control/form/edit-form/edit-form.controller.js

@@ -152,6 +152,9 @@ export class EditFormController extends FormController {
         this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
             default: `${this.data.srfmajortext || ''}保存成功`,
         });
+        if (this.view.modal.mode === 'ROUTE') {
+            ibiz.mc.command.send(this.data.$origin, isCreate ? 'OBJECTCREATED' : 'OBJECTUPDATED');
+        }
         return this.data;
     }
     /**
@@ -197,6 +200,9 @@ export class EditFormController extends FormController {
         this.state.modified = false;
         await this.evt.emit('onRemoveSuccess', undefined);
         this.actionNotification('REMOVESUCCESS');
+        if (this.view.modal.mode === 'ROUTE') {
+            ibiz.mc.command.send(this.data.$origin, 'OBJECTREMOVED');
+        }
         return ok;
     }
     /**
@@ -235,7 +241,7 @@ export class EditFormController extends FormController {
             throw new RuntimeError(`没找到${formItemUpdateId}表单项更新`);
         }
         const { appDEMethodId, defiupdateDetails, customCode, scriptCode } = formItemUpdate;
-        const updateItems = defiupdateDetails.map(item => item.id);
+        const updateItems = defiupdateDetails === null || defiupdateDetails === void 0 ? void 0 : defiupdateDetails.map(item => item.id);
         let updateData; // 要修改的数据
         if (customCode && scriptCode) {
             // 脚本模式获取修改数据

package/out/controller/control/form/form-detail/form-druipart/form-druipart.controller.js

@@ -100,10 +100,10 @@ export class FormDRUIPartController extends FormDetailController {
         let newContext = this.form.context.clone();
         const navContexts = this.model.navigateContexts;
         if (notNilEmpty(navContexts)) {
-            newContext = Object.assign(newContext, convertNavData(navContexts, this.form.context, this.form.params, this.form.data));
+            newContext = Object.assign(newContext, convertNavData(navContexts, this.form.data, this.form.params, this.form.context));
         }
         // 处理导航视图参数
-        const newParams = convertNavData(this.model.navigateParams, this.form.params, this.form.context, this.form.data);
+        const newParams = convertNavData(this.model.navigateParams, this.form.data, this.form.params, this.form.context);
         if (!this.state.viewComponentKey) {
             // 第一次直接修改然后render
             this.state.viewComponentKey = createUUID();

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.js

@@ -72,12 +72,12 @@ export class GridFieldColumnController extends GridColumnController {
         const { navigateContexts, navigateParams } = parseUserParams(userParam);
         let selfContext = {};
         if (navigateContexts && data) {
-            selfContext = convertNavData(navigateContexts, context, params, data);
+            selfContext = convertNavData(navigateContexts, data, params, context);
         }
         const _context = Object.assign(context.clone(), selfContext);
         let selfParams = {};
         if (navigateParams && data) {
-            selfParams = convertNavData(navigateParams, context, params, data);
+            selfParams = convertNavData(navigateParams, data, params, context);
         }
         const _params = Object.assign(Object.assign({}, params), selfParams);
         return { context: _context, params: _params };

package/out/controller/control/pickup-view-panel/pickup-view-panel.controller.js

@@ -33,10 +33,10 @@ export class PickupViewPanelController extends ControlController {
         const context = this.context.clone();
         const params = Object.assign({}, this.params);
         if (navigateContexts) {
-            Object.assign(context, convertNavData(navigateContexts, this.context, this.params));
+            Object.assign(context, convertNavData(navigateContexts, this.params, this.context));
         }
         if (navigateParams) {
-            Object.assign(params, convertNavData(navigateParams, this.context, this.params));
+            Object.assign(params, convertNavData(navigateParams, this.params, this.context));
         }
         this.state.context = context;
         this.state.params = params;

package/out/de-logic/de-logic.d.ts

@@ -1,4 +1,5 @@
 import { IAppDELogic } from '@ibiz/model-core';
+import { ScriptFunction } from '../utils';
 import { DELogicContext } from './de-logic-context';
 import { DELogicNode } from './de-logic-node';
 import { DELogicParam } from './de-logic-param/de-logic-param';
@@ -30,6 +31,14 @@ export declare class DELogic {
      * @type {Map<string, DELogicParam>}
      */
     protected params: Map<string, DELogicParam>;
+    /**
+     * 脚本函数
+     * @author lxm
+     * @date 2023-09-13 04:25:27
+     * @protected
+     * @type {ScriptFunction}
+     */
+    protected scriptFn?: ScriptFunction;
     /**
      * Creates an instance of DELogic.
      * @author lxm

package/out/de-logic/de-logic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-logic.d.ts","sourceRoot":"","sources":["../../src/de-logic/de-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAML,WAAW,EAOZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,WAAW;IA1BxC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,WAAW;IA+DxC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAmB5E;;;;;;;;;OASG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
+{"version":3,"file":"de-logic.d.ts","sourceRoot":"","sources":["../../src/de-logic/de-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAiB,cAAc,EAAE,MAAM,UAAU,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAML,WAAW,EAOZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IAoCN,SAAS,CAAC,KAAK,EAAE,WAAW;IAnCxC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC;IAEpC;;;;;OAKG;gBACmB,KAAK,EAAE,WAAW;IA0ExC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAsB5E;;;;;;;;;OASG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}

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

@@ -1,5 +1,6 @@
 /* eslint-disable no-await-in-loop */
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
+import { ScriptFactory } from '../utils';
 import { DELogicContext } from './de-logic-context';
 import { AppendParamNode, BindParamNode, CopyParamNode, DataSetNode, DEActionNode, EndNode, PrepareParamNode, RenewParamNode, ResetParamNode, SortParamNode, StartNode, } from './de-logic-node';
 import { ThrowExceptionNode } from './de-logic-node/throw-exception-node/throw-exception-node';
@@ -40,6 +41,16 @@ export class DELogic {
          * @type {Map<string, DELogicParam>}
          */
         this.params = new Map();
+        // 脚本代码模式
+        if (model.customCode) {
+            if (!model.scriptCode) {
+                throw new RuntimeModelError(model, '脚本代码模式没有配置脚本代码');
+            }
+            this.scriptFn = ScriptFactory.createScriptFn([], model.scriptCode, {
+                isAsync: true,
+            });
+            return;
+        }
         if (!((_a = model.delogicNodes) === null || _a === void 0 ? void 0 : _a.length)) {
             throw new RuntimeModelError(model, '实体逻辑没有配置逻辑节点');
         }
@@ -131,6 +142,9 @@ export class DELogic {
      * @return {*}  {Promise<IData>}
      */
     async exec(context, data, params) {
+        if (this.scriptFn) {
+            return this.scriptFn.exec({ context, data, params });
+        }
         const ctx = new DELogicContext(this.params, context, data, params);
         this.initLogicParams(ctx);
         const { startDELogicNodeId } = this.model;

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.js

@@ -72,12 +72,12 @@ export class AppUILogicExecutor extends LogicExecutor {
         // 处理导航参数
         // 处理上下文导航参数
         const navContexts = openViewRef.navigateContexts || [];
-        const tempContext = Object.assign(context, convertNavData(navContexts, context, params, data[0]));
+        const tempContext = Object.assign(context, convertNavData(navContexts, data[0], params, context));
         // 处理导航视图参数
         let tempParams = {};
         const navParams = openViewRef.navigateParams;
         if (notNilEmpty(navParams)) {
-            tempParams = convertNavData(navParams, params, context, data[0]);
+            tempParams = convertNavData(navParams, data[0], params, context);
         }
         // 打开视图
         return ibiz.commands.execute(OpenAppViewCommand.TAG, openView, tempContext, tempParams, rest);
@@ -127,12 +127,12 @@ export class AppUILogicExecutor extends LogicExecutor {
         const _data = (data === null || data === void 0 ? void 0 : data[0]) || {};
         const navContexts = newViewRef.navigateContexts;
         if (notNilEmpty(navContexts)) {
-            tempContext = convertNavData(navContexts, context, params, _data);
+            tempContext = convertNavData(navContexts, _data, params, context);
         }
         tempContext = Object.assign(context, tempContext);
         const navParams = newViewRef.navigateParams;
         if (notNilEmpty(navParams)) {
-            tempParams = convertNavData(navParams, params, context, _data);
+            tempParams = convertNavData(navParams, _data, params, context);
         }
         // 拷贝数据处理
         if (context.srfcopymode) {