From f125dec4ba25db404afce2b92b331e8be5fdd465 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 11 Jan 2024 11:36:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20Excel=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=BE=83=E5=A4=A7=E6=97=B6=E5=8A=A0=E8=BD=BD=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=95=BF=EF=BC=8C=E4=B8=94=E6=B2=A1=E6=9C=89=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=EF=BC=8C=E4=BD=93=E9=AA=8C=E4=B8=8D=E4=BD=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualized/data/datasource/index.vue      | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

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 df392c7eff..a9a8c418c3 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -638,16 +638,26 @@ const onChange = file => {
   fileList = file
 }
 
+const replaceLoading = ref(false)
+const addLoading = ref(false)
+
 const uploadExcel = editType => {
   const formData = new FormData()
   formData.append('file', fileList.raw)
   formData.append('type', '')
   formData.append('editType', editType)
   formData.append('id', (nodeInfo.id || 0) as string)
-  return uploadFile(formData).then(res => {
-    nodeInfo.editType = editType
-    datasourceEditor.value.init(nodeInfo, nodeInfo.id, res)
-  })
+  replaceLoading.value = editType === 0
+  addLoading.value = editType === 1
+  return uploadFile(formData)
+    .then(res => {
+      nodeInfo.editType = editType
+      datasourceEditor.value.init(nodeInfo, nodeInfo.id, res)
+    })
+    .finally(() => {
+      replaceLoading.value = false
+      addLoading.value = false
+    })
 }
 const activeName = ref('table')
 const defaultProps = {
@@ -839,7 +849,7 @@ const getMenuList = (val: boolean) => {
                   name="file"
                 >
                   <template #trigger>
-                    <el-button class="replace-excel" type="primary">
+                    <el-button v-loading="replaceLoading" class="replace-excel" type="primary">
                       <template #icon>
                         <Icon name="icon_edit_outlined"></Icon>
                       </template>
@@ -860,7 +870,7 @@ const getMenuList = (val: boolean) => {
                   name="file"
                 >
                   <template #trigger>
-                    <el-button type="primary">
+                    <el-button v-loading="addLoading" type="primary">
                       <template #icon>
                         <Icon name="icon_new-item_outlined"></Icon>
                       </template>

From e52b5e1b9da11af4f0c340c605489c98a08b47f9 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 11 Jan 2024 11:37:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=88=A0=E9=99=A4=E5=90=8E=EF=BC=8C=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E7=BC=96=E8=BE=91=E8=BF=98=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/v-query/QueryConditionConfiguration.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index 3df3d35f64..8a1301d08d 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -689,6 +689,7 @@ const addOperation = (cmd, condition, index) => {
     case 'del':
       renameInput.value = []
       conditions.value.splice(index, 1)
+      curComponent.value = null
       break
     case 'rename':
       renameInput.value = []
@@ -820,7 +821,7 @@ defineExpose({
           </template>
         </draggable>
       </div>
-      <div class="chart-field" :class="curComponent.auto && 'hidden'">
+      <div v-if="!!curComponent" class="chart-field" :class="curComponent.auto && 'hidden'">
         <div class="mask" v-if="curComponent.auto"></div>
         <div class="title flex-align-center">
           选择关联图表及字段
@@ -917,7 +918,7 @@ defineExpose({
           </el-checkbox-group>
         </div>
       </div>
-      <div class="condition-configuration">
+      <div v-if="!!curComponent" class="condition-configuration">
         <div class="mask condition" v-if="curComponent.auto"></div>
         <div class="title flex-align-center">
           查询条件配置