mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-17 08:14:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

code refactor

Browse Source
This commit is contained in:
MaysWind
2023-06-24 17:02:57 +08:00
parent a9338ed822
commit fb7790ba4a
36 changed files with 644 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/map/amap.js
+10 -6
View File
@@ -1,6 +1,10 @@
import { asyncLoadAssets } from '@/lib/misc.js';
import services from '@/lib/services.js';
import settings from '@/lib/settings.js';
import {
getAmapSecurityVerificationMethod,
getAmapApiExternalProxyUrl,
getAmapApplicationSecret
} from '@/lib/server_settings.js';
import logger from '@/lib/logger.js';
const amapHolder = {
@@ -15,12 +19,12 @@ export function loadAmapAssets() {
if (!window._AMapSecurityConfig) {
const amapSecurityConfig = {};
if (settings.getAmapSecurityVerificationMethod() === 'internalproxy') {
if (getAmapSecurityVerificationMethod() === 'internalproxy') {
amapSecurityConfig.serviceHost = services.generateAmapApiInternalProxyUrl();
} else if (settings.getAmapSecurityVerificationMethod() === 'externalproxy') {
amapSecurityConfig.serviceHost = settings.getAmapApiExternalProxyUrl();
} else if (settings.getAmapSecurityVerificationMethod() === 'plaintext') {
amapSecurityConfig.securityJsCode = settings.getAmapApplicationSecret();
} else if (getAmapSecurityVerificationMethod() === 'externalproxy') {
amapSecurityConfig.serviceHost = getAmapApiExternalProxyUrl();
} else if (getAmapSecurityVerificationMethod() === 'plaintext') {
amapSecurityConfig.securityJsCode = getAmapApplicationSecret();
}
window._AMapSecurityConfig = amapSecurityConfig;
src/lib/map/index.js
+19 -17
View File
@@ -1,5 +1,7 @@
import mapConstants from '@/consts/map.js';
import settings from '@/lib/settings.js';
import {
getMapProvider
} from '@/lib/server_settings.js';
import {
loadLeafletMapAssets,
@@ -38,26 +40,26 @@ import {
} from './amap.js';
export function loadMapAssets(language) {
if (mapConstants.leafletTileSources[settings.getMapProvider()]) {
if (mapConstants.leafletTileSources[getMapProvider()]) {
return loadLeafletMapAssets(language);
} else if (settings.getMapProvider() === 'googlemap') {
} else if (getMapProvider() === 'googlemap') {
return loadGoogleMapAssets(language);
} else if (settings.getMapProvider() === 'baidumap') {
} else if (getMapProvider() === 'baidumap') {
return loadBaiduMapAssets(language);
} else if (settings.getMapProvider() === 'amap') {
} else if (getMapProvider() === 'amap') {
return loadAmapAssets(language);
}
}
export function createMapHolder() {
if (mapConstants.leafletTileSources[settings.getMapProvider()]) {
return createLeafletMapHolder(settings.getMapProvider());
} else if (settings.getMapProvider() === 'googlemap') {
return createGoogleMapHolder(settings.getMapProvider());
} else if (settings.getMapProvider() === 'baidumap') {
return createBaiduMapHolder(settings.getMapProvider());
} else if (settings.getMapProvider() === 'amap') {
return createAmapHolder(settings.getMapProvider());
if (mapConstants.leafletTileSources[getMapProvider()]) {
return createLeafletMapHolder(getMapProvider());
} else if (getMapProvider() === 'googlemap') {
return createGoogleMapHolder(getMapProvider());
} else if (getMapProvider() === 'baidumap') {
return createBaiduMapHolder(getMapProvider());
} else if (getMapProvider() === 'amap') {
return createAmapHolder(getMapProvider());
} else {
return null;
}
@@ -68,7 +70,7 @@ export function initMapInstance(mapHolder, mapContainer, options) {
return;
}
if (mapConstants.leafletTileSources[settings.getMapProvider()]) {
if (mapConstants.leafletTileSources[getMapProvider()]) {
createLeafletMapInstance(mapHolder, mapContainer, options);
} else if (mapHolder.mapProvider === 'googlemap') {
createGoogleMapInstance(mapHolder, mapContainer, options);
@@ -84,7 +86,7 @@ export function setMapCenterTo(mapHolder, center, zoomLevel) {
return;
}
if (mapConstants.leafletTileSources[settings.getMapProvider()]) {
if (mapConstants.leafletTileSources[getMapProvider()]) {
setLeafletMapCenterTo(mapHolder, center, zoomLevel);
} else if (mapHolder.mapProvider === 'googlemap') {
setGoogleMapCenterTo(mapHolder, center, zoomLevel);
@@ -100,7 +102,7 @@ export function setMapCenterMarker(mapHolder, position) {
return;
}
if (mapConstants.leafletTileSources[settings.getMapProvider()]) {
if (mapConstants.leafletTileSources[getMapProvider()]) {
setLeafletMapCenterMaker(mapHolder, position);
} else if (mapHolder.mapProvider === 'googlemap') {
setGoogleMapCenterMaker(mapHolder, position);
@@ -116,7 +118,7 @@ export function removeMapCenterMarker(mapHolder) {
return;
}
if (mapConstants.leafletTileSources[settings.getMapProvider()]) {
if (mapConstants.leafletTileSources[getMapProvider()]) {
removeLeafletMapCenterMaker(mapHolder);
} else if (mapHolder.mapProvider === 'googlemap') {
removeGoogleMapCenterMaker(mapHolder);
src/lib/map/leaflet.js
+3 -3
View File
@@ -1,5 +1,5 @@
import mapConstants from '@/consts/map.js';
import settings from '@/lib/settings.js';
import { isMapDataFetchProxyEnabled, getTomTomMapAPIKey } from '@/lib/server_settings.js';
import services from '@/lib/services.js';
const leafletHolder = {
@@ -48,7 +48,7 @@ export function createLeafletMapInstance(mapHolder, mapContainer, options) {
});
let mapTileSource = Object.assign({}, mapConstants.leafletTileSources[mapHolder.mapProvider]);
if (settings.isMapDataFetchProxyEnabled()) {
if (isMapDataFetchProxyEnabled()) {
mapTileSource.tileUrlFormat = services.generateMapProxyTileImageUrl(mapHolder.mapProvider, options.language);
mapTileSource.tileUrlSubDomains = '';
} else if (mapTileSource.tileUrlExtraParams) {
@@ -58,7 +58,7 @@ export function createLeafletMapInstance(mapHolder, mapContainer, options) {
const param = mapTileSource.tileUrlExtraParams[i];
if (param.paramValueType === 'tomtom_key') {
params.push('key=' + settings.getTomTomMapAPIKey());
params.push('key=' + getTomTomMapAPIKey());
} else if (param.paramValueType === 'language' && options.language) {
params.push('language=' + options.language);
}