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

package/lib/editor/upload/use/use-iview-upload.cjs

@@ -9,7 +9,6 @@ function useIViewUpload(props, valueChange, c) {
   const uploadHeaders = ibiz.util.file.getUploadHeaders();
   const headers = vue.ref({ ...uploadHeaders });
   const uploadUrl = vue.ref("");
-  const downloadUrl = vue.ref("");
   const uploadCache = {
     count: 0,
     cacheFiles: []
@@ -23,6 +22,22 @@ function useIViewUpload(props, valueChange, c) {
     },
     { immediate: true }
   );
+  const getDownloadUrl = (data, file) => {
+    const editorParams = { ...c.editorParams };
+    if (editorParams.exportparams) {
+      editorParams.exportParams = JSON.parse(editorParams.exportparams);
+    }
+    if (file && file.folder) {
+      editorParams.osscat = file.folder;
+    }
+    const urls = ibiz.util.file.calcFileUpDownUrl(
+      c.context,
+      c.params,
+      data,
+      editorParams
+    );
+    return urls.downloadUrl;
+  };
   vue.watch(
     () => props.data,
     (newVal) => {
@@ -31,9 +46,6 @@ function useIViewUpload(props, valueChange, c) {
         if (editorParams.uploadparams) {
           editorParams.uploadParams = JSON.parse(editorParams.uploadparams);
         }
-        if (editorParams.exportparams) {
-          editorParams.exportParams = JSON.parse(editorParams.exportparams);
-        }
         const urls = ibiz.util.file.calcFileUpDownUrl(
           c.context,
           c.params,
@@ -41,7 +53,6 @@ function useIViewUpload(props, valueChange, c) {
           editorParams
         );
         uploadUrl.value = urls.uploadUrl;
-        downloadUrl.value = urls.downloadUrl;
       }
     },
     { immediate: true, deep: true }
@@ -86,24 +97,23 @@ function useIViewUpload(props, valueChange, c) {
   vue.watch(
     files,
     (newVal) => {
-      if ((newVal == null ? void 0 : newVal.length) && downloadUrl.value) {
+      if (newVal == null ? void 0 : newVal.length) {
         newVal.forEach((file) => {
-          file.url = file.url || downloadUrl.value.replace("%fileId%", file.id);
-          if (file.name.split(".").pop() === "svg") {
-            calcSvgPreview(file);
-          }
-        });
-      }
-    },
-    { immediate: true }
-  );
-  vue.watch(
-    downloadUrl,
-    (newVal) => {
-      if (newVal && files.value.length) {
-        files.value.forEach((file) => {
-          file.url = downloadUrl.value.replace("%fileId%", file.id);
-          if (file.name.split(".").pop() === "svg") {
+          const downloadUrl = getDownloadUrl(props.data, file);
+          file.url = file.url || downloadUrl.replace("%fileId%", file.id);
+          if (ibiz.config.common.enableDownloadTicket) {
+            ibiz.util.file.getDownloadTicket(c.context, { fileId: file.id }).then((downloadTicket) => {
+              if (downloadTicket && downloadTicket.ticket) {
+                file.url = downloadUrl.replace(
+                  "%fileId%",
+                  downloadTicket.ticket
+                );
+                if (file.name.split(".").pop() === "svg") {
+                  calcSvgPreview(file);
+                }
+              }
+            });
+          } else if (file.name.split(".").pop() === "svg") {
             calcSvgPreview(file);
           }
         });
@@ -117,6 +127,7 @@ function useIViewUpload(props, valueChange, c) {
       _files.map((file) => ({
         name: file.name,
         id: file.id,
+        folder: file.folder,
         ...c.transformInfoMap(file, c.infoMap, true)
       }))
     ) : null;
@@ -142,9 +153,13 @@ function useIViewUpload(props, valueChange, c) {
     if (!response) {
       return;
     }
+    if (ibiz.config.common.enableDownloadTicket) {
+      ibiz.util.file.setDownloadTicket(response.id, response.ticket);
+    }
     uploadCache.cacheFiles.push({
       name: response.filename,
       id: response.fileid,
+      folder: response.folder,
       ...c.transformInfoMap(response, c.infoMap)
     });
     if (response.name.split(".").pop() === "svg") {
@@ -177,15 +192,25 @@ function useIViewUpload(props, valueChange, c) {
     emitValue();
   };
   const onDownload = (file) => {
-    const url = file.url || downloadUrl.value.replace("%fileId%", file.id);
-    ibiz.util.file.fileDownload(url, file.name);
+    const downloadUrl = getDownloadUrl(props.data, file);
+    const url = file.url || downloadUrl.replace("%fileId%", file.id);
+    const editorParams = { ...c.editorParams };
+    if (editorParams.exportparams) {
+      editorParams.exportParams = JSON.parse(editorParams.exportparams);
+    }
+    ibiz.util.file.fileDownload(url, file.name, {
+      context: c.context,
+      params: c.params,
+      data: props.data,
+      file: { fileId: file.id, ...file },
+      extraParams: editorParams
+    });
   };
   const limit = vue.computed(() => {
     return c.multiple ? 9999 : 1;
   });
   return {
     uploadUrl,
-    downloadUrl,
     headers,
     files,
     limit,

package/lib/index.cjs

@@ -183,6 +183,7 @@ var keydownUtil = require('./util/keydown-util/keydown-util.cjs');
 var aiUtil = require('./util/ai-util/ai-util.cjs');
 var buttonUtil = require('./util/button-util/button-util.cjs');
 var wangEditorUtil = require('./util/wang-editor-util/wang-editor-util.cjs');
+var icon = require('./util/icon/icon.cjs');
 var authGuard = require('./web-app/guard/auth-guard/auth-guard.cjs');
 var main = require('./web-app/main.cjs');
 var index$1e = require('./web-app/router/index.cjs');
@@ -372,6 +373,8 @@ exports.useFocusByEnter = keydownUtil.useFocusByEnter;
 exports.calcAiToolbarItemsByAc = aiUtil.calcAiToolbarItemsByAc;
 exports.convertBtnType = buttonUtil.convertBtnType;
 exports.parseHtml = wangEditorUtil.parseHtml;
+exports.ArrowLeftBold = icon.ArrowLeftBold;
+exports.ArrowRightBold = icon.ArrowRightBold;
 exports.AuthGuard = authGuard.AuthGuard;
 exports.runApp = main.runApp;
 exports.AppRouter = index$1e.AppRouter;

package/lib/locale/en/index.cjs

@@ -808,6 +808,10 @@ var index = {
       aiDesc: "After deletion, the conversation will not be recoverable. Are you sure to delete?",
       clearTopic: "Clear conversation",
       clearTopicDesc: "Are you sure to clear all conversation data except for the current activation item?"
+    },
+    appModal: {
+      prev: "Previous record",
+      next: "Next record"
     }
   },
   // runTime

package/lib/locale/zh-CN/index.cjs

@@ -804,6 +804,10 @@ var index = {
       aiDesc: "\u5220\u9664\u540E\uFF0C\u8BE5\u5BF9\u8BDD\u5C06\u4E0D\u53EF\u6062\u590D\u3002\u786E\u8BA4\u5220\u9664\u5417\uFF1F",
       clearTopic: "\u6E05\u7A7A\u4F1A\u8BDD",
       clearTopicDesc: "\u786E\u8BA4\u6E05\u7A7A\u9664\u5F53\u524D\u6FC0\u6D3B\u9879\u5916\u7684\u6240\u6709\u4F1A\u8BDD\u6570\u636E\uFF1F"
+    },
+    appModal: {
+      prev: "\u4E0A\u4E00\u4E2A\u8BB0\u5F55",
+      next: "\u4E0B\u4E00\u4E2A\u8BB0\u5F55"
     }
   },
   // runTime

package/lib/panel-component/app-switch/app-switch.controller.cjs

@@ -261,7 +261,10 @@ class AppSwitchController extends runtime.PanelItemController {
       await ibiz.hub.getAppAsync(tempKey);
     }
     const targetAppModel = ibiz.hub.getAppSourceModel(tempKey);
-    if (targetAppModel.getDefaultPSAppIndexView) {
+    const defaultApp = ibiz.hub.getApp();
+    if (defaultApp.model.appId === tempKey && window.Environment.AppTitle) {
+      ibiz.env.AppTitle = window.Environment.AppTitle;
+    } else if (targetAppModel.getDefaultPSAppIndexView) {
       const view = targetAppModel.getDefaultPSAppIndexView;
       if (targetAppModel.caption) {
         ibiz.env.AppTitle = targetAppModel.caption;

package/lib/panel-component/auth-userinfo/auth-userinfo.cjs

@@ -4,7 +4,7 @@ var vue = require('vue');
 var vueRouter = require('vue-router');
 var vue3Util = require('@ibiz-template/vue3-util');
 require('./auth-userinfo.css');
-var runtime = require('@ibiz-template/runtime');
+var authUserinfo_controller = require('./auth-userinfo.controller.cjs');
 
 "use strict";
 const AuthUserinfo = /* @__PURE__ */ vue.defineComponent({
@@ -21,7 +21,7 @@ const AuthUserinfo = /* @__PURE__ */ vue.defineComponent({
      * @description 用户信息控件控制器
      */
     controller: {
-      type: runtime.PanelItemController,
+      type: authUserinfo_controller.AuthUserinfoController,
       required: true
     }
   },
@@ -45,8 +45,20 @@ const AuthUserinfo = /* @__PURE__ */ vue.defineComponent({
       ibiz.hub.controller.logout();
     };
     const isCollapse = vue.computed(() => {
+      const {
+        strictly
+      } = c.rawItemParams;
+      if (strictly && strictly === "true") {
+        return false;
+      }
       return c.panel.view.state.isCollapse;
     });
+    const isReadonly = vue.computed(() => {
+      const {
+        readonly
+      } = c.rawItemParams;
+      return readonly === "true";
+    });
     return {
       ns,
       c,
@@ -55,13 +67,16 @@ const AuthUserinfo = /* @__PURE__ */ vue.defineComponent({
       loginname,
       router,
       menuAlign,
-      isCollapse
+      isCollapse,
+      isReadonly
     };
   },
   render() {
     return vue.createVNode("div", {
-      "class": [this.ns.b(), this.ns.m(this.modelData.id), ...this.controller.containerClass, this.ns.is("left", this.menuAlign === "LEFT"), this.ns.is("top", this.menuAlign === "TOP"), this.ns.is("collapse", this.isCollapse)]
-    }, [vue.createVNode(vue.resolveComponent("el-dropdown"), null, {
+      "class": [this.ns.b(), this.ns.m(this.modelData.id), ...this.controller.containerClass, this.ns.is("left", this.menuAlign === "LEFT"), this.ns.is("top", this.menuAlign === "TOP"), this.ns.is("collapse", this.isCollapse), this.ns.is("readonly", this.isReadonly)]
+    }, [vue.createVNode(vue.resolveComponent("el-dropdown"), {
+      "disabled": this.isReadonly
+    }, {
       default: () => vue.createVNode("div", {
         "class": [this.ns.b("info"), this.ns.is("collapse", this.isCollapse)]
       }, [vue.createVNode("div", {

package/lib/panel-component/auth-userinfo/auth-userinfo.controller.cjs

@@ -0,0 +1,53 @@
+'use strict';
+
+var runtime = require('@ibiz-template/runtime');
+
+"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 AuthUserinfoController extends runtime.PanelItemController {
+  constructor() {
+    super(...arguments);
+    /**
+     * @description 自定义补充参数
+     * @exposedoc
+     * @type {IData}
+     * @memberof AuthUserinfoController
+     */
+    __publicField(this, "rawItemParams", {});
+  }
+  /**
+   * 初始化
+   *
+   * @return {*}  {Promise<void>}
+   * @memberof AuthUserinfoController
+   */
+  async onInit() {
+    await super.onInit();
+    this.handleRawItemParams();
+  }
+  /**
+   * @description 处理自定义补充参数 [{key:'name',value:'data'}] => {name:'data'}
+   * @protected
+   * @memberof AuthUserinfoController
+   */
+  handleRawItemParams() {
+    var _a;
+    const rawItemParams = (_a = this.model.rawItem) == null ? void 0 : _a.rawItemParams;
+    if (Array.isArray(rawItemParams)) {
+      rawItemParams.forEach((item) => {
+        const key = item.key;
+        const value = item.value;
+        if (key && value) {
+          this.rawItemParams[key.toLowerCase()] = value;
+        }
+      });
+    }
+  }
+}
+
+exports.AuthUserinfoController = AuthUserinfoController;

package/lib/panel-component/auth-userinfo/auth-userinfo.css

@@ -1 +1 @@
-.ibiz-user-info{--ibiz-user-info-padding:0 var(--ibiz-spacing-loose);--ibiz-user-info-color:var(--ibiz-color-text-0);--ibiz-user-info-font-size:var(--ibiz-font-size-header-5);--ibiz-user-info-height:44px;display:flex;align-items:center;justify-content:flex-start;width:100%;height:100%}.ibiz-user-info .el-dropdown{width:100%;height:var(--ibiz-user-info-height);padding:var(--ibiz-user-info-padding);cursor:pointer}.ibiz-user-info.is-left .ibiz-user-info__down{display:none}.ibiz-user-info.is-top .ibiz-user-info__down{margin-left:12px;font-size:var(--ibiz-user-info-font-size)}.ibiz-user-info.is-top .ibiz-user-info-avatar{max-width:32px;max-height:32px;margin-right:var(--ibiz-spacing-base)}.ibiz-user-info.is-collapse .el-dropdown{padding:0 var(--ibiz-spacing-base-tight)}.ibiz-user-info.is-collapse .ibiz-user-info-avatar{max-width:32px;max-height:32px;margin:0}.ibiz-user-info-avatar{width:var(--ibiz-user-info-height);height:var(--ibiz-user-info-height);margin-right:10px}.ibiz-user-info-info{width:100%;display:flex;align-items:center;justify-content:space-between;color:var(--ibiz-user-info-color)}.ibiz-user-info-info.is-collapse{justify-content:center}.ibiz-user-info-name__user-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:130px;font-size:var(--ibiz-user-info-font-size);line-height:1.3}.ibiz-user-info-name__person-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:130px;margin-top:4px;font-size:var(--ibiz-font-size-small);line-height:1.2}.ibiz-user-info-name.is-collapse{display:none}.ibiz-user-info-label{display:flex;align-items:center;justify-content:flex-start;font-size:var(--ibiz-user-info-font-size);color:var(--ibiz-user-info-color);outline:0}
+.ibiz-user-info{--ibiz-user-info-padding:0 var(--ibiz-spacing-loose);--ibiz-user-info-color:var(--ibiz-color-text-0);--ibiz-user-info-font-size:var(--ibiz-font-size-header-5);--ibiz-user-info-height:44px;display:flex;align-items:center;justify-content:flex-start;width:100%;height:100%}.ibiz-user-info .el-dropdown{width:100%;height:var(--ibiz-user-info-height);padding:var(--ibiz-user-info-padding);cursor:pointer}.ibiz-user-info.is-left .ibiz-user-info__down{display:none}.ibiz-user-info.is-top .ibiz-user-info__down{margin-left:12px;font-size:var(--ibiz-user-info-font-size)}.ibiz-user-info.is-top .ibiz-user-info-avatar{max-width:32px;max-height:32px;margin-right:var(--ibiz-spacing-base)}.ibiz-user-info.is-collapse .el-dropdown{padding:0 var(--ibiz-spacing-base-tight)}.ibiz-user-info.is-collapse .ibiz-user-info-avatar{max-width:32px;max-height:32px;margin:0}.ibiz-user-info.is-readonly .el-dropdown{cursor:default}.ibiz-user-info-avatar{width:var(--ibiz-user-info-height);height:var(--ibiz-user-info-height);margin-right:10px}.ibiz-user-info-info{width:100%;display:flex;align-items:center;justify-content:space-between;color:var(--ibiz-user-info-color)}.ibiz-user-info-info.is-collapse{justify-content:center}.ibiz-user-info-name__user-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:130px;font-size:var(--ibiz-user-info-font-size);line-height:1.3}.ibiz-user-info-name__person-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:130px;margin-top:4px;font-size:var(--ibiz-font-size-small);line-height:1.2}.ibiz-user-info-name.is-collapse{display:none}.ibiz-user-info-label{display:flex;align-items:center;justify-content:flex-start;font-size:var(--ibiz-user-info-font-size);color:var(--ibiz-user-info-color);outline:0}

package/lib/panel-component/auth-userinfo/auth-userinfo.provider.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var runtime = require('@ibiz-template/runtime');
+var authUserinfo_controller = require('./auth-userinfo.controller.cjs');
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -14,7 +14,7 @@ class AuthUserinfoProvider {
     __publicField(this, "component", "IBizAuthUserinfo");
   }
   async createController(panelItem, panel, parent) {
-    const c = new runtime.PanelItemController(panelItem, panel, parent);
+    const c = new authUserinfo_controller.AuthUserinfoController(panelItem, panel, parent);
     await c.init();
     return c;
   }

package/lib/panel-component/global-search/global-search.cjs

@@ -48,6 +48,12 @@ const GlobalSearch = /* @__PURE__ */ vue.defineComponent({
       const showEmpty = histories.includes(query) && list.length === 0;
       return (showSearch || showEmpty || showHistory || loading) && activated.value;
     });
+    const curPlaceholder = vue.computed(() => {
+      const {
+        placeholder
+      } = c.rawItemParams;
+      return placeholder || ibiz.i18n.t("panelComponent.globalSearch.placeholder");
+    });
     const handleEnter = (event) => {
       if (event.key === "Enter") {
         activated.value = true;
@@ -190,6 +196,7 @@ const GlobalSearch = /* @__PURE__ */ vue.defineComponent({
       visible,
       editorRef,
       searchValue,
+      curPlaceholder,
       handleFocus,
       handleEnter,
       renderAction,
@@ -214,7 +221,7 @@ const GlobalSearch = /* @__PURE__ */ vue.defineComponent({
           "ref": "editorRef",
           "modelValue": this.searchValue,
           "onUpdate:modelValue": ($event) => this.searchValue = $event,
-          "placeholder": ibiz.i18n.t("panelComponent.globalSearch.placeholder"),
+          "placeholder": this.curPlaceholder,
           "class": [this.ns.e("search"), this.ns.is("search", this.visible)],
           "onFocus": this.handleFocus,
           "onKeyup": this.handleEnter,

package/lib/panel-component/global-search/global-search.controller.cjs

@@ -2,7 +2,6 @@
 
 var runtime = require('@ibiz-template/runtime');
 var qxUtil = require('qx-util');
-var core = require('@ibiz-template/core');
 var globalSearch_state = require('./global-search.state.cjs');
 
 "use strict";
@@ -32,7 +31,7 @@ class GlobalSearchController extends runtime.PanelItemController {
     /**
      * @description 自定义参数
      * @exposedoc
-     * @protected
+     * @public
      * @type {IData}
      * @memberof GlobalSearchController
      */
@@ -127,6 +126,38 @@ class GlobalSearchController extends runtime.PanelItemController {
     if (cache)
       this.state.histories = JSON.parse(cache);
   }
+  /**
+   * @description 获取全局搜索应用功能
+   * @param {IAppMenuItem[]} appMenuItems
+   * @returns {*}  {Promise<IAppFunc[]>}
+   * @memberof GlobalSearchController
+   */
+  async getSearchFunc(appMenuItems) {
+    const result = [];
+    const promises = appMenuItems.map(async (menuItem) => {
+      try {
+        if (menuItem.appMenuItems) {
+          const subFuncs = await this.getSearchFunc(menuItem.appMenuItems);
+          result.push(...subFuncs);
+          return;
+        }
+        if (menuItem.appFuncId) {
+          let app = ibiz.hub.getApp(menuItem.appId);
+          if (!app) {
+            app = await ibiz.hub.getAppAsync(menuItem.appId);
+          }
+          const appFunc = app.getAppFunc(menuItem.appFuncId);
+          if (appFunc && appFunc.appFuncType === "SEARCH" && appFunc.appDEACModeId && appFunc.appDataEntityId) {
+            result.push(appFunc);
+          }
+        }
+      } catch (err) {
+        console.error("\u8BA1\u7B97\u83DC\u5355\u5E94\u7528\u529F\u80FD\u5F02\u5E38: ".concat(menuItem.appFuncId), err);
+      }
+    });
+    await Promise.all(promises);
+    return result;
+  }
   /**
    * 初始化全局搜索项
    *
@@ -134,24 +165,14 @@ class GlobalSearchController extends runtime.PanelItemController {
    * @memberof GlobalSearchController
    */
   async initGlobalSearchItem() {
-    const appMenu = runtime.getControl(this.panel.view.model, "appmenu");
+    const appMenu = runtime.getControl(
+      this.panel.view.model,
+      "appmenu"
+    );
     if (!appMenu)
       return;
-    const appFuncs = [];
-    core.recursiveIterate(
-      appMenu,
-      (menuItem) => {
-        if (menuItem.appFuncId) {
-          const app = ibiz.hub.getApp(menuItem.appId);
-          const appFunc = app.getAppFunc(menuItem.appFuncId);
-          if (appFunc && appFunc.appFuncType === "SEARCH" && appFunc.appDEACModeId && appFunc.appDataEntityId)
-            appFuncs.push(appFunc);
-        }
-      },
-      {
-        childrenFields: ["appMenuItems"]
-      }
-    );
+    const appMenuItems = appMenu.appMenuItems || [];
+    const appFuncs = await this.getSearchFunc(appMenuItems);
     await Promise.all(
       appFuncs.map(async (func) => {
         const deACMode = await runtime.getDeACMode(

package/lib/panel-component/index-blank-placeholder/index-blank-placeholder.controller.cjs

@@ -59,8 +59,6 @@ class IndexBlankPlaceholderController extends runtime.PanelItemController {
         const appView = await ibiz.hub.config.view.get(appViewId);
         const { openMode = "INDEXVIEWTAB" } = appView;
         this.state.visible = !openMode.startsWith("INDEXVIEWTAB");
-      } else {
-        this.state.visible = true;
       }
     });
   }

package/lib/panel-component/nav-breadcrumb/nav-breadcrumb.cjs

@@ -4,6 +4,7 @@ var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
 var vueRouter = require('vue-router');
 var navBreadcrumb_controller = require('./nav-breadcrumb.controller.cjs');
+var navBreadcrumb_util = require('./nav-breadcrumb.util.cjs');
 require('./nav-breadcrumb.css');
 
 "use strict";
@@ -44,15 +45,23 @@ const NavBreadcrumb = /* @__PURE__ */ vue.defineComponent({
         breadcrumbItems
       } = c.state;
       let result = breadcrumbItems.filter((x) => x.caption);
+      const indexViewName = navBreadcrumb_util.getAppIndexViewName(c.panel.context);
       if (!c.showHome) {
-        result = result.filter((x) => x.viewName !== ibiz.hub.defaultAppIndexViewName);
+        result = result.filter((x) => x.viewName !== indexViewName);
       }
       return result;
     });
+    const onClick = (event, item) => {
+      if (item.type === "menuItem") {
+        event.stopPropagation();
+        c.openMenuItemView(item, event);
+      }
+    };
     return {
       ns,
       c,
-      items
+      items,
+      onClick
     };
   },
   render() {
@@ -67,7 +76,9 @@ const NavBreadcrumb = /* @__PURE__ */ vue.defineComponent({
         label += " - ".concat(item.dataInfo);
       }
       return vue.createVNode(vue.resolveComponent("el-breadcrumb-item"), {
-        "to": item.fullPath
+        "class": this.ns.is("link", item.type === "menuItem"),
+        "to": item.fullPath,
+        "onClick": (event) => this.onClick(event, item)
       }, _isSlot(label) ? label : {
         default: () => [label]
       });

package/lib/panel-component/nav-breadcrumb/nav-breadcrumb.controller.cjs

@@ -110,24 +110,33 @@ class NavBreadcrumbController extends runtime.PanelItemController {
     }
     if (this.navMode === "store") {
       const { currentRoute } = router;
+      const routePath = vue3Util.route2routePath(currentRoute.value);
       const fullPath = currentRoute.value.fullPath;
       const viewName = navBreadcrumb_util.getCurViewName(router);
+      const menuTag = navBreadcrumb_util.getMenuTag(routePath.pathNodes);
       const chacheItem = this.service.getItem({ fullPath, viewName });
+      const indexViewName = navBreadcrumb_util.getAppIndexViewName(this.panel.context);
       if (chacheItem) {
-        if (chacheItem.viewName === ibiz.hub.defaultAppIndexViewName) {
+        if (chacheItem.viewName === indexViewName) {
           this.service.setChache([
             { ...navBreadcrumb_util.getIndexBreadcrumb(this.panel.context), fullPath }
           ]);
           this.resetBreadcrumbs();
           return;
         }
+        this.service.update({ ...chacheItem, fullPath });
         const removeItems = this.service.removeAfter(fullPath);
         removeItems.forEach((item) => {
           var _a;
           (_a = this.navPos) == null ? void 0 : _a.removeCache(item.fullPath);
         });
         this.resetBreadcrumbs();
+      } else if (this.state.menuTag !== menuTag) {
+        this.setBreadcrumbByRouter(router);
+      } else {
+        this.service.add({ viewName, fullPath, type: "default" });
       }
+      this.state.menuTag = menuTag;
     }
   }
   /**
@@ -148,7 +157,7 @@ class NavBreadcrumbController extends runtime.PanelItemController {
     if (this.navMode === "menu") {
       return;
     }
-    this.service.updateOrAdd({ fullPath, ...info });
+    this.service.update({ fullPath, type: "default", ...info });
     this.resetBreadcrumbs();
   }
   /**
@@ -164,19 +173,30 @@ class NavBreadcrumbController extends runtime.PanelItemController {
    * @param {Router} router
    * @memberof NavBreadcrumbController
    */
-  setBreadcrumbByRouter(router) {
+  async setBreadcrumbByRouter(router) {
     const { currentRoute } = router;
     const routePath = vue3Util.route2routePath(currentRoute.value);
-    const items = routePath.pathNodes.map(
-      (node, index) => {
-        const { appContext, pathNodes } = routePath;
+    const { appContext = {}, pathNodes } = routePath;
+    const menuTag = navBreadcrumb_util.getMenuTag(pathNodes);
+    let hasMenuItem = false;
+    const menuData = await navBreadcrumb_util.getMenuItemByTag(
+      menuTag,
+      this.appmenu,
+      this.panel.context
+    );
+    const calcPathNodes = routePath.pathNodes.map(
+      async (node, index) => {
+        if (this.appmenu && menuData && menuData.viewName === node.viewName) {
+          hasMenuItem = true;
+        }
         const fullPath = vue3Util.routePath2string({
           appContext,
           pathNodes: pathNodes.slice(0, index + 1)
         });
         const result = {
           viewName: node.viewName,
-          fullPath
+          fullPath,
+          type: "default"
         };
         const chacheItem = this.service.getItem({ viewName: node.viewName });
         if (chacheItem) {
@@ -185,13 +205,28 @@ class NavBreadcrumbController extends runtime.PanelItemController {
           }
           Object.assign(result, chacheItem);
         }
-        const viewInfo = navBreadcrumb_util.getViewInfoByViewStack(node.viewName);
+        const viewInfo = navBreadcrumb_util.getViewInfoByViewStack(
+          node.viewName,
+          this.panel.context
+        );
         if (viewInfo) {
           Object.assign(result, ramda.reject(ramda.isNil, viewInfo));
         }
         return result;
       }
     );
+    const items = await Promise.all(calcPathNodes);
+    if (!hasMenuItem && menuData) {
+      this.state.menuTag = menuData.tag;
+      const item = {
+        viewName: menuData.viewName,
+        caption: menuData.menuItem.caption,
+        fullPath: "",
+        type: "menuItem",
+        menuTag: menuData.tag
+      };
+      items.splice(1, 0, item);
+    }
     this.service.setChache(items);
     this.resetBreadcrumbs();
   }
@@ -225,6 +260,7 @@ class NavBreadcrumbController extends runtime.PanelItemController {
           return {
             caption: item.caption,
             fullPath: "",
+            type: "default",
             viewName: item.id
           };
         });
@@ -267,16 +303,14 @@ class NavBreadcrumbController extends runtime.PanelItemController {
     }
     if (this.appmenu) {
       this.appmenu.evt.on("onClick", async (data) => {
-        var _a;
         const { eventArg } = data;
-        const menuItem = this.appmenu.allAppMenuItems.find(
-          (x) => x.id === eventArg
+        const menuData = await navBreadcrumb_util.getMenuItemByTag(
+          eventArg,
+          this.appmenu,
+          this.panel.context
         );
-        if (menuItem) {
-          const app = ibiz.hub.getApp(this.panel.context.srfappid);
-          const appFunc = app.getAppFunc(menuItem.appFuncId);
-          const viewName = ((_a = appFunc.appViewId) == null ? void 0 : _a.split(".").pop()) || "";
-          const viewConfig = await ibiz.hub.config.view.get(viewName);
+        if (menuData) {
+          const { viewName, appFunc, viewConfig } = menuData;
           if (appFunc.openMode !== "INDEXVIEWTAB" || viewConfig && viewConfig.openMode && viewConfig.openMode !== "INDEXVIEWTAB") {
             return;
           }
@@ -287,7 +321,8 @@ class NavBreadcrumbController extends runtime.PanelItemController {
           } else {
             items.push({
               viewName,
-              fullPath: ""
+              fullPath: "",
+              type: "default"
             });
           }
           items.unshift(navBreadcrumb_util.getIndexBreadcrumb(this.panel.context));
@@ -314,6 +349,17 @@ class NavBreadcrumbController extends runtime.PanelItemController {
     }
     Object.assign(this.rawItemParams, params);
   }
+  /**
+   * @description 打开菜单项视图
+   * @param {IData} item
+   * @param {MouseEvent} event
+   * @memberof NavBreadcrumbController
+   */
+  openMenuItemView(item, event) {
+    if (this.appmenu) {
+      this.appmenu.onClickMenuItem(item.menuTag, event);
+    }
+  }
 }
 
 exports.NavBreadcrumbController = NavBreadcrumbController;