Merge branch 'dev' into v1.17

frontend/src/components/canvas/components/editor/ComponentWrapper.vue

@@ -13,6 +13,7 @@
       :canvas-id="canvasId"
       :chart="chart"
       :show-position="showPosition"
+      :series-id-map="seriesIdMap"
       @showViewDetails="showViewDetails"
     />
     <div
@@ -149,7 +150,10 @@ export default {
   data() {
     return {
       previewVisible: false,
-      chart: null
+      chart: null,
+      seriesIdMap: {
+        id: ''
+      }
     }
   },
   computed: {
@@ -274,7 +278,7 @@ export default {
       } else {
         return {
           ...
-            getStyle(style, ['top', 'left', 'width', 'height', 'rotate']),
+          getStyle(style, ['top', 'left', 'width', 'height', 'rotate']),
           position: 'relative'
         }
       }

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

@@ -137,13 +137,14 @@
           :target="curComponent.hyperlinks.openMode "
           :href="curComponent.hyperlinks.content "
         >
-          <i class="icon iconfont icon-com-jump"/>
+          <i class="icon iconfont icon-com-jump" />
         </a>
       </span>
 
       <map-layer-controller
         v-if="chart && showMapLayerController"
         :chart="chart"
+        :series-id-map="seriesIdMap"
       />
     </div>
 
@@ -239,6 +240,14 @@ export default {
     chart: {
       type: Object,
       default: null
+    },
+    seriesIdMap: {
+      type: Object,
+      default: () => {
+        return {
+          id: ''
+        }
+      }
     }
   },
   data() {

frontend/src/components/deDrag/index.vue

@@ -40,6 +40,7 @@
         :canvas-id="canvasId"
         :element="element"
         :chart="chart"
+        :series-id-map="seriesIdMap"
         @showViewDetails="showViewDetails"
         @amRemoveItem="amRemoveItem"
         @amAddItem="amAddItem"
@@ -65,7 +66,7 @@
         @mousedown.stop.prevent="handleDown(handlei, $event)"
         @touchstart.stop.prevent="handleTouchDown(handlei, $event)"
       >
-        <slot :name="handlei"/>
+        <slot :name="handlei" />
       </div>
       <div
         :id="componentCanvasId"
@@ -78,7 +79,7 @@
           class="svg-background"
           :icon-class="mainSlotSvgInner"
         />
-        <slot/>
+        <slot />
       </div>
     </div>
   </div>
@@ -431,7 +432,10 @@ export default {
       // 是否移动 （如果没有移动 不需要记录snapshot）
       hasMove: false,
       // 上次的鼠标指针纵向位置，用来判断指针是上移还是下移
-      latestMoveY: 0
+      latestMoveY: 0,
+      seriesIdMap: {
+        id: ''
+      }
     }
   },
   computed: {

frontend/src/components/widget/deWidget/DeTabs.vue

@@ -202,9 +202,7 @@
     </el-dialog>
 
     <text-attr
-      v-if="showAttr && curComponent.canvasId === activeCanvasId"
-      &&
-      is-edit
+      v-if="showAttr && curComponent.canvasId === activeCanvasId && isEdit"
       :canvas-id="curComponent.canvasId"
       :scroll-left="scrollLeft"
       :scroll-top="scrollTop"
@@ -466,15 +464,20 @@ export default {
       }
     },
     initCarousel() {
-      this.timer && clearInterval(this.timer)
-      if (this.element.style.carouselEnable) {
-        const switchTime = (this.element.style.switchTime || 5) * 1000
+      const _this = this
+      _this.timer && clearInterval(_this.timer)
+      if (_this.element.style.carouselEnable) {
+        const switchTime = (_this.element.style.switchTime || 5) * 1000
         let switchCount = 1
         // 轮播定时器
-        this.timer = setInterval(() => {
-          const nowIndex = switchCount % this.element.options.tabList.length
+        _this.timer = setInterval(() => {
+          const nowIndex = switchCount % _this.element.options.tabList.length
           switchCount++
-          this.activeTabName = this.element.options.tabList[nowIndex].name
+          _this.activeTabName = _this.element.options.tabList[nowIndex].name
+          const targetRef = _this.$refs['canvasTabRef-' + _this.activeTabName]
+          if (targetRef) {
+            targetRef[0].restore()
+          }
         }, switchTime)
       }
     },

frontend/src/lang/en.js

@@ -1758,7 +1758,7 @@ export default {
     http_port: 'Http Port',
     port: 'Port',
     datasource_url: 'URL address',
-    please_input_datasource_url: 'Please enter Elasticsearch 地址，e.g: http://es_host:es_port',
+    please_input_datasource_url: 'Please enter Elasticsearch URL address，e.g: http://es_host:es_port',
     please_input_data_base: 'Please enter the database name',
     please_select_oracle_type: 'Select connection type',
     please_input_user_name: 'Please enter user name',

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

@@ -42,6 +42,14 @@ export default {
     chart: {
       type: Object,
       required: true
+    },
+    seriesIdMap: {
+      type: Object,
+      default: () => {
+        return {
+          id: ''
+        }
+      }
     }
   },
   data() {
@@ -79,11 +87,12 @@ export default {
         id: this.chart.id,
         seriesId: this.currentSeriesId
       }
+      this.seriesIdMap.id = this.currentSeriesId
       bus.$emit('change-series-id', param)
     },
 
     init() {
-      this.currentSeriesId = this.customAttr.currentSeriesId
+      this.currentSeriesId = this.seriesIdMap?.id || this.customAttr.currentSeriesId
     }
   }
 }

frontend/src/views/panel/list/PanelList.vue

@@ -729,7 +729,6 @@ export default {
             optType: 'rename',
             titlePre: this.$t('commons.edit'),
             panelInfo: {
-              pid: param.data.pid,
               id: param.data.id,
               name: param.data.name,
               nodeType: param.type

frontend/src/views/system/datasource/DsForm.vue

@@ -155,7 +155,7 @@
               <el-input
                 v-model="form.name"
                 autocomplete="off"
-                :placeholder="$t('commons.input_name')"
+                :placeholder="$t('datasource.input_name')"
               />
             </el-form-item>
             <el-form-item