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

backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java

@@ -184,7 +184,7 @@ public class MysqlQueryProvider extends QueryProvider {
                 StringUtils.join(groupField, ","),
                 StringUtils.join(field, ","),
                 table,
-                xFilter.length > 0 ? StringUtils.join(xFilter, " ") : "" + transMysqlExtFilter(extFilterRequestList),// origin field filter and panel field filter
+                (xFilter.length > 0 ? StringUtils.join(xFilter, " ") : "") + transMysqlExtFilter(extFilterRequestList),// origin field filter and panel field filter
                 StringUtils.join(group, ","),
                 StringUtils.join(order, ","));
         if (sql.endsWith(",")) {

frontend/src/lang/en.js

@@ -803,7 +803,7 @@ export default {
     validate_success: 'Verification successful',
     validate: 'Validate',
     search_by_name: 'Search by name',
-    delete_warning: 'Deleting this data connection will delete all related data sets under this data connection synchronously. Confirm to delete?'
+    delete_warning: 'Confirm to delete?'
   },
   panel: {
     share: 'Share',

frontend/src/lang/tw.js

@@ -803,7 +803,7 @@ export default {
     validate_success: '校驗成功',
     validate: '校驗',
     search_by_name: '根據名稱搜索',
-    delete_warning: '刪除該數據源將同步刪除該數據源下所有的相關資源，確認刪除？'
+    delete_warning: '確認刪除？'
   },
   panel: {
     share: '分享',

frontend/src/lang/zh.js

@@ -805,7 +805,7 @@ export default {
     validate_success: '校验成功',
     validate: '校验',
     search_by_name: '根据名称搜索',
-    delete_warning: '删除该数据源将同步删除该数据源下所有相关的数据集, 确定要删除吗?'
+    delete_warning: '确定要删除吗?'
   },
   panel: {
     share: '分享',

frontend/src/views/chart/components/shape-attr/SizeSelector.vue

@@ -194,7 +194,7 @@ export default {
   methods: {
     init() {
       const arr = []
-      for (let i = 10; i <= 30; i = i + 2) {
+      for (let i = 10; i <= 60; i = i + 2) {
         arr.push({
           name: i + '',
           value: i + ''

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

@@ -179,7 +179,7 @@ export default {
     },
 
     _handleDelete(datasource) {
-      this.$confirm(this.$t('datasource.delete_confirm'), '', {
+      this.$confirm(this.$t('datasource.delete_warning'), '', {
         confirmButtonText: this.$t('commons.confirm'),
         cancelButtonText: this.$t('commons.cancel'),
         type: 'warning'