From d69b5756f5b1aca827bab3309e00e2ce3752beb6 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 29 Jul 2022 11:54:29 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=AE=E5=BD=95=E4=B9=9F=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E9=A2=84=E8=A7=88=E7=BC=96=E8=BE=91=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=BF=9B=E5=85=A5=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/list/PanelList.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index 0bfe88dfb4..cb13e2b738 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -374,8 +374,7 @@ export default {
     bus.$off('newPanelFromMarket', this.newPanelFromMarket)
   },
   mounted() {
-    this.$store.commit('setComponentData', [])
-    this.$store.commit('setCanvasStyle', DEFAULT_COMMON_CANVAS_STYLE_STRING)
+    this.clearCanvas()
     this.defaultTree(true)
     this.initCache()
     const routerParam = this.$router.currentRoute.params
@@ -845,7 +844,9 @@ export default {
       this.searchType = searchTypeInfo
     },
     editFromPanelViewShow() {
-      this.edit(this.lastActiveNodeData, this.lastActiveNode)
+      this.$store.commit('setComponentData', [])
+      this.$store.commit('setCanvasStyle', DEFAULT_COMMON_CANVAS_STYLE_STRING)
+      bus.$emit('PanelSwitchComponent', { name: 'PanelEdit' })
     },
     editPanelBashInfo(params) {
       if (params.operation === 'status') {

From d5d91b0d73bbfac0d68a56f6e8940d84b6d34a03 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 29 Jul 2022 12:05:53 +0800
Subject: [PATCH 2/6] =?UTF-8?q?style:=20=E6=9B=BF=E6=8D=A2=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E4=B8=BA=E6=96=B0=E4=B8=BB=E9=A2=98=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/styles/sidebar.scss | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/frontend/src/styles/sidebar.scss b/frontend/src/styles/sidebar.scss
index 2092fe4bde..a17f2e2b77 100644
--- a/frontend/src/styles/sidebar.scss
+++ b/frontend/src/styles/sidebar.scss
@@ -22,7 +22,7 @@
     left: 0;
     z-index: 999;
     overflow: hidden;
-    
+
     .horizontal-collapse-transition {
       transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
     }
@@ -63,33 +63,33 @@
       border: none;
       height: 100%;
       width: 100% !important;
-      background-color: var(--SiderBG, #ffffff);     
+      background-color: var(--SiderBG, #ffffff);
     }
 
-    
+
 
     .submenu-title-noDropdown:not(.is-active), .el-submenu__title {
       color: var(--SiderTextColor, #1e212a);
       &:hover {
         background-color: var(--MenuHovorBG, rgba(158,158,158,.2)) !important;
-        color: var(--TextActive, #409EFF);
+        color: var(--TextActive, #3370ff);
       }
       &:focus {
         background-color: var(--MenuActiveBG, #ecf5ff) !important;
-        color: var(--TextActive, #409EFF);
+        color: var(--TextActive, #3370ff);
       }
     }
     .submenu-title-noDropdown.is-active {
         background-color: var(--MenuActiveBG, #ecf5ff) !important;
-        color: var(--TextActive, #409EFF);
+        color: var(--TextActive, #3370ff);
     }
 
     .is-active > .el-submenu__title {
         background-color: var(--MenuActiveBG, #ecf5ff) !important;
-        color: var(--TextActive, #409EFF);
+        color: var(--TextActive, #3370ff);
     }
 
-    
+
 
     & .nest-menu .el-submenu > .el-submenu__title,
     & .el-submenu .el-menu-item {
@@ -106,10 +106,10 @@
     & .el-submenu .is-active.el-menu-item {
       min-width: $sideBarWidth !important;
       background-color: var(--SiderBG) !important;
-      color: var(--TextActive, #409EFF);
-      
+      color: var(--TextActive, #3370ff);
+
     }
-    
+
 
   }
 
@@ -160,7 +160,7 @@
             overflow: hidden;
             visibility: hidden;
             display: inline-block;
-            
+
           }
         }
       }
@@ -173,7 +173,7 @@
     min-width: $sideBarWidth !important;
   }
 
-  
+
 
   .withoutAnimation {
 

From 75a373c2226b3e22e994a957fe5db98769e66a49 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 29 Jul 2022 13:19:24 +0800
Subject: [PATCH 3/6] =?UTF-8?q?style:=20=E8=B7=B3=E8=BD=AC=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=AE=A1=E7=90=86=E8=BE=B9=E8=B7=9D=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/template/index.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/panel/template/index.vue b/frontend/src/views/panel/template/index.vue
index b128637e71..116a0d923a 100644
--- a/frontend/src/views/panel/template/index.vue
+++ b/frontend/src/views/panel/template/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <de-container>
-    <de-aside-container isTemplate>
+  <de-container class="content-container">
+    <de-aside-container class="template-aside-container" is-template>
       <el-tabs v-model="currentTemplateType" @tab-click="handleClick">
         <el-tab-pane name="self">
           <span slot="label"><i class="el-icon-star-off tablepanel-i" />{{ $t('panel.user_template') }}</span>
@@ -211,4 +211,13 @@ export default {
     height: 100%;
   }
 
+  .content-container{
+    padding: 20px!important;
+    overflow: hidden;
+    height: calc(100vh - 56px)!important;
+  }
+
+  .template-aside-container{
+    height: calc(100vh - 96px)!important;
+  }
 </style>

From 3ae8198a6653598b0cf9e3874201345d99f059e0 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Fri, 29 Jul 2022 15:22:50 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20API=E5=AD=97=E6=AE=B5=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=20=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=B1=95=E5=BC=80bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/layout/components/Sidebar/index.vue         | 2 +-
 frontend/src/views/system/datasource/DsConfiguration.vue | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/layout/components/Sidebar/index.vue b/frontend/src/layout/components/Sidebar/index.vue
index 1fd71d9501..6ae6d1942f 100644
--- a/frontend/src/layout/components/Sidebar/index.vue
+++ b/frontend/src/layout/components/Sidebar/index.vue
@@ -49,7 +49,7 @@ export default {
       // return this.$router.options.routes
       if (this.isCollapse) {
         return this.flatterRouter(
-          this.$store.state.permission.currentRoutes.children
+          JSON.parse(JSON.stringify(this.$store.state.permission.currentRoutes.children))
         );
       }
       return this.$store.state.permission.currentRoutes.children;
diff --git a/frontend/src/views/system/datasource/DsConfiguration.vue b/frontend/src/views/system/datasource/DsConfiguration.vue
index acb4bc7d4e..3c2a79f108 100644
--- a/frontend/src/views/system/datasource/DsConfiguration.vue
+++ b/frontend/src/views/system/datasource/DsConfiguration.vue
@@ -1039,7 +1039,9 @@ export default {
 
           for (var j = 0; j < this.apiItem.fields.length; j++) {
             if(this.apiItem.fields[j].name === jsonFields[i].name){
-              jsonFields[i].checked = false;
+              this.$nextTick(() => {
+                jsonFields[i].checked = false;
+              })
               this.$message.error(jsonFields[i].name + ', ' + i18n.t('datasource.has_repeat_field_name'))
               return
             }
@@ -1200,7 +1202,7 @@ export default {
       background-color: rgba(187, 191, 196, 0.5);
       height: 1px;
       top: 13px;
-      left: calc(50% + 22px);
+      left: calc(50% + 22px) !important;
       width: 100px;
       margin-right: 0px;
 

From 4b2db13671b9542202eb9753b0188ec6b9d06848 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 29 Jul 2022 18:15:04 +0800
Subject: [PATCH 5/6] =?UTF-8?q?pref:=20=E7=A7=BB=E9=99=A4=E6=9C=AA?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84npm=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/package.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index c42f945220..7ec9fde18a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -22,11 +22,9 @@
     "@tinymce/tinymce-vue": "^3.2.8",
     "axios": "^0.21.1",
     "core-js": "^2.6.5",
-    "css-color-function": "^1.3.3",
     "echarts": "^5.0.1",
     "element-resize-detector": "^1.2.3",
     "element-ui": "2.15.7",
-    "file-save": "^0.2.0",
     "file-saver": "^2.0.5",
     "fit2cloud-ui": "^1.8.0",
     "flv.js": "^1.6.2",
@@ -54,7 +52,6 @@
     "tinymce": "^5.8.2",
     "umy-ui": "^1.1.6",
     "vcolorpicker": "^1.1.0",
-    "videojs-flash": "^2.2.1",
     "vue": "2.6.10",
     "vue-axios": "3.2.4",
     "vue-clipboard2": "0.3.1",
@@ -90,8 +87,6 @@
     "eslint": "5.15.3",
     "eslint-plugin-vue": "5.2.2",
     "html-webpack-plugin": "3.2.0",
-    "less": "^3.0.0",
-    "less-loader": "^5.0.0",
     "mockjs": "1.0.1-beta3",
     "runjs": "^4.1.3",
     "sass": "^1.33.0",

From 6d64044bbe23deafc7ec80cb5add1dd4e85ef559 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 29 Jul 2022 18:28:41 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=9C=B0=E5=90=8D=E6=98=A0=E5=B0=84=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BB=A5=E8=A7=A3=E5=86=B3=E4=B8=96=E7=95=8C=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=B8=8B=E9=92=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/chart/map/map.js     |   5 +
 .../views/chart/components/ChartComponent.vue |   1 -
 .../chart/components/senior/MapMapping.vue    | 207 ++++++++++++++++++
 frontend/src/views/chart/view/ChartEdit.vue   |  29 ++-
 4 files changed, 239 insertions(+), 3 deletions(-)
 create mode 100644 frontend/src/views/chart/components/senior/MapMapping.vue

diff --git a/frontend/src/views/chart/chart/map/map.js b/frontend/src/views/chart/chart/map/map.js
index 278b44f62e..9af23ae8c0 100644
--- a/frontend/src/views/chart/chart/map/map.js
+++ b/frontend/src/views/chart/chart/map/map.js
@@ -88,6 +88,11 @@ export function baseMapOption(chart_option, chart, themeStyle) {
         y.name = chart.data.x[i]
         chart_option.series[0].data.push(y)
       }
+      if (chart.senior) {
+        const senior = JSON.parse(chart.senior)
+
+        senior && senior.mapMapping && (chart_option.series[0].nameMap = senior.mapMapping)
+      }
     }
   }
   componentStyle(chart_option, chart)
diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue
index ad91b3de3a..c1ee8f2edd 100644
--- a/frontend/src/views/chart/components/ChartComponent.vue
+++ b/frontend/src/views/chart/components/ChartComponent.vue
@@ -81,7 +81,6 @@ import {
   geoJson
 } from '@/api/map/map'
 import ViewTrackBar from '@/components/canvas/components/Editor/ViewTrackBar'
-import eventBus from '@/components/canvas/utils/eventBus'
 
 export default {
   name: 'ChartComponent',
diff --git a/frontend/src/views/chart/components/senior/MapMapping.vue b/frontend/src/views/chart/components/senior/MapMapping.vue
new file mode 100644
index 0000000000..6623d0156b
--- /dev/null
+++ b/frontend/src/views/chart/components/senior/MapMapping.vue
@@ -0,0 +1,207 @@
+<template>
+  <div style="width: 100%;display: block !important;">
+    <el-table
+      :data="currentDatas"
+      size="mini"
+      :span-method="mergeCellMethod"
+      style="width: 100%"
+      :row-style="{height:0+'px'}"
+    >
+      <el-table-column
+        label="图形"
+        prop="mapArea"
+        width="160"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="属性"
+        width="50"
+      >
+        <template slot-scope="scope">
+          <el-input
+            v-if="scope.row.isEdit"
+            :ref="scope.row.mapArea + scope.$index + '-widget'"
+            v-model="scope.row.attrArea"
+            size="mini"
+            @blur="finishEdit(scope.row)"
+            @keyup.enter.native="$event.target.blur()"
+          >
+
+            <i slot="suffix" class="el-icon-success el-input__icon map-mapping-ok" @click="finishEdit(scope.row)" />
+          </el-input>
+
+          <el-button v-else size="mini" plain @click="triggerEdit(scope)">
+            <span class="mapping-span">{{ scope.row.attrArea }}</span>
+            <i class="el-icon-edit el-icon--right" />
+          </el-button>
+
+        </template>
+      </el-table-column>
+      <el-table-column align="right">
+
+        <template slot="header">
+          <el-input
+            v-model="keyWord"
+            size="mini"
+            placeholder="输入关键字搜索"
+          />
+        </template>
+
+      </el-table-column>
+    </el-table>
+    <div class="mapping-pagination">
+      <el-pagination
+        small
+        layout="prev, pager, next"
+        :page-size="pageSize"
+        :total="total"
+        :current-page="currentPage"
+        @current-change="searchPager"
+        @prev-click="searchPager"
+        @next-click="searchPager"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'FunctionCfg',
+  props: {
+    chart: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      mappingForm: {},
+
+      keyWord: '',
+      dynamicAreaCode: '',
+      gridList: [],
+      currentPage: 1,
+      pageSize: 10,
+      total: 0,
+      currentDatas: [],
+      usePage: true
+    }
+  },
+  watch: {
+    'chart': {
+      handler: function() {
+        this.initData()
+      }
+    },
+    'keyWord': {
+      handler: function() {
+        this.buildGridList()
+      }
+    }
+  },
+  mounted() {
+    this.initData()
+  },
+  methods: {
+    triggerEdit(scope) {
+      this.$set(scope.row, 'isEdit', true)
+      this.$nextTick(() => {
+        this.$refs[scope.row.mapArea + scope.$index + '-widget'] && this.$refs[scope.row.mapArea + scope.$index + '-widget'].focus()
+      })
+    },
+    finishEdit(row) {
+      row.isEdit = false
+      this.mappingForm[row.mapArea] = row.attrArea
+      this.changeMapping()
+    },
+
+    mergeCellMethod({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 1) {
+        return [1, 2]
+      }
+      if (columnIndex === 2) {
+        return [0, 0]
+      }
+    },
+
+    initData() {
+      const chart = JSON.parse(JSON.stringify(this.chart))
+      if (chart.senior) {
+        let senior = null
+        if (Object.prototype.toString.call(chart.senior) === '[object Object]') {
+          senior = JSON.parse(JSON.stringify(chart.senior))
+        } else {
+          senior = JSON.parse(chart.senior)
+        }
+        if (senior.mapMapping) {
+          this.mappingForm = senior.mapMapping
+        } else {
+          this.initMapping()
+        }
+        this.buildGridList()
+      }
+    },
+    buildGridList() {
+      this.gridList = Object.keys(this.mappingForm).map(key => {
+        return {
+          mapArea: key,
+          attrArea: this.mappingForm[key] || key
+        }
+      })
+      const baseDatas = JSON.parse(JSON.stringify(this.gridList))
+      const tempDatas = baseDatas.filter(data => !this.keyWord || data.mapArea.toLowerCase().includes(this.keyWord.toLowerCase()) || (data.attrArea && data.attrArea.toLowerCase().includes(this.keyWord.toLowerCase())))
+      if (this.usePage) {
+        const start = (this.currentPage - 1) * this.pageSize
+        let end = this.currentPage * this.pageSize
+        if (end >= tempDatas.length) end = tempDatas.length
+        this.currentDatas = tempDatas.slice(start, end)
+      } else {
+        this.currentDatas = tempDatas
+      }
+      this.total = tempDatas.length
+    },
+    initMapping() {
+      const chart = JSON.parse(JSON.stringify(this.chart))
+      const customAttr = JSON.parse(chart.customAttr)
+      const cCode = this.chart.DetailAreaCode || this.dynamicAreaCode || customAttr.areaCode
+      if (this.$store.getters.geoMap[cCode]) {
+        const json = this.$store.getters.geoMap[cCode]
+        const features = json.features
+        this.mappingForm = {}
+        features.forEach(feature => {
+          this.mappingForm[feature.properties.name] = null
+        })
+      } else {
+        this.$warning('请先选择地图范围')
+      }
+    },
+    changeMapping() {
+      this.$emit('onMapMappingChange', this.mappingForm)
+    },
+    searchPager(pageNumber) {
+      this.currentPage = pageNumber
+      this.buildGridList()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.mapping-span {
+  display: inline-block;
+  width: 90px;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  text-align: left
+}
+
+.map-mapping-ok {
+  cursor: pointer;
+}
+.map-mapping-ok:hover {
+  color: #409eff;
+}
+
+</style>
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 82b01cae84..52403bf5ab 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -703,7 +703,7 @@
         <el-tab-pane name="senior" :label="$t('chart.senior')" class="padding-tab" style="width: 350px;">
           <el-row class="view-panel">
             <div
-              v-if="view.type && (view.type.includes('bar') || view.type.includes('line') || view.type.includes('mix') || view.type.includes('gauge') || view.type === 'text' || view.type.includes('table'))"
+              v-if="view.type && (view.type.includes('bar') || view.type.includes('line') || view.type.includes('mix') || view.type.includes('gauge') || view.type === 'text' || view.type.includes('table') || view.type === 'map' || view.type === 'buddle-map')"
               style="overflow:auto;border-right: 1px solid #e6e6e6;height: 100%;width: 100%;"
               class="attr-style theme-border-class"
             >
@@ -761,6 +761,25 @@
                   </el-collapse-item>
                 </el-collapse>
               </el-row>
+
+              <el-row v-if="view.type && (view.type === 'map' || view.type === 'buddle-map')">
+
+                <span class="padding-lr">{{ $t('chart.senior_cfg') }}</span>
+                <el-collapse v-model="attrActiveNames" class="style-collapse">
+
+                  <el-collapse-item title="地名映射">
+                    <map-mapping
+                      :param="param"
+                      class="attr-selector"
+                      :chart="chart"
+                      @onMapMappingChange="onMapMappingChange"
+                    />
+
+                  </el-collapse-item>
+
+                </el-collapse>
+              </el-row>
+
             </div>
             <div v-else class="no-senior">
               {{ $t('chart.chart_no_senior') }}
@@ -1084,6 +1103,7 @@ import PluginCom from '@/views/system/plugin/PluginCom'
 import { mapState } from 'vuex'
 
 import FunctionCfg from '@/views/chart/components/senior/FunctionCfg'
+import MapMapping from '@/views/chart/components/senior/MapMapping'
 import AssistLine from '@/views/chart/components/senior/AssistLine'
 import Threshold from '@/views/chart/components/senior/Threshold'
 import LabelNormalText from '@/views/chart/components/normal/LabelNormalText'
@@ -1129,7 +1149,8 @@ export default {
     ChartDragItem,
     DrillItem,
     DrillPath,
-    PluginCom
+    PluginCom,
+    MapMapping
   },
   props: {
     param: {
@@ -1952,6 +1973,10 @@ export default {
       this.view.senior.scrollCfg = val
       this.calcStyle()
     },
+    onMapMappingChange(val) {
+      this.view.senior.mapMapping = val
+      this.calcStyle()
+    },
 
     showDimensionEditFilter(item) {
       this.dimensionItem = JSON.parse(JSON.stringify(item))