xy-map 1.0.39 → 1.0.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xy-map",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "description": "地图组件",
   "main": "src/index.js",
   "scripts": {

package/src/layers/Point.js

@@ -19,7 +19,10 @@ const defaultOptions = {
   data: [],
   text: {
     show: true,
-    layout: {},
+    layout: {
+      'text-size': 10,
+      'text-offset': [0, 1],
+    },
     paint: {}
   },
   image: {
@@ -98,6 +101,24 @@ export const addLayerPoint = (option, layerId) => { // 点
   if (opt.text && opt.text.show) {
     addLayerText('point', opt)
   }
+
+  // 高亮样式
+  if (opt.high) {
+    let highPaint = opt.high.paint ? opt.high.paint : {
+      'circle-color': '#f00'
+    }
+    let highPaintOpt = Object.assign({
+      ...paintOpt,
+    }, highPaint)
+
+    map.addLayer({
+      id: id + '-high',
+      type: 'circle',
+      source: id,
+      paint: highPaintOpt,
+      filter: ['==', ['boolean', ['get', 'high']], true]
+    }, layerId)
+  }
 }
 
 /**
@@ -188,7 +209,7 @@ export const addLayerImagePoint = async (option, layerId) => { // 点
 
   let layout = opt.style ? opt.style.layout : {}
   let layoutOpt = Object.assign({
-    'icon-image': image.imageList && image.imageList.length > 0 ? ['get', 'imgId'] : `${id}-marker`,
+    'icon-image': image.imageList && image.imageList.length > 0 ? ['get', opt.image.key || 'imgId'] : `${id}-marker`,
     'icon-size': 1,
     'text-field': ['get', 'name'],
     /* 使用text标签显示的值，Feature属性使用{域名}格式*/

package/src/package/draw/index.vue

@@ -92,7 +92,7 @@ export default {
 
       map.on('draw.create', this.drawEnd)
       map.on('draw.update', this.drawUpdate)
-
+      map.on('draw.selectionchange', this.select)
 
       // map.on('draw.modechange', (e) => {
       //   const data = draw.getAll()
@@ -142,8 +142,11 @@ export default {
         this.$emit('clear')
       }
     },
-    fullScreen () {
-
+    clear () {
+      this.drawDelete()
+    },
+    select (e) {
+      this.$emit('select', e.features)
     }
   }
 }

package/src/package/draw/line.vue

@@ -126,10 +126,8 @@ export default {
       this.edit()
     },
     edit () { // 开启编辑
-      if (this.geoJson && this.geoJson.features.length > 0) {
-        this.geoJson.features.forEach(item => {
-          this.$refs.draw.drawEdit(item.geometry)
-        })
+      if (this.geoJson) {
+        this.$refs.draw.drawEdit(this.geoJson)
       }
     },
     drawUpdate (data, autoZoom = false) {

package/src/package/draw/polygon.vue

@@ -126,10 +126,8 @@ export default {
       this.edit()
     },
     edit () { // 开启编辑
-      if (this.geoJson && this.geoJson.features.length > 0) {
-        this.geoJson.features.forEach(item => {
-          this.$refs.draw.drawEdit(item.geometry)
-        })
+      if (this.geoJson) {
+        this.$refs.draw.drawEdit(this.geoJson)
       }
     },
     drawUpdate (data, autoZoom = false) {
@@ -159,6 +157,7 @@ export default {
       this.position = ''
     },
     getShp (shp) {
+      console.log(shp)
       this.$refs.draw.drawDelete() // 先清空画布
       this.drawUpdate(shp, true)
       this.edit()