@aochuang/common 1.0.146 → 1.0.148

package/common/static-map/static-map.vue

@@ -9,6 +9,13 @@ import { md5 } from '../../utils/string'
 export default {
   name: 'BiStaticMap',
   props: {
+    type: {
+      type: String,
+      default: 'tencent',
+      validator (value) {
+        return ['tencent', 'amap'].includes(value)
+      }
+    },
     width: {
       type: String,
       default: '400'
@@ -39,6 +46,9 @@ export default {
   },
   computed: {
     mapHref () {
+      if (this.type === 'amap') {
+        return `https://uri.amap.com/marker?position=${this.amapCenter}&src=workphone&coordinate=gaode&callnative=0`
+      }
       return `https://apis.map.qq.com/uri/v1/geocoder?coord=${this.center}&referer=workphone`
     },
     isVisible () {
@@ -47,6 +57,9 @@ export default {
     center () {
       return `${this.lat},${this.lng}`
     },
+    amapCenter () {
+      return `${this.lng},${this.lat}`
+    },
     size () {
       return `${this.width}*${this.height}`
     },
@@ -60,20 +73,27 @@ export default {
       return `/ws/staticmap/v2/?center=${this.center}&key=${this.mapKey}&markers=color:blue|${this.center}&size=${this.size}&zoom=15pIwHI3PGMl0wtRP7Zvj1kqlXlQiVej7B`
     },
     mapUrl () {
+      if (this.type === 'amap') {
+        return `https://restapi.amap.com/v3/staticmap?location=${this.amapCenter}&zoom=15&size=${this.size}&markers=mid,,A:${this.amapCenter}&key=${this.mapKey}`
+      }
       return `https://apis.map.qq.com/ws/staticmap/v2/?size=${this.size}&key=${this.mapKey}&center=${this.center}&markers=color:blue|${this.center}&zoom=15&sig=${this.sign}`
     }
   },
   created () {
     this.ready = false
     if (!this.mapKey) {
-      throw new Error('缺少腾讯地图授权key配置')
+      throw new Error(`缺少${this.type === 'amap' ? '高德' : '腾讯'}地图授权key配置`)
     }
-    md5(this.encryptUrl).then(rs => {
-      this.sign = rs
-      this.ready = true
-    }, () => {
+    if (this.type === 'amap') {
       this.ready = true
-    })
+    } else {
+      md5(this.encryptUrl).then(rs => {
+        this.sign = rs
+        this.ready = true
+      }, () => {
+        this.ready = true
+      })
+    }
     this.$emit('map-created', {
       mapHref: this.mapHref
     })

package/common/voice-player/voice-player.vue

@@ -80,7 +80,7 @@
     <div class="ac-voice-player__download" v-if="allowDownload" @click="handleDownloadClick">
       <ui-icon
         class="ac-voice-player__download-btn"
-        name="download-line"
+        :name="downloading ? 'loading' : 'download-line'"
         title="下载"
       ></ui-icon>
     </div>
@@ -139,6 +139,9 @@ export default {
       type: Boolean,
       default: true
     },
+    downloadMethod: {   
+      type: Function
+    },
     getUrlMethod: {
       type: Function
     },
@@ -153,6 +156,7 @@ export default {
   data () {
     return {
       loading: false,
+      downloading: false,
       progressing: false, // 真正的播放中
       converting: false,
       innerUrl: this.url,
@@ -387,6 +391,15 @@ export default {
       this.$refs.popover.hide()
     },
     handleDownloadClick () {
+      if (this.downloading) {
+        return Promise.resolve()
+      }
+      if (this.downloadMethod) {
+        this.downloading = true
+        return Promise.resolve().then(() => this.downloadMethod()).finally(() => {
+          this.downloading = false
+        })
+      }
       if (!this.voiceSrc) {
         if (this.getUrlMethod) {
           this.$warn('请先点击播放按钮，获取录音文件地址后再来下载')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/common",
-  "version": "1.0.146",
+  "version": "1.0.148",
   "description": "",
   "main": "index.js",
   "publishConfig": {