raise-common-lib 0.0.137 → 0.0.139
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 -3
- 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 +36 -3
- package/esm2015/lib/layout/page-list/index.component.js +10 -3
- package/esm5/lib/layout/multi-tab/index.component.js +37 -3
- package/esm5/lib/layout/page-list/index.component.js +10 -3
- package/fesm2015/raise-common-lib.js +43 -3
- package/fesm2015/raise-common-lib.js.map +1 -1
- package/fesm5/raise-common-lib.js +44 -3
- package/fesm5/raise-common-lib.js.map +1 -1
- package/lib/layout/multi-tab/index.component.d.ts +2 -0
- package/lib/layout/page-list/index.component.d.ts +2 -1
- package/package.json +1 -1
- package/raise-common-lib.metadata.json +1 -1
- package/src/assets/style/reset/grid.scss +1 -1
|
@@ -2714,6 +2714,7 @@
|
|
|
2714
2714
|
this.customPageTitle = false;
|
|
2715
2715
|
this.hideSearch = false;
|
|
2716
2716
|
this.isInner = false;
|
|
2717
|
+
this.onGridSearch = new core.EventEmitter();
|
|
2717
2718
|
this.hasWholeToolbarSlot = false;
|
|
2718
2719
|
}
|
|
2719
2720
|
/**
|
|
@@ -2757,6 +2758,9 @@
|
|
|
2757
2758
|
else if (this.treeGrid) {
|
|
2758
2759
|
this.treeGrid.search(this.searchValue);
|
|
2759
2760
|
}
|
|
2761
|
+
else {
|
|
2762
|
+
this.onGridSearch.emit(this.searchValue);
|
|
2763
|
+
}
|
|
2760
2764
|
};
|
|
2761
2765
|
/**
|
|
2762
2766
|
* @return {?}
|
|
@@ -2782,7 +2786,8 @@
|
|
|
2782
2786
|
pageTitle: [{ type: core.Input }],
|
|
2783
2787
|
customPageTitle: [{ type: core.Input }],
|
|
2784
2788
|
hideSearch: [{ type: core.Input }],
|
|
2785
|
-
isInner: [{ type: core.Input }]
|
|
2789
|
+
isInner: [{ type: core.Input }],
|
|
2790
|
+
onGridSearch: [{ type: core.Output }]
|
|
2786
2791
|
};
|
|
2787
2792
|
return RsPageListComponent;
|
|
2788
2793
|
}());
|
|
@@ -2803,6 +2808,8 @@
|
|
|
2803
2808
|
RsPageListComponent.prototype.hideSearch;
|
|
2804
2809
|
/** @type {?} */
|
|
2805
2810
|
RsPageListComponent.prototype.isInner;
|
|
2811
|
+
/** @type {?} */
|
|
2812
|
+
RsPageListComponent.prototype.onGridSearch;
|
|
2806
2813
|
/**
|
|
2807
2814
|
* @type {?}
|
|
2808
2815
|
* @private
|
|
@@ -3321,6 +3328,8 @@
|
|
|
3321
3328
|
//只能单个缓存的url
|
|
3322
3329
|
this.noGenerateTabUrls = []; //不生成tab的url
|
|
3323
3330
|
//不生成tab的url
|
|
3331
|
+
this.flattenMenu = [];
|
|
3332
|
+
this.defaultTabUrl = "";
|
|
3324
3333
|
this.onRefreshTab = new core.EventEmitter();
|
|
3325
3334
|
this.subscriptions = [];
|
|
3326
3335
|
this.TAB_WIDTH = 164;
|
|
@@ -3405,12 +3414,12 @@
|
|
|
3405
3414
|
/** @type {?} */
|
|
3406
3415
|
var navigationInfo = JSON.parse(sessionStorage.getItem("navigationInfo") || "{}");
|
|
3407
3416
|
/** @type {?} */
|
|
3408
|
-
var title = (state && state
|
|
3417
|
+
var title = (state && state["title"]) ||
|
|
3409
3418
|
navigationInfo.title ||
|
|
3410
3419
|
navigationInfo.subTitle ||
|
|
3411
3420
|
navigationInfo.name;
|
|
3412
3421
|
/** @type {?} */
|
|
3413
|
-
var noReused = (state && state
|
|
3422
|
+
var noReused = (state && state["noReused"]) || false;
|
|
3414
3423
|
if (currentRoute && !skipLocationChange) {
|
|
3415
3424
|
if (_this.noGenerateTabUrls.includes(_this.urlWithoutQuery(_this.router.url))) {
|
|
3416
3425
|
return; // 排除不生成tab的url
|
|
@@ -3531,6 +3540,8 @@
|
|
|
3531
3540
|
* @return {?}
|
|
3532
3541
|
*/
|
|
3533
3542
|
function () {
|
|
3543
|
+
var _this = this;
|
|
3544
|
+
// console.log("this.flattenMenu", this.flattenMenu);
|
|
3534
3545
|
/** @type {?} */
|
|
3535
3546
|
var TabCache = JSON.parse(sessionStorage.getItem("TabCache"));
|
|
3536
3547
|
this.tabList = TabCache || [];
|
|
@@ -3543,6 +3554,30 @@
|
|
|
3543
3554
|
var url = this.router.url;
|
|
3544
3555
|
this.addTab(url, title);
|
|
3545
3556
|
}
|
|
3557
|
+
else {
|
|
3558
|
+
/** @type {?} */
|
|
3559
|
+
var target = this.flattenMenu.find((/**
|
|
3560
|
+
* @param {?} ele
|
|
3561
|
+
* @return {?}
|
|
3562
|
+
*/
|
|
3563
|
+
function (ele) { return ele.url === _this.router.url; }));
|
|
3564
|
+
if (target) {
|
|
3565
|
+
if (target.url !== this.defaultTabUrl) {
|
|
3566
|
+
/** @type {?} */
|
|
3567
|
+
var defaultTab = this.flattenMenu.find((/**
|
|
3568
|
+
* @param {?} ele
|
|
3569
|
+
* @return {?}
|
|
3570
|
+
*/
|
|
3571
|
+
function (ele) { return ele.url === _this.defaultTabUrl; }));
|
|
3572
|
+
this.tabList.push({
|
|
3573
|
+
url: defaultTab.url,
|
|
3574
|
+
title: defaultTab.label,
|
|
3575
|
+
displayTitle: defaultTab.label,
|
|
3576
|
+
});
|
|
3577
|
+
}
|
|
3578
|
+
this.addTab(target.url, target.label);
|
|
3579
|
+
}
|
|
3580
|
+
}
|
|
3546
3581
|
}
|
|
3547
3582
|
};
|
|
3548
3583
|
/**
|
|
@@ -3789,6 +3824,8 @@
|
|
|
3789
3824
|
MultiTabComponent.propDecorators = {
|
|
3790
3825
|
singleReuseUrls: [{ type: core.Input }],
|
|
3791
3826
|
noGenerateTabUrls: [{ type: core.Input }],
|
|
3827
|
+
flattenMenu: [{ type: core.Input }],
|
|
3828
|
+
defaultTabUrl: [{ type: core.Input }],
|
|
3792
3829
|
onRefreshTab: [{ type: core.Output }],
|
|
3793
3830
|
onResize: [{ type: core.HostListener, args: ["window:resize", ["$event"],] }]
|
|
3794
3831
|
};
|
|
@@ -3802,6 +3839,10 @@
|
|
|
3802
3839
|
/** @type {?} */
|
|
3803
3840
|
MultiTabComponent.prototype.noGenerateTabUrls;
|
|
3804
3841
|
/** @type {?} */
|
|
3842
|
+
MultiTabComponent.prototype.flattenMenu;
|
|
3843
|
+
/** @type {?} */
|
|
3844
|
+
MultiTabComponent.prototype.defaultTabUrl;
|
|
3845
|
+
/** @type {?} */
|
|
3805
3846
|
MultiTabComponent.prototype.onRefreshTab;
|
|
3806
3847
|
/**
|
|
3807
3848
|
* @type {?}
|