raise-common-lib 0.0.24 → 0.0.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/raise-common-lib.umd.js +44 -12
- package/bundles/raise-common-lib.umd.js.map +1 -1
- package/bundles/raise-common-lib.umd.min.js +1 -1
- package/bundles/raise-common-lib.umd.min.js.map +1 -1
- package/esm2015/lib/layout/multi-tab/index.component.js +5 -2
- package/esm2015/lib/service/keep-alive.service.js +38 -12
- package/esm5/lib/layout/multi-tab/index.component.js +5 -2
- package/esm5/lib/service/keep-alive.service.js +41 -12
- package/fesm2015/raise-common-lib.js +41 -12
- package/fesm2015/raise-common-lib.js.map +1 -1
- package/fesm5/raise-common-lib.js +44 -12
- package/fesm5/raise-common-lib.js.map +1 -1
- package/lib/service/keep-alive.service.d.ts +1 -0
- package/package.json +1 -1
- package/raise-common-lib.metadata.json +1 -1
|
@@ -64,8 +64,11 @@ export class MultiTabComponent {
|
|
|
64
64
|
const state = navigation.extras.state;
|
|
65
65
|
// 获取传递的 state
|
|
66
66
|
/** @type {?} */
|
|
67
|
+
const skipLocationChange = navigation.extras.skipLocationChange;
|
|
68
|
+
// 获取是否跳过 location change
|
|
69
|
+
/** @type {?} */
|
|
67
70
|
const currentRoute = this.router.routerState.root.firstChild;
|
|
68
|
-
if (currentRoute) {
|
|
71
|
+
if (currentRoute && !skipLocationChange) {
|
|
69
72
|
this.setTab(this.router.url, currentRoute.snapshot.routeConfig.path, state && state.title);
|
|
70
73
|
}
|
|
71
74
|
}
|
|
@@ -307,4 +310,4 @@ if (false) {
|
|
|
307
310
|
*/
|
|
308
311
|
MultiTabComponent.prototype.ref;
|
|
309
312
|
}
|
|
310
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.component.js","sourceRoot":"ng://raise-common-lib/","sources":["lib/layout/multi-tab/index.component.ts"],"names":[],"mappings":"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","sourcesContent":["// 组件类\r\nimport {\r\n  ChangeDetectorRef,\r\n  Component,\r\n  HostListener,\r\n  Input,\r\n  OnInit,\r\n} from \"@angular/core\";\r\nimport {\r\n  ActivatedRoute,\r\n  NavigationEnd,\r\n  Router,\r\n  RouterOutlet,\r\n} from \"@angular/router\";\r\nimport { CommonFunctionService } from \"../../service/common-function.service\";\r\nimport { KeepAliveService } from \"../../service/keep-alive.service\";\r\nimport { filter } from \"rxjs/operators\";\r\n\r\n@Component({\r\n  selector: \"rs-multi-tab\",\r\n  templateUrl: \"./index.component.html\",\r\n  styleUrls: [\"./index.component.scss\"],\r\n})\r\nexport class MultiTabComponent implements OnInit {\r\n  constructor(\r\n    public router: Router,\r\n    public cf: CommonFunctionService,\r\n    public activatedRoute: ActivatedRoute,\r\n    public keepAlive: KeepAliveService,\r\n    private ref: ChangeDetectorRef\r\n  ) {}\r\n  @Input() singleReuseUrls: string[] = []; //只能单个缓存的url\r\n\r\n  TAB_WIDTH = 164;\r\n  GAP_NORMAL = 54;\r\n  GAP_SMALL = 30;\r\n  textGap; // 文本与边框的总间距\r\n  foo: RouterOutlet;\r\n  comRef: any;\r\n  tabList = [];\r\n  selectedTab: number = 0;\r\n  maxTabs: number = 10;\r\n  screenWidth: number = window.innerWidth; // 初始化屏幕宽度\r\n  @HostListener(\"window:resize\", [\"$event\"])\r\n  onResize(event) {\r\n    this.screenWidth = window.innerWidth; // 更新屏幕宽度\r\n    this.setEllipsisTitle();\r\n  }\r\n\r\n  ngOnInit() {\r\n    this.initTab();\r\n    this.router.events\r\n      .pipe(filter((event) => event instanceof NavigationEnd))\r\n      .subscribe(() => {\r\n        const navigation = this.router.getCurrentNavigation(); // 获取当前导航\r\n        if (navigation) {\r\n          const state = navigation.extras.state; // 获取传递的 state\r\n          const currentRoute = this.router.routerState.root.firstChild;\r\n          if (currentRoute) {\r\n            this.setTab(\r\n              this.router.url,\r\n              currentRoute.snapshot.routeConfig.path,\r\n              state && state.title\r\n            );\r\n          }\r\n        }\r\n      });\r\n    this.setEllipsisTitle();\r\n  }\r\n\r\n  setEllipsisTitle(title?) {\r\n    this.textGap = this.GAP_NORMAL;\r\n    if (this.screenWidth <= 1100) {\r\n      this.textGap = this.GAP_SMALL;\r\n    }\r\n    let { allWidth, leftWidth, rightWidth } = this.calcTabWidth();\r\n    let width = Math.floor(\r\n      (allWidth - rightWidth) / (this.tabList && this.tabList.length)\r\n    );\r\n\r\n    if (title) {\r\n      return this.cf.setMiddleEllipsis(\r\n        title,\r\n        width > this.TAB_WIDTH\r\n          ? this.TAB_WIDTH - this.textGap\r\n          : width - this.textGap,\r\n        12\r\n      );\r\n    } else {\r\n      this.tabList.forEach((ele, idx) => {\r\n        ele.displayTitle = this.cf.setMiddleEllipsis(\r\n          ele.title,\r\n          width > this.TAB_WIDTH\r\n            ? this.TAB_WIDTH - this.textGap\r\n            : width - this.textGap,\r\n          12\r\n        );\r\n      });\r\n    }\r\n  }\r\n\r\n  calcTabWidth() {\r\n    const wrap = document.querySelector(\".rs-multi-tab\");\r\n    const ulElement = document.querySelector(\".rs-multi-tab > ul\");\r\n    const refreshTabDiv = document.querySelector(\".rs-multi-tab .refresh-tab\");\r\n    let allWidth;\r\n    let leftWidth;\r\n    let rightWidth;\r\n    if (wrap && ulElement && refreshTabDiv) {\r\n      // 获取元素的位置信息\r\n      const wrapRect = wrap.getBoundingClientRect();\r\n      const ulRect = ulElement.getBoundingClientRect();\r\n      const refreshTabRect = refreshTabDiv.getBoundingClientRect();\r\n      allWidth = wrapRect.width;\r\n      leftWidth = ulRect.width;\r\n      rightWidth = refreshTabRect.width;\r\n    }\r\n    return {\r\n      allWidth,\r\n      leftWidth,\r\n      rightWidth,\r\n    };\r\n  }\r\n  initTab() {\r\n    let TabCache = JSON.parse(sessionStorage.getItem(\"TabCache\"));\r\n    this.tabList = TabCache || [];\r\n  }\r\n\r\n  closeTab(tab, idx) {\r\n    this.tabList = this.tabList.filter((ele) => ele.url !== tab.url);\r\n    this.clearCache(tab.url);\r\n    if (this.selectedTab === idx) {\r\n      const targetIdx = Math.max(0, idx - 1);\r\n      this.changeTab(this.tabList[targetIdx], targetIdx);\r\n    }\r\n    this.setEllipsisTitle();\r\n    sessionStorage.setItem(\"TabCache\", JSON.stringify(this.tabList));\r\n    this.ref.markForCheck();\r\n  }\r\n\r\n  changeTab(tab, idx) {\r\n    this.router.navigateByUrl(tab.url);\r\n    this.selectedTab = idx;\r\n    this.ref.markForCheck();\r\n  }\r\n\r\n  addTab(url, title) {\r\n    if (this.tabList.length >= this.maxTabs) {\r\n      this.closeTab(this.tabList[0], 0); // 删除第一个\r\n    }\r\n    this.tabList.push({\r\n      url: url,\r\n      title: title || \"default\",\r\n      displayTitle: this.setEllipsisTitle(title || \"default\"),\r\n    });\r\n    this.selectedTab = this.tabList.length - 1;\r\n    this.setEllipsisTitle();\r\n    sessionStorage.setItem(\"TabCache\", JSON.stringify(this.tabList));\r\n    this.ref.markForCheck();\r\n  }\r\n\r\n  public setTab(url, pureUrl, title) {\r\n    const isExistIdx = this.tabList.findIndex((ele) => ele.url === url);\r\n    if (isExistIdx === -1) {\r\n      const singleIdx = this.singleReuseUrls.findIndex(\r\n        (ele) => ele === pureUrl\r\n      );\r\n      if (singleIdx !== -1) {\r\n        this.tabList = this.tabList.filter(\r\n          (ele) => !ele.url.includes(this.singleReuseUrls[singleIdx])\r\n        );\r\n        this.keepAlive.clearCache(url);\r\n      }\r\n      this.addTab(url, title);\r\n    } else {\r\n      this.selectedTab = isExistIdx;\r\n      this.ref.markForCheck();\r\n    }\r\n  }\r\n\r\n  refreshTab() {\r\n    this.keepAlive.clearCache(this.tabList[this.selectedTab].url);\r\n    const currentUrl = this.router.url; // 获取当前 URL\r\n    this.router.navigateByUrl(\"/\", { skipLocationChange: true }).then(() => {\r\n      this.router.navigateByUrl(currentUrl); // 重新导航到当前 URL\r\n    });\r\n  }\r\n\r\n  clearCache(url) {\r\n    this.keepAlive.clearCache(url); // 调用自定义策略的清除缓存方法\r\n  }\r\n}\r\n"]}
|
|
313
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.component.js","sourceRoot":"ng://raise-common-lib/","sources":["lib/layout/multi-tab/index.component.ts"],"names":[],"mappings":"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","sourcesContent":["// 组件类\r\nimport {\r\n  ChangeDetectorRef,\r\n  Component,\r\n  HostListener,\r\n  Input,\r\n  OnInit,\r\n} from \"@angular/core\";\r\nimport {\r\n  ActivatedRoute,\r\n  NavigationEnd,\r\n  Router,\r\n  RouterOutlet,\r\n} from \"@angular/router\";\r\nimport { CommonFunctionService } from \"../../service/common-function.service\";\r\nimport { KeepAliveService } from \"../../service/keep-alive.service\";\r\nimport { filter } from \"rxjs/operators\";\r\n\r\n@Component({\r\n  selector: \"rs-multi-tab\",\r\n  templateUrl: \"./index.component.html\",\r\n  styleUrls: [\"./index.component.scss\"],\r\n})\r\nexport class MultiTabComponent implements OnInit {\r\n  constructor(\r\n    public router: Router,\r\n    public cf: CommonFunctionService,\r\n    public activatedRoute: ActivatedRoute,\r\n    public keepAlive: KeepAliveService,\r\n    private ref: ChangeDetectorRef\r\n  ) {}\r\n  @Input() singleReuseUrls: string[] = []; //只能单个缓存的url\r\n\r\n  TAB_WIDTH = 164;\r\n  GAP_NORMAL = 54;\r\n  GAP_SMALL = 30;\r\n  textGap; // 文本与边框的总间距\r\n  foo: RouterOutlet;\r\n  comRef: any;\r\n  tabList = [];\r\n  selectedTab: number = 0;\r\n  maxTabs: number = 10;\r\n  screenWidth: number = window.innerWidth; // 初始化屏幕宽度\r\n  @HostListener(\"window:resize\", [\"$event\"])\r\n  onResize(event) {\r\n    this.screenWidth = window.innerWidth; // 更新屏幕宽度\r\n    this.setEllipsisTitle();\r\n  }\r\n\r\n  ngOnInit() {\r\n    this.initTab();\r\n    this.router.events\r\n      .pipe(filter((event) => event instanceof NavigationEnd))\r\n      .subscribe(() => {\r\n        const navigation = this.router.getCurrentNavigation(); // 获取当前导航\r\n        if (navigation) {\r\n          const state = navigation.extras.state; // 获取传递的 state\r\n          const skipLocationChange = navigation.extras.skipLocationChange; // 获取是否跳过 location change\r\n          const currentRoute = this.router.routerState.root.firstChild;\r\n          if (currentRoute && !skipLocationChange) {\r\n            this.setTab(\r\n              this.router.url,\r\n              currentRoute.snapshot.routeConfig.path,\r\n              state && state.title\r\n            );\r\n          }\r\n        }\r\n      });\r\n    this.setEllipsisTitle();\r\n  }\r\n\r\n  setEllipsisTitle(title?) {\r\n    this.textGap = this.GAP_NORMAL;\r\n    if (this.screenWidth <= 1100) {\r\n      this.textGap = this.GAP_SMALL;\r\n    }\r\n    let { allWidth, leftWidth, rightWidth } = this.calcTabWidth();\r\n    let width = Math.floor(\r\n      (allWidth - rightWidth) / (this.tabList && this.tabList.length)\r\n    );\r\n\r\n    if (title) {\r\n      return this.cf.setMiddleEllipsis(\r\n        title,\r\n        width > this.TAB_WIDTH\r\n          ? this.TAB_WIDTH - this.textGap\r\n          : width - this.textGap,\r\n        12\r\n      );\r\n    } else {\r\n      this.tabList.forEach((ele, idx) => {\r\n        ele.displayTitle = this.cf.setMiddleEllipsis(\r\n          ele.title,\r\n          width > this.TAB_WIDTH\r\n            ? this.TAB_WIDTH - this.textGap\r\n            : width - this.textGap,\r\n          12\r\n        );\r\n      });\r\n    }\r\n  }\r\n\r\n  calcTabWidth() {\r\n    const wrap = document.querySelector(\".rs-multi-tab\");\r\n    const ulElement = document.querySelector(\".rs-multi-tab > ul\");\r\n    const refreshTabDiv = document.querySelector(\".rs-multi-tab .refresh-tab\");\r\n    let allWidth;\r\n    let leftWidth;\r\n    let rightWidth;\r\n    if (wrap && ulElement && refreshTabDiv) {\r\n      // 获取元素的位置信息\r\n      const wrapRect = wrap.getBoundingClientRect();\r\n      const ulRect = ulElement.getBoundingClientRect();\r\n      const refreshTabRect = refreshTabDiv.getBoundingClientRect();\r\n      allWidth = wrapRect.width;\r\n      leftWidth = ulRect.width;\r\n      rightWidth = refreshTabRect.width;\r\n    }\r\n    return {\r\n      allWidth,\r\n      leftWidth,\r\n      rightWidth,\r\n    };\r\n  }\r\n  initTab() {\r\n    let TabCache = JSON.parse(sessionStorage.getItem(\"TabCache\"));\r\n    this.tabList = TabCache || [];\r\n  }\r\n\r\n  closeTab(tab, idx) {\r\n    this.tabList = this.tabList.filter((ele) => ele.url !== tab.url);\r\n    this.clearCache(tab.url);\r\n    if (this.selectedTab === idx) {\r\n      const targetIdx = Math.max(0, idx - 1);\r\n      this.changeTab(this.tabList[targetIdx], targetIdx);\r\n    }\r\n    this.setEllipsisTitle();\r\n    sessionStorage.setItem(\"TabCache\", JSON.stringify(this.tabList));\r\n    this.ref.markForCheck();\r\n  }\r\n\r\n  changeTab(tab, idx) {\r\n    this.router.navigateByUrl(tab.url);\r\n    this.selectedTab = idx;\r\n    this.ref.markForCheck();\r\n  }\r\n\r\n  addTab(url, title) {\r\n    if (this.tabList.length >= this.maxTabs) {\r\n      this.closeTab(this.tabList[0], 0); // 删除第一个\r\n    }\r\n    this.tabList.push({\r\n      url: url,\r\n      title: title || \"default\",\r\n      displayTitle: this.setEllipsisTitle(title || \"default\"),\r\n    });\r\n    this.selectedTab = this.tabList.length - 1;\r\n    this.setEllipsisTitle();\r\n    sessionStorage.setItem(\"TabCache\", JSON.stringify(this.tabList));\r\n    this.ref.markForCheck();\r\n  }\r\n\r\n  public setTab(url, pureUrl, title) {\r\n    const isExistIdx = this.tabList.findIndex((ele) => ele.url === url);\r\n    if (isExistIdx === -1) {\r\n      const singleIdx = this.singleReuseUrls.findIndex(\r\n        (ele) => ele === pureUrl\r\n      );\r\n      if (singleIdx !== -1) {\r\n        this.tabList = this.tabList.filter(\r\n          (ele) => !ele.url.includes(this.singleReuseUrls[singleIdx])\r\n        );\r\n        this.keepAlive.clearCache(url);\r\n      }\r\n      this.addTab(url, title);\r\n    } else {\r\n      this.selectedTab = isExistIdx;\r\n      this.ref.markForCheck();\r\n    }\r\n  }\r\n\r\n  refreshTab() {\r\n    this.keepAlive.clearCache(this.tabList[this.selectedTab].url);\r\n    const currentUrl = this.router.url; // 获取当前 URL\r\n    this.router.navigateByUrl(\"/\", { skipLocationChange: true }).then(() => {\r\n      this.router.navigateByUrl(currentUrl); // 重新导航到当前 URL\r\n    });\r\n  }\r\n\r\n  clearCache(url) {\r\n    this.keepAlive.clearCache(url); // 调用自定义策略的清除缓存方法\r\n  }\r\n}\r\n"]}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import { Injectable } from "@angular/core";
|
|
7
7
|
import * as i0 from "@angular/core";
|
|
8
8
|
/** @type {?} */
|
|
9
|
-
const storedRoutes =
|
|
9
|
+
const storedRoutes = new Map();
|
|
10
10
|
/** @type {?} */
|
|
11
11
|
let toBeDeleteUrl;
|
|
12
12
|
/** @type {?} */
|
|
@@ -25,12 +25,21 @@ export class KeepAliveService {
|
|
|
25
25
|
* @return {?}
|
|
26
26
|
*/
|
|
27
27
|
shouldDetach(route) {
|
|
28
|
+
/** @type {?} */
|
|
29
|
+
let config = route.routeConfig;
|
|
30
|
+
// console.log("shouldDetach", toBeDeleteUrl, this.getRoutePath(route));
|
|
28
31
|
if (toBeDeleteUrl === this.getRoutePath(route)) {
|
|
29
32
|
// 对于新开的又即将关闭的tab,不缓存
|
|
30
|
-
|
|
33
|
+
if (route.children.length === 0) {
|
|
34
|
+
toBeDeleteUrl = "";
|
|
35
|
+
}
|
|
36
|
+
return false;
|
|
37
|
+
}
|
|
38
|
+
if (config && excludeRoutes.includes(this.getRoutePath(route))) {
|
|
31
39
|
return false;
|
|
32
40
|
}
|
|
33
|
-
|
|
41
|
+
//Don't store lazy loaded routes
|
|
42
|
+
return config && !config.loadChildren;
|
|
34
43
|
}
|
|
35
44
|
/**
|
|
36
45
|
* @param {?} route
|
|
@@ -40,25 +49,33 @@ export class KeepAliveService {
|
|
|
40
49
|
store(route, handle) {
|
|
41
50
|
// console.log("store", this.getRoutePath(route));
|
|
42
51
|
// console.log("store", storedRoutes);
|
|
43
|
-
|
|
52
|
+
/** @type {?} */
|
|
53
|
+
const key = this.getRoutePath(route);
|
|
54
|
+
storedRoutes.set(key, handle);
|
|
44
55
|
}
|
|
45
56
|
/**
|
|
46
57
|
* @param {?} route
|
|
47
58
|
* @return {?}
|
|
48
59
|
*/
|
|
49
60
|
shouldAttach(route) {
|
|
50
|
-
|
|
61
|
+
/** @type {?} */
|
|
62
|
+
const key = this.getRoutePath(route);
|
|
63
|
+
return !!route.routeConfig && storedRoutes.has(key);
|
|
51
64
|
}
|
|
52
65
|
/**
|
|
53
66
|
* @param {?} route
|
|
54
67
|
* @return {?}
|
|
55
68
|
*/
|
|
56
69
|
retrieve(route) {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
70
|
+
/** @type {?} */
|
|
71
|
+
let config = route.routeConfig;
|
|
72
|
+
/** @type {?} */
|
|
73
|
+
const key = this.getRoutePath(route);
|
|
74
|
+
//We don't store lazy loaded routes, so don't even bother trying to retrieve them
|
|
75
|
+
if (!config || config.loadChildren) {
|
|
76
|
+
return false;
|
|
77
|
+
}
|
|
78
|
+
return storedRoutes.get(key) || null;
|
|
62
79
|
}
|
|
63
80
|
/**
|
|
64
81
|
* @param {?} future
|
|
@@ -66,6 +83,8 @@ export class KeepAliveService {
|
|
|
66
83
|
* @return {?}
|
|
67
84
|
*/
|
|
68
85
|
shouldReuseRoute(future, curr) {
|
|
86
|
+
// console.log("shouldReuseRoute", future, curr);
|
|
87
|
+
// return future.routeConfig === curr.routeConfig;
|
|
69
88
|
if (future.routeConfig === curr.routeConfig) {
|
|
70
89
|
if (future.children.length === 0 && curr.children.length === 0) {
|
|
71
90
|
// 无子路由时, 通过params和queryParams判断是否复用路由
|
|
@@ -83,6 +102,7 @@ export class KeepAliveService {
|
|
|
83
102
|
*/
|
|
84
103
|
getRoutePath(route) {
|
|
85
104
|
if (route.routeConfig) {
|
|
105
|
+
// const pathParams = JSON.stringify(route.params);
|
|
86
106
|
/** @type {?} */
|
|
87
107
|
const queryParams = new URLSearchParams(route.queryParams).toString();
|
|
88
108
|
/** @type {?} */
|
|
@@ -102,7 +122,13 @@ export class KeepAliveService {
|
|
|
102
122
|
clearCache(path) {
|
|
103
123
|
// console.log("clearCache", storedRoutes, path);
|
|
104
124
|
toBeDeleteUrl = path;
|
|
105
|
-
delete
|
|
125
|
+
storedRoutes.delete(path);
|
|
126
|
+
}
|
|
127
|
+
/**
|
|
128
|
+
* @return {?}
|
|
129
|
+
*/
|
|
130
|
+
clearAllCache() {
|
|
131
|
+
storedRoutes.clear();
|
|
106
132
|
}
|
|
107
133
|
}
|
|
108
134
|
KeepAliveService.decorators = [
|
|
@@ -111,4 +137,4 @@ KeepAliveService.decorators = [
|
|
|
111
137
|
},] }
|
|
112
138
|
];
|
|
113
139
|
/** @nocollapse */ KeepAliveService.ngInjectableDef = i0.ɵɵdefineInjectable({ factory: function KeepAliveService_Factory() { return new KeepAliveService(); }, token: KeepAliveService, providedIn: "root" });
|
|
114
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
140
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2VlcC1hbGl2ZS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6Im5nOi8vcmFpc2UtY29tbW9uLWxpYi8iLCJzb3VyY2VzIjpbImxpYi9zZXJ2aWNlL2tlZXAtYWxpdmUuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7OztNQU9yQyxZQUFZLEdBQUcsSUFBSSxHQUFHLEVBQStCOztJQUN2RCxhQUFxQjs7SUFDckIsYUFBYSxHQUFhLEVBQUU7O0FBSWhDLE1BQU0sT0FBTyxnQkFBZ0I7Ozs7O0lBQzNCLGdCQUFnQixDQUFDLE1BQWdCO1FBQy9CLGFBQWEsR0FBRyxNQUFNLENBQUMsQ0FBQyxXQUFXO0lBQ3JDLENBQUM7Ozs7O0lBQ0QsWUFBWSxDQUFDLEtBQTZCOztZQUNwQyxNQUFNLEdBQUcsS0FBSyxDQUFDLFdBQVc7UUFDOUIsd0VBQXdFO1FBQ3hFLElBQUksYUFBYSxLQUFLLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDOUMscUJBQXFCO1lBQ3JCLElBQUksS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO2dCQUMvQixhQUFhLEdBQUcsRUFBRSxDQUFDO2FBQ3BCO1lBQ0QsT0FBTyxLQUFLLENBQUM7U0FDZDtRQUNELElBQUksTUFBTSxJQUFJLGFBQWEsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFO1lBQzlELE9BQU8sS0FBSyxDQUFDO1NBQ2Q7UUFDRCxnQ0FBZ0M7UUFDaEMsT0FBTyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDO0lBQ3hDLENBQUM7Ozs7OztJQUVELEtBQUssQ0FBQyxLQUE2QixFQUFFLE1BQTJCOzs7O2NBR3hELEdBQUcsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQztRQUNwQyxZQUFZLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNoQyxDQUFDOzs7OztJQUVELFlBQVksQ0FBQyxLQUE2Qjs7Y0FDbEMsR0FBRyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDO1FBQ3BDLE9BQU8sQ0FBQyxDQUFDLEtBQUssQ0FBQyxXQUFXLElBQUksWUFBWSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUN0RCxDQUFDOzs7OztJQUVELFFBQVEsQ0FBQyxLQUE2Qjs7WUFDaEMsTUFBTSxHQUFHLEtBQUssQ0FBQyxXQUFXOztjQUN4QixHQUFHLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUM7UUFDcEMsaUZBQWlGO1FBQ2pGLElBQUksQ0FBQyxNQUFNLElBQUksTUFBTSxDQUFDLFlBQVksRUFBRTtZQUNsQyxPQUFPLEtBQUssQ0FBQztTQUNkO1FBQ0QsT0FBTyxZQUFZLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxJQUFJLElBQUksQ0FBQztJQUN2QyxDQUFDOzs7Ozs7SUFFRCxnQkFBZ0IsQ0FDZCxNQUE4QixFQUM5QixJQUE0QjtRQUU1QixpREFBaUQ7UUFDakQsa0RBQWtEO1FBQ2xELElBQUksTUFBTSxDQUFDLFdBQVcsS0FBSyxJQUFJLENBQUMsV0FBVyxFQUFFO1lBQzNDLElBQUksTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEtBQUssQ0FBQyxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRTtnQkFDOUQsc0NBQXNDO2dCQUN0QyxPQUFPLENBQ0wsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEtBQUssSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDO29CQUM3RCxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUM7d0JBQ2hDLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUNuQyxDQUFDO2FBQ0g7WUFDRCxPQUFPLElBQUksQ0FBQztTQUNiO1FBQ0QsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDOzs7OztJQUVELFlBQVksQ0FBQyxLQUFLO1FBQ2hCLElBQUksS0FBSyxDQUFDLFdBQVcsRUFBRTs7O2tCQUVmLFdBQVcsR0FBRyxJQUFJLGVBQWUsQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUMsUUFBUSxFQUFFOztrQkFDL0QsR0FBRyxHQUFHLEtBQUssQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLEdBQUc7Ozs7WUFBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUM7WUFDbkUsT0FBTyxHQUFHLEdBQUcsR0FBRyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxHQUFHLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQztTQUMzRDtRQUNELE9BQU8sRUFBRSxDQUFDO0lBQ1osQ0FBQzs7Ozs7SUFFRCxVQUFVLENBQUMsSUFBWTtRQUNyQixpREFBaUQ7UUFDakQsYUFBYSxHQUFHLElBQUksQ0FBQztRQUNyQixZQUFZLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzVCLENBQUM7Ozs7SUFFRCxhQUFhO1FBQ1gsWUFBWSxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQ3ZCLENBQUM7OztZQXBGRixVQUFVLFNBQUM7Z0JBQ1YsVUFBVSxFQUFFLE1BQU07YUFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSBcIkBhbmd1bGFyL2NvcmVcIjtcclxuaW1wb3J0IHtcclxuICBSb3V0ZVJldXNlU3RyYXRlZ3ksXHJcbiAgQWN0aXZhdGVkUm91dGVTbmFwc2hvdCxcclxuICBEZXRhY2hlZFJvdXRlSGFuZGxlLFxyXG59IGZyb20gXCJAYW5ndWxhci9yb3V0ZXJcIjtcclxuXHJcbmNvbnN0IHN0b3JlZFJvdXRlcyA9IG5ldyBNYXA8c3RyaW5nLCBEZXRhY2hlZFJvdXRlSGFuZGxlPigpO1xyXG5sZXQgdG9CZURlbGV0ZVVybDogc3RyaW5nO1xyXG5sZXQgZXhjbHVkZVJvdXRlczogc3RyaW5nW10gPSBbXTsgLy8g5LiN6ZyA6KaB57yT5a2Y55qEdXJsXHJcbkBJbmplY3RhYmxlKHtcclxuICBwcm92aWRlZEluOiBcInJvb3RcIixcclxufSlcclxuZXhwb3J0IGNsYXNzIEtlZXBBbGl2ZVNlcnZpY2UgaW1wbGVtZW50cyBSb3V0ZVJldXNlU3RyYXRlZ3kge1xyXG4gIHNldEV4Y2x1ZGVSb3V0ZXMocm91dGVzOiBzdHJpbmdbXSkge1xyXG4gICAgZXhjbHVkZVJvdXRlcyA9IHJvdXRlczsgLy8g6K6+572u5LiN57yT5a2Y55qE6Lev55SxXHJcbiAgfVxyXG4gIHNob3VsZERldGFjaChyb3V0ZTogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCk6IGJvb2xlYW4ge1xyXG4gICAgbGV0IGNvbmZpZyA9IHJvdXRlLnJvdXRlQ29uZmlnO1xyXG4gICAgLy8gY29uc29sZS5sb2coXCJzaG91bGREZXRhY2hcIiwgdG9CZURlbGV0ZVVybCwgdGhpcy5nZXRSb3V0ZVBhdGgocm91dGUpKTtcclxuICAgIGlmICh0b0JlRGVsZXRlVXJsID09PSB0aGlzLmdldFJvdXRlUGF0aChyb3V0ZSkpIHtcclxuICAgICAgLy8g5a+55LqO5paw5byA55qE5Y+I5Y2z5bCG5YWz6Zet55qEdGFi77yM5LiN57yT5a2YXHJcbiAgICAgIGlmIChyb3V0ZS5jaGlsZHJlbi5sZW5ndGggPT09IDApIHtcclxuICAgICAgICB0b0JlRGVsZXRlVXJsID0gXCJcIjtcclxuICAgICAgfVxyXG4gICAgICByZXR1cm4gZmFsc2U7XHJcbiAgICB9XHJcbiAgICBpZiAoY29uZmlnICYmIGV4Y2x1ZGVSb3V0ZXMuaW5jbHVkZXModGhpcy5nZXRSb3V0ZVBhdGgocm91dGUpKSkge1xyXG4gICAgICByZXR1cm4gZmFsc2U7XHJcbiAgICB9XHJcbiAgICAvL0Rvbid0IHN0b3JlIGxhenkgbG9hZGVkIHJvdXRlc1xyXG4gICAgcmV0dXJuIGNvbmZpZyAmJiAhY29uZmlnLmxvYWRDaGlsZHJlbjtcclxuICB9XHJcblxyXG4gIHN0b3JlKHJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBoYW5kbGU6IERldGFjaGVkUm91dGVIYW5kbGUpOiB2b2lkIHtcclxuICAgIC8vIGNvbnNvbGUubG9nKFwic3RvcmVcIiwgdGhpcy5nZXRSb3V0ZVBhdGgocm91dGUpKTtcclxuICAgIC8vIGNvbnNvbGUubG9nKFwic3RvcmVcIiwgc3RvcmVkUm91dGVzKTtcclxuICAgIGNvbnN0IGtleSA9IHRoaXMuZ2V0Um91dGVQYXRoKHJvdXRlKTtcclxuICAgIHN0b3JlZFJvdXRlcy5zZXQoa2V5LCBoYW5kbGUpO1xyXG4gIH1cclxuXHJcbiAgc2hvdWxkQXR0YWNoKHJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90KTogYm9vbGVhbiB7XHJcbiAgICBjb25zdCBrZXkgPSB0aGlzLmdldFJvdXRlUGF0aChyb3V0ZSk7XHJcbiAgICByZXR1cm4gISFyb3V0ZS5yb3V0ZUNvbmZpZyAmJiBzdG9yZWRSb3V0ZXMuaGFzKGtleSk7XHJcbiAgfVxyXG5cclxuICByZXRyaWV2ZShyb3V0ZTogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCk6IERldGFjaGVkUm91dGVIYW5kbGUge1xyXG4gICAgbGV0IGNvbmZpZyA9IHJvdXRlLnJvdXRlQ29uZmlnO1xyXG4gICAgY29uc3Qga2V5ID0gdGhpcy5nZXRSb3V0ZVBhdGgocm91dGUpO1xyXG4gICAgLy9XZSBkb24ndCBzdG9yZSBsYXp5IGxvYWRlZCByb3V0ZXMsIHNvIGRvbid0IGV2ZW4gYm90aGVyIHRyeWluZyB0byByZXRyaWV2ZSB0aGVtXHJcbiAgICBpZiAoIWNvbmZpZyB8fCBjb25maWcubG9hZENoaWxkcmVuKSB7XHJcbiAgICAgIHJldHVybiBmYWxzZTtcclxuICAgIH1cclxuICAgIHJldHVybiBzdG9yZWRSb3V0ZXMuZ2V0KGtleSkgfHwgbnVsbDtcclxuICB9XHJcblxyXG4gIHNob3VsZFJldXNlUm91dGUoXHJcbiAgICBmdXR1cmU6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsXHJcbiAgICBjdXJyOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90XHJcbiAgKTogYm9vbGVhbiB7XHJcbiAgICAvLyBjb25zb2xlLmxvZyhcInNob3VsZFJldXNlUm91dGVcIiwgZnV0dXJlLCBjdXJyKTtcclxuICAgIC8vIHJldHVybiBmdXR1cmUucm91dGVDb25maWcgPT09IGN1cnIucm91dGVDb25maWc7XHJcbiAgICBpZiAoZnV0dXJlLnJvdXRlQ29uZmlnID09PSBjdXJyLnJvdXRlQ29uZmlnKSB7XHJcbiAgICAgIGlmIChmdXR1cmUuY2hpbGRyZW4ubGVuZ3RoID09PSAwICYmIGN1cnIuY2hpbGRyZW4ubGVuZ3RoID09PSAwKSB7XHJcbiAgICAgICAgLy8g5peg5a2Q6Lev55Sx5pe2LCDpgJrov4dwYXJhbXPlkoxxdWVyeVBhcmFtc+WIpOaWreaYr+WQpuWkjeeUqOi3r+eUsVxyXG4gICAgICAgIHJldHVybiAoXHJcbiAgICAgICAgICBKU09OLnN0cmluZ2lmeShmdXR1cmUucGFyYW1zKSA9PT0gSlNPTi5zdHJpbmdpZnkoY3Vyci5wYXJhbXMpICYmXHJcbiAgICAgICAgICBKU09OLnN0cmluZ2lmeShmdXR1cmUucXVlcnlQYXJhbXMpID09PVxyXG4gICAgICAgICAgICBKU09OLnN0cmluZ2lmeShjdXJyLnF1ZXJ5UGFyYW1zKVxyXG4gICAgICAgICk7XHJcbiAgICAgIH1cclxuICAgICAgcmV0dXJuIHRydWU7XHJcbiAgICB9XHJcbiAgICByZXR1cm4gZmFsc2U7XHJcbiAgfVxyXG5cclxuICBnZXRSb3V0ZVBhdGgocm91dGUpOiBzdHJpbmcge1xyXG4gICAgaWYgKHJvdXRlLnJvdXRlQ29uZmlnKSB7XHJcbiAgICAgIC8vIGNvbnN0IHBhdGhQYXJhbXMgPSBKU09OLnN0cmluZ2lmeShyb3V0ZS5wYXJhbXMpO1xyXG4gICAgICBjb25zdCBxdWVyeVBhcmFtcyA9IG5ldyBVUkxTZWFyY2hQYXJhbXMocm91dGUucXVlcnlQYXJhbXMpLnRvU3RyaW5nKCk7XHJcbiAgICAgIGNvbnN0IHVybCA9IHJvdXRlLl91cmxTZWdtZW50LnNlZ21lbnRzLm1hcCgodikgPT4gdi5wYXRoKS5qb2luKFwiL1wiKTtcclxuICAgICAgcmV0dXJuIFwiL1wiICsgdXJsICsgKHF1ZXJ5UGFyYW1zID8gXCI/XCIgKyBxdWVyeVBhcmFtcyA6IFwiXCIpO1xyXG4gICAgfVxyXG4gICAgcmV0dXJuIFwiXCI7XHJcbiAgfVxyXG5cclxuICBjbGVhckNhY2hlKHBhdGg6IHN0cmluZykge1xyXG4gICAgLy8gY29uc29sZS5sb2coXCJjbGVhckNhY2hlXCIsIHN0b3JlZFJvdXRlcywgcGF0aCk7XHJcbiAgICB0b0JlRGVsZXRlVXJsID0gcGF0aDtcclxuICAgIHN0b3JlZFJvdXRlcy5kZWxldGUocGF0aCk7XHJcbiAgfVxyXG5cclxuICBjbGVhckFsbENhY2hlKCkge1xyXG4gICAgc3RvcmVkUm91dGVzLmNsZWFyKCk7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -67,8 +67,11 @@ var MultiTabComponent = /** @class */ (function () {
|
|
|
67
67
|
var state = navigation.extras.state;
|
|
68
68
|
// 获取传递的 state
|
|
69
69
|
/** @type {?} */
|
|
70
|
+
var skipLocationChange = navigation.extras.skipLocationChange;
|
|
71
|
+
// 获取是否跳过 location change
|
|
72
|
+
/** @type {?} */
|
|
70
73
|
var currentRoute = _this.router.routerState.root.firstChild;
|
|
71
|
-
if (currentRoute) {
|
|
74
|
+
if (currentRoute && !skipLocationChange) {
|
|
72
75
|
_this.setTab(_this.router.url, currentRoute.snapshot.routeConfig.path, state && state.title);
|
|
73
76
|
}
|
|
74
77
|
}
|
|
@@ -353,4 +356,4 @@ if (false) {
|
|
|
353
356
|
*/
|
|
354
357
|
MultiTabComponent.prototype.ref;
|
|
355
358
|
}
|
|
356
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.component.js","sourceRoot":"ng://raise-common-lib/","sources":["lib/layout/multi-tab/index.component.ts"],"names":[],"mappings":"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","sourcesContent":["// 组件类\r\nimport {\r\n  ChangeDetectorRef,\r\n  Component,\r\n  HostListener,\r\n  Input,\r\n  OnInit,\r\n} from \"@angular/core\";\r\nimport {\r\n  ActivatedRoute,\r\n  NavigationEnd,\r\n  Router,\r\n  RouterOutlet,\r\n} from \"@angular/router\";\r\nimport { CommonFunctionService } from \"../../service/common-function.service\";\r\nimport { KeepAliveService } from \"../../service/keep-alive.service\";\r\nimport { filter } from \"rxjs/operators\";\r\n\r\n@Component({\r\n  selector: \"rs-multi-tab\",\r\n  templateUrl: \"./index.component.html\",\r\n  styleUrls: [\"./index.component.scss\"],\r\n})\r\nexport class MultiTabComponent implements OnInit {\r\n  constructor(\r\n    public router: Router,\r\n    public cf: CommonFunctionService,\r\n    public activatedRoute: ActivatedRoute,\r\n    public keepAlive: KeepAliveService,\r\n    private ref: ChangeDetectorRef\r\n  ) {}\r\n  @Input() singleReuseUrls: string[] = []; //只能单个缓存的url\r\n\r\n  TAB_WIDTH = 164;\r\n  GAP_NORMAL = 54;\r\n  GAP_SMALL = 30;\r\n  textGap; // 文本与边框的总间距\r\n  foo: RouterOutlet;\r\n  comRef: any;\r\n  tabList = [];\r\n  selectedTab: number = 0;\r\n  maxTabs: number = 10;\r\n  screenWidth: number = window.innerWidth; // 初始化屏幕宽度\r\n  @HostListener(\"window:resize\", [\"$event\"])\r\n  onResize(event) {\r\n    this.screenWidth = window.innerWidth; // 更新屏幕宽度\r\n    this.setEllipsisTitle();\r\n  }\r\n\r\n  ngOnInit() {\r\n    this.initTab();\r\n    this.router.events\r\n      .pipe(filter((event) => event instanceof NavigationEnd))\r\n      .subscribe(() => {\r\n        const navigation = this.router.getCurrentNavigation(); // 获取当前导航\r\n        if (navigation) {\r\n          const state = navigation.extras.state; // 获取传递的 state\r\n          const currentRoute = this.router.routerState.root.firstChild;\r\n          if (currentRoute) {\r\n            this.setTab(\r\n              this.router.url,\r\n              currentRoute.snapshot.routeConfig.path,\r\n              state && state.title\r\n            );\r\n          }\r\n        }\r\n      });\r\n    this.setEllipsisTitle();\r\n  }\r\n\r\n  setEllipsisTitle(title?) {\r\n    this.textGap = this.GAP_NORMAL;\r\n    if (this.screenWidth <= 1100) {\r\n      this.textGap = this.GAP_SMALL;\r\n    }\r\n    let { allWidth, leftWidth, rightWidth } = this.calcTabWidth();\r\n    let width = Math.floor(\r\n      (allWidth - rightWidth) / (this.tabList && this.tabList.length)\r\n    );\r\n\r\n    if (title) {\r\n      return this.cf.setMiddleEllipsis(\r\n        title,\r\n        width > this.TAB_WIDTH\r\n          ? this.TAB_WIDTH - this.textGap\r\n          : width - this.textGap,\r\n        12\r\n      );\r\n    } else {\r\n      this.tabList.forEach((ele, idx) => {\r\n        ele.displayTitle = this.cf.setMiddleEllipsis(\r\n          ele.title,\r\n          width > this.TAB_WIDTH\r\n            ? this.TAB_WIDTH - this.textGap\r\n            : width - this.textGap,\r\n          12\r\n        );\r\n      });\r\n    }\r\n  }\r\n\r\n  calcTabWidth() {\r\n    const wrap = document.querySelector(\".rs-multi-tab\");\r\n    const ulElement = document.querySelector(\".rs-multi-tab > ul\");\r\n    const refreshTabDiv = document.querySelector(\".rs-multi-tab .refresh-tab\");\r\n    let allWidth;\r\n    let leftWidth;\r\n    let rightWidth;\r\n    if (wrap && ulElement && refreshTabDiv) {\r\n      // 获取元素的位置信息\r\n      const wrapRect = wrap.getBoundingClientRect();\r\n      const ulRect = ulElement.getBoundingClientRect();\r\n      const refreshTabRect = refreshTabDiv.getBoundingClientRect();\r\n      allWidth = wrapRect.width;\r\n      leftWidth = ulRect.width;\r\n      rightWidth = refreshTabRect.width;\r\n    }\r\n    return {\r\n      allWidth,\r\n      leftWidth,\r\n      rightWidth,\r\n    };\r\n  }\r\n  initTab() {\r\n    let TabCache = JSON.parse(sessionStorage.getItem(\"TabCache\"));\r\n    this.tabList = TabCache || [];\r\n  }\r\n\r\n  closeTab(tab, idx) {\r\n    this.tabList = this.tabList.filter((ele) => ele.url !== tab.url);\r\n    this.clearCache(tab.url);\r\n    if (this.selectedTab === idx) {\r\n      const targetIdx = Math.max(0, idx - 1);\r\n      this.changeTab(this.tabList[targetIdx], targetIdx);\r\n    }\r\n    this.setEllipsisTitle();\r\n    sessionStorage.setItem(\"TabCache\", JSON.stringify(this.tabList));\r\n    this.ref.markForCheck();\r\n  }\r\n\r\n  changeTab(tab, idx) {\r\n    this.router.navigateByUrl(tab.url);\r\n    this.selectedTab = idx;\r\n    this.ref.markForCheck();\r\n  }\r\n\r\n  addTab(url, title) {\r\n    if (this.tabList.length >= this.maxTabs) {\r\n      this.closeTab(this.tabList[0], 0); // 删除第一个\r\n    }\r\n    this.tabList.push({\r\n      url: url,\r\n      title: title || \"default\",\r\n      displayTitle: this.setEllipsisTitle(title || \"default\"),\r\n    });\r\n    this.selectedTab = this.tabList.length - 1;\r\n    this.setEllipsisTitle();\r\n    sessionStorage.setItem(\"TabCache\", JSON.stringify(this.tabList));\r\n    this.ref.markForCheck();\r\n  }\r\n\r\n  public setTab(url, pureUrl, title) {\r\n    const isExistIdx = this.tabList.findIndex((ele) => ele.url === url);\r\n    if (isExistIdx === -1) {\r\n      const singleIdx = this.singleReuseUrls.findIndex(\r\n        (ele) => ele === pureUrl\r\n      );\r\n      if (singleIdx !== -1) {\r\n        this.tabList = this.tabList.filter(\r\n          (ele) => !ele.url.includes(this.singleReuseUrls[singleIdx])\r\n        );\r\n        this.keepAlive.clearCache(url);\r\n      }\r\n      this.addTab(url, title);\r\n    } else {\r\n      this.selectedTab = isExistIdx;\r\n      this.ref.markForCheck();\r\n    }\r\n  }\r\n\r\n  refreshTab() {\r\n    this.keepAlive.clearCache(this.tabList[this.selectedTab].url);\r\n    const currentUrl = this.router.url; // 获取当前 URL\r\n    this.router.navigateByUrl(\"/\", { skipLocationChange: true }).then(() => {\r\n      this.router.navigateByUrl(currentUrl); // 重新导航到当前 URL\r\n    });\r\n  }\r\n\r\n  clearCache(url) {\r\n    this.keepAlive.clearCache(url); // 调用自定义策略的清除缓存方法\r\n  }\r\n}\r\n"]}
|
|
359
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.component.js","sourceRoot":"ng://raise-common-lib/","sources":["lib/layout/multi-tab/index.component.ts"],"names":[],"mappings":"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","sourcesContent":["// 组件类\r\nimport {\r\n  ChangeDetectorRef,\r\n  Component,\r\n  HostListener,\r\n  Input,\r\n  OnInit,\r\n} from \"@angular/core\";\r\nimport {\r\n  ActivatedRoute,\r\n  NavigationEnd,\r\n  Router,\r\n  RouterOutlet,\r\n} from \"@angular/router\";\r\nimport { CommonFunctionService } from \"../../service/common-function.service\";\r\nimport { KeepAliveService } from \"../../service/keep-alive.service\";\r\nimport { filter } from \"rxjs/operators\";\r\n\r\n@Component({\r\n  selector: \"rs-multi-tab\",\r\n  templateUrl: \"./index.component.html\",\r\n  styleUrls: [\"./index.component.scss\"],\r\n})\r\nexport class MultiTabComponent implements OnInit {\r\n  constructor(\r\n    public router: Router,\r\n    public cf: CommonFunctionService,\r\n    public activatedRoute: ActivatedRoute,\r\n    public keepAlive: KeepAliveService,\r\n    private ref: ChangeDetectorRef\r\n  ) {}\r\n  @Input() singleReuseUrls: string[] = []; //只能单个缓存的url\r\n\r\n  TAB_WIDTH = 164;\r\n  GAP_NORMAL = 54;\r\n  GAP_SMALL = 30;\r\n  textGap; // 文本与边框的总间距\r\n  foo: RouterOutlet;\r\n  comRef: any;\r\n  tabList = [];\r\n  selectedTab: number = 0;\r\n  maxTabs: number = 10;\r\n  screenWidth: number = window.innerWidth; // 初始化屏幕宽度\r\n  @HostListener(\"window:resize\", [\"$event\"])\r\n  onResize(event) {\r\n    this.screenWidth = window.innerWidth; // 更新屏幕宽度\r\n    this.setEllipsisTitle();\r\n  }\r\n\r\n  ngOnInit() {\r\n    this.initTab();\r\n    this.router.events\r\n      .pipe(filter((event) => event instanceof NavigationEnd))\r\n      .subscribe(() => {\r\n        const navigation = this.router.getCurrentNavigation(); // 获取当前导航\r\n        if (navigation) {\r\n          const state = navigation.extras.state; // 获取传递的 state\r\n          const skipLocationChange = navigation.extras.skipLocationChange; // 获取是否跳过 location change\r\n          const currentRoute = this.router.routerState.root.firstChild;\r\n          if (currentRoute && !skipLocationChange) {\r\n            this.setTab(\r\n              this.router.url,\r\n              currentRoute.snapshot.routeConfig.path,\r\n              state && state.title\r\n            );\r\n          }\r\n        }\r\n      });\r\n    this.setEllipsisTitle();\r\n  }\r\n\r\n  setEllipsisTitle(title?) {\r\n    this.textGap = this.GAP_NORMAL;\r\n    if (this.screenWidth <= 1100) {\r\n      this.textGap = this.GAP_SMALL;\r\n    }\r\n    let { allWidth, leftWidth, rightWidth } = this.calcTabWidth();\r\n    let width = Math.floor(\r\n      (allWidth - rightWidth) / (this.tabList && this.tabList.length)\r\n    );\r\n\r\n    if (title) {\r\n      return this.cf.setMiddleEllipsis(\r\n        title,\r\n        width > this.TAB_WIDTH\r\n          ? this.TAB_WIDTH - this.textGap\r\n          : width - this.textGap,\r\n        12\r\n      );\r\n    } else {\r\n      this.tabList.forEach((ele, idx) => {\r\n        ele.displayTitle = this.cf.setMiddleEllipsis(\r\n          ele.title,\r\n          width > this.TAB_WIDTH\r\n            ? this.TAB_WIDTH - this.textGap\r\n            : width - this.textGap,\r\n          12\r\n        );\r\n      });\r\n    }\r\n  }\r\n\r\n  calcTabWidth() {\r\n    const wrap = document.querySelector(\".rs-multi-tab\");\r\n    const ulElement = document.querySelector(\".rs-multi-tab > ul\");\r\n    const refreshTabDiv = document.querySelector(\".rs-multi-tab .refresh-tab\");\r\n    let allWidth;\r\n    let leftWidth;\r\n    let rightWidth;\r\n    if (wrap && ulElement && refreshTabDiv) {\r\n      // 获取元素的位置信息\r\n      const wrapRect = wrap.getBoundingClientRect();\r\n      const ulRect = ulElement.getBoundingClientRect();\r\n      const refreshTabRect = refreshTabDiv.getBoundingClientRect();\r\n      allWidth = wrapRect.width;\r\n      leftWidth = ulRect.width;\r\n      rightWidth = refreshTabRect.width;\r\n    }\r\n    return {\r\n      allWidth,\r\n      leftWidth,\r\n      rightWidth,\r\n    };\r\n  }\r\n  initTab() {\r\n    let TabCache = JSON.parse(sessionStorage.getItem(\"TabCache\"));\r\n    this.tabList = TabCache || [];\r\n  }\r\n\r\n  closeTab(tab, idx) {\r\n    this.tabList = this.tabList.filter((ele) => ele.url !== tab.url);\r\n    this.clearCache(tab.url);\r\n    if (this.selectedTab === idx) {\r\n      const targetIdx = Math.max(0, idx - 1);\r\n      this.changeTab(this.tabList[targetIdx], targetIdx);\r\n    }\r\n    this.setEllipsisTitle();\r\n    sessionStorage.setItem(\"TabCache\", JSON.stringify(this.tabList));\r\n    this.ref.markForCheck();\r\n  }\r\n\r\n  changeTab(tab, idx) {\r\n    this.router.navigateByUrl(tab.url);\r\n    this.selectedTab = idx;\r\n    this.ref.markForCheck();\r\n  }\r\n\r\n  addTab(url, title) {\r\n    if (this.tabList.length >= this.maxTabs) {\r\n      this.closeTab(this.tabList[0], 0); // 删除第一个\r\n    }\r\n    this.tabList.push({\r\n      url: url,\r\n      title: title || \"default\",\r\n      displayTitle: this.setEllipsisTitle(title || \"default\"),\r\n    });\r\n    this.selectedTab = this.tabList.length - 1;\r\n    this.setEllipsisTitle();\r\n    sessionStorage.setItem(\"TabCache\", JSON.stringify(this.tabList));\r\n    this.ref.markForCheck();\r\n  }\r\n\r\n  public setTab(url, pureUrl, title) {\r\n    const isExistIdx = this.tabList.findIndex((ele) => ele.url === url);\r\n    if (isExistIdx === -1) {\r\n      const singleIdx = this.singleReuseUrls.findIndex(\r\n        (ele) => ele === pureUrl\r\n      );\r\n      if (singleIdx !== -1) {\r\n        this.tabList = this.tabList.filter(\r\n          (ele) => !ele.url.includes(this.singleReuseUrls[singleIdx])\r\n        );\r\n        this.keepAlive.clearCache(url);\r\n      }\r\n      this.addTab(url, title);\r\n    } else {\r\n      this.selectedTab = isExistIdx;\r\n      this.ref.markForCheck();\r\n    }\r\n  }\r\n\r\n  refreshTab() {\r\n    this.keepAlive.clearCache(this.tabList[this.selectedTab].url);\r\n    const currentUrl = this.router.url; // 获取当前 URL\r\n    this.router.navigateByUrl(\"/\", { skipLocationChange: true }).then(() => {\r\n      this.router.navigateByUrl(currentUrl); // 重新导航到当前 URL\r\n    });\r\n  }\r\n\r\n  clearCache(url) {\r\n    this.keepAlive.clearCache(url); // 调用自定义策略的清除缓存方法\r\n  }\r\n}\r\n"]}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import { Injectable } from "@angular/core";
|
|
7
7
|
import * as i0 from "@angular/core";
|
|
8
8
|
/** @type {?} */
|
|
9
|
-
var storedRoutes =
|
|
9
|
+
var storedRoutes = new Map();
|
|
10
10
|
/** @type {?} */
|
|
11
11
|
var toBeDeleteUrl;
|
|
12
12
|
/** @type {?} */
|
|
@@ -35,12 +35,21 @@ var KeepAliveService = /** @class */ (function () {
|
|
|
35
35
|
* @return {?}
|
|
36
36
|
*/
|
|
37
37
|
function (route) {
|
|
38
|
+
/** @type {?} */
|
|
39
|
+
var config = route.routeConfig;
|
|
40
|
+
// console.log("shouldDetach", toBeDeleteUrl, this.getRoutePath(route));
|
|
38
41
|
if (toBeDeleteUrl === this.getRoutePath(route)) {
|
|
39
42
|
// 对于新开的又即将关闭的tab,不缓存
|
|
40
|
-
|
|
43
|
+
if (route.children.length === 0) {
|
|
44
|
+
toBeDeleteUrl = "";
|
|
45
|
+
}
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
if (config && excludeRoutes.includes(this.getRoutePath(route))) {
|
|
41
49
|
return false;
|
|
42
50
|
}
|
|
43
|
-
|
|
51
|
+
//Don't store lazy loaded routes
|
|
52
|
+
return config && !config.loadChildren;
|
|
44
53
|
};
|
|
45
54
|
/**
|
|
46
55
|
* @param {?} route
|
|
@@ -55,7 +64,9 @@ var KeepAliveService = /** @class */ (function () {
|
|
|
55
64
|
function (route, handle) {
|
|
56
65
|
// console.log("store", this.getRoutePath(route));
|
|
57
66
|
// console.log("store", storedRoutes);
|
|
58
|
-
|
|
67
|
+
/** @type {?} */
|
|
68
|
+
var key = this.getRoutePath(route);
|
|
69
|
+
storedRoutes.set(key, handle);
|
|
59
70
|
};
|
|
60
71
|
/**
|
|
61
72
|
* @param {?} route
|
|
@@ -66,7 +77,9 @@ var KeepAliveService = /** @class */ (function () {
|
|
|
66
77
|
* @return {?}
|
|
67
78
|
*/
|
|
68
79
|
function (route) {
|
|
69
|
-
|
|
80
|
+
/** @type {?} */
|
|
81
|
+
var key = this.getRoutePath(route);
|
|
82
|
+
return !!route.routeConfig && storedRoutes.has(key);
|
|
70
83
|
};
|
|
71
84
|
/**
|
|
72
85
|
* @param {?} route
|
|
@@ -77,11 +90,15 @@ var KeepAliveService = /** @class */ (function () {
|
|
|
77
90
|
* @return {?}
|
|
78
91
|
*/
|
|
79
92
|
function (route) {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
93
|
+
/** @type {?} */
|
|
94
|
+
var config = route.routeConfig;
|
|
95
|
+
/** @type {?} */
|
|
96
|
+
var key = this.getRoutePath(route);
|
|
97
|
+
//We don't store lazy loaded routes, so don't even bother trying to retrieve them
|
|
98
|
+
if (!config || config.loadChildren) {
|
|
99
|
+
return false;
|
|
100
|
+
}
|
|
101
|
+
return storedRoutes.get(key) || null;
|
|
85
102
|
};
|
|
86
103
|
/**
|
|
87
104
|
* @param {?} future
|
|
@@ -94,6 +111,8 @@ var KeepAliveService = /** @class */ (function () {
|
|
|
94
111
|
* @return {?}
|
|
95
112
|
*/
|
|
96
113
|
function (future, curr) {
|
|
114
|
+
// console.log("shouldReuseRoute", future, curr);
|
|
115
|
+
// return future.routeConfig === curr.routeConfig;
|
|
97
116
|
if (future.routeConfig === curr.routeConfig) {
|
|
98
117
|
if (future.children.length === 0 && curr.children.length === 0) {
|
|
99
118
|
// 无子路由时, 通过params和queryParams判断是否复用路由
|
|
@@ -115,6 +134,7 @@ var KeepAliveService = /** @class */ (function () {
|
|
|
115
134
|
*/
|
|
116
135
|
function (route) {
|
|
117
136
|
if (route.routeConfig) {
|
|
137
|
+
// const pathParams = JSON.stringify(route.params);
|
|
118
138
|
/** @type {?} */
|
|
119
139
|
var queryParams = new URLSearchParams(route.queryParams).toString();
|
|
120
140
|
/** @type {?} */
|
|
@@ -138,7 +158,16 @@ var KeepAliveService = /** @class */ (function () {
|
|
|
138
158
|
function (path) {
|
|
139
159
|
// console.log("clearCache", storedRoutes, path);
|
|
140
160
|
toBeDeleteUrl = path;
|
|
141
|
-
delete
|
|
161
|
+
storedRoutes.delete(path);
|
|
162
|
+
};
|
|
163
|
+
/**
|
|
164
|
+
* @return {?}
|
|
165
|
+
*/
|
|
166
|
+
KeepAliveService.prototype.clearAllCache = /**
|
|
167
|
+
* @return {?}
|
|
168
|
+
*/
|
|
169
|
+
function () {
|
|
170
|
+
storedRoutes.clear();
|
|
142
171
|
};
|
|
143
172
|
KeepAliveService.decorators = [
|
|
144
173
|
{ type: Injectable, args: [{
|
|
@@ -149,4 +178,4 @@ var KeepAliveService = /** @class */ (function () {
|
|
|
149
178
|
return KeepAliveService;
|
|
150
179
|
}());
|
|
151
180
|
export { KeepAliveService };
|
|
152
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
181
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2VlcC1hbGl2ZS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6Im5nOi8vcmFpc2UtY29tbW9uLWxpYi8iLCJzb3VyY2VzIjpbImxpYi9zZXJ2aWNlL2tlZXAtYWxpdmUuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7OztJQU9yQyxZQUFZLEdBQUcsSUFBSSxHQUFHLEVBQStCOztJQUN2RCxhQUFxQjs7SUFDckIsYUFBYSxHQUFhLEVBQUU7O0FBQ2hDO0lBQUE7S0FxRkM7Ozs7O0lBakZDLDJDQUFnQjs7OztJQUFoQixVQUFpQixNQUFnQjtRQUMvQixhQUFhLEdBQUcsTUFBTSxDQUFDLENBQUMsV0FBVztJQUNyQyxDQUFDOzs7OztJQUNELHVDQUFZOzs7O0lBQVosVUFBYSxLQUE2Qjs7WUFDcEMsTUFBTSxHQUFHLEtBQUssQ0FBQyxXQUFXO1FBQzlCLHdFQUF3RTtRQUN4RSxJQUFJLGFBQWEsS0FBSyxJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQzlDLHFCQUFxQjtZQUNyQixJQUFJLEtBQUssQ0FBQyxRQUFRLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRTtnQkFDL0IsYUFBYSxHQUFHLEVBQUUsQ0FBQzthQUNwQjtZQUNELE9BQU8sS0FBSyxDQUFDO1NBQ2Q7UUFDRCxJQUFJLE1BQU0sSUFBSSxhQUFhLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRTtZQUM5RCxPQUFPLEtBQUssQ0FBQztTQUNkO1FBQ0QsZ0NBQWdDO1FBQ2hDLE9BQU8sTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQztJQUN4QyxDQUFDOzs7Ozs7SUFFRCxnQ0FBSzs7Ozs7SUFBTCxVQUFNLEtBQTZCLEVBQUUsTUFBMkI7Ozs7WUFHeEQsR0FBRyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDO1FBQ3BDLFlBQVksQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ2hDLENBQUM7Ozs7O0lBRUQsdUNBQVk7Ozs7SUFBWixVQUFhLEtBQTZCOztZQUNsQyxHQUFHLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUM7UUFDcEMsT0FBTyxDQUFDLENBQUMsS0FBSyxDQUFDLFdBQVcsSUFBSSxZQUFZLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3RELENBQUM7Ozs7O0lBRUQsbUNBQVE7Ozs7SUFBUixVQUFTLEtBQTZCOztZQUNoQyxNQUFNLEdBQUcsS0FBSyxDQUFDLFdBQVc7O1lBQ3hCLEdBQUcsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQztRQUNwQyxpRkFBaUY7UUFDakYsSUFBSSxDQUFDLE1BQU0sSUFBSSxNQUFNLENBQUMsWUFBWSxFQUFFO1lBQ2xDLE9BQU8sS0FBSyxDQUFDO1NBQ2Q7UUFDRCxPQUFPLFlBQVksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLElBQUksSUFBSSxDQUFDO0lBQ3ZDLENBQUM7Ozs7OztJQUVELDJDQUFnQjs7Ozs7SUFBaEIsVUFDRSxNQUE4QixFQUM5QixJQUE0QjtRQUU1QixpREFBaUQ7UUFDakQsa0RBQWtEO1FBQ2xELElBQUksTUFBTSxDQUFDLFdBQVcsS0FBSyxJQUFJLENBQUMsV0FBVyxFQUFFO1lBQzNDLElBQUksTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEtBQUssQ0FBQyxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRTtnQkFDOUQsc0NBQXNDO2dCQUN0QyxPQUFPLENBQ0wsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEtBQUssSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDO29CQUM3RCxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUM7d0JBQ2hDLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUNuQyxDQUFDO2FBQ0g7WUFDRCxPQUFPLElBQUksQ0FBQztTQUNiO1FBQ0QsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDOzs7OztJQUVELHVDQUFZOzs7O0lBQVosVUFBYSxLQUFLO1FBQ2hCLElBQUksS0FBSyxDQUFDLFdBQVcsRUFBRTs7O2dCQUVmLFdBQVcsR0FBRyxJQUFJLGVBQWUsQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUMsUUFBUSxFQUFFOztnQkFDL0QsR0FBRyxHQUFHLEtBQUssQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLEdBQUc7Ozs7WUFBQyxVQUFDLENBQUMsSUFBSyxPQUFBLENBQUMsQ0FBQyxJQUFJLEVBQU4sQ0FBTSxFQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQztZQUNuRSxPQUFPLEdBQUcsR0FBRyxHQUFHLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLEdBQUcsR0FBRyxXQUFXLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1NBQzNEO1FBQ0QsT0FBTyxFQUFFLENBQUM7SUFDWixDQUFDOzs7OztJQUVELHFDQUFVOzs7O0lBQVYsVUFBVyxJQUFZO1FBQ3JCLGlEQUFpRDtRQUNqRCxhQUFhLEdBQUcsSUFBSSxDQUFDO1FBQ3JCLFlBQVksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDNUIsQ0FBQzs7OztJQUVELHdDQUFhOzs7SUFBYjtRQUNFLFlBQVksQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUN2QixDQUFDOztnQkFwRkYsVUFBVSxTQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQjs7OzJCQVpEO0NBK0ZDLEFBckZELElBcUZDO1NBbEZZLGdCQUFnQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tIFwiQGFuZ3VsYXIvY29yZVwiO1xyXG5pbXBvcnQge1xyXG4gIFJvdXRlUmV1c2VTdHJhdGVneSxcclxuICBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LFxyXG4gIERldGFjaGVkUm91dGVIYW5kbGUsXHJcbn0gZnJvbSBcIkBhbmd1bGFyL3JvdXRlclwiO1xyXG5cclxuY29uc3Qgc3RvcmVkUm91dGVzID0gbmV3IE1hcDxzdHJpbmcsIERldGFjaGVkUm91dGVIYW5kbGU+KCk7XHJcbmxldCB0b0JlRGVsZXRlVXJsOiBzdHJpbmc7XHJcbmxldCBleGNsdWRlUm91dGVzOiBzdHJpbmdbXSA9IFtdOyAvLyDkuI3pnIDopoHnvJPlrZjnmoR1cmxcclxuQEluamVjdGFibGUoe1xyXG4gIHByb3ZpZGVkSW46IFwicm9vdFwiLFxyXG59KVxyXG5leHBvcnQgY2xhc3MgS2VlcEFsaXZlU2VydmljZSBpbXBsZW1lbnRzIFJvdXRlUmV1c2VTdHJhdGVneSB7XHJcbiAgc2V0RXhjbHVkZVJvdXRlcyhyb3V0ZXM6IHN0cmluZ1tdKSB7XHJcbiAgICBleGNsdWRlUm91dGVzID0gcm91dGVzOyAvLyDorr7nva7kuI3nvJPlrZjnmoTot6/nlLFcclxuICB9XHJcbiAgc2hvdWxkRGV0YWNoKHJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90KTogYm9vbGVhbiB7XHJcbiAgICBsZXQgY29uZmlnID0gcm91dGUucm91dGVDb25maWc7XHJcbiAgICAvLyBjb25zb2xlLmxvZyhcInNob3VsZERldGFjaFwiLCB0b0JlRGVsZXRlVXJsLCB0aGlzLmdldFJvdXRlUGF0aChyb3V0ZSkpO1xyXG4gICAgaWYgKHRvQmVEZWxldGVVcmwgPT09IHRoaXMuZ2V0Um91dGVQYXRoKHJvdXRlKSkge1xyXG4gICAgICAvLyDlr7nkuo7mlrDlvIDnmoTlj4jljbPlsIblhbPpl63nmoR0YWLvvIzkuI3nvJPlrZhcclxuICAgICAgaWYgKHJvdXRlLmNoaWxkcmVuLmxlbmd0aCA9PT0gMCkge1xyXG4gICAgICAgIHRvQmVEZWxldGVVcmwgPSBcIlwiO1xyXG4gICAgICB9XHJcbiAgICAgIHJldHVybiBmYWxzZTtcclxuICAgIH1cclxuICAgIGlmIChjb25maWcgJiYgZXhjbHVkZVJvdXRlcy5pbmNsdWRlcyh0aGlzLmdldFJvdXRlUGF0aChyb3V0ZSkpKSB7XHJcbiAgICAgIHJldHVybiBmYWxzZTtcclxuICAgIH1cclxuICAgIC8vRG9uJ3Qgc3RvcmUgbGF6eSBsb2FkZWQgcm91dGVzXHJcbiAgICByZXR1cm4gY29uZmlnICYmICFjb25maWcubG9hZENoaWxkcmVuO1xyXG4gIH1cclxuXHJcbiAgc3RvcmUocm91dGU6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIGhhbmRsZTogRGV0YWNoZWRSb3V0ZUhhbmRsZSk6IHZvaWQge1xyXG4gICAgLy8gY29uc29sZS5sb2coXCJzdG9yZVwiLCB0aGlzLmdldFJvdXRlUGF0aChyb3V0ZSkpO1xyXG4gICAgLy8gY29uc29sZS5sb2coXCJzdG9yZVwiLCBzdG9yZWRSb3V0ZXMpO1xyXG4gICAgY29uc3Qga2V5ID0gdGhpcy5nZXRSb3V0ZVBhdGgocm91dGUpO1xyXG4gICAgc3RvcmVkUm91dGVzLnNldChrZXksIGhhbmRsZSk7XHJcbiAgfVxyXG5cclxuICBzaG91bGRBdHRhY2gocm91dGU6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QpOiBib29sZWFuIHtcclxuICAgIGNvbnN0IGtleSA9IHRoaXMuZ2V0Um91dGVQYXRoKHJvdXRlKTtcclxuICAgIHJldHVybiAhIXJvdXRlLnJvdXRlQ29uZmlnICYmIHN0b3JlZFJvdXRlcy5oYXMoa2V5KTtcclxuICB9XHJcblxyXG4gIHJldHJpZXZlKHJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90KTogRGV0YWNoZWRSb3V0ZUhhbmRsZSB7XHJcbiAgICBsZXQgY29uZmlnID0gcm91dGUucm91dGVDb25maWc7XHJcbiAgICBjb25zdCBrZXkgPSB0aGlzLmdldFJvdXRlUGF0aChyb3V0ZSk7XHJcbiAgICAvL1dlIGRvbid0IHN0b3JlIGxhenkgbG9hZGVkIHJvdXRlcywgc28gZG9uJ3QgZXZlbiBib3RoZXIgdHJ5aW5nIHRvIHJldHJpZXZlIHRoZW1cclxuICAgIGlmICghY29uZmlnIHx8IGNvbmZpZy5sb2FkQ2hpbGRyZW4pIHtcclxuICAgICAgcmV0dXJuIGZhbHNlO1xyXG4gICAgfVxyXG4gICAgcmV0dXJuIHN0b3JlZFJvdXRlcy5nZXQoa2V5KSB8fCBudWxsO1xyXG4gIH1cclxuXHJcbiAgc2hvdWxkUmV1c2VSb3V0ZShcclxuICAgIGZ1dHVyZTogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCxcclxuICAgIGN1cnI6IEFjdGl2YXRlZFJvdXRlU25hcHNob3RcclxuICApOiBib29sZWFuIHtcclxuICAgIC8vIGNvbnNvbGUubG9nKFwic2hvdWxkUmV1c2VSb3V0ZVwiLCBmdXR1cmUsIGN1cnIpO1xyXG4gICAgLy8gcmV0dXJuIGZ1dHVyZS5yb3V0ZUNvbmZpZyA9PT0gY3Vyci5yb3V0ZUNvbmZpZztcclxuICAgIGlmIChmdXR1cmUucm91dGVDb25maWcgPT09IGN1cnIucm91dGVDb25maWcpIHtcclxuICAgICAgaWYgKGZ1dHVyZS5jaGlsZHJlbi5sZW5ndGggPT09IDAgJiYgY3Vyci5jaGlsZHJlbi5sZW5ndGggPT09IDApIHtcclxuICAgICAgICAvLyDml6DlrZDot6/nlLHml7YsIOmAmui/h3BhcmFtc+WSjHF1ZXJ5UGFyYW1z5Yik5pat5piv5ZCm5aSN55So6Lev55SxXHJcbiAgICAgICAgcmV0dXJuIChcclxuICAgICAgICAgIEpTT04uc3RyaW5naWZ5KGZ1dHVyZS5wYXJhbXMpID09PSBKU09OLnN0cmluZ2lmeShjdXJyLnBhcmFtcykgJiZcclxuICAgICAgICAgIEpTT04uc3RyaW5naWZ5KGZ1dHVyZS5xdWVyeVBhcmFtcykgPT09XHJcbiAgICAgICAgICAgIEpTT04uc3RyaW5naWZ5KGN1cnIucXVlcnlQYXJhbXMpXHJcbiAgICAgICAgKTtcclxuICAgICAgfVxyXG4gICAgICByZXR1cm4gdHJ1ZTtcclxuICAgIH1cclxuICAgIHJldHVybiBmYWxzZTtcclxuICB9XHJcblxyXG4gIGdldFJvdXRlUGF0aChyb3V0ZSk6IHN0cmluZyB7XHJcbiAgICBpZiAocm91dGUucm91dGVDb25maWcpIHtcclxuICAgICAgLy8gY29uc3QgcGF0aFBhcmFtcyA9IEpTT04uc3RyaW5naWZ5KHJvdXRlLnBhcmFtcyk7XHJcbiAgICAgIGNvbnN0IHF1ZXJ5UGFyYW1zID0gbmV3IFVSTFNlYXJjaFBhcmFtcyhyb3V0ZS5xdWVyeVBhcmFtcykudG9TdHJpbmcoKTtcclxuICAgICAgY29uc3QgdXJsID0gcm91dGUuX3VybFNlZ21lbnQuc2VnbWVudHMubWFwKCh2KSA9PiB2LnBhdGgpLmpvaW4oXCIvXCIpO1xyXG4gICAgICByZXR1cm4gXCIvXCIgKyB1cmwgKyAocXVlcnlQYXJhbXMgPyBcIj9cIiArIHF1ZXJ5UGFyYW1zIDogXCJcIik7XHJcbiAgICB9XHJcbiAgICByZXR1cm4gXCJcIjtcclxuICB9XHJcblxyXG4gIGNsZWFyQ2FjaGUocGF0aDogc3RyaW5nKSB7XHJcbiAgICAvLyBjb25zb2xlLmxvZyhcImNsZWFyQ2FjaGVcIiwgc3RvcmVkUm91dGVzLCBwYXRoKTtcclxuICAgIHRvQmVEZWxldGVVcmwgPSBwYXRoO1xyXG4gICAgc3RvcmVkUm91dGVzLmRlbGV0ZShwYXRoKTtcclxuICB9XHJcblxyXG4gIGNsZWFyQWxsQ2FjaGUoKSB7XHJcbiAgICBzdG9yZWRSb3V0ZXMuY2xlYXIoKTtcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -1300,7 +1300,7 @@ CommonFunctionService.ctorParameters = () => [];
|
|
|
1300
1300
|
* @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
|
|
1301
1301
|
*/
|
|
1302
1302
|
/** @type {?} */
|
|
1303
|
-
const storedRoutes =
|
|
1303
|
+
const storedRoutes = new Map();
|
|
1304
1304
|
/** @type {?} */
|
|
1305
1305
|
let toBeDeleteUrl;
|
|
1306
1306
|
/** @type {?} */
|
|
@@ -1319,12 +1319,21 @@ class KeepAliveService {
|
|
|
1319
1319
|
* @return {?}
|
|
1320
1320
|
*/
|
|
1321
1321
|
shouldDetach(route) {
|
|
1322
|
+
/** @type {?} */
|
|
1323
|
+
let config = route.routeConfig;
|
|
1324
|
+
// console.log("shouldDetach", toBeDeleteUrl, this.getRoutePath(route));
|
|
1322
1325
|
if (toBeDeleteUrl === this.getRoutePath(route)) {
|
|
1323
1326
|
// 对于新开的又即将关闭的tab,不缓存
|
|
1324
|
-
|
|
1327
|
+
if (route.children.length === 0) {
|
|
1328
|
+
toBeDeleteUrl = "";
|
|
1329
|
+
}
|
|
1330
|
+
return false;
|
|
1331
|
+
}
|
|
1332
|
+
if (config && excludeRoutes.includes(this.getRoutePath(route))) {
|
|
1325
1333
|
return false;
|
|
1326
1334
|
}
|
|
1327
|
-
|
|
1335
|
+
//Don't store lazy loaded routes
|
|
1336
|
+
return config && !config.loadChildren;
|
|
1328
1337
|
}
|
|
1329
1338
|
/**
|
|
1330
1339
|
* @param {?} route
|
|
@@ -1334,25 +1343,33 @@ class KeepAliveService {
|
|
|
1334
1343
|
store(route, handle) {
|
|
1335
1344
|
// console.log("store", this.getRoutePath(route));
|
|
1336
1345
|
// console.log("store", storedRoutes);
|
|
1337
|
-
|
|
1346
|
+
/** @type {?} */
|
|
1347
|
+
const key = this.getRoutePath(route);
|
|
1348
|
+
storedRoutes.set(key, handle);
|
|
1338
1349
|
}
|
|
1339
1350
|
/**
|
|
1340
1351
|
* @param {?} route
|
|
1341
1352
|
* @return {?}
|
|
1342
1353
|
*/
|
|
1343
1354
|
shouldAttach(route) {
|
|
1344
|
-
|
|
1355
|
+
/** @type {?} */
|
|
1356
|
+
const key = this.getRoutePath(route);
|
|
1357
|
+
return !!route.routeConfig && storedRoutes.has(key);
|
|
1345
1358
|
}
|
|
1346
1359
|
/**
|
|
1347
1360
|
* @param {?} route
|
|
1348
1361
|
* @return {?}
|
|
1349
1362
|
*/
|
|
1350
1363
|
retrieve(route) {
|
|
1351
|
-
|
|
1352
|
-
|
|
1353
|
-
|
|
1354
|
-
|
|
1355
|
-
|
|
1364
|
+
/** @type {?} */
|
|
1365
|
+
let config = route.routeConfig;
|
|
1366
|
+
/** @type {?} */
|
|
1367
|
+
const key = this.getRoutePath(route);
|
|
1368
|
+
//We don't store lazy loaded routes, so don't even bother trying to retrieve them
|
|
1369
|
+
if (!config || config.loadChildren) {
|
|
1370
|
+
return false;
|
|
1371
|
+
}
|
|
1372
|
+
return storedRoutes.get(key) || null;
|
|
1356
1373
|
}
|
|
1357
1374
|
/**
|
|
1358
1375
|
* @param {?} future
|
|
@@ -1360,6 +1377,8 @@ class KeepAliveService {
|
|
|
1360
1377
|
* @return {?}
|
|
1361
1378
|
*/
|
|
1362
1379
|
shouldReuseRoute(future, curr) {
|
|
1380
|
+
// console.log("shouldReuseRoute", future, curr);
|
|
1381
|
+
// return future.routeConfig === curr.routeConfig;
|
|
1363
1382
|
if (future.routeConfig === curr.routeConfig) {
|
|
1364
1383
|
if (future.children.length === 0 && curr.children.length === 0) {
|
|
1365
1384
|
// 无子路由时, 通过params和queryParams判断是否复用路由
|
|
@@ -1377,6 +1396,7 @@ class KeepAliveService {
|
|
|
1377
1396
|
*/
|
|
1378
1397
|
getRoutePath(route) {
|
|
1379
1398
|
if (route.routeConfig) {
|
|
1399
|
+
// const pathParams = JSON.stringify(route.params);
|
|
1380
1400
|
/** @type {?} */
|
|
1381
1401
|
const queryParams = new URLSearchParams(route.queryParams).toString();
|
|
1382
1402
|
/** @type {?} */
|
|
@@ -1396,7 +1416,13 @@ class KeepAliveService {
|
|
|
1396
1416
|
clearCache(path) {
|
|
1397
1417
|
// console.log("clearCache", storedRoutes, path);
|
|
1398
1418
|
toBeDeleteUrl = path;
|
|
1399
|
-
delete
|
|
1419
|
+
storedRoutes.delete(path);
|
|
1420
|
+
}
|
|
1421
|
+
/**
|
|
1422
|
+
* @return {?}
|
|
1423
|
+
*/
|
|
1424
|
+
clearAllCache() {
|
|
1425
|
+
storedRoutes.clear();
|
|
1400
1426
|
}
|
|
1401
1427
|
}
|
|
1402
1428
|
KeepAliveService.decorators = [
|
|
@@ -1466,8 +1492,11 @@ class MultiTabComponent {
|
|
|
1466
1492
|
const state = navigation.extras.state;
|
|
1467
1493
|
// 获取传递的 state
|
|
1468
1494
|
/** @type {?} */
|
|
1495
|
+
const skipLocationChange = navigation.extras.skipLocationChange;
|
|
1496
|
+
// 获取是否跳过 location change
|
|
1497
|
+
/** @type {?} */
|
|
1469
1498
|
const currentRoute = this.router.routerState.root.firstChild;
|
|
1470
|
-
if (currentRoute) {
|
|
1499
|
+
if (currentRoute && !skipLocationChange) {
|
|
1471
1500
|
this.setTab(this.router.url, currentRoute.snapshot.routeConfig.path, state && state.title);
|
|
1472
1501
|
}
|
|
1473
1502
|
}
|