@ibiz-template/vue3-components 0.7.41-alpha.19 → 0.7.41-alpha.20

package/es/panel-component/panel-app-title/panel-app-title.controller.d.ts

@@ -19,7 +19,7 @@ export declare class PanelAppTitleController extends PanelItemController<IPanelR
      */
     panel: ViewLayoutPanelController;
     /**
-     * @description 分隔符,将标题以`|`符分割，分隔符前面为caption，后面为caption2
+     * @description 分隔符，将标题以`\|`符分割，分隔符前面为caption，后面为caption2
      * @exposedoc
      * @return {*}
      * @memberof PanelAppTitleController

package/es/panel-component/panel-app-title/panel-app-title.controller.mjs

@@ -12,7 +12,7 @@ class PanelAppTitleController extends PanelItemController {
   constructor() {
     super(...arguments);
     /**
-     * @description 分隔符,将标题以`|`符分割，分隔符前面为caption，后面为caption2
+     * @description 分隔符，将标题以`\|`符分割，分隔符前面为caption，后面为caption2
      * @exposedoc
      * @return {*}
      * @memberof PanelAppTitleController

package/es/panel-component/user-action/user-action.d.ts

@@ -6,7 +6,7 @@ import './user-action.scss';
  * 用户操作
  * @primary
  * @description 首页中用户操作行为按钮，需在菜单上配置标识为设置（setting）、帮助（helper）、自定义（custom）的三种隐藏菜单项，点击按钮将会执行对应的菜单项应用功能。
- * @panelitemparams {name:noprivmode,parameterType:PARENT|SELF,defaultvalue:PARENT,description:无权限模式，为PARENT时会通过父容器进行显示隐藏}
+ * @panelitemparams {name:noprivmode,parameterType:'PARENT' | 'SELF',defaultvalue:'PARENT',description:无权限模式，为PARENT时会通过父容器进行显示隐藏}
  * @export
  * @class UserAction
  */

package/es/panel-component/view-message/view-message.d.ts

@@ -4,7 +4,7 @@ import { PanelItemController } from '@ibiz-template/runtime';
 /**
  * 视图消息
  * @primary
- * @description 使用el-alert组件，用于高亮显示视图消息，支持滚动显示。
+ * @description 使用el-alert组件，用于高亮显示消息位置为BODY视图内容区的视图消息。
  * @param {*}
  * @return {*}
  */

package/es/panel-component/view-msg-pos/view-msg-pos.d.ts

@@ -6,7 +6,7 @@ import { ViewMsgPosController } from './view-msg-pos.controller';
  * @primary
  * @description 使用el-alert组件，读取视图状态的viewMessages数据，用于在界面布局中给视图消息提供一个显示位置。
  * @panelitemparams {name:scroll,parameterType:boolean,defaultvalue:false,description:是否滚动展示}
