From 1e6736c81bf94a3d54239033668cc04725a7c59b Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Thu, 2 Mar 2023 13:31:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE=20?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=E6=94=B9?=
 =?UTF-8?q?=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/add/AddSQL.vue | 38 +++++++++++++----------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index 391da9b87c..25c7b80365 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -517,7 +517,21 @@
                       />
                     </el-select>
                   </el-input>
-
+                  <div v-if="['DATETIME-YEAR', 'DATETIME-YEAR-MONTH', 'DATETIME-YEAR-MONTH-DAY', 'DATETIME'].includes(scope.row.type[0])" class="el-input-group el-input-group--prepend de-group__prepend">
+                    <div class="el-input-group__prepend">
+                      <el-select
+                        v-model="scope.row.defaultValueScope"
+                        style="width: 100px"
+                        size="small"
+                      >
+                        <el-option
+                          v-for="item in defaultValueScopeList"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"
+                        />
+                      </el-select>
+                    </div>
                   <el-date-picker
                     v-if="scope.row.type[0] === 'DATETIME-YEAR'"
                     v-model="scope.row.defaultValue"
@@ -525,21 +539,7 @@
                     size="small"
                     value-format="yyyy"
                     :placeholder="$t('dataset.select_year')"
-                  >
-                    <el-select
-                      slot="prepend"
-                      v-model="scope.row.defaultValueScope"
-                      style="width: 100px"
-                      size="small"
-                    >
-                      <el-option
-                        v-for="item in defaultValueScopeList"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-date-picker>
+                  />
 
                   <el-date-picker
                     v-if="scope.row.type[0] === 'DATETIME-YEAR-MONTH'"
@@ -570,6 +570,7 @@
                     :value-format="scope.row.type[1]"
                     :placeholder="$t('dataset.select_time')"
                   />
+                </div>
                 </template>
               </el-table-column>
             </el-table>
@@ -1141,8 +1142,13 @@ export default {
     padding-bottom: 80px;
   }
 
+  .de-group__prepend {
+    width: 100%;
+  }
+
   .el-date-editor {
     width: 100%;
+    display: inline-block;
   }
 
   .select-type {