Merge branch 'develop' into 'master'

fix：楼盘详情-面宽柱状图， x轴刻度名称换行显示

See merge request !56

src/views/propertiesDetail/index.vue

@@ -221,8 +221,9 @@
                   <ve-histogram
                     v-if="houseWidthCharts.rows.length > 0"
                     :legend="{ bottom: 0 }"
+                    :extend="houseWidthExtend"
                     :settings="houseWidthChartsSettings"
-                    :data="houseWidthCharts" :extend="extend"
+                    :data="houseWidthCharts"
                     :colors="colorArr"></ve-histogram>
                   <div v-else style="height: 400px;display: flex;align-items: center">
                     <div style="width: 50%;text-align: center;margin: auto">
@@ -418,16 +419,6 @@
             barMaxWidth: 30,
             barMinWidth: 12,
             fontSize: 9,
-            // label: {
-            //   show: false,
-            //   position: 'top',
-            //   formatter:(params) => { // 柱状图上方总面宽信息显示
-            //     if(params.data === 0) {
-            //       return ''
-            //     }
-            //     return this.unitTotalAreaMap[params.name].toFixed(1)
-            //   }
-            // }
           }
         },
         rateExtend: {
@@ -469,6 +460,23 @@
             }
           }
         },
+        houseWidthExtend: {
+          xAxis: {
+            axisLabel: {
+              interval: 0,
+              //换行显示
+              formatter: function(value) {
+                const format = value.split(' ').join('\n')
+                return "{labelText|" + format + "}";
+              },
+              rich: {
+                labelText: {
+                  lineHeight: 18
+                }
+              }
+            }
+          }
+        },
         // 面宽图表、表格map匹配
         // houseWidthMap : {
         //   'nxmk': '南向面宽',