Aw5812
This commit is contained in:
parent
92b29135b5
commit
4641e351fd
3371
package-lock.json
generated
3371
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -57,7 +57,7 @@
|
|||||||
"zone.js": "~0.13.3"
|
"zone.js": "~0.13.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-builders/custom-webpack": "^15",
|
"@angular-builders/custom-webpack": "^16",
|
||||||
"@angular-devkit/build-angular": "^16.2.11",
|
"@angular-devkit/build-angular": "^16.2.11",
|
||||||
"@angular/cli": "^16.2.11",
|
"@angular/cli": "^16.2.11",
|
||||||
"@angular/compiler-cli": "^16.2.12",
|
"@angular/compiler-cli": "^16.2.12",
|
||||||
|
@ -58,7 +58,7 @@ export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
|
|||||||
export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
|
export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
|
||||||
export const SETVIEWSTATE = '[Map] SetViewState'
|
export const SETVIEWSTATE = '[Map] SetViewState'
|
||||||
export const CLEARFEATURES = '[Map] ClearFeatures';
|
export const CLEARFEATURES = '[Map] ClearFeatures';
|
||||||
|
export const SETPANELEXTRAWIDE = '[Map] SetPanelExtraWide';
|
||||||
|
|
||||||
export class Clear implements Action {
|
export class Clear implements Action {
|
||||||
readonly type = CLEAR;
|
readonly type = CLEAR;
|
||||||
@ -342,6 +342,11 @@ export class ClearFeatures implements Action {
|
|||||||
constructor() {}
|
constructor() {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class SetPanelExtraWide implements Action {
|
||||||
|
readonly type = SETPANELEXTRAWIDE;
|
||||||
|
constructor(public panelExtraWide:boolean) {}
|
||||||
|
}
|
||||||
|
|
||||||
export type Actions = SetMapState
|
export type Actions = SetMapState
|
||||||
| Init
|
| Init
|
||||||
| Clear
|
| Clear
|
||||||
@ -389,5 +394,6 @@ export type Actions = SetMapState
|
|||||||
| SetPeriod
|
| SetPeriod
|
||||||
| ToggleShowDataLayerSlide
|
| ToggleShowDataLayerSlide
|
||||||
| SetViewState
|
| SetViewState
|
||||||
| ClearFeatures;
|
| ClearFeatures
|
||||||
|
| SetPanelExtraWide;
|
||||||
|
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
panelVisible:panelVisible$|async,
|
panelVisible:panelVisible$|async,
|
||||||
openedModalName:openedModalName$|async,
|
openedModalName:openedModalName$|async,
|
||||||
panelCollapsed:panelCollapsed$|async,
|
panelCollapsed:panelCollapsed$|async,
|
||||||
|
panelExtraWide:panelExtraWide$|async,
|
||||||
searchMinified:searchMinified$|async,
|
searchMinified:searchMinified$|async,
|
||||||
selectedItem:selectedItem$|async,
|
selectedItem:selectedItem$|async,
|
||||||
parentItem:parentItem$|async,
|
parentItem:parentItem$|async,
|
||||||
@ -64,7 +65,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="side-panel-container">
|
<div class="side-panel-container">
|
||||||
|
|
||||||
<fm-side-panel [resizeable]="true" (onResize)="handlePanelResize($event)" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false">
|
<fm-side-panel [resizeable]="true" (onResize)="handlePanelResize($event)" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false" [extrawide]="state.panelExtraWide">
|
||||||
<div class="panel-wrapper" *ngIf="noContent">
|
<div class="panel-wrapper" *ngIf="noContent">
|
||||||
<div class="panel-top bg-secondary" *ngIf="!(state.searchMinified)">
|
<div class="panel-top bg-secondary" *ngIf="!(state.searchMinified)">
|
||||||
</div>
|
</div>
|
||||||
|
@ -66,6 +66,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
|||||||
public parentCode$: Observable<string> =this.store.select(mapReducers.selectGetParentCode);
|
public parentCode$: Observable<string> =this.store.select(mapReducers.selectGetParentCode);
|
||||||
public panelVisible$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelVisible);
|
public panelVisible$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelVisible);
|
||||||
public panelCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelCollapsed);
|
public panelCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelCollapsed);
|
||||||
|
public panelExtraWide$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelExtraWide);
|
||||||
public selectedFeature$: Observable<Feature<Geometry>> = this.store.select(mapReducers.selectGetSelectedFeature);
|
public selectedFeature$: Observable<Feature<Geometry>> = this.store.select(mapReducers.selectGetSelectedFeature);
|
||||||
public clickedFeature: Subject<Feature<Geometry>> = new Subject<Feature<Geometry>>();
|
public clickedFeature: Subject<Feature<Geometry>> = new Subject<Feature<Geometry>>();
|
||||||
public selectedItem$: Observable<IItem> = this.store.select(mapReducers.selectGetSelectedItem);
|
public selectedItem$: Observable<IItem> = this.store.select(mapReducers.selectGetSelectedItem);
|
||||||
@ -208,7 +209,10 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
|||||||
if(component && component.hasOwnProperty('clickedFeature')) {
|
if(component && component.hasOwnProperty('clickedFeature')) {
|
||||||
(component as IClickedFeature).clickedFeature = this.clickedFeature;
|
(component as IClickedFeature).clickedFeature = this.clickedFeature;
|
||||||
}
|
}
|
||||||
|
if(component && component.hasOwnProperty('extraWide')) {
|
||||||
|
this.store.dispatch(new mapActions.SetPanelExtraWide(true));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
handleSidepaneloutletDeactivate(component:any) {
|
handleSidepaneloutletDeactivate(component:any) {
|
||||||
if(component && component.hasOwnProperty('clickedFeature')) {
|
if(component && component.hasOwnProperty('clickedFeature')) {
|
||||||
|
@ -49,6 +49,7 @@ export interface State {
|
|||||||
features: Array<Feature<Geometry>>,
|
features: Array<Feature<Geometry>>,
|
||||||
panelVisible: boolean,
|
panelVisible: boolean,
|
||||||
panelCollapsed: boolean,
|
panelCollapsed: boolean,
|
||||||
|
panelExtraWide: boolean,
|
||||||
selectedFeature: Feature<Geometry>,
|
selectedFeature: Feature<Geometry>,
|
||||||
selectedItem:IItem,
|
selectedItem:IItem,
|
||||||
parentItem:IItem,
|
parentItem:IItem,
|
||||||
@ -94,6 +95,7 @@ export const initialState: State = {
|
|||||||
features: [],
|
features: [],
|
||||||
panelVisible: false,
|
panelVisible: false,
|
||||||
panelCollapsed: false,
|
panelCollapsed: false,
|
||||||
|
panelExtraWide: false,
|
||||||
selectedFeature: null,
|
selectedFeature: null,
|
||||||
selectedItem: null,
|
selectedItem: null,
|
||||||
parentItem: null,
|
parentItem: null,
|
||||||
@ -572,6 +574,10 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
|||||||
}
|
}
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
case mapActions.SETPANELEXTRAWIDE:{
|
||||||
|
const a= action as mapActions.SetPanelExtraWide;
|
||||||
|
return tassign(state,{panelExtraWide:a.panelExtraWide});
|
||||||
|
}
|
||||||
default: {
|
default: {
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
@ -583,6 +589,7 @@ export const getParentCode = (state: State) => state.parentCode;
|
|||||||
export const getFeatures = (state: State) => state.features;
|
export const getFeatures = (state: State) => state.features;
|
||||||
export const getPanelVisible = (state: State) => state.panelVisible;
|
export const getPanelVisible = (state: State) => state.panelVisible;
|
||||||
export const getPanelCollapsed = (state: State) => state.panelCollapsed;
|
export const getPanelCollapsed = (state: State) => state.panelCollapsed;
|
||||||
|
export const getPanelExtraWide = (state: State) => state.panelExtraWide;
|
||||||
export const getSelectedFeature = (state: State) => state.selectedFeature;
|
export const getSelectedFeature = (state: State) => state.selectedFeature;
|
||||||
export const getSelectedItem = (state: State) => state.selectedItem;
|
export const getSelectedItem = (state: State) => state.selectedItem;
|
||||||
export const getParentItem = (state: State) => state.parentItem;
|
export const getParentItem = (state: State) => state.parentItem;
|
||||||
@ -618,6 +625,7 @@ export const selectGetParentCode = createSelector(selectMapState, getParentCode)
|
|||||||
export const selectGetFeatures = createSelector(selectMapState, getFeatures);
|
export const selectGetFeatures = createSelector(selectMapState, getFeatures);
|
||||||
export const selectGetPanelVisible = createSelector(selectMapState, getPanelVisible);
|
export const selectGetPanelVisible = createSelector(selectMapState, getPanelVisible);
|
||||||
export const selectGetPanelCollapsed = createSelector(selectMapState, getPanelCollapsed);
|
export const selectGetPanelCollapsed = createSelector(selectMapState, getPanelCollapsed);
|
||||||
|
export const selectGetPanelExtraWide = createSelector(selectMapState, getPanelExtraWide);
|
||||||
export const selectGetSelectedFeature = createSelector(selectMapState, getSelectedFeature);
|
export const selectGetSelectedFeature = createSelector(selectMapState, getSelectedFeature);
|
||||||
export const selectGetSelectedItem = createSelector(selectMapState, getSelectedItem);
|
export const selectGetSelectedItem = createSelector(selectMapState, getSelectedItem);
|
||||||
export const selectGetParentItem = createSelector(selectMapState, getParentItem);
|
export const selectGetParentItem = createSelector(selectMapState, getParentItem);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<div class="side-panel hidden" [ngClass]="{'hidden':!visible,'collapsed':collapsed,'resizeable':(resizeable && mobile),'resizing':resizing,'left':left}" [ngStyle]="{'top':top}">
|
<div class="side-panel hidden" [ngClass]="{'hidden':!visible,'collapsed':collapsed,'resizeable':(resizeable && mobile),'resizing':resizing,'left':left,'extrawide':extraWide}" [ngStyle]="{'top':top}">
|
||||||
<div *ngIf="collapsable" class="arrow rounded-end p-2" (click)="handleToggleClick($event)">
|
<div *ngIf="collapsable" class="arrow rounded-end p-2" (click)="handleToggleClick($event)">
|
||||||
<i class="fal fa-chevron-left" aria-hidden="true"></i>
|
<i class="fal fa-chevron-left" aria-hidden="true"></i>
|
||||||
</div>
|
</div>
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.side-panel.collapsed {
|
.side-panel.collapsed {
|
||||||
left:-22rem;
|
left:-44rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.arrow {
|
.arrow {
|
||||||
@ -76,7 +76,6 @@ div.resizegrip > span {
|
|||||||
|
|
||||||
.resizeable .resizegrip {
|
.resizeable .resizegrip {
|
||||||
display:block;
|
display:block;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.resizeable .content {
|
.resizeable .content {
|
||||||
@ -94,10 +93,17 @@ div.resizegrip > span {
|
|||||||
|
|
||||||
.side-panel.hidden {
|
.side-panel.hidden {
|
||||||
width: 22rem;
|
width: 22rem;
|
||||||
left:-24rem;
|
left:-22rem;
|
||||||
height:100%;
|
height:100%;
|
||||||
top: 0px;
|
top: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.side-panel.extra-wide {
|
||||||
|
top:0px;
|
||||||
|
width: 44rem;
|
||||||
|
height:100%;
|
||||||
|
left:0px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -3,8 +3,7 @@ import { Component, Input,Output,ViewChild,EventEmitter, ElementRef,OnChanges,Si
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-side-panel',
|
selector: 'fm-side-panel',
|
||||||
templateUrl: 'side-panel.component.html',
|
templateUrl: 'side-panel.component.html',
|
||||||
styleUrls: ['side-panel.component.scss'],
|
styleUrls: ['side-panel.component.scss']
|
||||||
encapsulation: ViewEncapsulation.None
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
@ -14,6 +13,7 @@ export class SidePanelComponent implements OnChanges {
|
|||||||
@Input() public collapsable: boolean;
|
@Input() public collapsable: boolean;
|
||||||
@Input() public resizeable = false;
|
@Input() public resizeable = false;
|
||||||
@Input() public left = false;
|
@Input() public left = false;
|
||||||
|
@Input() public extraWide = false;
|
||||||
@Output() onResize: EventEmitter<number> = new EventEmitter<number>();
|
@Output() onResize: EventEmitter<number> = new EventEmitter<number>();
|
||||||
@ViewChild("resizeGrip") elementView: ElementRef;
|
@ViewChild("resizeGrip") elementView: ElementRef;
|
||||||
public mobile = true;
|
public mobile = true;
|
||||||
|
Loading…
Reference in New Issue
Block a user