From fe499ce88753f9e018fdea714fba2a6b4cdcbead Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 5 Sep 2024 11:16:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BASQLServer=E4=B8=8D=E8=BE=93=E5=85=A5=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=8F=90=E7=A4=BA=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=90=8E=E6=8C=81=E7=BB=AD=E5=8A=A0=E8=BD=BD=EF=BC=8C=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/ConditionDefaultConfiguration.vue |  7 ++-
 .../data/datasource/form/EditorDetail.vue     | 13 +++---
 .../visualized/data/datasource/form/index.vue | 43 ++++++++++---------
 3 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue b/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue
index 57a0bfb6da..da6f318544 100644
--- a/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue
@@ -459,7 +459,12 @@ defineExpose({
             class="setting-input"
             :class="curComponent.timeGranularity === 'datetime' && 'with-date'"
           >
-            <el-input-number v-model="curComponent.timeNum" :min="0" controls-position="right" />
+            <el-input-number
+              step-strictly
+              v-model="curComponent.timeNum"
+              :min="0"
+              controls-position="right"
+            />
             <el-select @focus="handleDialogClick" v-model="curComponent.relativeToCurrentType">
               <el-option
                 v-for="item in relativeToCurrentTypeList"
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 02ab4efe31..26338d78d8 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
@@ -504,11 +504,14 @@ const getDsSchema = () => {
       const request = JSON.parse(JSON.stringify(form.value))
       request.configuration = Base64.encode(JSON.stringify(request.configuration))
       loading.value = true
-      getSchema(request).then(res => {
-        loading.value = false
-        schemas.value = res.data
-        ElMessage.success(t('commons.success'))
-      })
+      getSchema(request)
+        .then(res => {
+          schemas.value = res.data
+          ElMessage.success(t('commons.success'))
+        })
+        .finally(() => {
+          loading.value = false
+        })
     }
   })
 }
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
index a2669595a4..a444747c0d 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
@@ -362,30 +362,33 @@ const validateDS = () => {
 
 const doValidateDs = request => {
   dsLoading.value = true
-  validate(request).then(res => {
-    dsLoading.value = false
-    if (res.data.type === 'API') {
-      let error = 0
-      const status = JSON.parse(res.data.status) as Array<{ status: string; name: string }>
-      for (let i = 0; i < status.length; i++) {
-        if (status[i].status === 'Error') {
-          error++
-        }
-        for (let j = 0; j < form.apiConfiguration.length; j++) {
-          if (status[i].name === form.apiConfiguration[j].name) {
-            form.apiConfiguration[j].status = status[i].status
+  validate(request)
+    .then(res => {
+      if (res.data.type === 'API') {
+        let error = 0
+        const status = JSON.parse(res.data.status) as Array<{ status: string; name: string }>
+        for (let i = 0; i < status.length; i++) {
+          if (status[i].status === 'Error') {
+            error++
+          }
+          for (let j = 0; j < form.apiConfiguration.length; j++) {
+            if (status[i].name === form.apiConfiguration[j].name) {
+              form.apiConfiguration[j].status = status[i].status
+            }
           }
         }
-      }
-      if (error === 0) {
-        ElMessage.success(t('datasource.validate_success'))
+        if (error === 0) {
+          ElMessage.success(t('datasource.validate_success'))
+        } else {
+          ElMessage.error('校验失败')
+        }
       } else {
-        ElMessage.error('校验失败')
+        ElMessage.success(t('datasource.validate_success'))
       }
-    } else {
-      ElMessage.success(t('datasource.validate_success'))
-    }
-  })
+    })
+    .finally(() => {
+      dsLoading.value = false
+    })
 }
 
 const typeTitle = computed(() => {