From 8fe512cdf38e48add3b7d1174c456b066c987ad3 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Fri, 28 Oct 2022 16:58:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=A7=92=E8=89=B2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A4=9A=E9=80=89=E6=89=93=E5=8B=BE=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=20=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=95=B0=E6=8D=AEloading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/styles/index.scss                | 25 ++++++++++++++++++
 frontend/src/views/dataset/add/AddApi.vue     | 18 +------------
 frontend/src/views/dataset/add/AddDB.vue      | 19 +-------------
 frontend/src/views/dataset/form.vue           |  2 +-
 .../system/datasource/DsConfiguration.vue     | 26 ++++++++++++++++++-
 .../src/views/system/datasource/DsForm.vue    |  3 +++
 6 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 0c6f4b2b69..3b1b8cfb1d 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -1632,4 +1632,29 @@ div:focus {
     white-space: nowrap;
     height: 24px;
   }
+}
+
+.db-multiple-select-pop {
+  .selected::after {
+    content: '';
+    width: 6px;
+    height: 12px;
+    position: absolute;
+    right: 12px;
+    top: 9px;
+    border: 2px solid #3370ff;
+    border-top-color: rgba(0, 0, 0, 0);
+    border-left-color: rgba(0, 0, 0, 0);
+    -webkit-transform: rotate(45deg);
+    transform: rotate(45deg);
+  }
+}
+
+.role-add-name {
+  .el-select-dropdown__item.selected::after {
+    content: '';
+    position: absolute;
+    right: 12px;
+    top: 9px;
+  }
 }
\ No newline at end of file
diff --git a/frontend/src/views/dataset/add/AddApi.vue b/frontend/src/views/dataset/add/AddApi.vue
index a142f9a921..2e009ccca8 100644
--- a/frontend/src/views/dataset/add/AddApi.vue
+++ b/frontend/src/views/dataset/add/AddApi.vue
@@ -32,6 +32,7 @@
       <el-select
         v-model="dataSource"
         class="ds-list"
+        popper-class="db-multiple-select-pop"
         filterable
         :placeholder="$t('dataset.pls_slc_data_source')"
         size="small"
@@ -623,20 +624,3 @@ export default {
   }
 }
 </style>
-<style lang="scss">
-.db-select-pop {
-  .selected::after {
-    content: '';
-    width: 6px;
-    height: 12px;
-    position: absolute;
-    right: 12px;
-    top: 9px;
-    border: 2px solid #3370ff;
-    border-top-color: rgba(0, 0, 0, 0);
-    border-left-color: rgba(0, 0, 0, 0);
-    -webkit-transform: rotate(45deg);
-    transform: rotate(45deg);
-  }
-}
-</style>
diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue
index ba39fb8381..791f839d8c 100644
--- a/frontend/src/views/dataset/add/AddDB.vue
+++ b/frontend/src/views/dataset/add/AddDB.vue
@@ -33,7 +33,7 @@
         v-model="dataSource"
         class="ds-list"
         filterable
-        popper-class="db-select-pop"
+        popper-class="db-multiple-select-pop"
         :placeholder="$t('dataset.pls_slc_data_source')"
         size="small"
       >
@@ -640,20 +640,3 @@ export default {
   }
 }
 </style>
-<style lang="scss">
-.db-select-pop {
-  .selected::after {
-    content: '';
-    width: 6px;
-    height: 12px;
-    position: absolute;
-    right: 12px;
-    top: 9px;
-    border: 2px solid #3370ff;
-    border-top-color: rgba(0, 0, 0, 0);
-    border-left-color: rgba(0, 0, 0, 0);
-    -webkit-transform: rotate(45deg);
-    transform: rotate(45deg);
-  }
-}
-</style>
diff --git a/frontend/src/views/dataset/form.vue b/frontend/src/views/dataset/form.vue
index fa397647c1..6612092422 100644
--- a/frontend/src/views/dataset/form.vue
+++ b/frontend/src/views/dataset/form.vue
@@ -21,7 +21,7 @@
             style="left: 55px"
             class="el-form-item__error"
           >
