@ibiz-template/runtime 0.7.41-alpha.5 → 0.7.41-alpha.51

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,6 +10,12 @@ 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;
     /**
      * 导航页面首次打开且没有回显时，
      * 默认取第一条数据进行导航
@@ -19,6 +25,11 @@ export declare class ChartExpBarController extends ExpBarControlController<IChar
      * @protected
      */
     protected navByFirstItem(): void;
+    /**
+     * @description 根据栈数据导航数据
+     * @memberof ChartExpBarController
+     */
+    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;IACH,SAAS,CAAC,cAAc,IAAI,IAAI;IAOhC;;;OAGG;IACH,cAAc,IAAI,IAAI;IAuBtB;;;;;;;;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,6 +9,23 @@ 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;
+        }
+    }
     /**
      * 导航页面首次打开且没有回显时，
      * 默认取第一条数据进行导航
@@ -18,26 +35,30 @@ export class ChartExpBarController extends ExpBarControlController {
      * @protected
      */
     navByFirstItem() {
-        const data = this.xDataController.state.items[0];
-        if (!data) {
-            // 导航视图传空让他导航占位绘制空界面
-            this.state.srfnav = '';
-            this._evt.emit('onNavViewChange', {
-                navViewMsg: {
-                    key: '',
-                    isCache: this.isCache,
-                },
-            });
-            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() {
+        // 根据栈数据查找最近的一次导航数据
+        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 +83,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;
     /**
      * 加载
@@ -144,6 +153,12 @@ export declare class ExpBarControlController<T extends IExpBar = IExpBar, S exte
      * @protected
      */
     protected navByFirstItem(): void;
+    /**
+     * @description 清空导航
+     * @protected
+     * @memberof ExpBarControlController
+     */
+    protected 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, RuntimeModelError, } 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();
@@ -156,7 +179,7 @@ export class ExpBarControlController extends ControlController {
                 }
             });
             if (placeHolders.length > 0) {
-                this.state.placeHolder = placeHolders.join('、');
+                this.state.placeHolder = placeHolders.join(this.searchPhSeparator);
             }
         }
     }
@@ -185,7 +208,7 @@ export class ExpBarControlController extends ControlController {
         if (this.toolbarController) {
             this.xDataController.evt.on('onSelectionChange', async (event) => {
                 // 更新工具栏状态
-                this.toolbarController.calcButtonState(event.data[0], this.model.appDataEntityId);
+                this.toolbarController.calcButtonState(event.data[0], this.model.appDataEntityId, event);
             });
         }
         // 如果外面没有配置默认不加载的话，默认部件自己加载
@@ -226,6 +249,8 @@ 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);
+        const tempContext = this.context.clone();
+        tempContext.srfnavctrlid = this.xDataController.ctrlId;
         // 是否是路由模式且有子路由
         const routeAndHasSub = this.routeDepth && hasSubRoute(this.routeDepth);
         if (routeAndHasSub) {
@@ -240,7 +265,7 @@ export class ExpBarControlController extends ControlController {
                     isRoutePushed: true,
                     isCache: this.isCache,
                 },
-                context: this.context,
+                context: tempContext,
             });
             return;
         }
@@ -257,7 +282,7 @@ export class ExpBarControlController extends ControlController {
                     is404: true,
                     isCache: this.isCache,
                 },
-                context: this.context,
+                context: tempContext,
             });
         }
     }
