shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

demo 手写高德的搜索框逻辑.方便移植至科达

上海一张图
赵旭 4 years ago
parent
f25b1565db
commit
7fbb4b87c7
8 changed files with 292 additions and 265 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 90
      src/app/app.component.ts
  2. 62
      src/app/app.module.ts
  3. 257
      src/app/pages/login/login.component.ts
  4. 23
      src/app/searchComponent.service.ts
  5. 5
      src/global.d.ts
  6. 22
      src/modules/map/declare/component/SearchDownListPlugins/SearchDownList.ts
  7. 89
      src/modules/map/declare/gaode-map.ts
  8. 9
      src/modules/map/declare/keda-map.ts

90
src/app/app.component.ts
Unescape View File

@ -1,60 +1,60 @@
import { Component, Inject, Injector } from '@angular/core'; import { Component, Inject, Injector } from '@angular/core';
import { HttpClient } from '@angular/common/http' import { HttpClient } from '@angular/common/http'
import { Data } from './interface' import { Data } from './interface'
import { Router,ActivatedRoute } from '@angular/router' import { Router, ActivatedRoute } from '@angular/router'
import {CacheTokenService} from './http-interceptors/cache-token.service'//引入服务 import { CacheTokenService } from './http-interceptors/cache-token.service'//引入服务
import { MaskLayerService } from './mask-layer.service'; import { MaskLayerService } from './mask-layer.service';
import * as global from 'globals';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
templateUrl: './app.component.html', templateUrl: './app.component.html',
styleUrls: ['./app.component.scss'] styleUrls: ['./app.component.scss']
}) })
export class AppComponent { export class AppComponent {
constructor(private maskLayerService:MaskLayerService,private http:HttpClient,private router:Router,public token:CacheTokenService,private injector:Injector) { constructor(private maskLayerService: MaskLayerService, private http: HttpClient, private router: Router, public token: CacheTokenService, private injector: Injector) {
window.injector = injector; global.injector = injector;
}
isMaskLayerShow:boolean = false
ngOnInit(): void {
//监听遮罩层
this.maskLayerService.getMessage().subscribe((message: any)=>{
this.isMaskLayerShow = message
});
var token = sessionStorage.getItem("token");
var refreshToken = sessionStorage.getItem("refreshToken");
if(token && refreshToken) {
this.http.post('/api/Account/RefreshToken', {
token: token,
refreshToken: refreshToken
}).subscribe((data: Data) => {
sessionStorage.setItem("level",data.level);
sessionStorage.setItem("token",data.token);
sessionStorage.setItem("refreshToken",data.refreshToken);
this.token.startUp()
})
}
// console.log(1234,document.documentElement.clientWidth)
function addMeta(name,content){//手动添加mate标签
let meta = document.createElement('meta');
    meta.content=content;
    meta.name=name;
    document.getElementsByTagName('head')[0].appendChild(meta);
} }
if(document.documentElement.clientWidth < 800){
addMeta('viewport','initial-scale=0.5, maximum-scale=0.5, minimum-scale=0.5, user-scalable=no,uc-fitscreen=yes,viewport-fit=cover') isMaskLayerShow: boolean = false
ngOnInit(): void {
//监听遮罩层
this.maskLayerService.getMessage().subscribe((message: any) => {
this.isMaskLayerShow = message
});
var token = sessionStorage.getItem("token");
var refreshToken = sessionStorage.getItem("refreshToken");
if (token && refreshToken) {
this.http.post('/api/Account/RefreshToken', {
token: token,
refreshToken: refreshToken
}).subscribe((data: Data) => {
sessionStorage.setItem("level", data.level);
sessionStorage.setItem("token", data.token);
sessionStorage.setItem("refreshToken", data.refreshToken);
this.token.startUp()
})
}
// console.log(1234,document.documentElement.clientWidth)
function addMeta(name, content) {//手动添加mate标签
let meta = document.createElement('meta');
meta.content = content;
meta.name = name;
document.getElementsByTagName('head')[0].appendChild(meta);
}
if (document.documentElement.clientWidth < 800) {
addMeta('viewport', 'initial-scale=0.5, maximum-scale=0.5, minimum-scale=0.5, user-scalable=no,uc-fitscreen=yes,viewport-fit=cover')
}
} }
}

62
src/app/app.module.ts
Unescape View File

@ -2,7 +2,7 @@ import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { AppRoutingModule } from './app-routing.module'; import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { MatButtonModule } from '@angular/material/button'; import { MatButtonModule } from '@angular/material/button';
import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
@ -15,8 +15,8 @@ import { FormsModule } from '@angular/forms';
import { UiModule } from './ui/ui.module'; import { UiModule } from './ui/ui.module';
import { HttpClientModule } from '@angular/common/http'; import { HttpClientModule } from '@angular/common/http';
import { httpInterceptorProviders } from './http-interceptors/index' import { httpInterceptorProviders } from './http-interceptors/index'
import {CacheTokenService} from './http-interceptors/cache-token.service' import { CacheTokenService } from './http-interceptors/cache-token.service'
import { TreeService } from'./http-interceptors/tree.service'; import { TreeService } from './http-interceptors/tree.service';
import { MTokenK1Component } from './m-token-k1/m-token-k1.component' //K1秘钥 import { MTokenK1Component } from './m-token-k1/m-token-k1.component' //K1秘钥
import { CountdownModule } from 'ngx-countdown'; //倒计时插件 import { CountdownModule } from 'ngx-countdown'; //倒计时插件
import { GISManagementModule } from './gis-management/gis-management.module'; import { GISManagementModule } from './gis-management/gis-management.module';
@ -24,34 +24,36 @@ import { DataCollectionModule } from './data-collection/data-collection.module';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { TestComponent } from './test/test.component'; import { TestComponent } from './test/test.component';
import { ExternalLinksPlanComponent } from './external-links-plan/external-links-plan.component'; import { ExternalLinksPlanComponent } from './external-links-plan/external-links-plan.component';
import { SearchDownList } from '../modules/map/declare/component/SearchDownListPlugins/SearchDownList';
@NgModule({ @NgModule({
declarations: [ declarations: [
AppComponent, AppComponent,
HomeComponent, HomeComponent,
MTokenK1Component, MTokenK1Component,
TestComponent, TestComponent,
ExternalLinksPlanComponent ExternalLinksPlanComponent,
], SearchDownList
imports: [ ],
BrowserModule, imports: [
AppRoutingModule, BrowserModule,
BrowserAnimationsModule, AppRoutingModule,
MatButtonModule, BrowserAnimationsModule,
MatCheckboxModule, MatButtonModule,
MatSidenavModule, MatCheckboxModule,
NavigationModule, MatSidenavModule,
MatIconModule, NavigationModule,
PagesModule, MatIconModule,
FormsModule, PagesModule,
HttpClientModule, FormsModule,
CountdownModule, HttpClientModule,
GISManagementModule, CountdownModule,
DataCollectionModule, GISManagementModule,
MatProgressSpinnerModule, DataCollectionModule,
UiModule MatProgressSpinnerModule,
], UiModule
providers: [httpInterceptorProviders, CacheTokenService,TreeService], ],
bootstrap: [AppComponent] providers: [httpInterceptorProviders, CacheTokenService, TreeService],
bootstrap: [AppComponent]
}) })
export class AppModule { } export class AppModule { }

257
src/app/pages/login/login.component.ts
Unescape View File

@ -1,153 +1,154 @@
import { ApplicationRef, Component, ComponentFactoryResolver, Injector, OnInit } from '@angular/core'; import { ApplicationRef, Component, ComponentFactoryResolver, Injector, OnInit } from '@angular/core';
import { HttpClient } from '@angular/common/http' import { HttpClient } from '@angular/common/http'
import { Data } from '../../interface' import { Data } from '../../interface'
import { Router,ActivatedRoute } from '@angular/router' import { Router, ActivatedRoute } from '@angular/router'
import {CacheTokenService} from '../../http-interceptors/cache-token.service'//引入服务 import { CacheTokenService } from '../../http-interceptors/cache-token.service'//引入服务
import { MatSnackBar,MatSnackBarConfig } from '@angular/material/snack-bar'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
import { MatDialog,MatDialogRef } from '@angular/material/dialog'; import { MatDialog, MatDialogRef } from '@angular/material/dialog';
import { SearchService } from '@src/app/searchComponent.service'; import { SearchService } from '@src/app/searchComponent.service';
import { SearchDownList } from '@src/modules/map/declare/component/SearchDownListPlugins/SearchDownList'; import { SearchDownList } from '@src/modules/map/declare/component/SearchDownListPlugins/SearchDownList';
import * as global from 'globals';
@Component({ @Component({
selector: 'app-login', selector: 'app-login',
templateUrl: './login.component.html', templateUrl: './login.component.html',
styleUrls: ['./login.component.scss'], styleUrls: ['./login.component.scss'],
}) })
export class LoginComponent implements OnInit { export class LoginComponent implements OnInit {
constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,public token:CacheTokenService,public snackBar: MatSnackBar, public dialog: MatDialog) { constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, public token: CacheTokenService, public snackBar: MatSnackBar, public dialog: MatDialog) {
window.injector.get<SearchService>(SearchService).appendComponentToBody(SearchDownList); }
}
ngOnInit() {
ngOnInit() { this.automaticLogin()
this.automaticLogin() }
}
errmsg: string = ''
errmsg :string = ''
onSubmit(e) {
onSubmit(e){ this.http.post('/api/Account/SignIn', {
this.http.post('/api/Account/SignIn',{ name: e.name,
name: e.name, password: e.password
password: e.password}).subscribe( (data: Data) => { }).subscribe((data: Data) => {
sessionStorage.setItem("level",data.level); sessionStorage.setItem("level", data.level);
sessionStorage.setItem("token",data.token); sessionStorage.setItem("token", data.token);
sessionStorage.setItem("refreshToken",data.refreshToken); sessionStorage.setItem("refreshToken", data.refreshToken);
sessionStorage.setItem("isDefaultPassword",data.isDefaultPassword);//是否需要修改默认密码 sessionStorage.setItem("isDefaultPassword", data.isDefaultPassword);//是否需要修改默认密码
this.http.get('/api/Account/NavMenus').subscribe((data:any)=>{ this.http.get('/api/Account/NavMenus').subscribe((data: any) => {
let isHave = data.find(item=>{ return item.url == "/statisticanalysis/home"}) let isHave = data.find(item => { return item.url == "/statisticanalysis/home" })
let isHaveGis = data.find(item=>{ return item.url == "/gis"}) let isHaveGis = data.find(item => { return item.url == "/gis" })
if (isHave) { if (isHave) {
this.router.navigate([`/statisticanalysis/home`]) this.router.navigate([`/statisticanalysis/home`])
this.dialogChangePassword() this.dialogChangePassword()
return return
} else if(isHaveGis){ } else if (isHaveGis) {
this.router.navigate([`/gis`]) this.router.navigate([`/gis`])
this.dialogChangePassword() this.dialogChangePassword()
return return
} else if(data.length != 0){ } else if (data.length != 0) {
this.router.navigate([`/keyUnit`]) this.router.navigate([`/keyUnit`])
this.dialogChangePassword() this.dialogChangePassword()
return return
data.forEach(item => { data.forEach(item => {
if(item.url){ if (item.url) {
} }
}); });
}else{ } else {
this.snackBar.open('该用户角色未分配任何菜单', '确定', { this.snackBar.open('该用户角色未分配任何菜单', '确定', {
duration: 3000 duration: 3000
});
}
})
if (e.notlogin) { //7天免登录时
localStorage.setItem("isnologin", "true")
localStorage.setItem("token", data.token)
localStorage.setItem("refreshToken", data.refreshToken)
}
//调用服务中的function刷新token
this.token.startUp()
},
(err) => { this.errmsg = err }
)
}
dialogChangePassword() {
if (sessionStorage.getItem('isDefaultPassword') == 'true') {
let dialogRef = this.dialog.open(ChangepasswordComponent2,
{ width: '348px' });
dialogRef.afterClosed().subscribe((data) => {
sessionStorage.setItem('isDefaultPassword', 'false')
}); });
} }
}
}) //7天免登录自动登录
if(e.notlogin){ //7天免登录时 automaticLogin() {
localStorage.setItem("isnologin","true") let isNoLogin = localStorage.getItem("isnologin")
localStorage.setItem("token",data.token) if (isNoLogin) { //7天免登录时
localStorage.setItem("refreshToken",data.refreshToken) } let token = localStorage.getItem("token");
//调用服务中的function刷新token let refreshToken = localStorage.getItem("refreshToken");
this.token.startUp() this.http.post('/api/Account/RefreshToken', {
}, token: token,
(err) => {this.errmsg = err} refreshToken: refreshToken
) }).subscribe((data: any) => {
} sessionStorage.setItem("level", data.level);
sessionStorage.setItem("token", data.token);
sessionStorage.setItem("refreshToken", data.refreshToken);
dialogChangePassword(){ this.token.startUp()
if(sessionStorage.getItem('isDefaultPassword') == 'true'){ this.router.navigate(['/keyUnit'])
let dialogRef = this.dialog.open(ChangepasswordComponent2, this.snackBar.open('已自动登录', '确定', { duration: 3000 });
{width:'348px'}); })
} //if
dialogRef.afterClosed().subscribe((data)=>{
sessionStorage.setItem('isDefaultPassword','false') }
});
//打开弹窗
open() {
this.snackBar.open('请联系管理员', '确定', {
duration: 3000
});
} }
}
//7天免登录自动登录
automaticLogin () {
let isNoLogin = localStorage.getItem("isnologin")
if (isNoLogin) { //7天免登录时
let token = localStorage.getItem("token");
let refreshToken = localStorage.getItem("refreshToken");
this.http.post('/api/Account/RefreshToken', {
token: token,
refreshToken: refreshToken}).subscribe((data:any)=>{
sessionStorage.setItem("level",data.level);
sessionStorage.setItem("token",data.token);
sessionStorage.setItem("refreshToken",data.refreshToken);
this.token.startUp()
this.router.navigate(['/keyUnit'])
this.snackBar.open('已自动登录', '确定', {duration: 3000});
})
} //if
}
//打开弹窗
open () {
this.snackBar.open('请联系管理员', '确定', {
duration: 3000
});
}
} }
@Component({ @Component({
selector: 'app-changepassword', selector: 'app-changepassword',
templateUrl: './changePassword.html', templateUrl: './changePassword.html',
styleUrls: ['./changepassword.scss'] styleUrls: ['./changepassword.scss']
}) })
export class ChangepasswordComponent2 implements OnInit { export class ChangepasswordComponent2 implements OnInit {
constructor(private http:HttpClient,public snackBar: MatSnackBar, constructor(private http: HttpClient, public snackBar: MatSnackBar,
public dialogRef: MatDialogRef<ChangepasswordComponent2>) { } public dialogRef: MatDialogRef<ChangepasswordComponent2>) { }
ngOnInit() { ngOnInit() {
} }
errmsg :string = '' errmsg: string = ''
onSubmit(e){ onSubmit(e) {
this.http.put( this.http.put(
'/api/Account/Password', '/api/Account/Password',
{ {
newPassword: e.newPassword, newPassword: e.newPassword,
password: 'SHya119!@' password: 'SHya119!@'
} }
).subscribe(data=> { ).subscribe(data => {
this.dialogRef.close(data); this.dialogRef.close(data);
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('密码修改成功','确定',config); this.snackBar.open('密码修改成功', '确定', config);
},(err) => }, (err) => { this.errmsg = err }
{this.errmsg = err} )
) }
}

23
src/app/searchComponent.service.ts
Unescape View File

@ -1,30 +1,29 @@
import { ApplicationRef, ComponentFactoryResolver, ComponentRef, EmbeddedViewRef, Injectable, Injector } from '@angular/core'; import { ApplicationRef, ComponentFactoryResolver, ComponentRef, EmbeddedViewRef, Injectable, Injector } from '@angular/core';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class SearchService { export class SearchService {
constructor(private componentFactoryResolver: ComponentFactoryResolver,private applicationRef: ApplicationRef,private injector: Injector,) {} constructor(private componentFactoryResolver: ComponentFactoryResolver, private applicationRef: ApplicationRef, private injector: Injector,) { }
//angular 动态组件 //angular 动态组件
appendComponentToBody(component: any) { appendComponentToBody<T>(component: any): ComponentRef<T> {
//create a component reference //create a component reference
const componentRef = this.componentFactoryResolver.resolveComponentFactory(component).create(this.injector); const componentRef = this.componentFactoryResolver.resolveComponentFactory(component).create(this.injector);
// attach component to the appRef so that so that it will be dirty checked. // attach component to the appRef so that so that it will be dirty checked.
this.applicationRef.attachView(componentRef.hostView); this.applicationRef.attachView(componentRef.hostView);
// get DOM element from component // get DOM element from component
const domElem = (componentRef.hostView as EmbeddedViewRef < any > ).rootNodes[0] as HTMLElement; const domElem = (componentRef.hostView as EmbeddedViewRef<any>).rootNodes[0] as HTMLElement;
document.body.appendChild(domElem); document.body.appendChild(domElem);
return componentRef;
}
removeComponentFromBody(componentRef: ComponentRef < any > ) { return componentRef as ComponentRef<T>;
}
removeComponentFromBody(componentRef: ComponentRef<any>) {
this.applicationRef.detachView(componentRef.hostView); this.applicationRef.detachView(componentRef.hostView);
componentRef.destroy(); componentRef.destroy();
} }
} }

5
src/global.d.ts vendored
Unescape View File

@ -1,5 +0,0 @@
import { Injector } from "@angular/core";
export declare interface Window {
injector: Injector
}

22
src/modules/map/declare/component/SearchDownListPlugins/SearchDownList.ts
Unescape View File

@ -2,7 +2,7 @@ import { Component, OnInit, Inject } from '@angular/core';
import { AutocompleteSelect } from '../../map'; import { AutocompleteSelect } from '../../map';
type ClickHandler = (data:AutocompleteSelect)=>void; type ClickHandler = (data: AutocompleteSelect) => void;
@Component({ @Component({
selector: 'SearchDownList', selector: 'SearchDownList',
@ -17,13 +17,17 @@ export class SearchDownList implements OnInit {
public leftCss: string = '0px'; public leftCss: string = '0px';
public topCss: string = '0px'; public topCss: string = '0px';
public minWidthCss: string = '0px'; public minWidthCss: string = '0px';
private clickHandler:ClickHandler; private clickHandler: ClickHandler;
ngOnInit(): void { ngOnInit(): void {
} }
setClickHander(handler: ClickHandler) {
init(elementId:string,clickCallback:ClickHandler):void{ this.clickHandler = handler;
}
clearClickHander() {
this.clearClickHander = null;
}
init(elementId: string): void {
this.$input = document.getElementById(elementId); this.$input = document.getElementById(elementId);
this.clickHandler = clickCallback;
//this.addDOMEvent(); //this.addDOMEvent();
} }
// input 添加监听事件 // input 添加监听事件
@ -35,11 +39,17 @@ export class SearchDownList implements OnInit {
} }
select(e) { select(e) {
this.clickHandler(e); this.clearClickHander && this.clickHandler(e);
this.searchList = []; this.searchList = [];
} }
watch() { watch() {
//TODO:修改leftCss ,topCss //TODO:修改leftCss ,topCss
} }
testAddData() {
this.searchList.push({
name: "asfasdfasdf"
} as AutocompleteSelect);
}
} }

89
src/modules/map/declare/gaode-map.ts
Unescape View File

@ -1,5 +1,8 @@
import { HtmlRender, ICircle, IIcon, IIconOptions, ILayer, ILngLat, IMap, IMapOptions, IMarker, IMarkerCluster, IMarkOptions, IMouseTool, IInfoWindow, IPixel, IRenderClusterMarker, ISelf, ISize, PixelRender, ITileLayer, IDriving, IDrivingOptions, IAutocomplete, IPlaceSearch, AutocompleteSearchCallback, AutocompleteSelectCallback, PlaceSearchCallback } from './map' import { HtmlRender, ICircle, IIcon, IIconOptions, ILayer, ILngLat, IMap, IMapOptions, IMarker, IMarkerCluster, IMarkOptions, IMouseTool, IInfoWindow, IPixel, IRenderClusterMarker, ISelf, ISize, PixelRender, ITileLayer, IDriving, IDrivingOptions, IAutocomplete, IPlaceSearch, AutocompleteSearchCallback, AutocompleteSelectCallback, PlaceSearchCallback, AutocompleteSearch } from './map'
import MapTools from './map-tools'; import MapTools from './map-tools';
import * as global from 'globals';
import { SearchService } from '@src/app/searchComponent.service';
import { SearchDownList } from './component/SearchDownListPlugins/SearchDownList';
declare var AMap: any; declare var AMap: any;
declare var AMapUI: any; declare var AMapUI: any;
@ -10,13 +13,13 @@ class GaodeBasic implements ISelf {
export class GaoDeMap extends GaodeBasic implements IMap { export class GaoDeMap extends GaodeBasic implements IMap {
/// plugins:同步加载插件 /// plugins:同步加载插件
constructor(container: string, options: IMapOptions,plugins?:string[]) { constructor(container: string, options: IMapOptions, plugins?: string[]) {
super(); super();
this.self = new AMap.Map(container, options); this.self = new AMap.Map(container, options);
if(!!plugins && plugins.length){ if (!!plugins && plugins.length) {
for(var i in plugins){ for (var i in plugins) {
let name = plugins[i]; let name = plugins[i];
if(name.indexOf('AMap.')==-1)continue; if (name.indexOf('AMap.') == -1) continue;
let pObj = eval(`new ${plugins[i]}()`); let pObj = eval(`new ${plugins[i]}()`);
this.self.plugin(pObj); this.self.plugin(pObj);
} }
@ -38,7 +41,7 @@ export class GaoDeMap extends GaodeBasic implements IMap {
return this.self.setZoomAndCenter(zoom, pos) return this.self.setZoomAndCenter(zoom, pos)
} }
plugin(pluginNames: string[], callback: Function) { plugin(pluginNames: string[], callback: Function) {
let names = pluginNames.filter(s=>s.indexOf("AMap.")==0); let names = pluginNames.filter(s => s.indexOf("AMap.") == 0);
return this.self.plugin(names, callback) return this.self.plugin(names, callback)
} }
getBounds() { getBounds() {
@ -59,9 +62,9 @@ export class GaoDeMap extends GaodeBasic implements IMap {
setCenter(pos: any) { setCenter(pos: any) {
return this.self.setCenter(pos) return this.self.setCenter(pos)
} }
getCenter():ILngLat { getCenter(): ILngLat {
let d = this.self.getCenter(); let d = this.self.getCenter();
return new GaoDeLngLat(0,0,d); return new GaoDeLngLat(0, 0, d);
} }
getZoom() { getZoom() {
return this.self.getZoom(); return this.self.getZoom();
@ -238,9 +241,9 @@ export class GaoDePixel extends GaodeBasic implements IPixel {
this.self = new AMap.Pixel(x, y); this.self = new AMap.Pixel(x, y);
} }
getArray(): number[] { getArray(): number[] {
return [this.x,this.y]; return [this.x, this.y];
} }
x: number; x: number;
y: number; y: number;
} }
@ -255,8 +258,8 @@ export class GaoDeMarker extends GaodeBasic implements IMarker {
setContent(html: string) { setContent(html: string) {
return this.self.setContent(html) return this.self.setContent(html)
} }
setPosition(x: ILngLat|number[]) { setPosition(x: ILngLat | number[]) {
x = (x as ILngLat).getArray == undefined ? x:(x as ILngLat).getArray(); x = (x as ILngLat).getArray == undefined ? x : (x as ILngLat).getArray();
return this.self.setPosition(x) return this.self.setPosition(x)
} }
_position: number[] _position: number[]
@ -279,7 +282,7 @@ export class GaoDeMarkerCluster extends GaodeBasic implements IMarkerCluster {
super(); super();
let conf = MapTools.ExplicitConvert(options); let conf = MapTools.ExplicitConvert(options);
AMap.plugin('AMap.MarkerClusterer',()=>{ AMap.plugin('AMap.MarkerClusterer', () => {
this.self = new AMap.MarkerCluster(map.self, list, conf) this.self = new AMap.MarkerCluster(map.self, list, conf)
}); });
} }
@ -292,23 +295,23 @@ export class GaoDeMarkerCluster extends GaodeBasic implements IMarkerCluster {
} }
export class GaoDeLngLat extends GaodeBasic implements ILngLat { export class GaoDeLngLat extends GaodeBasic implements ILngLat {
constructor(x: number, y: number,me?:any) { constructor(x: number, y: number, me?: any) {
super(); super();
if(me==undefined) if (me == undefined)
this.self = new AMap.LngLat(x, y); this.self = new AMap.LngLat(x, y);
else else
this.self = me; this.self = me;
} }
typeName="LngLat"; typeName = "LngLat";
get KL():number{ get KL(): number {
return this.lng; return this.lng;
} }
get kT():number{ get kT(): number {
return this.lat; return this.lat;
} }
getArray(): number[] { getArray(): number[] {
return [this.lng,this.lat]; return [this.lng, this.lat];
} }
get lng(): number { get lng(): number {
return this.self.lng; return this.self.lng;
@ -316,7 +319,7 @@ export class GaoDeLngLat extends GaodeBasic implements ILngLat {
get lat(): number { get lat(): number {
return this.self.lat; return this.self.lat;
} }
offset(x: number, y: number):ILngLat { offset(x: number, y: number): ILngLat {
return this.self.offset(x, y) return this.self.offset(x, y)
} }
} }
@ -362,12 +365,12 @@ export class GaodeDriving extends GaodeBasic implements IDriving {
constructor(options: IDrivingOptions) { constructor(options: IDrivingOptions) {
super(); super();
options.map = options.map.self options.map = options.map.self
AMap.plugin('AMap.Driving',()=>{ AMap.plugin('AMap.Driving', () => {
this.self = new AMap.Driving(options) this.self = new AMap.Driving(options)
}) })
} }
search(posStart?: ILngLat, posEnd?: ILngLat, callback?: Function) { search(posStart?: ILngLat, posEnd?: ILngLat, callback?: Function) {
return this.self.search(posStart.getArray(),posEnd.getArray(),callback) return this.self.search(posStart.getArray(), posEnd.getArray(), callback)
} }
clear() { clear() {
return this.self.clear() return this.self.clear()
@ -375,38 +378,54 @@ export class GaodeDriving extends GaodeBasic implements IDriving {
} }
export class GaodeAutocomplete extends GaodeBasic implements IAutocomplete { export class GaodeAutocomplete extends GaodeBasic implements IAutocomplete {
private component:any private component: any
constructor(options: any,component: any) { private searchDownList: SearchDownList
constructor(options: any, component: any) {
super(); super();
this.component = component this.component = component
AMap.plugin('AMap.AutoComplete',()=>{ AMap.plugin('AMap.AutoComplete', () => {
this.self = new AMap.Autocomplete(options) this.self = new AMap.Autocomplete(options)
}) })
this.searchDownList = global.injector.get<SearchService>(SearchService).appendComponentToBody(SearchDownList).instance;
this.searchDownList.init(options.input);
this.self.on('complete', (e) => {
console.log('search complete', e);
this.searchDownList.searchList = e.tips || [];
})
} }
on(eventName: string, callback: AutocompleteSelectCallback) { on(eventName: string, callback: AutocompleteSelectCallback) {
return this.self.on(eventName, (event)=>{ this.searchDownList.setClickHander(e => {
callback.call(this.component,event) alert(e.name);
}) callback(e);
});
//$().addEventListener
// return this.self.on(eventName, (event) => {
// console.log('on event', event)
// callback.call(this.component, event)
// })
} }
search(address: string, callback: AutocompleteSearchCallback) { search(address: string, callback: AutocompleteSearchCallback) {
return this.self.search(address,(status,result)=>{ return this.self.search(address, (status, result: AutocompleteSearch) => {
callback.call(this.component,status,result) this.searchDownList.searchList = result.tips || [];
callback.call(this.component, status, result)
}) })
} }
} }
export class GaodePlaceSearch extends GaodeBasic implements IPlaceSearch { export class GaodePlaceSearch extends GaodeBasic implements IPlaceSearch {
private component:any private component: any
constructor(component: any) { constructor(component: any) {
super(); super();
this.component = component this.component = component
AMap.plugin('AMap.PlaceSearch',()=>{ AMap.plugin('AMap.PlaceSearch', () => {
this.self = new AMap.PlaceSearch() this.self = new AMap.PlaceSearch()
}) })
} }
search(text: string, callback: PlaceSearchCallback) { search(text: string, callback: PlaceSearchCallback) {
return this.self.search(text,(status,result)=>{ return this.self.search(text, (status, result) => {
callback.call(this.component,status,result) callback.call(this.component, status, result)
}) })
} }
} }
@ -414,7 +433,7 @@ export class GaodePlaceSearch extends GaodeBasic implements IPlaceSearch {
export class GaodeMouseTool extends GaodeBasic implements IMouseTool { export class GaodeMouseTool extends GaodeBasic implements IMouseTool {
constructor(map: IMap) { constructor(map: IMap) {
super(); super();
AMap.plugin(["AMap.RangingTool", "AMap.MouseTool"],()=>{ AMap.plugin(["AMap.RangingTool", "AMap.MouseTool"], () => {
this.self = new AMap.MouseTool(map.self); this.self = new AMap.MouseTool(map.self);
}) })
} }

9
src/modules/map/declare/keda-map.ts
Unescape View File

@ -3,6 +3,7 @@ import * as ObjectID from 'bson-objectid';
import { SearchDownList } from './component/SearchDownListPlugins/SearchDownList'; import { SearchDownList } from './component/SearchDownListPlugins/SearchDownList';
import { ApplicationRef, ComponentFactoryResolver, Injector, ReflectiveInjector } from '@angular/core'; import { ApplicationRef, ComponentFactoryResolver, Injector, ReflectiveInjector } from '@angular/core';
import { SearchService } from '@src/app/searchComponent.service'; import { SearchService } from '@src/app/searchComponent.service';
import * as global from 'globals';
declare var KMap: any; declare var KMap: any;
class KedaBasic implements ISelf { class KedaBasic implements ISelf {
@ -319,9 +320,9 @@ export class KedaAutocomplete extends KedaBasic implements IAutocomplete { //Aut
this.component = component this.component = component
const injector = Injector.create({ const injector = Injector.create({
providers: providers:
[{provide: SearchService, deps: [ComponentFactoryResolver,ApplicationRef,Injector]}] [{ provide: SearchService, deps: [ComponentFactoryResolver, ApplicationRef, Injector] }]
}); });
injector.get<SearchService>(SearchService).appendComponentToBody(SearchDownList); injector.get<SearchService>(SearchService).appendComponentToBody(SearchDownList);
if (options && options.input != undefined) { //绑定input框搜索事件 if (options && options.input != undefined) { //绑定input框搜索事件
this.inputListen(options.input); this.inputListen(options.input);
} }
@ -329,7 +330,7 @@ export class KedaAutocomplete extends KedaBasic implements IAutocomplete { //Aut
on(eventName: string, callback: AutocompleteSelectCallback) { on(eventName: string, callback: AutocompleteSelectCallback) {
} }
inputListen(elementId:string){ inputListen(elementId: string) {
} }
search(address: string, callback: AutocompleteSearchCallback) { search(address: string, callback: AutocompleteSearchCallback) {

Write Preview
Loading…
Cancel
Save