-            {{ $t('deDataset.already_Exists') }}
+            {{ $t('deDataset.already_exists') }}
           </div>
         </template>
         <template v-else>
diff --git a/frontend/src/views/system/datasource/DsConfiguration.vue b/frontend/src/views/system/datasource/DsConfiguration.vue
index 69f005d2be..ca3d2a9cbb 100644
--- a/frontend/src/views/system/datasource/DsConfiguration.vue
+++ b/frontend/src/views/system/datasource/DsConfiguration.vue
@@ -291,9 +291,10 @@
           ['oracle', 'sqlServer', 'pg', 'redshift', 'db2'].includes(form.type)
         "
         class="schema-label"
+        prop="configuration.schema"
       >
         <template slot="label">
-          {{ $t('datasource.schema') }}
+          <span class="name">{{ $t('datasource.schema') }}<i class="required" /></span>
           <el-button
             type="text"
             icon="el-icon-plus"
@@ -895,6 +896,13 @@ export default {
             trigger: 'blur'
           }
         ],
+        'configuration.schema': [
+          {
+            required: true,
+            message: i18n.t('datasource.please_input_connect_timeout'),
+            trigger: 'blur'
+          }
+        ],
         url: [
           {
             required: true,
@@ -1617,4 +1625,20 @@ export default {
     }
   }
 }
+.schema-label {
+  ::v-deep.el-form-item__label {
+    display: flex;
+    justify-content: space-between;
+    &::after {
+      display: none;
+    }
+    .name {
+      .required::after {
+        content: "*";
+        color: #f54a45;
+        margin-left: 2px;
+      }
+    }
+  }
+}
 </style>
diff --git a/frontend/src/views/system/datasource/DsForm.vue b/frontend/src/views/system/datasource/DsForm.vue
index b3aa91b2dc..c7300b6fee 100644
--- a/frontend/src/views/system/datasource/DsForm.vue
+++ b/frontend/src/views/system/datasource/DsForm.vue
@@ -661,8 +661,11 @@ export default {
       })
     },
     getDatasourceDetail(id, showModel) {
+      this.formLoading = true
       return getDatasourceDetail(id).then((res) => {
         this.params = { ...res.data, showModel }
+      }).finally(() => {
+        this.formLoading = false
       })
     },
     queryTreeData() {

From 9932fe95a89c7308a772e75ac9c1efd1b7c1ccc1 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Fri, 28 Oct 2022 17:50:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20hive=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/components/component-style/TitleSelector.vue  | 4 ++--
 frontend/src/views/system/datasource/DsForm.vue               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/chart/components/component-style/TitleSelector.vue b/frontend/src/views/chart/components/component-style/TitleSelector.vue
index d5691cc72e..b674de0668 100644
--- a/frontend/src/views/chart/components/component-style/TitleSelector.vue
+++ b/frontend/src/views/chart/components/component-style/TitleSelector.vue
@@ -12,10 +12,10 @@
           :label="$t('chart.show')"
           class="form-item"
         >
-          <el-checkbox
+          <el-switch
             v-model="titleForm.show"
             @change="changeTitleStyle('show')"
-          >{{ $t('chart.show') }}</el-checkbox>
+          />
         </el-form-item>
         <div v-show="showProperty('show') && titleForm.show">
           <el-form-item
diff --git a/frontend/src/views/system/datasource/DsForm.vue b/frontend/src/views/system/datasource/DsForm.vue
index c7300b6fee..95c41caa64 100644
--- a/frontend/src/views/system/datasource/DsForm.vue
+++ b/frontend/src/views/system/datasource/DsForm.vue
@@ -1065,7 +1065,7 @@ export default {
                 } else {
                   this.openMessageSuccess(
                     res.message.substring(0, 2500) + '......',
-                    'danger'
+                    'error'
                   )
                 }
               }
@@ -1085,7 +1085,7 @@ export default {
                   } else {
                     this.openMessageSuccess(
                       res.message.substring(0, 2500) + '......',
-                      'danger'
+                      'error'
                     )
                   }
                 }