瀏覽代碼

Merge branch 'develop/3.1.7' into test

DESKTOP-SVI9JE1\muzen 1 年之前
父節點
當前提交
af5cde9d56
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      src/mixin/index.js

+ 1 - 1
src/mixin/index.js

@@ -641,7 +641,7 @@ const mapMixin = {
     
     
     areaFormatter(row) {
     areaFormatter(row) {
       if (this.mapOptions.length > 0) {
       if (this.mapOptions.length > 0) {
-        let province = row.province ? this.mapOptions.find(i => i.id == row.province) : ''
+        let province = row.province ? this.mapOptions.find(i => i.id == row.province) : { name: '', childList: [] }
         let provinceName = province ? province.name : ''
         let provinceName = province ? province.name : ''
         let city = province.childList.length > 0 ? province.childList.find(i => i.id == row.city) : ''
         let city = province.childList.length > 0 ? province.childList.find(i => i.id == row.city) : ''
         let cityName = city ? `-${city.name}` : ''
         let cityName = city ? `-${city.name}` : ''