Skip to content

Commit 570b4e9

Browse files
[fix]echarts echartslayer 版本冲突
1 parent b02d974 commit 570b4e9

File tree

6 files changed

+7
-34
lines changed

6 files changed

+7
-34
lines changed

core/controllers/mapboxgl/WebMapViewModel.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,13 @@ import mapboxgl from 'vue-iclient-static/libs/mapboxgl/mapbox-gl-enhance';
77
import 'vue-iclient-static/libs/iclient-mapboxgl/iclient-mapboxgl.min';
88
import 'vue-iclient-static/libs/geostats/geostats';
99
import 'vue-iclient-static/libs/json-sql/jsonsql';
10-
import * as echarts from 'echarts';
1110
import EchartsLayer from 'vue-iclient-static/libs/echarts-layer/EchartsLayer';
1211
import iPortalDataService from 'vue-iclient-core/utils/iPortalDataService';
1312
import proj4 from 'proj4';
1413
import { getLayerCatalogIds, getGroupChildrenLayers, findLayerCatalog } from 'vue-iclient-core/controllers/mapboxgl/utils/layerCatalogGroupUtil';
1514
import bbox from '@turf/bbox';
1615
import { points } from '@turf/helpers';
1716

18-
// @ts-ignore
19-
window.echarts = echarts;
2017
// @ts-ignore
2118
window.EchartsLayer = EchartsLayer;
2219

core/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"@turf/length": "^7.2.0",
1616
"@turf/transform-scale": "^7.2.0",
1717
"css-vars-ponyfill": "^2.2.1",
18-
"echarts": "^4.8.0",
1918
"lodash.assignin": "^4.2.0",
2019
"lodash.clonedeep": "^4.5.0",
2120
"lodash.debounce": "^4.0.8",

pnpm-lock.yaml

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vue2/src/mapboxgl/web-map/WebMap.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ import { addListener, removeListener } from 'resize-detector';
1818
import debounce from 'lodash.debounce';
1919
import SmSpin from 'vue-iclient/src/common/spin/Spin.vue';
2020
import Message from 'vue-iclient/src/common/message/Message.js';
21+
import * as echarts from 'echarts';
22+
23+
// @ts-ignore
24+
window.echarts = echarts;
2125
2226
interface commonControlParam {
2327
show?: boolean;

vue3/packages/mapboxgl/components/web-map/webmap.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ import SmQuery from '@supermapgis/mapboxgl/components/query/query.vue'
2222
import SmSearch from '@supermapgis/mapboxgl/components/search/search.vue'
2323
import SmScale from '@supermapgis/mapboxgl/components/scale/scale.vue'
2424
import SmMiniMap from '@supermapgis/mapboxgl/components/mini-map/mini-map.vue'
25+
import * as echarts from 'echarts';
26+
// @ts-ignore
27+
window.echarts = echarts;
2528
2629
const viewModelProps = [
2730
'mapId',

vue3/pnpm-lock.yaml

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)