From d0376427cbc6e0f1cebb9af50ef3598a9e4e5321 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 3 Jul 2024 12:51:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20API=20=E5=8F=82=E6=95=B0=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/exportCenter/manage/ExportCenterManage.java | 9 ++++++---
 .../src/views/system/common/InfoTemplate.vue             | 4 ++--
 .../visualized/data/datasource/form/EditorDetail.vue     | 2 +-
 .../src/views/visualized/data/datasource/index.vue       | 1 +
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
index 3b233c749b..7b8638641e 100644
--- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
+++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
@@ -51,6 +51,10 @@ public class ExportCenterManage {
     private WsService wsService;
     @Resource
     private SysParameterManage sysParameterManage;
+    @Value("${export.core.size:10}")
+    private int core;
+    @Value("${export.max.size:10}")
+    private int max;
 
     @Value("${export.dataset.limit:100000}")
     private int limit;
@@ -60,7 +64,6 @@ public class ExportCenterManage {
     private Integer extractPageSize;
     static private List<String> STATUS = Arrays.asList("SUCCESS", "FAILED", "PENDING", "IN_PROGRESS", "ALL");
     private ScheduledThreadPoolExecutor scheduledThreadPoolExecutor;
-    private int corePoolSize = 10;
     private int keepAliveSeconds = 600;
     private Map<String, Future> Running_Task = new HashMap<>();
     @Resource
@@ -68,9 +71,9 @@ public class ExportCenterManage {
 
     @PostConstruct
     public void init() {
-        scheduledThreadPoolExecutor = new ScheduledThreadPoolExecutor(corePoolSize);
+        scheduledThreadPoolExecutor = new ScheduledThreadPoolExecutor(core);
         scheduledThreadPoolExecutor.setKeepAliveTime(keepAliveSeconds, TimeUnit.SECONDS);
-        scheduledThreadPoolExecutor.setMaximumPoolSize(10);
+        scheduledThreadPoolExecutor.setMaximumPoolSize(max);
     }
 
     @Scheduled(fixedRate = 5000)
diff --git a/core/core-frontend/src/views/system/common/InfoTemplate.vue b/core/core-frontend/src/views/system/common/InfoTemplate.vue
index b93f84d32e..314cc19a31 100644
--- a/core/core-frontend/src/views/system/common/InfoTemplate.vue
+++ b/core/core-frontend/src/views/system/common/InfoTemplate.vue
@@ -6,10 +6,10 @@
       </div>
       <div>
         <el-button v-if="testConnectText" secondary @click="check">{{ testConnectText }}</el-button>
-        <el-button type="primary" @click="edit">{{ t('commons.edit') }}</el-button>
-        <el-button v-if="showValidate" type="primary" @click="check">{{
+        <el-button v-if="showValidate" secondary @click="check">{{
           t('datasource.validate')
         }}</el-button>
+        <el-button type="primary" @click="edit">{{ t('commons.edit') }}</el-button>
       </div>
     </div>
     <div class="info-template-content">
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
index 0a6bdd0427..644c5bf08f 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
@@ -628,7 +628,7 @@ const delParams = data => {
     autofocus: false,
     showClose: false
   }).then(() => {
-    gridData.value.splice(0, 1)
+    gridData.value.splice(form.value.apiConfiguration.indexOf(data), 1)
   })
 }
 const datasetTypeList = [
diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue
index c9d835ced7..402d7f2481 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -630,6 +630,7 @@ const editDatasource = (editType?: number) => {
 }
 
 const handleEdit = async data => {
+  await handleNodeClick(data)
   editDatasource()
 }