@ibiz-template/runtime 0.1.29 → 0.1.31

package/out/config/global-config.js

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

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

@@ -31,6 +31,15 @@ export declare class ControlController<T extends IControl = IControl, S extends
      */
     controlPanel?: IViewLayoutPanel;
     layoutPanel?: IViewLayoutPanelController;
+    /**
+     * 部件参数
+     *
+     * @author zk
+     * @date 2023-09-26 03:09:21
+     * @type {IData}
+     * @memberof ControlController
+     */
+    controlParams: IData;
     /**
      * 子适配器
      * @author lxm
@@ -117,6 +126,15 @@ export declare class ControlController<T extends IControl = IControl, S extends
      * @param {IViewLayoutPanelController} panel
      */
     setLayoutPanel(panel: IViewLayoutPanelController): void;
+    /**
+     * 部件参数解析
+     *
+     * @author zk
+     * @date 2023-09-27 07:09:08
+     * @protected
+     * @memberof ControlController
+     */
+    protected handleControlParams(): void;
     /**
      * 初始化部件逻辑调度器
      * @author lxm

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,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"}
+{"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;AAI7E,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;;;;;;;OAOG;IACH,aAAa,EAAE,KAAK,CAAM;IAE1B;;;;;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;cAe1B,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;;;;;;;OAOG;IACH,SAAS,CAAC,mBAAmB,IAAI,IAAI;IASrC;;;;;;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

@@ -1,8 +1,9 @@
 import { NoticeError } from '@ibiz-template/core';
 import { isNil } from 'ramda';
+import { notNilEmpty } from 'qx-util';
 import { BaseController } from '..';
 import { getControlProvider } from '../../../register';
-import { ScriptFactory } from '../../../utils';
+import { convertNavData, ScriptFactory } from '../../../utils';
 /**
  * 部件控制器
  *
@@ -29,6 +30,15 @@ export class ControlController extends BaseController {
      */
     constructor(model, context, params, ctx) {
         super(model, context, params, ctx);
+        /**
+         * 部件参数
+         *
+         * @author zk
+         * @date 2023-09-26 03:09:21
+         * @type {IData}
+         * @memberof ControlController
+         */
+        this.controlParams = {};
         /**
          * 子适配器
          * @author lxm
@@ -73,6 +83,8 @@ export class ControlController extends BaseController {
             const provider = await getControlProvider(this.controlPanel);
             this.providers[this.controlPanel.name] = provider;
         }
+        // 处理上下文和导航参数
+        this.handleControlParams();
         // 部件逻辑初始化
         this.initControlScheduler(this.model.controlLogics);
     }
@@ -153,6 +165,22 @@ export class ControlController extends BaseController {
             });
         }
     }
+    /**
+     * 部件参数解析
+     *
+     * @author zk
+     * @date 2023-09-27 07:09:08
+     * @protected
+     * @memberof ControlController
+     */
+    handleControlParams() {
+        const { ctrlParams } = this.model.controlParam;
+        let params = {};
+        if (notNilEmpty(ctrlParams)) {
+            params = convertNavData(ctrlParams, this.params, this.context);
+        }
+        Object.assign(this.controlParams, params);
+    }
     /**
      * 初始化部件逻辑调度器
      * @author lxm

package/out/controller/control/dashboard/portlet/index.d.ts

@@ -1,4 +1,5 @@
 export * from './portlet-part';
 export * from './container-portlet';
 export * from './view-portlet';
+export * from './menu-portlet';
 //# sourceMappingURL=index.d.ts.map

package/out/controller/control/dashboard/portlet/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/dashboard/portlet/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/dashboard/portlet/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC"}

package/out/controller/control/dashboard/portlet/index.js

@@ -1,3 +1,4 @@
 export * from './portlet-part';
 export * from './container-portlet';
 export * from './view-portlet';
+export * from './menu-portlet';

package/out/controller/control/dashboard/portlet/menu-portlet/index.d.ts

@@ -0,0 +1,2 @@
+export * from './menu-portlet.controller';
+//# sourceMappingURL=index.d.ts.map

package/out/controller/control/dashboard/portlet/menu-portlet/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/menu-portlet/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC"}

package/out/controller/control/dashboard/portlet/menu-portlet/index.js

@@ -0,0 +1 @@
+export * from './menu-portlet.controller';

package/out/controller/control/dashboard/portlet/menu-portlet/menu-portlet.controller.d.ts

@@ -0,0 +1,5 @@
+import { IDBAppMenuPortletPart } from '@ibiz/model-core';
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+export declare class MenuPortletController extends PortletPartController<IDBAppMenuPortletPart> {
+}
+//# sourceMappingURL=menu-portlet.controller.d.ts.map

package/out/controller/control/dashboard/portlet/menu-portlet/menu-portlet.controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"menu-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/menu-portlet/menu-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAEhF,qBAAa,qBAAsB,SAAQ,qBAAqB,CAAC,qBAAqB,CAAC;CAAG"}

package/out/controller/control/dashboard/portlet/menu-portlet/menu-portlet.controller.js

@@ -0,0 +1,3 @@
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+export class MenuPortletController extends PortletPartController {
+}

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

@@ -83,6 +83,16 @@ export declare class ExpBarControlController<T extends IExpBar = IExpBar, S exte
      * @memberof ExpBarControlController
      */
     get XDataModel(): XDataControlModel | undefined;
+    /**
+     * 是否缓存
+     *
+     * @author zk
+     * @date 2023-09-27 09:09:59
+     * @readonly
+     * @type {boolean}
+     * @memberof ExpBarControlController
+     */
+    get isCache(): boolean;
     /**
      * 创建完成
      *

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;IA8B1C;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAaxC;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,IAAI,IAAI;IA4BpC;;;;;;;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"}
+{"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;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAaxC;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,IAAI,IAAI;IA+BpC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAkBvC;;;;;;;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;IAYd;;;;;;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

@@ -100,6 +100,24 @@ export class ExpBarControlController extends ControlController {
         });
         return control;
     }
+    /**
+     * 是否缓存
+     *
+     * @author zk
+     * @date 2023-09-27 09:09:59
+     * @readonly
+     * @type {boolean}
+     * @memberof ExpBarControlController
+     */
+    get isCache() {
+        if (this.controlParams.expcache === 'CACHE') {
+            return true;
+        }
+        if (this.controlParams.expcache === 'NO_CACHE') {
+            return false;
+        }
+        return ibiz.config.view.expCacheMode.includes(this.model.controlType);
+    }
     /**
      * 创建完成
      *
@@ -205,7 +223,10 @@ export class ExpBarControlController extends ControlController {
             }
             // 此时不需要导航占位push路由，只要有个key触发绘制下级视图就行。
             this._evt.emit('onNavViewChange', {
-                navViewMsg: { key: this.state.srfnav },
+                navViewMsg: {
+                    key: this.state.srfnav,
+                    isCache: this.isCache,
+                },
                 context: this.context,
             });
         }
@@ -228,7 +249,12 @@ export class ExpBarControlController extends ControlController {
         if (!data) {
             // 导航视图传空让他导航占位绘制空界面
             this.state.srfnav = '';
-            this._evt.emit('onNavViewChange', { navViewMsg: { key: '' } });
+            this._evt.emit('onNavViewChange', {
+                navViewMsg: {
+                    key: '',
+                    isCache: this.isCache,
+                },
+            });
             return;
         }
         // 默认选中并激活第一项
@@ -312,6 +338,7 @@ export class ExpBarControlController extends ControlController {
             context: result.context,
             params: result.params,
             viewId: viewModelId,
+            isCache: this.isCache,
         };
     }
     /**

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;IAiBd,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;IAkBd,SAAS,CAAC,qBAAqB,IAAI,IAAI;cAwBvB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAyB3C"}

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

@@ -85,7 +85,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);
+        return Object.assign({ key: nodeId, viewId: nodeModel.navAppViewId, isCache: this.isCache }, result);
     }
     defaultNavByFirstItem() {
         const data = this.xDataController.state.items.find(node => {

package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.d.ts

@@ -24,6 +24,16 @@ export declare class TabExpPanelController extends ControlController<ITabExpPane
      * @Date: 2023-09-20 10:36:46
      */
     isShowIcon: boolean;
+    /**
+     * 是否缓存
+     *
+     * @author zk
+     * @date 2023-09-27 09:09:59
+     * @readonly
+     * @type {boolean}
+     * @memberof ExpBarControlController
+     */
+    get isCache(): boolean;
     /**
      * 初始化state的属性
      *

package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tab-exp-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EAEtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,CAC5E,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,aAAa,UAAQ;IAErB;;;;;OAKG;IACH,UAAU,UAAS;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAiBpB;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;IAoBvB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CACnB,GAAG,GAAE,eAA+C,GACnD,IAAI;IAKP;;;;;;;;OAQG;IACH,IAAI,uBAAuB,IAAI,eAAe,CAI7C;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtC;;;;;OAKG;IACH,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG;QAC5C,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IA6BD;;;;;;;;OAQG;IACI,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG,WAAW;CASjE"}
+{"version":3,"file":"tab-exp-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EAEtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,CAC5E,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,aAAa,UAAQ;IAErB;;;;;OAKG;IACH,UAAU,UAAS;IAEnB;;;;;;;;OAQG;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAiBpB;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;IAoBvB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CACnB,GAAG,GAAE,eAA+C,GACnD,IAAI;IAKP;;;;;;;;OAQG;IACH,IAAI,uBAAuB,IAAI,eAAe,CAI7C;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtC;;;;;OAKG;IACH,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG;QAC5C,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IA6BD;;;;;;;;OAQG;IACI,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG,WAAW;CAUjE"}

package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.js

@@ -27,6 +27,24 @@ export class TabExpPanelController extends ControlController {
          */
         this.isShowIcon = false;
     }
