Merge pull request #6509 from dataease/dev

merge v1.18.12

README.md

@@ -7,6 +7,11 @@
   <a href="https://github.com/dataease/dataease"><img src="https://img.shields.io/github/stars/dataease/dataease?color=%231890FF&style=flat-square" alt="Stars"></a>
   <a href="https://app.fossa.com/projects/git%2Bgithub.com%2F1dataease%2Fdataease?ref=badge_shield"><img src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fdataease%2Fdataease.svg?type=shield" alt="FOSSA Status"></a>  
 </p>
+
+|说明|
+|------------------|
+|此分支为 DataEase v1.18 版本的开发分支。DataEase v2 版本的开发分支为 [dev-v2](https://github.com/dataease/dataease/tree/dev-v2)，v2 版本正在快速迭代中，如是在生产环境部署 DataEase，建议使用 v1.18.* 的最新稳定版本。|
+
 <hr/>
 
 ## 什么是 DataEase？

core/frontend/package.json

@@ -26,8 +26,17 @@
   },
   "dependencies": {
     "@antv/g2plot": "^2.4.9",
-    "@antv/l7": "^2.15.0",
-    "@antv/s2": "^1.49.1",
+    "@antv/l7": "2.15.0",
+    "@antv/l7-component": "2.15.0",
+    "@antv/l7-core": "2.15.0",
+    "@antv/l7-layers": "2.15.0",
+    "@antv/l7-maps": "2.15.0",
+    "@antv/l7-renderer": "2.15.0",
+    "@antv/l7-scene": "2.15.0",
+    "@antv/l7-source": "2.15.0",
+    "@antv/l7-utils": "2.15.0",
+    "@antv/s2": "1.49.1",
+    "@antv/util": "^2.0.17",
     "@riophae/vue-treeselect": "0.4.0",
     "@tinymce/tinymce-vue": "^3.2.8",
     "axios": "^0.21.3",

core/frontend/src/components/canvas/components/editor/EditBar.vue

@@ -153,6 +153,7 @@
         v-if="chart && showMapLayerController"
         :chart="chart"
         :series-id-map="seriesIdMap"
+        :show-edit-position="showEditPosition"
       />
     </div>
 

core/frontend/src/components/canvas/customComponent/Picture.vue

@@ -3,7 +3,7 @@
     <img
       v-if="!showLink"
       :style="imageAdapter"
-      :src="imgUrl"
+      :src="element.propValue"
     >
     <a
       v-if="showLink"
@@ -13,15 +13,13 @@
     >
       <img
         :style="imageAdapter"
-        :src="imgUrl"
+        :src="element.propValue"
       >
     </a>
   </div>
 </template>
 
 <script>
-import { imgUrlTrans } from '@/components/canvas/utils/utils'
-
 export default {
   props: {
     element: {
@@ -35,9 +33,6 @@ export default {
     }
   },
   computed: {
-    imgUrl() {
-      return imgUrlTrans(this.element.propValue)
-    },
     showLink() {
       return this.editMode === 'preview' && this.element && this.element.hyperlinks && this.element.hyperlinks.enable
     },

core/frontend/src/views/chart/components/map/MapLayerController.vue

@@ -1,11 +1,12 @@
 <template>
 
   <el-popover
-    placement="left"
+    placement="left-start"
     title=""
     width="150"
     :append-to-body="false"
     trigger="click"
+    :popper-class="showEditPosition === 'bar-main-preview' ? 'map-layer-poper' : ''"
   >
     <i
       slot="reference"
@@ -51,6 +52,10 @@ export default {
           id: ''
         }
       }
+    },
+    showEditPosition: {
+      type: String,
+      required: true
     }
   },
   data() {
@@ -98,9 +103,15 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+.map-layer-poper {
+  top: 3px !important;
+  right: 80px !important;
+  left: auto !important;
+}
+</style>
 
 <style scoped lang="scss">
-
 .de-ul li {
   margin: 5px 2px;
   cursor: pointer;