@ibiz-template/runtime 0.7.41-alpha.1 → 0.7.41-alpha.100

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

@@ -1,8 +1,8 @@
 import { ICalendarExpBar, ISysCalendarItem } from '@ibiz/model-core';
-import { ICalendarExpBarState, ICalendarExpBarEvent, ICalendarExpBarController, ICalendarController, ICalendarItemData, INavViewMsg } from '../../../interface';
+import { INavViewMsg, ICalendarItemData, ICalendarController, ICalendarExpBarState, ICalendarExpBarEvent, ICalendarExpBarController } from '../../../interface';
 import { ExpBarControlController } from './exp-bar.controller';
 /**
- * 树导航栏控制器
+ * 日历导航栏控制器
  *
  * @export
  * @class CalendarExpBarController
@@ -17,10 +17,16 @@ export declare class CalendarExpBarController extends ExpBarControlController<IC
      * @date 2023-07-10 03:07:53
      * @memberof ExpBarControlController
      */
-    navKeyName: string;
+    navKeyName: 'navId';
     protected getCalendarItemModel(itemTypeName: string): ISysCalendarItem | undefined;
-    get xDataController(): ICalendarController;
+    get xDataController(): ICalendarController | undefined;
     navBySrfnav(): void;
+    /**
+     * @description 根据栈数据导航
+     * - 特殊处理仅使用开始时间绘制的日历
+     * @memberof CalendarExpBarController
+     */
+    navDataByStack(): void;
     /**
      *  获取导航视图
      *

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,CAWzC;IAEM,WAAW,IAAI,IAAI;IAa1B;;;;;;;;OAQG;IACI,aAAa,CAAC,IAAI,EAAE,iBAAiB,GAAG,WAAW;CAwB3D"}
+{"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,EAEL,eAAe,EACf,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,EACpB,yBAAyB,EAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAG/D;;;;;;;GAOG;AACH,qBAAa,wBACX,SAAQ,uBAAuB,CAC7B,eAAe,EACf,oBAAoB,EACpB,oBAAoB,CAEtB,YAAW,yBAAyB;IAEpC;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAW;IAE9B,SAAS,CAAC,oBAAoB,CAC5B,YAAY,EAAE,MAAM,GACnB,gBAAgB,GAAG,SAAS;IAK/B,IAAI,eAAe,IAAI,mBAAmB,GAAG,SAAS,CASrD;IAEM,WAAW,IAAI,IAAI;IAY1B;;;;OAIG;IACH,cAAc,IAAI,IAAI;IA8BtB;;;;;;;;OAQG;IACI,aAAa,CAAC,IAAI,EAAE,iBAAiB,GAAG,WAAW;CA0B3D"}

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

@@ -1,7 +1,7 @@
-import { RuntimeModelError } from '@ibiz-template/core';
 import { ExpBarControlController } from './exp-bar.controller';
+import { compareDateEqualByScale } from '../../../utils';
 /**
- * 树导航栏控制器
+ * 日历导航栏控制器
  *
  * @export
  * @class CalendarExpBarController
@@ -22,30 +22,54 @@ export class CalendarExpBarController extends ExpBarControlController {
     }
     getCalendarItemModel(itemTypeName) {
         const { sysCalendarItems } = this.XDataModel;
-        if (!sysCalendarItems) {
-            return undefined;
-        }
-        return sysCalendarItems.find(item => item.itemType === itemTypeName);
+        return sysCalendarItems === null || sysCalendarItems === void 0 ? void 0 : sysCalendarItems.find(item => item.itemType === itemTypeName);
     }
     get xDataController() {
         const controller = this.view.getController(this.model.xdataControlName);
-        if (!controller) {
-            throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.control.expBar.unableMore', {
+        if (!controller)
+            ibiz.log.error(ibiz.i18n.t('runtime.controller.control.expBar.unableMore', {
                 xdataControlName: this.model.xdataControlName,
             }));
-        }
         return controller;
     }
     navBySrfnav() {
-        var _a;
-        const selectItem = (_a = this.xDataController) === null || _a === void 0 ? void 0 : _a.state.items.find(item => item.navId === this.state.srfnav);
+        if (!this.xDataController)
+            return;
+        const selectItem = this.xDataController.state.items.find(item => item.navId === this.state.srfnav);
         super.navBySrfnav();
-        if (!selectItem) {
+        if (!selectItem)
             return;
-        }
         const date = new Date(selectItem.beginTime);
         this.xDataController.setSelectDate(date);
     }
+    /**
+     * @description 根据栈数据导航
+     * - 特殊处理仅使用开始时间绘制的日历
+     * @memberof CalendarExpBarController
+     */
+    navDataByStack() {
+        var _a;
+        if (!this.xDataController)
+            return;
+        const { controlParams, state, model } = this.xDataController;
+        const calendarStyle = (_a = model.calendarStyle) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+        const items = state.items.filter(item => {
+            if ((calendarStyle === 'month' && controlParams.showmode !== 'daterange') ||
+                calendarStyle === 'user')
+                return compareDateEqualByScale(item.beginTime, state.selectedDate, calendarStyle === 'user' ? 'week' : 'month');
+            return true;
+        });
+        const navData = this.navStack
+            .map(nav => items.find(item => nav[this.navKeyName] === item[this.navKeyName]))
+            .find(item => item !== undefined) || items[0];
+        if (navData) {
+            this.xDataController.setActive(navData);
+            this.xDataController.setSelection([navData]);
+        }
+        else {
+            this.clearNavigation();
+        }
+    }
     /**
      *  获取导航视图
      *
@@ -66,12 +90,14 @@ export class CalendarExpBarController extends ExpBarControlController {
                 context,
                 params,
                 viewId: itemModel.navAppViewId,
+                isCache: this.isCache,
             };
         }
         return {
             key: item.navId,
             context: this.context,
             params: this.params,
+            isCache: this.isCache,
         };
     }
 }

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

@@ -1,5 +1,5 @@
 import { IChartExpBar, INavigatable } from '@ibiz/model-core';
-import { IChartExpBarState, IChartExpBarEvent, IChartExpBarController, INavViewMsg } from '../../../interface';
+import { INavViewMsg, IChartExpBarState, IChartExpBarEvent, IChartExpBarController } from '../../../interface';
 import { ExpBarControlController } from './exp-bar.controller';
 /**
  * 图表导航栏控制器
@@ -10,15 +10,26 @@ import { ExpBarControlController } from './exp-bar.controller';
  * @implements {IChartExpBarController}
  */
 export declare class ChartExpBarController extends ExpBarControlController<IChartExpBar, IChartExpBarState, IChartExpBarEvent> implements IChartExpBarController {
+    /**
+     * @description 获取默认激活数据
+     * @returns {*}  {(IData | undefined)}
+     * @memberof ChartExpBarController
+     */
+    getDefaultActiveData(): IData | undefined;
     /**
      * 导航页面首次打开且没有回显时，
      * 默认取第一条数据进行导航
      * 对于不同的导航，第一条可导航的数据可能定义不同，可以重写改方法。
      * @author lxm
      * @date 2023-08-10 03:58:15
-     * @protected
+     * @public
+     */
+    navByFirstItem(): void;
+    /**
+     * @description 根据栈数据导航数据
+     * @memberof ChartExpBarController
      */
-    protected navByFirstItem(): void;
+    navDataByStack(): void;
     /**
      * 解析参数
      *

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

@@ -1 +1 @@
-{"version":3,"file":"chart-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/chart-exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAI/D;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,uBAAuB,CAC7B,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,IAAI,IAAI;IA0BhC;;;;;;;;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;IAsCzC;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;CAmBf"}
+{"version":3,"file":"chart-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/chart-exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACvB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAI/D;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,uBAAuB,CAC7B,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;OAIG;IACH,oBAAoB,IAAI,KAAK,GAAG,SAAS;IAezC;;;;;;;OAOG;IACI,cAAc,IAAI,IAAI;IAQ7B;;;OAGG;IACH,cAAc,IAAI,IAAI;IAwBtB;;;;;;;;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;IAuCzC;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;CAmBf"}

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

@@ -9,35 +9,59 @@ import { convertNavData } from '../../../utils';
  * @implements {IChartExpBarController}
  */
 export class ChartExpBarController extends ExpBarControlController {
+    /**
+     * @description 获取默认激活数据
+     * @returns {*}  {(IData | undefined)}
+     * @memberof ChartExpBarController
+     */
+    getDefaultActiveData() {
+        const activeSeriesGenerator = this.xDataController.generator.seriesGenerators.find(generator => {
+            return generator.chartDataArr.length > 0 && generator.model.navAppViewId;
+        });
+        if (activeSeriesGenerator && activeSeriesGenerator.groupData) {
+            const firstGroupName = Object.keys(activeSeriesGenerator.groupData)[0];
+            const { chartData } = activeSeriesGenerator.groupData[firstGroupName].values().next().value ||
+                {};
+            return chartData;
+        }
+    }
     /**
      * 导航页面首次打开且没有回显时，
      * 默认取第一条数据进行导航
      * 对于不同的导航，第一条可导航的数据可能定义不同，可以重写改方法。
      * @author lxm
      * @date 2023-08-10 03:58:15
-     * @protected
+     * @public
      */
     navByFirstItem() {
-        const data = this.xDataController.state.items[0];
-        if (!data) {
-            // 导航视图传空让他导航占位绘制空界面
-            this.state.srfnav = '';
-            this._evt.emit('onNavViewChange', {
-                navViewMsg: {
-                    key: '',
-                    isCache: this.isCache,
-                },
-            });
+        if (!this.xDataController)
             return;
-        }
-        // 默认选中并激活第一项(这里的第一项是我们自己封装的chartData)
-        const activeSeriesGenerator = this.xDataController.generator.seriesGenerators.find(generator => {
-            return generator.chartDataArr.length > 0 && generator.model.navAppViewId;
+        const data = this.getDefaultActiveData();
+        if (!data)
+            return this.clearNavigation();
+        this.xDataController.setActive(data);
+        this.xDataController.setSelection([data]);
+    }
+    /**
+     * @description 根据栈数据导航数据
+     * @memberof ChartExpBarController
+     */
+    navDataByStack() {
+        if (!this.xDataController)
+            return;
+        // 根据栈数据查找最近的一次导航数据
+        const preNav = this.navStack.find(nav => {
+            return this.xDataController.generator.seriesGenerators.find(generator => generator.chartDataArr.find(item => item._seriesModelId === nav._seriesModelId &&
+                item._catalog === nav._catalog &&
+                item._groupName === nav._groupName));
         });
-        if (activeSeriesGenerator) {
-            const iterator = activeSeriesGenerator.groupData.$default_group.values();
-            const { chartData } = iterator.next().value;
-            this.xDataController.setActive(chartData);
+        const navData = preNav || this.getDefaultActiveData();
+        if (navData) {
+            this.xDataController.setActive(navData);
+            this.xDataController.setSelection([navData]);
+        }
+        else {
+            this.clearNavigation();
         }
     }
     /**
@@ -62,6 +86,8 @@ export class ChartExpBarController extends ExpBarControlController {
                 // 序列上配的导航视图参数和上下文
                 const tempContext2 = convertNavData(navigateContexts, data, params, tempContext);
                 const tempParams2 = convertNavData(navigateParams, data, params, tempParams);
+                if (data.navParams)
+                    Object.assign(tempParams2, data.navParams);
                 return {
                     context: Object.assign(tempContext.clone(), tempContext2),
                     params: tempParams2,

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

@@ -1,7 +1,8 @@
-import { IDEGrid, IExpBar, IDEList, IDEDataView, INavigatable } from '@ibiz/model-core';
-import { IExpBarControlState, IExpBarControlEvent, IExpBarControlController, IMDControlController, IToolbarController, LoadEvent, EventBase, INavViewMsg, IViewLayoutPanelController } from '../../../interface';
+import { IExpBar, IDEList, IDEGrid, IDEDataView, INavigatable } from '@ibiz/model-core';
+import { LoadEvent, EventBase, INavViewMsg, IToolbarController, IExpBarControlState, IExpBarControlEvent, IMDControlController, IExpBarControlController, IViewLayoutPanelController } from '../../../interface';
 import { ControlController } from '../../common';
 import { ControllerEvent } from '../../utils';
+import { CTX } from '../../ctx';
 type XDataControlModel = IDEGrid | IDEList | IDEDataView;
 /**
  * 导航部件控制器
@@ -28,6 +29,13 @@ export declare class ExpBarControlController<T extends IExpBar = IExpBar, S exte
      * @memberof ExpBarControlController
      */
     get routeDepth(): number | undefined;
+    /**
+     * @description 快速搜索提示分隔符
+     * @readonly
+     * @type {string}
+     * @memberof ExpBarControlController
+     */
+    get searchPhSeparator(): string;
     /**
      * 多数据部件类型
      *
@@ -52,6 +60,7 @@ export declare class ExpBarControlController<T extends IExpBar = IExpBar, S exte
      * @memberof ExpBarControlController
      */
     navStack: IData[];
+    constructor(model: T, context: IContext, params: IParams, ctx: CTX);
     protected initState(): void;
     /**
      * 加载
@@ -71,7 +80,7 @@ export declare class ExpBarControlController<T extends IExpBar = IExpBar, S exte
      * @type {IGridController}
      * @memberof ExpBarControlController
      */
-    get xDataController(): IMDControlController;
+    get xDataController(): IMDControlController | undefined;
     /**
      * 工具栏
      * @author lxm
@@ -132,18 +141,24 @@ export declare class ExpBarControlController<T extends IExpBar = IExpBar, S exte
      * 默认通过路由上的srfnav导航
      * @author lxm
      * @date 2023-08-10 04:04:08
-     * @protected
+     * @public
      */
-    protected navBySrfnav(): void;
+    navBySrfnav(): void;
     /**
      * 导航页面首次打开且没有回显时，
      * 默认取第一条数据进行导航
      * 对于不同的导航，第一条可导航的数据可能定义不同，可以重写改方法。
      * @author lxm
      * @date 2023-08-10 03:58:15
-     * @protected
+     * @public
+     */
+    navByFirstItem(): void;
+    /**
+     * @description 清空导航
+     * @public
+     * @memberof ExpBarControlController
      */
-    protected navByFirstItem(): void;
+    clearNavigation(): void;
     /**
      * 根据栈数据导航数据
      *

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":"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"}
+{"version":3,"file":"exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/exp-bar.controller.ts"],"names":[],"mappings":"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"}

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

@@ -1,4 +1,4 @@
-import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
+import { IBizParams, IBizContext, RuntimeError } from '@ibiz-template/core';
 import { calcDeCodeNameById } from '../../../model';
 import { calcNavParams } from '../../../utils';
 import { ControlController } from '../../common';
@@ -17,8 +17,36 @@ import { hasSubRoute } from '../../utils';
  * @template E
  */
 export class ExpBarControlController extends ControlController {
-    constructor() {
-        super(...arguments);
+    get _evt() {
+        return this.evt;
+    }
+    /**
+     * 当前路由视图的层级
+     *
+     * @author zk
+     * @date 2023-07-11 10:07:20
+     * @readonly
+     * @type {(number | undefined)}
+     * @memberof ExpBarControlController
+     */
+    get routeDepth() {
+        return this.view.modal.routeDepth;
+    }
+    /**
+     * @description 快速搜索提示分隔符
+     * @readonly
+     * @type {string}
+     * @memberof ExpBarControlController
+     */
+    get searchPhSeparator() {
+        if (this.controlParams.searchphseparator) {
+            return this.controlParams.searchphseparator;
+        }
+        return ibiz.config.common.searchPhSeparator;
+    }
+    constructor(model, context, params, ctx) {
+        var _a, _b, _c;
+        super(model, IBizContext.create({}, context), new IBizParams({}, params), ctx);
         /**
          * 导航栏key名称 默认srfkey 多导航视图类 由子类重写
          *
@@ -34,21 +62,16 @@ export class ExpBarControlController extends ControlController {
          * @memberof ExpBarControlController
          */
         this.navStack = [];
-    }
-    get _evt() {
-        return this.evt;
-    }
-    /**
-     * 当前路由视图的层级
-     *
-     * @author zk
-     * @date 2023-07-11 10:07:20
-     * @readonly
-     * @type {(number | undefined)}
-     * @memberof ExpBarControlController
-     */
-    get routeDepth() {
-        return this.view.modal.routeDepth;
+        // 更新搜索栏的模型
+        if (this.model.enableSearch) {
+            const modelData = (_b = (_a = this.view.model.viewLayoutPanel) === null || _a === void 0 ? void 0 : _a.controls) === null || _b === void 0 ? void 0 : _b.find(item => item.id === 'searchbar');
+            if (modelData && modelData.controlParam) {
+                const { SEARCHPHSEPARATOR } = ((_c = this.model.controlParam) === null || _c === void 0 ? void 0 : _c.ctrlParams) || {};
+                if (SEARCHPHSEPARATOR) {
+                    modelData.controlParam.ctrlParams = Object.assign(Object.assign({}, (modelData.controlParam.ctrlParams || {})), { SEARCHPHSEPARATOR });
+                }
+            }
+        }
     }
     initState() {
         super.initState();
@@ -62,7 +85,9 @@ export class ExpBarControlController extends ControlController {
      * @return {*}  {Promise<IData[]>}
      * @memberof ExpBarControlController
      */
-    load() {
+    async load() {
+        if (!this.xDataController)
+            return [];
         return this.xDataController.load({ isInitialLoad: true });
     }
     /**
@@ -76,11 +101,10 @@ export class ExpBarControlController extends ControlController {
      */
     get xDataController() {
         const controller = this.view.getController(this.model.xdataControlName);
-        if (!controller) {
-            throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.control.expBar.unableMore', {
+        if (!controller)
+            ibiz.log.error(ibiz.i18n.t('runtime.controller.control.expBar.unableMore', {
                 xdataControlName: this.model.xdataControlName,
             }));
-        }
         return controller;
     }
     /**
@@ -156,7 +180,7 @@ export class ExpBarControlController extends ControlController {
                 }
             });
             if (placeHolders.length > 0) {
-                this.state.placeHolder = placeHolders.join('、');
+                this.state.placeHolder = placeHolders.join(this.searchPhSeparator);
             }
         }
     }
@@ -170,6 +194,7 @@ export class ExpBarControlController extends ControlController {
      * @memberof ExpBarControlController
      */
     async onMounted() {
+        var _a;
         super.onMounted();
         if (this.xDataController) {
             this.xDataController.evt.on('onActive', event => {
@@ -183,9 +208,9 @@ export class ExpBarControlController extends ControlController {
             });
         }
         if (this.toolbarController) {
-            this.xDataController.evt.on('onSelectionChange', async (event) => {
+            (_a = this.xDataController) === null || _a === void 0 ? void 0 : _a.evt.on('onSelectionChange', async (event) => {
                 // 更新工具栏状态
-                this.toolbarController.calcButtonState(event.data[0], this.model.appDataEntityId);
+                this.toolbarController.calcButtonState(event.data[0], this.model.appDataEntityId, event);
             });
         }
         // 如果外面没有配置默认不加载的话，默认部件自己加载
@@ -220,12 +245,15 @@ export class ExpBarControlController extends ControlController {
      * 默认通过路由上的srfnav导航
      * @author lxm
      * @date 2023-08-10 04:04:08
-     * @protected
+     * @public
      */
     navBySrfnav() {
-        var _a;
+        if (!this.xDataController)
+            return;
         // 找到选中项，如果没有就模拟选中数据
-        const selectItem = (_a = this.xDataController) === null || _a === void 0 ? void 0 : _a.state.items.find(item => item[this.navKeyName] === this.state.srfnav);
+        const selectItem = this.xDataController.state.items.find(item => item[this.navKeyName] === this.state.srfnav);
+        const tempContext = this.context.clone();
+        tempContext.srfnavctrlid = this.xDataController.ctrlId;
         // 是否是路由模式且有子路由
         const routeAndHasSub = this.routeDepth && hasSubRoute(this.routeDepth);
         if (routeAndHasSub) {
@@ -240,7 +268,7 @@ export class ExpBarControlController extends ControlController {
                     isRoutePushed: true,
                     isCache: this.isCache,
                 },
-                context: this.context,
+                context: tempContext,
             });
             return;
         }
@@ -257,7 +285,7 @@ export class ExpBarControlController extends ControlController {
                     is404: true,
                     isCache: this.isCache,
                 },
-                context: this.context,
+                context: tempContext,
             });
         }
     }
@@ -267,50 +295,53 @@ export class ExpBarControlController extends ControlController {
      * 对于不同的导航，第一条可导航的数据可能定义不同，可以重写改方法。
      * @author lxm
      * @date 2023-08-10 03:58:15
-     * @protected
+     * @public
      */
     navByFirstItem() {
-        const data = this.xDataController.state.items[0];
-        if (!data) {
-            // 导航视图传空让他导航占位绘制空界面
-            this.state.srfnav = '';
-            this._evt.emit('onNavViewChange', {
-                navViewMsg: {
-                    key: '',
-                    isCache: this.isCache,
-                },
-            });
+        if (!this.xDataController)
             return;
-        }
+        const data = this.xDataController.state.items[0];
+        if (!data)
+            return this.clearNavigation();
         // 默认选中并激活第一项
         this.xDataController.setActive(data);
         this.xDataController.setSelection([data]);
     }
+    /**
+     * @description 清空导航
+     * @public
+     * @memberof ExpBarControlController
+     */
+    clearNavigation() {
+        var _a;
+        this.navStack = [];
+        (_a = this.xDataController) === null || _a === void 0 ? void 0 : _a.setSelection([]);
+        this.state.srfnav = '';
+        this._evt.emit('onNavViewChange', {
+            navViewMsg: {
+                key: '',
+                isCache: this.isCache,
+            },
+        });
+    }
     /**
      * 根据栈数据导航数据
      *
      * @memberof ExpBarControlController
      */
     navDataByStack() {
+        if (!this.xDataController)
+            return;
         const { items } = this.xDataController.state;
-        const preNav = this.navStack.find(nav => items.find(item => nav[this.navKeyName] === item[this.navKeyName]));
-        const navData = preNav
-            ? items.find(item => preNav[this.navKeyName] === item[this.navKeyName])
-            : items[0];
-        if (navData) {
+        const navData = this.navStack
+            .map(nav => items.find(item => nav[this.navKeyName] === item[this.navKeyName]))
+            .find(item => item !== undefined) || items[0];
+        if (navData && this.xDataController) {
             this.xDataController.setActive(navData);
             this.xDataController.setSelection([navData]);
         }
         else {
-            this.navStack = [];
-            this.xDataController.setSelection([]);
-            this.state.srfnav = '';
-            this._evt.emit('onNavViewChange', {
-                navViewMsg: {
-                    key: '',
-                    isCache: this.isCache,
-                },
-            });
+            this.clearNavigation();
         }
     }
     /**
@@ -338,6 +369,7 @@ export class ExpBarControlController extends ControlController {
      * @memberof ExpBarControlController
      */
     prepareParams(XDataModel, data, context, params) {
+        var _a;
         const { navDER, navFilter, navigateContexts, navigateParams, appDataEntityId, } = XDataModel;
         const model = {
             deName: appDataEntityId ? calcDeCodeNameById(appDataEntityId) : undefined,
@@ -355,6 +387,7 @@ export class ExpBarControlController extends ControlController {
         // 合并SrfNav
         const tempContext = Object.assign(context.clone(), resultContext, {
             currentSrfNav: data[this.navKeyName],
+            srfnavctrlid: (_a = this.xDataController) === null || _a === void 0 ? void 0 : _a.ctrlId,
         });
         this.state.srfnav = data[this.navKeyName];
         const tempParams = Object.assign({}, resultParams);

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

@@ -1,5 +1,5 @@
 import { IDETreeNode, ITreeExpBar } from '@ibiz/model-core';
-import { ITreeExpBarState, ITreeExpBarEvent, ITreeExpBarController, ITreeController, ITreeEvent, ITreeNodeData, INavViewMsg } from '../../../interface';
+import { ITreeEvent, INavViewMsg, ITreeNodeData, ITreeController, ITreeExpBarState, ITreeExpBarEvent, ITreeExpBarController } from '../../../interface';
 import { ExpBarControlController } from './exp-bar.controller';
 /**
  * 树导航栏控制器
@@ -17,7 +17,7 @@ export declare class TreeExpBarController extends ExpBarControlController<ITreeE
      * @type {string[]}
      */
     defaultExpandedKeys?: string[];
-    get xDataController(): ITreeController;
+    get xDataController(): ITreeController | undefined;
     /**
      * 导航栏key
      *
@@ -64,7 +64,7 @@ export declare class TreeExpBarController extends ExpBarControlController<ITreeE
      * @memberof TabExpPanelController
      */
     getNavViewMsg(node: ITreeNodeData, context: IContext, params: IParams): INavViewMsg;
-    protected navByFirstItem(): void;
+    navByFirstItem(): void;
     /**
      * 根据栈数据导航数据
      *

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,CAWrC;IAED;;;;;;OAMG;IACH,UAAU,QAAkB;IAE5B;;;;;OAKG;IACH,eAAe,EAAE,MAAM,EAAE,CAAM;IAE/B;;;OAGG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;;OAMG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAarD;;;;;;OAMG;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;IAsBd,SAAS,CAAC,cAAc,IAAI,IAAI;IAgChC;;;;OAIG;IACH,cAAc,IAAI,IAAI;cA4CN,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1C;;;;;;OAMG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE;IAalC,cAAc,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3E;;;;;;OAMG;IACH,SAAS,CAAC,wBAAwB,IAAI,OAAO;CAU9C"}
+{"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,UAAU,EACV,WAAW,EACX,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACtB,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,GAAG,SAAS,CASjD;IAED;;;;;;OAMG;IACH,UAAU,QAAkB;IAE5B;;;;;OAKG;IACH,eAAe,EAAE,MAAM,EAAE,CAAM;IAE/B;;;OAGG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;;OAMG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAarD;;;;;;OAMG;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;IA8BP,cAAc,IAAI,IAAI;IAuB7B;;;;OAIG;IACH,cAAc,IAAI,IAAI;cAqCN,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1C;;;;;;OAMG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE;IAalC,cAAc,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3E;;;;;;OAMG;IACH,SAAS,CAAC,wBAAwB,IAAI,OAAO;CAU9C"}