From 557b59f550ff9a234b70f7b49defb7c75b5ff91a Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 28 Sep 2022 17:43:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=9B=B4=E6=94=B9=20=20=E5=8F=8A?=
 =?UTF-8?q?=E8=81=94=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/add/AddSQL.vue | 28 ++++++++++++++++++++++-
 frontend/src/views/system/task/form.vue   |  2 +-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index ecad900e12..6fc632a98e 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -228,7 +228,33 @@
                     class="select-type"
                     :options="fieldOptions"
                     @change="variableTypeChange(scope.row)"
-                  />
+                  >
+                  <template slot-scope="{ data }">
+                    <svg-icon
+                      v-if="data.value === 'TEXT'"
+                      icon-class="field_text"
+                      class="field-icon-text"
+                    />
+                    <svg-icon
+                      v-if="
+                        [
+                          'DATETIME-YEAR',
+                          'DATETIME-YEAR-MONTH',
+                          'DATETIME',
+                          'DATETIME-YEAR-MONTH-DAY'
+                        ].includes(data.value)
+                      "
+                      icon-class="field_time"
+                      class="field-icon-time"
+                    />
+                    <svg-icon
+                      v-if="['LONG', 'DOUBLE'].includes(data.value)"
+                      icon-class="field_value"
+                      class="field-icon-value"
+                    />
+                    <span>{{ data.label }}</span>
+                  </template>
+                  </el-cascader>
                   <span class="select-svg-icon">
                     <svg-icon
                       v-if="scope.row.type[0] === 'TEXT'"
diff --git a/frontend/src/views/system/task/form.vue b/frontend/src/views/system/task/form.vue
index 3c868a425e..4b038d7e76 100644
--- a/frontend/src/views/system/task/form.vue
+++ b/frontend/src/views/system/task/form.vue
@@ -15,11 +15,11 @@
             @click.native="selectDataset"
             :label="$t('chart.select_dataset')"
             prop="datasetName"
-            :disabled="taskForm.id"
           >
             <el-input
               v-model="taskForm.datasetName"
               size="small"
+              :disabled="!!taskForm.id"
               readonly
               :placeholder="$t('dataset.task_name')"
             />