xy-map 1.0.41 → 1.0.43

package/package.json

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

package/src/map.js

@@ -44,6 +44,7 @@ class mapSdk {
     this.accessToken = 'pk.eyJ1IjoiaGo0NjI3NzEzOTYiLCJhIjoiY2w5YzNjOTZvMDF6NDNwb2d6YmJkYWRpMCJ9.-fW-OChGB1oY2DCMO_c8sg'
     this.options = defaultOptions // 初始参数
     this.map = null
+    this.setInterval = '' // 定时器
   }
 
   /**
@@ -441,15 +442,15 @@ class mapSdk {
    */
   mapRotate(isStart = true, sheep = 5) {
     let map = this.map
-    let rotateTime = setInterval(() => {
-      if (isStart) {
+    if (isStart) {
+      this.setInterval = setInterval(() => {
         map.jumpTo({
           bearing: (map.getBearing() + (sheep / 100)) % 360
         })
-      } else {
-        window.clearInterval(rotateTime)
-      }
-    })
+      })
+    } else {
+      clearInterval(this.setInterval)
+    }
   }
 }
 

package/src/package/draw/index.vue

@@ -18,6 +18,11 @@
       </div>
       <div class="ml-20"
            @click="drawDelete"
+           title="删除">
+        <i class="el-icon-close mr-5"></i>删除
+      </div>
+      <div class="ml-20"
+           @click="clear"
            title="清空">
         <i class="el-icon-delete mr-5"></i>清空
       </div>
@@ -61,6 +66,7 @@ export default {
       type: 'move',
       isEdit: false, //是否编辑模式
       draw: '',
+      activeFeatures: ''
     }
   },
   computed: {
@@ -106,11 +112,15 @@ export default {
       //   }
       // })
     },
+    getDraw () { // 获取绘制内容
+      const data = this.draw.getAll()
+      return data
+    },
     startDraw (type) {
       this.type = type
       if (type === 'move') return
       if (this.single) {
-        this.drawDelete()
+        this.clear()
       }
       console.log('开始绘制')
       this.draw.changeMode(type)
@@ -118,15 +128,15 @@ export default {
     },
     drawEnd (e) {
       // console.log(e)
-      const data = this.draw.getAll()
-      console.log('绘制结束')
+      const data = this.getDraw()
+      console.log('绘制结束', data)
       this.type = 'move'
       this.$emit('end', data)
     },
     drawUpdate (e) {
       // console.log(e)
-      const data = this.draw.getAll()
-      console.log('修改结束')
+      const data = this.getDraw()
+      console.log('修改结束', data)
       this.$emit('update', data)
     },
     drawEdit (geometry) { // 修改回填元素
@@ -136,16 +146,26 @@ export default {
       // }
       this.draw.add(geometry)
     },
-    drawDelete () {
+    drawDelete () { // 删除选中对象
+      if (this.activeFeatures && this.activeFeatures.length > 0) {
+        this.activeFeatures.forEach(item => {
+          this.draw.delete(item.id)
+          const data = this.getDraw()
+          console.log('删除选中对象', data)
+          this.$emit('delete', data)
+        })
+      } else {
+        this.$message.warning('未选择删除的对象')
+      }
+    },
+    clear () {
       if (this.draw) {
         this.draw.deleteAll()
         this.$emit('clear')
       }
     },
-    clear () {
-      this.drawDelete()
-    },
     select (e) {
+      this.activeFeatures = e.features
       this.$emit('select', e.features)
     }
   }

package/src/package/draw/line.vue

@@ -157,7 +157,7 @@ export default {
       this.position = ''
     },
     getShp (shp) {
-      this.$refs.draw.drawDelete() // 先清空画布
+      this.$refs.draw.clear() // 先清空画布
       this.drawUpdate(shp, true)
       this.edit()
     }

package/src/package/draw/polygon.vue

@@ -158,7 +158,7 @@ export default {
     },
     getShp (shp) {
       console.log(shp)
-      this.$refs.draw.drawDelete() // 先清空画布
+      this.$refs.draw.clear() // 先清空画布
       this.drawUpdate(shp, true)
       this.edit()
     }