+    /**
+     * 是否缓存
+     *
+     * @author zk
+     * @date 2023-09-27 09:09:59
+     * @readonly
+     * @type {boolean}
+     * @memberof ExpBarControlController
+     */
+    get isCache() {
+        if (this.controlParams.expcache === 'CACHE') {
+            return true;
+        }
+        if (this.controlParams.expcache === 'NO_CACHE') {
+            return false;
+        }
+        return ibiz.config.view.expCacheMode.includes(this.model.controlType);
+    }
     /**
      * 初始化state的属性
      *
@@ -203,6 +221,7 @@ export class TabExpPanelController extends ControlController {
             context,
             params,
             viewId: tabViewPanel.embeddedAppDEViewId,
+            isCache: this.isCache,
         };
     }
 }

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

@@ -48,6 +48,14 @@ export declare class TreeController extends MDControlController<IDETree, ITreeSt
      * @memberof TreeController
      */
     onTreeNodeClick(nodeData: ITreeNodeData): Promise<void>;
+    /**
+     * 树节点数据变更事件处理
+     * @author lxm
+     * @date 2023-09-28 01:48:05
+     * @param {ITreeNodeData} nodeData
+     * @param {boolean} isExpand true为展开，false为折叠
+     */
+    onExpandChange(nodeData: ITreeNodeData, isExpand: boolean): void;
     /**
      * 树节点双击事件
      * @author lxm
@@ -89,7 +97,7 @@ export declare class TreeController extends MDControlController<IDETree, ITreeSt
         params: IParams;
     };
     /**
-     * 计算展开节点集合
+     * 计算展开节点集合(根据加载的子节点计算所有的展开节点标识集合)
      * @author lxm
      * @date 2023-08-09 05:19:36
      * @param {ITreeNodeData[]} nodes

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

@@ -1 +1 @@
-{"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAE1D,SAAS,CAAC,SAAS,IAAI,IAAI;cAOX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAajE;;;;;;OAMG;IACG,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAyCrE;;;;;;OAMG;IACG,eAAe,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB7D;;;;;;OAMG;IACG,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAIjD;;;;;;;;OAQG;IACG,UAAU,CACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG;QACpD,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IAQD;;;;;;;OAOG;IACH,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE;IAclD;;;;;;;OAOG;IACG,mBAAmB,CACvB,QAAQ,EAAE,aAAa,GAAG,KAAK,EAC/B,aAAa,UAAQ,GACpB,OAAO,CAAC,IAAI,CAAC;CA+BjB"}
+{"version":3,"file":"tree.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAE1D,SAAS,CAAC,SAAS,IAAI,IAAI;cAQX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAsBjE;;;;;;OAMG;IACG,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAkCrE;;;;;;OAMG;IACG,eAAe,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB7D;;;;;;OAMG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI;IAYhE;;;;;;OAMG;IACG,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/D,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAWtC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAIjD;;;;;;;;OAQG;IACG,UAAU,CACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG;QACpD,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IAQD;;;;;;;OAOG;IACH,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE;IAgBlD;;;;;;;OAOG;IACG,mBAAmB,CACvB,QAAQ,EAAE,aAAa,GAAG,KAAK,EAC/B,aAAa,UAAQ,GACpB,OAAO,CAAC,IAAI,CAAC;CA+BjB"}

package/out/controller/control/tree/tree.controller.js

@@ -28,10 +28,12 @@ export class TreeController extends MDControlController {
         super.initState();
         // 根节点初始化
         this.state.defaultExpandedKeys = [];
+        this.state.expandedKeys = [];
         this.state.size = 0;
     }
     async onCreated() {
         await super.onCreated();
+        this.state.expandedKeys = [...this.state.defaultExpandedKeys];
         this.service = new TreeService(this.model);
         await this.service.init(this.context);
         // 初始化上下文菜单控制器
@@ -52,8 +54,18 @@ export class TreeController extends MDControlController {
      */
     async load(args = {}) {
         const isInitialLoad = args.isInitialLoad === true;
-        const nodes = await this.loadNodes();
-        this.state.expandedKeys = this.calcExpandedKeys(nodes);
+        if (isInitialLoad) {
+            await this.startLoading();
+        }
+        let nodes;
+        try {
+            nodes = await this.loadNodes();
+        }
+        finally {
+            if (isInitialLoad) {
+                await this.endLoading();
+            }
+        }
         await this.afterLoad(args, nodes);
         this.state.isLoaded = true;
         await this.evt.emit('onLoadSuccess', {
@@ -71,24 +83,13 @@ export class TreeController extends MDControlController {
     async loadNodes(parentNode) {
         const params = await this.getFetchParams();
         const hasQuery = !!params.query;
-        const defaultExpandedKeys = !parentNode
-            ? this.state.defaultExpandedKeys
-            : undefined;
         // 请求服务获取子节点数据
-        await this.startLoading();
-        let nodes;
-        try {
-            nodes =
-                (await this.service.fetchChildNodes(parentNode, {
-                    context: this.context.clone(),
-                    params,
-                    hasQuery,
-                    defaultExpandedKeys,
-                })) || [];
-        }
-        finally {
-            await this.endLoading();
-        }
+        const nodes = (await this.service.fetchChildNodes(parentNode, {
+            context: this.context.clone(),
+            params,
+            hasQuery,
+            defaultExpandedKeys: this.state.expandedKeys,
+        })) || [];
         // 有父节点绑定到父节点数据上，无父节点替换rootNodes
         if (parentNode) {
             parentNode.children = nodes;
@@ -101,6 +102,7 @@ export class TreeController extends MDControlController {
         recursiveIterate({ children: this.state.rootNodes }, (node) => {
             this.state.items.push(node);
         });
+        this.state.expandedKeys = this.calcExpandedKeys(nodes);
         return nodes;
     }
     /**
@@ -131,6 +133,25 @@ export class TreeController extends MDControlController {
             await this.setActive(nodeData);
         }
     }
+    /**
+     * 树节点数据变更事件处理
+     * @author lxm
+     * @date 2023-09-28 01:48:05
+     * @param {ITreeNodeData} nodeData
+     * @param {boolean} isExpand true为展开，false为折叠
+     */
+    onExpandChange(nodeData, isExpand) {
+        const hasKey = this.state.expandedKeys.includes(nodeData.id);
+        if (isExpand && !hasKey) {
+            this.state.expandedKeys.push(nodeData.id);
+        }
+        else if (!isExpand && hasKey) {
+            const index = this.state.expandedKeys.indexOf(nodeData.id);
+            if (index !== -1) {
+                this.state.expandedKeys.splice(index, 1);
+            }
+        }
+    }
     /**
      * 树节点双击事件
      * @author lxm
@@ -214,7 +235,7 @@ export class TreeController extends MDControlController {
         };
     }
     /**
-     * 计算展开节点集合
+     * 计算展开节点集合(根据加载的子节点计算所有的展开节点标识集合)
      * @author lxm
      * @date 2023-08-09 05:19:36
      * @param {ITreeNodeData[]} nodes
@@ -222,17 +243,17 @@ export class TreeController extends MDControlController {
      * @return {*}  {string[]}
      */
     calcExpandedKeys(nodes) {
-        let expandedKeys = [];
+        // 用户操作的添加的要保留
+        let expandedKeys = [...this.state.expandedKeys];
+        // 计算加载回来的里面带的默认展开
         recursiveIterate({ children: nodes }, (node) => {
             var _a;
             if ((_a = node.children) === null || _a === void 0 ? void 0 : _a.length) {
                 expandedKeys.push(node.id);
             }
         });
-        if (this.state.defaultExpandedKeys.length) {
-            expandedKeys.push(...this.state.defaultExpandedKeys);
-            expandedKeys = Array.from(new Set(expandedKeys));
-        }
+        // 去重
+        expandedKeys = Array.from(new Set(expandedKeys));
         return expandedKeys;
     }
     /**

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

@@ -19,12 +19,14 @@ export interface IGlobalViewConfig {
      */
     enableDataInfoBar: boolean;
     /**
-     * 全局导航是否启用缓存
+     * 用于控制全局哪些导航部件启用缓存，全大写。TABEXPPANEL:GRIDEXPBAR: - :分隔每个导航部件的缓存开关，必须用:结尾，如：TABEXPPANEL:开启表格导航部件缓存，GRIDEXPBAR:开启分页导航部件缓存
      *
+     * @default 'TABEXPPANEL:'
+     * @description 判断时将使用 `部件类型:` 的方式进行判断，如：TABEXPPANEL:，表示开启表格导航视图的缓存
      * @author chitanda
      * @date 2023-09-15 12:09:09
-     * @type {boolean}
+     * @type {string}
      */
-    enableExpCache: boolean;
+    expCacheMode: string;
 }
 //# 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;IAE3B;;;;;;OAMG;IACH,cAAc,EAAE,OAAO,CAAC;CACzB"}
+{"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;;;;;;;;OAQG;IACH,YAAY,EAAE,MAAM,CAAC;CACtB"}

package/out/interface/controller/common/i-nav-view-msg/i-nav-view-msg.d.ts

@@ -41,5 +41,14 @@ export interface INavViewMsg {
      * @type {IAppView}
      */
     viewId?: string;
+    /**
+     * 是否缓存
+     *
+     * @author zk
+     * @date 2023-09-26 06:09:17
+     * @type {string}
+     * @memberof INavViewMsg
+     */
+    isCache?: boolean;
 }
 //# sourceMappingURL=i-nav-view-msg.d.ts.map

package/out/interface/controller/common/i-nav-view-msg/i-nav-view-msg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-nav-view-msg.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/i-nav-view-msg/i-nav-view-msg.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB"}
+{"version":3,"file":"i-nav-view-msg.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/i-nav-view-msg/i-nav-view-msg.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB"}

package/out/service/app-data-entity/app-data-entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-data-entity.d.ts","sourceRoot":"","sources":["../../../src/service/app-data-entity/app-data-entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,WAAW;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,UAAkB,KAAK,EAAE,KAAK,CAAC;IAE/B,UAAkB,OAAO,EAAE,cAAc,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,aAAa,EAAE,MAAM,CAAC;IAEtB,UAAU,EAAE,MAAM,CAAC;IAEnB,YAAY,EAAE,MAAM,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAErB,YAAY,EAAE,MAAM,CAAC;IAE7B,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED;;;;;;;OAOG;gBACS,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,GAAG,aAAa;IA6E/D;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAgClC;;;;;;OAMG;IACH,KAAK,IAAI,aAAa;IAMtB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,aAAa;IASlD;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;CAoB5E"}
+{"version":3,"file":"app-data-entity.d.ts","sourceRoot":"","sources":["../../../src/service/app-data-entity/app-data-entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,WAAW;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,UAAkB,KAAK,EAAE,KAAK,CAAC;IAE/B,UAAkB,OAAO,EAAE,cAAc,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,aAAa,EAAE,MAAM,CAAC;IAEtB,UAAU,EAAE,MAAM,CAAC;IAEnB,YAAY,EAAE,MAAM,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,EAAE,MAAM,CAAC;IAErB,YAAY,EAAE,MAAM,CAAC;IAE7B,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED;;;;;;;OAOG;gBACS,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,GAAG,aAAa;IA6E/D;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAgClC;;;;;;OAMG;IACH,KAAK,IAAI,aAAa;IAMtB;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,aAAa;IASlD;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;CAyB5E"}

package/out/service/app-data-entity/app-data-entity.js

@@ -172,6 +172,10 @@ export class AppDataEntity {
      * @return {*}  {unknown}
      */
     convertVal(value, dataType) {
+        // 空值不转换
+        if (value == null) {
+            return value;
+        }
         // 没有数据类型的给原值
         if (isNil(dataType)) {
             return value;

package/out/service/service/entity/method/method-renturn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method-renturn.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-renturn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAgBrB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAhBhC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAED;;;;;;;OAOG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAchC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;CAOlE"}
+{"version":3,"file":"method-renturn.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-renturn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;GAOG;AACH,qBAAa,YAAY;IAgBrB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAhBhC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAED;;;;;;;OAOG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAchC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;CAUlE"}

package/out/service/service/entity/method/method-renturn.js

@@ -1,3 +1,4 @@
+import { isNilOrEmpty } from 'qx-util';
 import { MethodDto } from '../../../dto/method.dto';
 import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { findModelChild } from '../../../../model';
@@ -47,6 +48,9 @@ export class MethodReturn {
             const items = await this.dto.sets(context, [data]);
             return items[0];
         }
+        if (isNilOrEmpty(data)) {
+            data = {};
+        }
         return new AppDataEntity(this.entity, data);
     }
 }

package/out/ui-action/provider/ui-action-provider-base.js

@@ -90,7 +90,7 @@ export class UIActionProviderBase {
     async isConfirm(action, args) {
         const confirmMsg = this.calcMessage('confirm', action, args);
         if (action.enableConfirm && confirmMsg) {
-            return ibiz.modal.confirm({ title: confirmMsg });
+            return ibiz.confirm.warning({ title: '操作确认', desc: confirmMsg });
         }
         return true;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,11 +29,11 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.24",
+    "@ibiz-template/core": "^0.1.31",
     "@ibiz/model-core": "^0.0.18",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
-    "@types/systemjs": "^6.13.2",
+    "@types/systemjs": "^6.13.3",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.10",
     "echarts": "^5.4.3",
@@ -42,7 +42,7 @@
     "path-browserify": "^1.0.1",
     "qs": "^6.11.2",
     "qx-util": "^0.4.8",
-    "ramda": "^0.29.0"
+    "ramda": "^0.29.1"
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.1.0",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "ad1df38edba37a696e639c986b12087f72ead394"
+  "gitHead": "c431fb7031558c3ae1762f6005f601d32d1f0b49"
 }

package/src/config/global-config.ts

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