Merge branch 'dev' into pr@dev@fix_i18n

# Conflicts:
#	frontend/src/views/chart/view/CalcChartFieldEdit.vue
#	frontend/src/views/dataset/data/CalcFieldEdit.vue

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

@@ -293,14 +293,18 @@ export default {
       }
     },
     elementMouseDown(e) {
-      // private 设置当前组件数据及状态
+      // // private 设置当前组件数据及状态
       this.$store.commit('setClickComponentStatus', true)
       if (this.config.component !== 'v-text' && this.config.component !== 'rect-shape' && this.config.component !== 'de-input-search' && this.config.component !== 'de-select-grid' && this.config.component !== 'de-number-range' && this.config.component !== 'de-date') {
         e.preventDefault()
       }
       // 阻止冒泡事件
       e.stopPropagation()
-      this.$store.commit('setCurComponent', { component: this.config, index: this.index })
+      const _this = this
+      setTimeout(() => {
+        _this.$store.commit('setCurComponent', { component: _this.config, index: _this.index })
+      }, 200)
+
     },
     showViewDetails(params) {
       this.$refs.wrapperChild.openChartDetailsDialog(params)

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

@@ -372,7 +372,7 @@ export default {
     ])
   },
   mounted() {
-    if (navigator.platform.indexOf('Mac') == -1) {
+    if (navigator.platform.indexOf('Mac') === -1) {
       this.systemOS = 'Other'
     }
     this.initCurFields()

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

@@ -17,8 +17,7 @@
             v-if="curComponent.type != 'custom-button'"
             icon="el-icon-document-copy"
             @click.native="copy"
-          ><span>{{ $t('panel.copy') }}(<span v-show="systemOS==='Mac'"><i class="icon iconfont icon-command"
-          />+ D</span> <span v-show="systemOS!=='Mac'">Control + D</span>)</span>
+          ><span>{{ $t('panel.copy') }}(<span v-show="systemOS==='Mac'"><i class="icon iconfont icon-command" />+ D</span> <span v-show="systemOS!=='Mac'">Control + D</span>)</span>
           </el-dropdown-item>
           <el-dropdown-item
             icon="el-icon-delete"
@@ -210,7 +209,7 @@ export default {
     ])
   },
   mounted() {
-    if (navigator.platform.indexOf('Mac') == -1) {
+    if (navigator.platform.indexOf('Mac') === -1) {
       this.systemOS = 'Other'
     }
   },

frontend/src/components/deCustomCm/DePager.vue

@@ -112,9 +112,9 @@ export default {
         }
       }
 
-      //eslint-disable-next-line
+      // eslint-disable-next-line
       this.showPrevMore = showPrevMore
-      //eslint-disable-next-line
+      // eslint-disable-next-line
       this.showNextMore = showNextMore
 
       return array

frontend/src/components/deCustomCm/DeTextarea.vue

@@ -1,12 +1,12 @@
 <template>
   <el-input
-    v-count="value"
+    v-count="{value, maxlength}"
     :placeholder="$t('fu.search_bar.please_input')"
     show-word-limit
     :disabled="disabled"
     :value="value"
     type="textarea"
-    maxlength="200"
+    :maxlength="maxlength"
     @input="handleChange"
   />
 </template>
@@ -16,14 +16,14 @@ export default {
   directives: {
     count: {
       update: function(el, binding) {
-        const lg = binding.value?.length || 0
+        const lg = binding.value.value?.length || 0
         const count = el.querySelector('.el-input__count')
         if (!count) return
         if (!lg) {
           if (count?.classList?.contains('no-zore')) {
             count.classList.remove('no-zore')
           }
-          count.innerHTML = '0/200'
+          count.innerHTML = `0/${binding.value.maxlength || 200}`
           return
         }
         if (el.querySelector('.no-zore')) {
@@ -34,7 +34,7 @@ export default {
         const num = document.createElement('span')
         const total = document.createElement('span')
         num.style.color = '#1F2329'
-        total.innerHTML = '/200'
+        total.innerHTML = `/${binding.value.maxlength || 200}`
         num.innerHTML = lg
         if (!newCount) return
         newCount.classList.add('el-input__count', 'no-zore')
@@ -46,7 +46,11 @@ export default {
   },
   props: {
     disabled: Boolean,
-    value: String
+    value: String,
+    maxlength: {
+      type: Number,
+      default: 200
+    }
   },
   methods: {
     handleChange(val) {

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

@@ -707,23 +707,26 @@ export default {
   border-color: blueviolet;
 }
 
-::v-deep .el-tabs__nav {
-  width: 100%;
+::v-deep .el-tabs__nav-prev {
+  line-height: 25px;
+}
+::v-deep .el-tabs__nav-next {
+  line-height: 25px;
 }
 
-.tab-head-left ::v-deep .el-tabs__nav {
-  width: 100%;
-  text-align: left;
+.tab-head-left ::v-deep .el-tabs__nav-scroll {
+  display: flex;
+  justify-content: start;
 }
 
-.tab-head-right ::v-deep .el-tabs__nav {
-  width: 100%;
-  text-align: right;
+.tab-head-right ::v-deep .el-tabs__nav-scroll {
+  display: flex;
+  justify-content: end;
 }
 
-.tab-head-center ::v-deep .el-tabs__nav {
-  width: 100%;
-  text-align: center;
+.tab-head-center ::v-deep .el-tabs__nav-scroll {
+  display: flex;
+  justify-content: center;
 }
 
 .frame-mask {