Merge branch 'develop' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/hyl

# Conflicts:
#	src/views/chart/chart/util.js
#	src/views/chart/components/ChartComponentG2.vue

.gitignore

@@ -15,3 +15,4 @@ tests/**/coverage/
 *.ntvs*
 *.ntvs*
 *.njsproj
 *.njsproj
 *.sln
 *.sln
+yarn.lock

package.json

@@ -34,6 +34,7 @@
     "@antv/l7-renderer": "2.15.0",
     "@antv/l7-renderer": "2.15.0",
     "@antv/l7-scene": "2.15.0",
     "@antv/l7-scene": "2.15.0",
     "@antv/l7-source": "2.15.0",
     "@antv/l7-source": "2.15.0",
+    "@antv/l7-three": "2.15.0",
     "@antv/l7-utils": "2.15.0",
     "@antv/l7-utils": "2.15.0",
     "@antv/s2": "1.35.0",
     "@antv/s2": "1.35.0",
     "@antv/util": "^2.0.17",
     "@antv/util": "^2.0.17",
@@ -65,14 +66,17 @@
     "lodash.isstring": "^4.0.1",
     "lodash.isstring": "^4.0.1",
     "normalize.css": "7.0.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "nprogress": "0.2.0",
+    "popmotion": "^11.0.5",
     "screenfull": "4.2.0",
     "screenfull": "4.2.0",
     "sockjs-client": "^1.6.0",
     "sockjs-client": "^1.6.0",
     "stompjs": "^2.3.3",
     "stompjs": "^2.3.3",
     "svg-sprite-loader": "4.1.3",
     "svg-sprite-loader": "4.1.3",
     "svgo": "1.2.2",
     "svgo": "1.2.2",
+    "three": "^0.115.0",
     "tinymce": "^5.8.2",
     "tinymce": "^5.8.2",
     "umy-ui": "^1.1.6",
     "umy-ui": "^1.1.6",
     "vue": "2.6.10",
     "vue": "2.6.10",
+    "vue-amap": "^0.5.10",
     "vue-clipboard2": "0.3.1",
     "vue-clipboard2": "0.3.1",
     "vue-codemirror": "^4.0.6",
     "vue-codemirror": "^4.0.6",
     "vue-friendly-iframe": "^0.20.0",
     "vue-friendly-iframe": "^0.20.0",
@@ -89,8 +93,7 @@
     "vuex": "3.1.0",
     "vuex": "3.1.0",
     "webpack": "^4.46.0",
     "webpack": "^4.46.0",
     "xlsx": "^0.17.0",
     "xlsx": "^0.17.0",
-    "xss": "^1.0.14",
-		"vue-amap": "^0.5.10"
+    "xss": "^1.0.14"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "@babel/core": "^7.4.0-0",
     "@babel/core": "^7.4.0-0",

src/lang/zh.js

@@ -1371,6 +1371,7 @@ export default {
     table_column_custom: '自定义',
     table_column_custom: '自定义',
     chart_table_pivot: '透视表',
     chart_table_pivot: '透视表',
     chart_heat_map: '热力图',
     chart_heat_map: '热力图',
+    chart_building: '点击建筑',
     chart_3d_column_chart_map: '3D柱图',
     chart_3d_column_chart_map: '3D柱图',
     table_pivot_row: '数据行',
     table_pivot_row: '数据行',
     field_error_tips: '该字段所对应的数据集原始字段发生变更（包括维度、指标，字段类型，字段被删除等），建议重新编辑',
     field_error_tips: '该字段所对应的数据集原始字段发生变更（包括维度、指标，字段类型，字段被删除等），建议重新编辑',

src/views/chart/chart/util.js

@@ -2180,6 +2180,7 @@ export const TYPE_CONFIGS = [
       ]
       ]
     }
     }
   },
   },
+
   // 漂浮地图模块
   // 漂浮地图模块
   {
   {
     render: 'antv',
     render: 'antv',
@@ -2210,6 +2211,42 @@ export const TYPE_CONFIGS = [
       ]
       ]
     }
     }
   },
   },
+
+  // 点击建筑
+  {
+    render: 'antv',
+    category: 'chart.chart_type_space',
+    value: 'chart_building',
+    title: 'chart.chart_building',
+    icon: 'building',
+    properties: [
+      'color-selector',
+      'size-selector-ant-v',
+      'title-selector-ant-v'
+    ],
+    propertyInner: {
+
+      'color-selector': [
+        'mapStyle'
+      ],
+      'size-selector-ant-v': [
+        'mapPitch'
+      ],
+      'title-selector-ant-v': [
+        'show',
+        'title',
+        'fontSize',
+        'color',
+        'hPosition',
+        'isItalic',
+        'isBolder',
+        'remarkShow',
+        'fontFamily',
+        'letterSpace',
+        'fontShadow'
+      ]
+    }
+  },
   /* 下面是echarts图表类型 */
   /* 下面是echarts图表类型 */
   {
   {
     render: 'echarts',
     render: 'echarts',

src/views/chart/components/ChartComponentG2.vue

@@ -69,6 +69,8 @@ import { baseFloatMapOption } from '@/views/chart/chart/float/float_antv'
 import { baseCitySweepMapOptionAntV } from '@/views/chart/chart/citySweep/citySweep_antv'
 import { baseCitySweepMapOptionAntV } from '@/views/chart/chart/citySweep/citySweep_antv'
 import { clear } from 'size-sensor'
 import { clear } from 'size-sensor'
 import { baseSankeyOptionAntV } from '@/views/chart/chart/sankey/sankey_antv'
 import { baseSankeyOptionAntV } from '@/views/chart/chart/sankey/sankey_antv'
+
+import { baseBuildingOptionAntV } from '@/views/chart/chart/building/building'
 export default {
 export default {
   name: 'ChartComponentG2',
   name: 'ChartComponentG2',
   components: { TitleRemark, ViewTrackBar, ChartTitleUpdate },
   components: { TitleRemark, ViewTrackBar, ChartTitleUpdate },
@@ -322,6 +324,8 @@ export default {
         this.myChart = base3DColumnOptionAntV(this.myChart, this.chartId, chart, this.antVAction)
         this.myChart = base3DColumnOptionAntV(this.myChart, this.chartId, chart, this.antVAction)
       } else if (chart.type === 'float') {
       } else if (chart.type === 'float') {
         this.myChart = baseFloatMapOption(this.myChart, this.chartId, chart, this.antVAction)
         this.myChart = baseFloatMapOption(this.myChart, this.chartId, chart, this.antVAction)
+      } else if (chart.type === 'chart_building') {
+        this.myChart = baseBuildingOptionAntV(this.myChart, this.chartId, chart, this.antVAction)
       } else {
       } else {
         if (this.myChart) {
         if (this.myChart) {
           this.antVRenderStatus = false
           this.antVRenderStatus = false

vue.config.js

@@ -42,7 +42,17 @@ module.exports = {
       filename: 'index.html'
       filename: 'index.html'
     }
     }
   },
   },
+
   configureWebpack: {
   configureWebpack: {
+    module: {
+      rules: [
+        {
+          test: /\.mjs$/,
+          include: /node_modules/,
+          type: 'javascript/auto'
+        }
+      ]
+    },
     name: name,
     name: name,
     devtool: 'source-map',
     devtool: 'source-map',
     resolve: {
     resolve: {