@@ -271,21 +296,28 @@ export class ExpBarControlController extends ControlController {
      */
     navByFirstItem() {
         const data = this.xDataController.state.items[0];
-        if (!data) {
-            // 导航视图传空让他导航占位绘制空界面
-            this.state.srfnav = '';
-            this._evt.emit('onNavViewChange', {
-                navViewMsg: {
-                    key: '',
-                    isCache: this.isCache,
-                },
-            });
-            return;
-        }
+        if (!data)
+            return this.clearNavigation();
         // 默认选中并激活第一项
         this.xDataController.setActive(data);
         this.xDataController.setSelection([data]);
     }
+    /**
+     * @description 清空导航
+     * @protected
+     * @memberof ExpBarControlController
+     */
+    clearNavigation() {
+        this.navStack = [];
+        this.xDataController.setSelection([]);
+        this.state.srfnav = '';
+        this._evt.emit('onNavViewChange', {
+            navViewMsg: {
+                key: '',
+                isCache: this.isCache,
+            },
+        });
+    }
     /**
      * 根据栈数据导航数据
      *
@@ -293,24 +325,15 @@ export class ExpBarControlController extends ControlController {
      */
     navDataByStack() {
         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];
+        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.navStack = [];
-            this.xDataController.setSelection([]);
-            this.state.srfnav = '';
-            this._evt.emit('onNavViewChange', {
-                navViewMsg: {
-                    key: '',
-                    isCache: this.isCache,
-                },
-            });
+            this.clearNavigation();
         }
     }
     /**
@@ -355,6 +378,7 @@ export class ExpBarControlController extends ControlController {
         // 合并SrfNav
         const tempContext = Object.assign(context.clone(), resultContext, {
             currentSrfNav: data[this.navKeyName],
+            srfnavctrlid: this.xDataController.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';
 /**
  * 树导航栏控制器

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,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;IA8Bd,SAAS,CAAC,cAAc,IAAI,IAAI;IAsBhC;;;;OAIG;IACH,cAAc,IAAI,IAAI;cAoCN,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"}

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

@@ -100,7 +100,15 @@ 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, isCache: this.isCache }, result);
+        const navViewMsg = Object.assign({ key: nodeId, viewId: nodeModel.navAppViewId, isCache: this.isCache }, result);
+        if (ibiz.env.isMob) {
+            Object.assign(navViewMsg, {
+                modalOptions: {
+                    replace: true,
+                },
+            });
+        }
+        return navViewMsg;
     }
     navByFirstItem() {
         const data = this.xDataController.state.items.find(node => {
@@ -116,17 +124,8 @@ export class TreeExpBarController extends ExpBarControlController {
             // 需要导航视图的时候，返回第一个配置了导航视图的节点数据
             return this.navNodeModelIds.includes(node._nodeId);
         });
-        if (!data) {
-            // 导航视图传空让导航占位绘制空界面
-            this.state.srfnav = '';
-            this._evt.emit('onNavViewChange', {
-                navViewMsg: {
-                    key: '',
-                    isCache: this.isCache,
-                },
-            });
-            return;
-        }
+        if (!data)
+            return this.clearNavigation();
         // 默认选中并激活第一项
         this.xDataController.setActive(data);
         this.xDataController.setSelection([data]);
@@ -163,15 +162,7 @@ export class TreeExpBarController extends ExpBarControlController {
                 this.xDataController.setSelection([data]);
             }
             else {
-                this.navStack = [];
-                this.xDataController.setSelection([]);
-                this.state.srfnav = '';
-                this._evt.emit('onNavViewChange', {
-                    navViewMsg: {
-                        key: '',
-                        isCache: this.isCache,
-                    },
-                });
+                this.clearNavigation();
             }
         }
     }

package/out/controller/control/form/edit-form/edit-form.controller.d.ts

@@ -1,6 +1,6 @@
 import { IPortalMessage } from '@ibiz-template/core';
 import { IAppDEEditView, IDEEditForm, IDEFormPage } from '@ibiz/model-core';
-import { IEditFormState, IEditFormEvent, IEditFormController, IViewController, IEditViewState, IEditViewEvent, IDataAbilityParams, FormSaveParams } from '../../../../interface';
+import { IEditFormState, IEditFormEvent, IEditFormController, IViewController, IEditViewState, IEditViewEvent, IDataAbilityParams, FormSaveParams, IApiChangeTracker } from '../../../../interface';
 import { ControlVO } from '../../../../service';
 import { FormController } from '../form';
 import { EditFormService } from './edit-form.service';
@@ -22,6 +22,13 @@ export declare class EditFormController extends FormController<IDEEditForm, IEdi
      */
     service: EditFormService;
     get view(): IViewController<IAppDEEditView, IEditViewState, IEditViewEvent>;
+    /**
+     * @description 变更记录器
+     * @protected
+     * @type {IApiChangeTracker<ControlVO>}
+     * @memberof EditFormController
+     */
+    protected changeTracker: IApiChangeTracker<ControlVO>;
     /**
      * 表单旧数据
      *
@@ -200,5 +207,12 @@ export declare class EditFormController extends FormController<IDEEditForm, IEdi
      * @memberof EditFormController
      */
     filterDetail(filter: string): void;
+    /**
+     * @description 取消变更，'UNDO' | 'REDO'暂未支持
+     * @param {('INIT' | 'UNDO' | 'REDO')} [targetState] 目标状态，初始化状态|撤销上一步操作|重做下一步操作
+     * @returns {*}  {Promise<void>}
+     * @memberof FormController
+     */
+    cancelChanges(targetState?: 'INIT' | 'UNDO' | 'REDO'): Promise<void>;
 }
 //# sourceMappingURL=edit-form.controller.d.ts.map

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