瀏覽代碼

Merge branch 'develop/3.1.7' into test

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

+ 2 - 2
src/mixin/index.js

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