Merge remote-tracking branch 'origin/dev' into dev

frontend/src/lang/en.js

@@ -1349,7 +1349,7 @@ export default {
     client_principal: 'Client Principal',
     keytab_Key_path: 'Keytab Key Path',
     datasource: 'Data Source',
-    please_select_left: 'Please select the data source from the left',
+    please_select_left: 'Please select data from the left',
     show_info: 'Data Source Info',
     create: 'Create Data Source',
     type: 'Type',

frontend/src/lang/tw.js

@@ -1349,7 +1349,7 @@ export default {
     client_principal: 'Client Principal',
     keytab_Key_path: 'Keytab Key Path',
     datasource: '數據源',
-    please_select_left: '請從左側選擇數據源',
+    please_select_left: '請從左側選擇',
     show_info: '數據源信息',
     create: '新建數據源',
     type: '類型',

frontend/src/lang/zh.js

@@ -1351,7 +1351,7 @@ export default {
     client_principal: 'Client Principal',
     keytab_Key_path: 'Keytab Key Path',
     datasource: '数据源',
-    please_select_left: '请从左侧选择数据源',
+    please_select_left: '请从左侧选择',
     show_info: '数据源信息',
     create: '新建数据源',
     type: '类型',

frontend/src/views/chart/chart/util.js

@@ -1564,7 +1564,9 @@ export const TYPE_CONFIGS = [
         'position',
         'name',
         'nameTextStyle',
-        'splitLine'
+        'axisValue',
+        'splitLine',
+        'axisLabel'
       ],
       'title-selector': [
         'show',
@@ -1934,7 +1936,7 @@ export const TYPE_CONFIGS = [
         'labelLine',
         'fontSize',
         'color',
-        'position-v',
+        'position-pie',
         'formatter'
       ],
       'tooltip-selector': [

frontend/src/views/system/SysParam/ClusterModeSetting.vue

@@ -281,8 +281,6 @@ export default {
                 this.$error(res.message.substring(0, 2500) + '......')
               }
             }
-          }).catch(res => {
-            this.$error(res.message)
           })
         } else {
           return false

frontend/src/views/system/SysParam/SimpleModeSetting.vue

@@ -246,8 +246,6 @@ export default {
                 this.$error(res.message.substring(0, 2500) + '......')
               }
             }
-          }).catch(res => {
-            this.$error(res.message)
           })
         } else {
           return false

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

@@ -9,7 +9,6 @@
       <el-row v-show="showView === 'Datasource'">
         <el-button icon="el-icon-plus" type="text" size="mini" style="float: left;" @click="addFolder"> {{ $t('datasource.create') }}</el-button>
         <el-button icon="el-icon-setting" type="text" size="mini" style="float: right;" @click="driverMgm"> {{ $t('driver.mgm') }}</el-button>
-        </el-button>
       </el-row>
 
       <el-row class="title-css" v-show="showView === 'Driver'">
@@ -324,12 +323,14 @@ export default {
     },
 
     driverMgm() {
+      this.$emit('switch-main', {})
       this.showView = 'Driver'
       this.expandedArray = []
       this.tData = []
       this.queryTreeDatas()
     },
     dsMgm() {
+      this.$emit('switch-main', {})
       this.showView = 'Datasource'
       this.expandedArray = []
       this.tData = []

frontend/src/views/system/plugin/PluginCom.vue

@@ -56,6 +56,17 @@ export default {
       this.showAsync = false
     }
   },
+  watch: {
+    'componentName': function () {
+      this.refId = uuid.v1
+      if (this.componentName) {
+        this.showAsync = true
+        this.url = this.baseUrl + this.componentName
+      } else {
+        this.showAsync = false
+      }
+    }
+  },
   methods: {
     // hasLicense
     executeAxios(options) {