Oak-Team
/
oak-general-business
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 38 Wiki Activity

修正了map的相关配置

This commit is contained in:
Xu Chang 2024-11-25 10:32:14 +08:00
parent 8a72d844e7
commit 3131181e60
5 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
es/components/config/upsert/map/index.js
View File

@ -85,14 +85,6 @@ export default function Map(props) {
若配置多个地图服务，系统会默认使用第一个。高德地图目前支持多个key循环使用
</Card>
</Row>
<AMaps maps={amaps} setValue={(path, value) => setValue(`amaps.${path}`, value)} removeItem={(path, index) => {
if (index === 0) {
cleanKey('', 'amaps');
}
else {
removeItem(`amaps`, index);
}
}} addItem={(path, index) => setValue(`amaps.${index}`, {})}/>
<MapWorld mapWorld={mapWorld} setValue={(path, value) => {
if (value) {
setValue(`mapWorld.${path}`, value);
@ -101,5 +93,13 @@ export default function Map(props) {
cleanKey('', 'mapWorld');
}
}}/>
<AMaps maps={amaps} setValue={(path, value) => setValue(`amaps.${path}`, value)} removeItem={(path, index) => {
if (index === 0) {
cleanKey('', 'amaps');
}
else {
removeItem(`amaps`, index);
}
}} addItem={(path, index) => setValue(`amaps.${index}`, {})}/>
</Space>);
}

10
es/routines/start.js
View File

@ -1,6 +1,7 @@
import { rewriteOperation, rewriteSelection } from '../utils/selectionRewriter';
import { registerGetMapService } from 'oak-common-aspect';
import AMap from 'oak-common-aspect/lib/map/amap';
import MapWorld from 'oak-common-aspect/lib/map/mapWorld';
let mapService;
const startRoutines = [
{
@ -20,12 +21,11 @@ const startRoutines = [
}
const application = context.getApplication();
const { config } = application.system;
if (config.Map?.amaps) {
mapService = new AMap(config.Map.amaps);
return mapService;
}
if (config.Map?.mapWorld) {
// todo 天地图的class实现
mapService = new MapWorld(config.Map.mapWorld.webApiKey);
}
else if (config.Map?.amaps) {
mapService = new AMap(config.Map.amaps);
}
return mapService;
});

10
lib/routines/start.js
View File

@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
const selectionRewriter_1 = require("../utils/selectionRewriter");
const oak_common_aspect_1 = require("oak-common-aspect");
const amap_1 = tslib_1.__importDefault(require("oak-common-aspect/lib/map/amap"));
const mapWorld_1 = tslib_1.__importDefault(require("oak-common-aspect/lib/map/mapWorld"));
let mapService;
const startRoutines = [
{
@ -23,12 +24,11 @@ const startRoutines = [
}
const application = context.getApplication();
const { config } = application.system;
if (config.Map?.amaps) {
mapService = new amap_1.default(config.Map.amaps);
return mapService;
}
if (config.Map?.mapWorld) {
// todo 天地图的class实现
mapService = new mapWorld_1.default(config.Map.mapWorld.webApiKey);
}
else if (config.Map?.amaps) {
mapService = new amap_1.default(config.Map.amaps);
}
return mapService;
});

22
src/components/config/upsert/map/index.tsx
View File

@ -189,6 +189,17 @@ export default function Map(props: {
若配置多个地图服务，系统会默认使用第一个。高德地图目前支持多个key循环使用
</Card>
</Row>
<MapWorld
mapWorld={mapWorld}
setValue={(path, value) => {
if (value) {
setValue(`mapWorld.${path}`, value);
}
else {
cleanKey('', 'mapWorld');
}
}}
/>
<AMaps
maps={amaps}
setValue={(path, value) => setValue(`amaps.${path}`, value)}
@ -202,17 +213,6 @@ export default function Map(props: {
}}
addItem={(path, index) => setValue(`amaps.${index}`, {})}
/>
<MapWorld
mapWorld={mapWorld}
setValue={(path, value) => {
if (value) {
setValue(`mapWorld.${path}`, value);
}
else {
cleanKey('', 'mapWorld');
}
}}
/>
</Space>
);
}

12
src/routines/start.ts
View File

@ -7,6 +7,7 @@ import { rewriteOperation, rewriteSelection } from '../utils/selectionRewriter';
import { registerGetMapService } from 'oak-common-aspect';
import AMap from 'oak-common-aspect/lib/map/amap';
import MapWorld from 'oak-common-aspect/lib/map/mapWorld';
import { MapService } from 'oak-common-aspect/es/types/Map';
let mapService: MapService;
@ -30,13 +31,12 @@ const startRoutines: Array<Routine<EntityDict & BaseEntityDict, keyof EntityDict
}
const application = (<BackendRuntimeContext<EntityDict & BaseEntityDict>>context).getApplication();
const { config } = application!.system!;
if (config.Map?.amaps) {
mapService = new AMap(config.Map.amaps!);
return mapService;
}
if (config.Map?.mapWorld) {
// todo 天地图的class实现
mapService = new MapWorld(config.Map.mapWorld.webApiKey);
}
else if (config.Map?.amaps) {
mapService = new AMap(config.Map.amaps!);
}
return mapService;