- * @panelitemparams {name:position,parameterType:TOP | BOTTOM | BODY,defaultvalue:BODY,description:指定展示哪个位置的视图消息，TOP代表视图上方，BOTTOM代表视图下方，BODY代表视图内容区}
+ * @panelitemparams {name:position,parameterType:'TOP' | 'BOTTOM' | 'BODY',defaultvalue:'BODY',description:指定展示哪个位置的视图消息，TOP代表视图上方，BOTTOM代表视图下方，BODY代表视图内容区}
  */
 export declare const ViewMsgPos: import("vue").DefineComponent<{
     /**

package/es/view-engine/mpickup-view-engine.d.ts

@@ -48,7 +48,7 @@ export declare class MPickupViewEngine extends PickupViewEngine {
      * @param {*} data
      * @memberof PickupViewEngine
      */
-    protected pickupViewPanelDataActive(data: IData[]): void;
+    protected pickupViewPanelDataActive(data: IData[]): Promise<void>;
     /**
      * 列表激活
      *
@@ -67,14 +67,12 @@ export declare class MPickupViewEngine extends PickupViewEngine {
      */
     addSelection(): Promise<void>;
     /**
-     * 处理添加简单列表数据
-     *
-     * @author zk
-     * @date 2023-05-26 02:05:41
+     * @description 处理添加简单列表数据
+     * @protected
      * @param {IData[]} data
      * @memberof MPickupViewEngine
      */
-    protected handlePushSimpleListItems(data: IData[]): void;
+    protected handlePushSimpleListItems(data: IData[]): Promise<void>;
     /**
      * 去重数组
      *

package/es/view-engine/mpickup-view-engine.mjs

@@ -94,8 +94,8 @@ class MPickupViewEngine extends PickupViewEngine {
    * @param {*} data
    * @memberof PickupViewEngine
    */
-  pickupViewPanelDataActive(data) {
-    this.handlePushSimpleListItems(data);
+  async pickupViewPanelDataActive(data) {
+    await this.handlePushSimpleListItems(data);
   }
   /**
    * 列表激活
@@ -124,20 +124,19 @@ class MPickupViewEngine extends PickupViewEngine {
    */
   async addSelection() {
     const selectItem = await this.pickupViewPanel.getSelectedData();
-    this.handlePushSimpleListItems(selectItem);
+    await this.handlePushSimpleListItems(selectItem);
   }
   /**
-   * 处理添加简单列表数据
-   *
-   * @author zk
-   * @date 2023-05-26 02:05:41
+   * @description 处理添加简单列表数据
+   * @protected
    * @param {IData[]} data
    * @memberof MPickupViewEngine
    */
-  handlePushSimpleListItems(data) {
-    const allData = this.simpleList.getAllData();
-    const items = [...allData, ...data];
-    const uniqueItems = this.handleUniqueItems(items);
+  async handlePushSimpleListItems(data) {
+    const items = await this.pickupViewPanel.getAllData();
+    const selectItems = this.simpleList.getAllData().filter((selected) => !items.some((item) => item.srfkey === selected.srfkey));
+    selectItems.push(...data);
+    const uniqueItems = this.handleUniqueItems(selectItems);
     this.setSelectedData(uniqueItems);
   }
   /**
@@ -164,7 +163,7 @@ class MPickupViewEngine extends PickupViewEngine {
    */
   async addAll() {
     const allItems = await this.pickupViewPanel.getAllData();
-    this.handlePushSimpleListItems(allItems);
+    await this.handlePushSimpleListItems(allItems);
   }
   /**
    * 删除所有
@@ -190,9 +189,8 @@ class MPickupViewEngine extends PickupViewEngine {
       const index = items.findIndex(
         (item) => _item.srfkey === item.srfkey
       );
-      if (index !== -1) {
+      if (index !== -1)
         items.splice(index, 1);
-      }
     });
     this.setSelectedData(items);
   }

package/es/view-engine/pickup-data-view.engine.d.ts

@@ -3,6 +3,12 @@ import { IAppDEDataView } from '@ibiz/model-core';
 import { DataViewEngine } from './data-view.engine';
 export declare class PickupDataViewEngine extends DataViewEngine {
     protected view: ViewController<IAppDEDataView, IPickupDataViewState, IPickupDataViewEvent>;
+    /**
+     * @description 选中数据
+     * @type {IData[]}
+     * @memberof PickupDataViewEngine
+     */
+    selectData: IData[];
     /**
      * 表格控制器
      *
@@ -13,6 +19,12 @@ export declare class PickupDataViewEngine extends DataViewEngine {
      */
     get dataview(): IDataViewControlController;
     onCreated(): Promise<void>;
+    /**
+     * @description 初始化选中数据
+     * @protected
+     * @memberof PickupDataViewEngine
+     */
+    protected initSelectData(): void;
     onMounted(): Promise<void>;
     call(key: keyof IApiPickupDataViewCall, args: any): Promise<IData | null | undefined>;
 }

package/es/view-engine/pickup-data-view.engine.mjs

@@ -2,7 +2,22 @@ import { ViewCallTag } from '@ibiz-template/runtime';
 import { DataViewEngine } from './data-view.engine.mjs';
 
 "use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 class PickupDataViewEngine extends DataViewEngine {
+  constructor() {
+    super(...arguments);
+    /**
+     * @description 选中数据
+     * @type {IData[]}
+     * @memberof PickupDataViewEngine
+     */
+    __publicField(this, "selectData", []);
+  }
   /**
    * 表格控制器
    *
@@ -17,6 +32,21 @@ class PickupDataViewEngine extends DataViewEngine {
   async onCreated() {
     super.onCreated();
     this.view.slotProps.dataview.singleSelect = this.view.state.singleSelect;
+    this.initSelectData();
+  }
+  /**
+   * @description 初始化选中数据
+   * @protected
+   * @memberof PickupDataViewEngine
+   */
+  initSelectData() {
+    if (this.view.params.selecteddata) {
+      this.selectData = JSON.parse(this.view.params.selecteddata);
+      delete this.view.params.selecteddata;
+    }
+    if (this.view.state.selectedData) {
+      this.selectData = [...this.view.state.selectedData];
+    }
   }
   async onMounted() {
     await super.onMounted();
@@ -26,6 +56,7 @@ class PickupDataViewEngine extends DataViewEngine {
     this.xdataControl.evt.on("onActive", async (event) => {
       this.view.evt.emit("onDataActive", { ...event });
     });
+    this.setSelectedData(this.selectData);
   }
   async call(key, args) {
     if (key === ViewCallTag.GET_ALL_DATA) {

package/es/view-engine/pickup-grid-view.engine.d.ts

@@ -3,6 +3,12 @@ import { IAppDEGridView } from '@ibiz/model-core';
 import { GridViewEngine } from './grid-view.engine';
 export declare class PickupGridViewEngine extends GridViewEngine {
     protected view: ViewController<IAppDEGridView, IPickupGridViewState, IPickupGridViewEvent>;
+    /**
+     * @description 选中数据
+     * @type {IData[]}
+     * @memberof PickupGridViewEngine
+     */
+    selectData: IData[];
     /**
      * 表格控制器
      *
@@ -13,6 +19,12 @@ export declare class PickupGridViewEngine extends GridViewEngine {
      */
     get grid(): IGridController;
     onCreated(): Promise<void>;
+    /**
+     * @description 初始化选中数据
+     * @protected
+     * @memberof PickupGridViewEngine
+     */
+    protected initSelectData(): void;
     onMounted(): Promise<void>;
     call(key: keyof IApiPickupGridViewCall, args: any): Promise<IData | null | undefined>;
 }

package/es/view-engine/pickup-grid-view.engine.mjs

@@ -2,7 +2,22 @@ import { ViewCallTag } from '@ibiz-template/runtime';
 import { GridViewEngine } from './grid-view.engine.mjs';
 
 "use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 class PickupGridViewEngine extends GridViewEngine {
+  constructor() {
+    super(...arguments);
+    /**
+     * @description 选中数据
+     * @type {IData[]}
+     * @memberof PickupGridViewEngine
+     */
+    __publicField(this, "selectData", []);
+  }
   /**
    * 表格控制器
    *
@@ -22,6 +37,21 @@ class PickupGridViewEngine extends GridViewEngine {
     }
     this.view.slotProps.grid.singleSelect = this.view.state.singleSelect;
     this.view.slotProps.grid.mdctrlActiveMode = model.gridRowActiveMode;
+    this.initSelectData();
+  }
+  /**
+   * @description 初始化选中数据
+   * @protected
+   * @memberof PickupGridViewEngine
+   */
+  initSelectData() {
+    if (this.view.params.selecteddata) {
+      this.selectData = JSON.parse(this.view.params.selecteddata);
+      delete this.view.params.selecteddata;
+    }
+    if (this.view.state.selectedData) {
+      this.selectData = [...this.view.state.selectedData];
+    }
   }
   async onMounted() {
     await super.onMounted();
@@ -31,6 +61,7 @@ class PickupGridViewEngine extends GridViewEngine {
     this.xdataControl.evt.on("onActive", async (event) => {
       this.view.evt.emit("onDataActive", { ...event });
     });
+    this.setSelectedData(this.selectData);
   }
   async call(key, args) {
     if (key === ViewCallTag.GET_ALL_DATA) {

package/es/view-engine/pickup-tree-view.engine.d.ts

@@ -4,19 +4,11 @@ import { TreeViewEngine } from './tree-view.engine';
 export declare class PickupTreeViewEngine extends TreeViewEngine {
     protected view: ViewController<IAppDETreeView, IPickupTreeViewState, IPickupTreeViewEvent>;
     /**
-     * 选中数据
-     *
+     * @description 选中数据
      * @type {IData[]}
-     * @memberof PickupViewEngine
+     * @memberof PickupTreeViewEngine
      */
     selectData: IData[];
-    /**
-     * 通过srfkey选中数据
-     * @author lxm
-     * @date 2024-02-21 09:17:23
-     * @type {boolean}
-     */
-    selectBySrfkey: boolean;
     /**
      * 创建完成
      *
@@ -26,13 +18,11 @@ export declare class PickupTreeViewEngine extends TreeViewEngine {
      */
     onCreated(): Promise<void>;
     /**
-     * 根据key计算需要展开的节点标识
-     * @author lxm
-     * @date 2023-11-07 02:42:45
-     * @param {string} key
-     * @return {*}  {string[]}
+     * @description 初始化选中数据
+     * @protected
+     * @memberof PickupTreeViewEngine
      */
-    calcExpandKeys(key: string): string[];
+    protected initSelectData(): void;
     /**
      * 挂载完成
      *

package/es/view-engine/pickup-tree-view.engine.mjs

@@ -12,19 +12,11 @@ class PickupTreeViewEngine extends TreeViewEngine {
   constructor() {
     super(...arguments);
     /**
-     * 选中数据
-     *
+     * @description 选中数据
      * @type {IData[]}
-     * @memberof PickupViewEngine
+     * @memberof PickupTreeViewEngine
      */
     __publicField(this, "selectData", []);
-    /**
-     * 通过srfkey选中数据
-     * @author lxm
-     * @date 2024-02-21 09:17:23
-     * @type {boolean}
-     */
-    __publicField(this, "selectBySrfkey", false);
   }
   /**
    * 创建完成
@@ -40,43 +32,21 @@ class PickupTreeViewEngine extends TreeViewEngine {
     }
     this.view.slotProps.tree.singleSelect = this.view.state.singleSelect;
     this.view.slotProps.tree.checkStrictly = this.view.state.checkStrictly;
-    if (this.view.state.selectedData) {
-      this.selectData = this.view.state.selectedData.map((item) => {
-        return {
-          ...item,
-          _id: item.srfnodeid
-        };
-      });
-      const set = /* @__PURE__ */ new Set();
-      this.selectData.forEach((item) => {
-        if (item.srfnodeid) {
-          const keys = this.calcExpandKeys(item.srfnodeid);
-          keys.forEach((key) => set.add(key));
-        } else {
-          this.selectBySrfkey = true;
-        }
-      });
-      this.view.slotProps.tree.defaultExpandedKeys = Array.from(set);
-    }
+    this.initSelectData();
   }
   /**
-   * 根据key计算需要展开的节点标识
-   * @author lxm
-   * @date 2023-11-07 02:42:45
-   * @param {string} key
-   * @return {*}  {string[]}
+   * @description 初始化选中数据
+   * @protected
+   * @memberof PickupTreeViewEngine
    */
-  calcExpandKeys(key) {
-    const expandedKeys = [];
-    key.split(":").forEach((item, index) => {
-      if (index === 0) {
-        expandedKeys.push(item);
-      } else {
-        expandedKeys.push("".concat(expandedKeys[index - 1], ":").concat(item));
-      }
-    });
-    expandedKeys.pop();
-    return expandedKeys;
+  initSelectData() {
+    if (this.view.params.selecteddata) {
+      this.selectData = JSON.parse(this.view.params.selecteddata);
+      delete this.view.params.selecteddata;
+    }
+    if (this.view.state.selectedData) {
+      this.selectData = [...this.view.state.selectedData];
+    }
   }
   /**
    * 挂载完成
@@ -87,31 +57,16 @@ class PickupTreeViewEngine extends TreeViewEngine {
    */
   async onMounted() {
     const { model } = this.view;
-    let forbiddenSelectionChange = false;
     this.xdataControl.evt.on("onSelectionChange", async (event) => {
-      if (forbiddenSelectionChange) {
-        return;
-      }
       this.view.evt.emit("onSelectionChange", { ...event });
     });
     this.xdataControl.evt.on("onActive", async (event) => {
       this.view.evt.emit("onDataActive", { ...event });
     });
-    this.xdataControl.evt.on("onLoadSuccess", () => {
-      forbiddenSelectionChange = true;
-      let selectData = this.selectData;
-      if (this.selectBySrfkey) {
-        const srfkeys = this.selectData.map((item) => item.srfkey);
-        selectData = this.tree.state.items.filter((item) => {
-          return srfkeys.includes(item.srfkey);
-        });
-      }
-      this.xdataControl.setSelection(selectData);
-      forbiddenSelectionChange = false;
-    });
     if (!this.view.state.noLoadDefault && model.loadDefault) {
       this.load();
     }
+    this.setSelectedData(this.selectData);
   }
   async call(key, args) {
     if (key === ViewCallTag.GET_ALL_DATA) {

package/es/view-engine/pickup-view.engine.d.ts

@@ -30,6 +30,12 @@ export declare class PickupViewEngine extends ViewEngineBase {
      * @memberof PickupViewEngine
      */
     onCreated(): Promise<void>;
+    /**
+     * @description 初始化选中数据
+     * @protected
+     * @memberof PickupViewEngine
+     */
+    protected initSelectData(): void;
     /**
      * 视图mounted生命周期执行逻辑
      *

package/es/view-engine/pickup-view.engine.mjs

@@ -39,10 +39,21 @@ class PickupViewEngine extends ViewEngineBase {
     await super.onCreated();
     const { childNames } = this.view;
     childNames.push("pickupviewpanel");
+    this.initSelectData();
+  }
+  /**
+   * @description 初始化选中数据
+   * @protected
+   * @memberof PickupViewEngine
+   */
+  initSelectData() {
     if (this.view.params.selecteddata) {
       this.selectData = JSON.parse(this.view.params.selecteddata);
       delete this.view.params.selecteddata;
     }
+    if (this.view.state.selectedData) {
+      this.selectData = [...this.view.state.selectedData];
+    }
   }
   /**
    * 视图mounted生命周期执行逻辑

package/es/web-app/App.mjs

@@ -1,4 +1,4 @@
-import { onUnmounted, resolveComponent, createVNode, defineComponent } from 'vue';
+import { onMounted, onBeforeUnmount, onUnmounted, resolveComponent, createVNode, defineComponent } from 'vue';
 import { ViewMode, Modal } from '@ibiz-template/runtime';
 import { AppHooks } from '@ibiz-template/vue3-util';
 import './App.css';
@@ -16,6 +16,22 @@ var App = /* @__PURE__ */ defineComponent({
       ibiz.hub.destroy();
     };
     window.addEventListener("unload", destroyAppHub);
+    let watermarkDestroy;
+    onMounted(() => {
+      AppHooks.initedApp.tapPromise(async ({
+        context
+      }) => {
+        var _a;
+        watermarkDestroy == null ? void 0 : watermarkDestroy();
+        watermarkDestroy = ibiz.util.watermark.mount(ibiz.config.watermark, void 0, {
+          ...context,
+          ...(_a = ibiz.appData) == null ? void 0 : _a.context
+        });
+      });
+    });
+    onBeforeUnmount(() => {
+      watermarkDestroy == null ? void 0 : watermarkDestroy();
+    });
     onUnmounted(() => {
       destroyAppHub();
       AppHooks.destoryApp.call(null);

package/es/web-app/guard/auth-guard/auth-guard.mjs

@@ -128,6 +128,7 @@ class AuthGuard {
     }
     if (viewModel.accUserMode !== 3) {
       this.throw401();
+      return;
     }
     if (!authInfo) {
       const loginResult = await ibiz.auth.anonymousLogin();

package/es/web-app/util/unauthorized-handler/unauthorized-handler.d.ts

@@ -10,6 +10,13 @@ import { IErrorHandler } from '@ibiz-template/runtime';
  */
 export declare class UnauthorizedHandler implements IErrorHandler {
     match(error: unknown): boolean;
+    /**
+     * @description 是否存在403错误未处理
+     * @protected
+     * @type {boolean}
+     * @memberof UnauthorizedHandler
+     */
+    protected hasPermErrPending: boolean;
     /**
      * oauth登录处理
      *

package/es/web-app/util/unauthorized-handler/unauthorized-handler.mjs

@@ -2,7 +2,22 @@ import qs from 'qs';
 import { HttpError, RuntimeError, UrlHelper, LoginMode } from '@ibiz-template/core';
 
 "use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 class UnauthorizedHandler {
+  constructor() {
+    /**
+     * @description 是否存在403错误未处理
+     * @protected
+     * @type {boolean}
+     * @memberof UnauthorizedHandler
+     */
+    __publicField(this, "hasPermErrPending", false);
+  }
   match(error) {
     return error instanceof HttpError && (error.status === 401 || error.status === 403);
   }
@@ -83,10 +98,15 @@ class UnauthorizedHandler {
    */
   async handle403(error) {
     if (error.tag === "APPINIT") {
+      if (this.hasPermErrPending) {
+        return;
+      }
+      this.hasPermErrPending = true;
       const result = await ibiz.confirm.warning({
         title: ibiz.i18n.t("webApp.unauthorizedHandler.forbiddenAccess"),
         desc: ibiz.i18n.t("webApp.unauthorizedHandler.logoutAccount")
       });
+      this.hasPermErrPending = false;
       if (result) {
         const bol = await ibiz.hub.controller.logout();
         if (bol) {
@@ -108,7 +128,8 @@ class UnauthorizedHandler {
     if (error instanceof HttpError) {
       if (error.status === 401) {
         const search = qs.parse(window.location.search.replace("?", ""));
-        if (search.isAnonymous || ibiz.env.enableAnonymous) {
+        if ((search.isAnonymous || ibiz.env.enableAnonymous) && // 匿名登录获取视图模型发生异常，走普通登录，防止循环执行
+        error.tag !== "APPINIT") {
           ibiz.auth.anonymousLogin().then((bol) => {
             if (bol) {
               window.location.reload();

package/lib/common/control-navigation/control-navigation.cjs

@@ -84,15 +84,14 @@ const IBizControlNavigation = /* @__PURE__ */ vue.defineComponent({
       }
     });
     const renderNavView = () => {
-      if (navViewMsg.value) {
-        if (!navViewMsg.value.viewId)
-          return;
-        return vue.h(vue.resolveComponent("IBizViewShell"), {
-          ...navViewMsg.value,
-          isEmbedCtrlNav: isEmbedCtrlNav.value,
-          class: ns.e("nav-view")
-        });
-      }
+      var _a2;
+      if (!((_a2 = navViewMsg.value) == null ? void 0 : _a2.viewId))
+        return;
+      return vue.h(vue.resolveComponent("IBizViewShell"), {
+        ...navViewMsg.value,
+        isEmbedCtrlNav: isEmbedCtrlNav.value,
+        class: ns.e("nav-view")
+      });
     };
     return {
       ns,

package/lib/common/control-navigation/provider/calendar-navigation.provider.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var dayjs = require('dayjs');
+var runtime = require('@ibiz-template/runtime');
 var navigationBase_provider = require('./navigation-base.provider.cjs');
 
 "use strict";
@@ -15,18 +15,29 @@ class CalendarNavigationProvider extends navigationBase_provider.NavgationBasePr
     super(...arguments);
     __publicField(this, "keyName", "navId");
   }
+  /**
+   * @description 通过栈数据导航
+   * - 特殊处理仅使用开始时间绘制的日历
+   * @memberof CalendarNavigationProvider
+   */
   onNavDataByStack() {
-    const { items } = this.controller.state;
-    const navData = this.navStack.map((key) => items.find((item) => item.navId === key)).find((item) => item !== void 0) || items[0];
+    var _a;
+    const { controlParams, state, model } = this.controller;
+    const calendarStyle = (_a = model.calendarStyle) == null ? void 0 : _a.toLowerCase();
+    const items = state.items.filter((item) => {
+      if (calendarStyle === "month" && controlParams.showmode !== "daterange" || calendarStyle === "user")
+        return runtime.compareDateEqualByScale(
+          item.beginTime,
+          state.selectedDate,
+          calendarStyle === "user" ? "week" : "month"
+        );
+      return true;
+    });
+    const navData = this.navStack.map((key) => items.find((item) => item[this.keyName] === key)).find((item) => item !== void 0) || items[0];
     if (navData) {
-      const date = new Date(navData.beginTime);
-      if (dayjs(date).isValid())
-        this.controller.setSelectDate(date);
-      this.controller.setNavData(navData);
+      this.setNavData(navData);
     } else {
-      this.navStack = [];
-      this.controller.setSelectDate(/* @__PURE__ */ new Date());
-      this.navViewMsg.value = void 0;
+      this.clearNavigation();
     }
   }
   getNavViewMsg(item) {