chitanda 发布系统代码

app_CRM/src/studio-core/components/app-breadcrumb/app-breadcrumb.tsx

@@ -60,15 +60,17 @@ export class AppBreadcrumb extends Vue {
      * 根据下标从父导航查询是否有列表数据
      *
      * @protected
+     * @param {*} context
      * @param {string} [tag]
+     * @returns {(any[] | null)}
      * @memberof AppBreadcrumb
      */
-    protected getItems(tag?: string): any[] | null {
+    protected getItems(context: any, tag?: string): any[] | null {
         if (tag) {
             const view = this.$appService.viewStore.findParentByTag(tag);
             if (view) {
                 const c = view.context;
-                const data = c[c.srfdatakey];
+                const data = c[`srf${context.srfappdename}`];
                 if (data && data.items) {
                     return data.items;
                 }
@@ -122,7 +124,7 @@ export class AppBreadcrumb extends Vue {
         arr.forEach((item, i) => {
             let dropdown: any = null;
             if (arr.length === (i + 1)) {
-                const list = this.getItems(item.tag);
+                const list = this.getItems(item.context, item.tag);
                 if (list && list.length > 0) {
                     const c = item.context;
                     dropdown = <i-select v-model={c[c.srfappdename]} on-on-change={(val: any) => this.itemChange(c, item, val)} size="small">

app_CRM/src/studio-core/service/app-nav-history/AppNavHistoryBase.ts

@@ -87,6 +87,16 @@ export class AppNavHistoryBase {
      */
     public indexMeta: any = null;
 
+    /**
+     * Creates an instance of AppNavHistoryBase.
+     * @memberof AppNavHistoryBase
+     */
+    constructor() {
+        addEventListener('popstate', (event) => {
+            this.pop();
+        });
+    }
+
     /**
      * 查找路由缓存
      *