点击建筑

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

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

--- a/src/views/chart/chart/building/building.js
+++ b/src/views/chart/chart/building/building.js
--- a/src/views/chart/chart/util.js
+++ b/src/views/chart/chart/util.js
@@ -2145,6 +2145,40 @@ 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图表类型 */
  {
    render: 'echarts',

--- a/src/views/chart/components/ChartComponentG2.vue
+++ b/src/views/chart/components/ChartComponentG2.vue
@@ -66,7 +66,8 @@ import { baseFlowMapOption } from '@/views/chart/chart/map/map_antv'
 import { baseBubbleMapOption } from '@/views/chart/chart/bubble/bubble_antv'
 import { baseCityBrightnessMapOptionAntV } from '@/views/chart/chart/cityBrightness/cityBrightness_antv'
 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 {
  name: 'ChartComponentG2',
  components: { TitleRemark, ViewTrackBar, ChartTitleUpdate },
@@ -262,6 +263,7 @@ export default {
          ]
        }
      }
+      console.log('chart.type ',chart.type )
      if (chart.type === 'bar') {
        this.myChart = baseBarOptionAntV(this.myChart, this.chartId, chart, this.antVAction, true, false)
      } else if (chart.type === 'bar-group') {
@@ -312,17 +314,18 @@ export default {
        this.myChart = baseBubbleMapOption(this.myChart, this.chartId, chart, this.antVAction)
      } else if (chart.type === 'city-brightness') {
        this.myChart = baseCityBrightnessMapOptionAntV(this.myChart, this.chartId, chart, this.antVAction)
-       }else if (chart.type === 'chart_sankey') {
+      } else if (chart.type === 'chart_sankey') {
        this.myChart = baseSankeyOptionAntV(this.myChart, this.chartId, chart, this.antVAction)
-       } else if (chart.type === 'threeDColumn') {
+      } else if (chart.type === 'threeDColumn') {
        this.myChart = base3DColumnOptionAntV(this.myChart, this.chartId, chart, this.antVAction)
-       } else {
+      } else if (chart.type === 'chart_building') {
+        this.myChart = baseBuildingOptionAntV(this.myChart, this.chartId, chart, this.antVAction)
+      } else {
        if (this.myChart) {
          this.antVRenderStatus = false
          this.myChart.destroy()
        }
      }
      if (this.myChart && !equalsAny(chart.type, 'liquid', 'flow-map', 'bubble', 'city-brightness') && this.searchCount > 0) {
        this.myChart.options.animation = false
      }

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

--- a/yarn.lock
+++ b/yarn.lock
@@ -347,6 +347,17 @@
    reflect-metadata "^0.1.13"
    supercluster "^7.0.0"
+"@antv/l7-three@2.15.0":
+  version "2.15.0"
+  resolved "https://registry.npmmirror.com/@antv/l7-three/-/l7-three-2.15.0.tgz#ad92e3c0fba707443c54dbe1ccd241e19e09e5e1"
+  integrity sha512-FNbMiYT1k1w13JzxinZMPLWSLEhJc4b9QB7TkyAc1yUNI/az9nmC3EUGoLLl0AlOhyqtes4/R4Shiw9dgBNWrA==
+  dependencies:
+    "@antv/l7" "2.15.0"
+    "@babel/runtime" "^7.7.7"
+    inversify "^5.0.1"
+    reflect-metadata "^0.1.13"
+    three "0.115.0"
 "@antv/l7-utils@2.15.0":
  version "2.15.0"
  resolved "https://registry.yarnpkg.com/@antv/l7-utils/-/l7-utils-2.15.0.tgz#ac49e04d77ecfb479923fa71caa2ba5b1c79dfe6"
@@ -5779,6 +5790,13 @@ fragment-cache@^0.2.1:
  dependencies:
    map-cache "^0.2.2"
+framesync@6.1.2:
+  version "6.1.2"
+  resolved "https://registry.npmmirror.com/framesync/-/framesync-6.1.2.tgz#755eff2fb5b8f3b4d2b266dd18121b300aefea27"
+  integrity sha512-jBTqhX6KaQVDyus8muwZbBeGGP0XgujBRbQ7gM7BRdS3CadCZIHiawyzYLnafYcvZIh5j8WE7cxZKFn7dXhu9g==
+  dependencies:
+    tslib "2.4.0"
 fresh@0.5.2:
  version "0.5.2"
  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
@@ -6280,6 +6298,11 @@ hex-color-regex@^1.1.0:
  resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
  integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
+hey-listen@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.npmmirror.com/hey-listen/-/hey-listen-1.0.8.tgz#8e59561ff724908de1aa924ed6ecc84a56a9aa68"
+  integrity sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==
 highlight.js@^10.7.1:
  version "10.7.3"
  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531"
@@ -8986,6 +9009,16 @@ polyline-miter-util@^1.0.1:
  dependencies:
    gl-vec2 "^1.0.0"
+popmotion@^11.0.5:
+  version "11.0.5"
+  resolved "https://registry.npmmirror.com/popmotion/-/popmotion-11.0.5.tgz#8e3e014421a0ffa30ecd722564fd2558954e1f7d"
+  integrity sha512-la8gPM1WYeFznb/JqF4GiTkRRPZsfaj2+kCxqQgr2MJylMmIKUwBfWW8Wa5fml/8gmtlD5yI01MP1QCZPWmppA==
+  dependencies:
+    framesync "6.1.2"
+    hey-listen "^1.0.8"
+    style-value-types "5.1.2"
+    tslib "2.4.0"
 portfinder@^1.0.20, portfinder@^1.0.26:
  version "1.0.32"
  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.32.tgz#2fe1b9e58389712429dc2bea5beb2146146c7f81"
@@ -10877,6 +10910,14 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+style-value-types@5.1.2:
+  version "5.1.2"
+  resolved "https://registry.npmmirror.com/style-value-types/-/style-value-types-5.1.2.tgz#6be66b237bd546048a764883528072ed95713b62"
+  integrity sha512-Vs9fNreYF9j6W2VvuDTP7kepALi7sk0xtk2Tu8Yxi9UoajJdEVpNpCov0HsLTqXvNGKX+Uv09pkozVITi1jf3Q==
+  dependencies:
+    hey-listen "^1.0.8"
+    tslib "2.4.0"
 stylehacks@^4.0.0:
  version "4.0.3"
  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
@@ -11159,6 +11200,11 @@ thread-loader@^2.1.2:
    loader-utils "^1.1.0"
    neo-async "^2.6.0"
+three@0.115.0, three@^0.115.0:
+  version "0.115.0"
+  resolved "https://registry.npmmirror.com/three/-/three-0.115.0.tgz#540d800c381b9da2334c024f0fbe4d23f84eb05e"
+  integrity sha512-mAV2Ky3RdcbdSbR9capI+tKLvRldWYxd4151PZTT/o7+U2jh9Is3a4KmnYwzyUAhB2ZA3pXSgCd2DOY4Tj5kow==
 throttle-debounce@^1.0.1:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz#51853da37be68a155cb6e827b3514a3c422e89cd"
@@ -11289,6 +11335,11 @@ tslib@2.3.0:
  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+tslib@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
+  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
 tslib@^1.10.0:
  version "1.14.1"
  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"