From 54e1ed31ad9039622a815fb3e55a2e93f0e52377 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 30 Jun 2022 11:37:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20sql=20=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                   |  3 +-
 frontend/src/lang/tw.js                   |  3 +-
 frontend/src/lang/zh.js                   |  3 +-
 frontend/src/views/dataset/add/AddSQL.vue | 95 +++++++++++------------
 4 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 2add74060d..4d40e9cd2d 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1122,7 +1122,8 @@ export default {
     max_more_than_mix: 'Max must more than Min'
   },
   dataset: {
-    sql_variable_limit: 'SQL variables can only be used in where conditions',
+    sql_variable_limit_1: '1、SQL variables can only be used in where conditions',
+    sql_variable_limit_2: '2、Example：select * from table_name where column_name=‘${parm_name}',
     select_year: 'Select Year',
     select_month: 'Select Month',
     select_date: 'Select Date',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 7fff4723be..5115518c68 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1122,7 +1122,8 @@ export default {
     max_more_than_mix: '最大值必須大於最小值'
   },
   dataset: {
-    sql_variable_limit: 'SQL 變數只能在 WHERE 條件中使用',
+    sql_variable_limit_1: '1、SQL變數只能在WHERE條件中使用',
+    sql_variable_limit_2: '2、示例：select * from table_name where column_name=‘${parm_name}',
     select_year: '選擇年',
     select_month: '選擇月',
     select_date: '選擇日期',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index b7a649b7aa..d11c35ac96 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1125,7 +1125,8 @@ export default {
   },
   dataset: {
     select_year: '选择年',
-    sql_variable_limit: 'SQL 变量只能在 WHERE 条件中使用',
+    sql_variable_limit_1: '1、SQL 变量只能在 WHERE 条件中使用',
+    sql_variable_limit_2: '2、示例：select * from table_name where column_name=‘${parm_name}',
     select_month: '选择月',
     select_date: '选择日期',
     select_time: '选择时间',
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index d0ef9c1e97..9f2196c7f3 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -46,27 +46,8 @@
                 <el-option :label="$t('dataset.sync_latter')" value="sync_latter"/>
               </el-select>
             </el-form-item>
-            <el-form-item>
-              <span  v-if="mode === '0'" style="line-height: 26px;">
-                <el-tooltip class="item" effect="dark" content="Right Bottom 提示文字" placement="bottom">
-                  <div slot="content">
-                    {{ $t('dataset.sql_variable_limit') }}<br>
-                  </div>
-                  <i class="el-icon-info" style="cursor: pointer;" />
-                </el-tooltip>
-              </span>
-            </el-form-item>
-
           </el-form>
         </el-col>
-        <el-col :span="8">
-
-          <el-tooltip tyle="float: right;"  v-if="mode === '0'" class="item" effect="dark" :content="$t('dataset.sql_variable_limit')" placement="left">
-            <el-button   type="text" size="mini" style="float: right;" @click="variableMgm">
-              {{ $t('sql_variable.variable_mgm') }}
-            </el-button>
-          </el-tooltip>
-        </el-col>
       </el-row>
       <el-row>
         <el-col style="min-width: 200px;">
@@ -118,6 +99,19 @@
 
       <el-dialog :title="dialogTitle" :visible="showVariableMgm" :before-close="closeVariableMgm" width="60%"
                  class="dialog-css" append-to-body>
+
+              <div slot="title" class="header-title">
+                <span>{{dialogTitle}}</span>
+                <span>
+                  <el-tooltip class="item" effect="dark" content="Right Bottom 提示文字" placement="bottom">
+                    <div slot="content">
+                      {{ $t('dataset.sql_variable_limit_1') }}<br>
+                      {{ $t('dataset.sql_variable_limit_2') }}<br>
+                    </div>
+                    <i class="el-icon-info" style="cursor: pointer;" />
+                  </el-tooltip>
+                </span>
+              </div>
               <el-table :data="variablesTmp" style="width: 80%">
                 <el-table-column prop="variableName" :label="$t('commons.name')" width="180">
                 </el-table-column>
@@ -129,8 +123,8 @@
                 </el-table-column>
                 <el-table-column prop="defaultValue" :label="$t('commons.default_value')">
                   <template slot-scope="scope">
-                    <input v-if="scope.row.type[0] === 'TEXT'" type="text" v-model="scope.row.defaultValue" />
-                    <input v-if="scope.row.type[0] === 'LONG' || scope.row.type[0] === 'DOUBLE'" type="number" v-model="scope.row.defaultValue" />
+                    <el-input size="mini" v-if="scope.row.type[0] === 'TEXT'" type="text" v-model="scope.row.defaultValue" />
+                    <el-input  size="mini" v-if="scope.row.type[0] === 'LONG' || scope.row.type[0] === 'DOUBLE'" type="number" v-model="scope.row.defaultValue" />
 
                     <el-date-picker v-if="scope.row.type[0] === 'DATETIME-YEAR'"
                       v-model="scope.row.defaultValue"
@@ -247,34 +241,35 @@ export default {
         { label: this.$t('dataset.text'), value: 'TEXT' },
         { label: this.$t('dataset.value'), value: 'LONG' },
         { label: this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')', value: 'DOUBLE' },
-        { label: this.$t('dataset.time_year'), value: 'DATETIME-YEAR' },
-        { label: this.$t('dataset.time_year_month'), value: 'DATETIME-YEAR-MONTH',
-          children: [{
-            value: 'yyyy-MM',
-            label: 'YYYY-MM'
-          }, {
-            value: 'yyyy/MM',
-            label: 'YYYY/MM'
-          }]
-        },
-        { label: this.$t('dataset.time_year_month_day'), value: 'DATETIME-YEAR-MONTH-DAY',
-          children: [{
-            value: 'yyyy-MM-dd',
-            label: 'YYYY-MM-DD'
-          }, {
-            value: 'yyyy/MM/dd',
-            label: 'YYYY/MM/DD'
-          }]
-        },
-        { label: this.$t('dataset.time_all'), value: 'DATETIME',
-          children: [{
-            value: 'yyyy-MM-dd HH:mm:ss',
-            label: 'YYYY-MM-DD HH:MI:SS'
-          }, {
-            value: 'yyyy/MM/dd HH:mm:ss',
-            label: 'YYYY/MM/DD HH:MI:SS'
-          }]
-        }
+        // { label: this.$t('dataset.time_year'), value: 'DATETIME-YEAR' },
+        // { label: this.$t('dataset.time_year_month'), value: 'DATETIME-YEAR-MONTH',
+        //   children: [{
+        //     value: 'yyyy-MM',
+        //     label: 'YYYY-MM'
+        //   }, {
+        //     value: 'yyyy/MM',
+        //     label: 'YYYY/MM'
+        //   }]
+        // },
+        // { label: this.$t('dataset.time_year_month_day'), value: 'DATETIME-YEAR-MONTH-DAY',
+        //   children: [{
+        //     value: 'yyyy-MM-dd',
+        //     label: 'YYYY-MM-DD'
+        //   }, {
+        //     value: 'yyyy/MM/dd',
+        //     label: 'YYYY/MM/DD'
+        //   }]
+        // },
+        // { label: this.$t('dataset.time_all'), value: 'DATETIME',
+        //   children: [{
+        //     value: 'yyyy-MM-dd HH:mm:ss',
+        //     label: 'YYYY-MM-DD HH:MI:SS'
+        //   }, {
+        //     value: 'yyyy/MM/dd HH:mm:ss',
+        //     label: 'YYYY/MM/DD HH:MI:SS'
+        //   }
+        //   ]
+        // }
       ],
     }
   },
@@ -455,7 +450,7 @@ export default {
 
     variableMgm() {
       this.parseVariable()
-      this.dialogTitle = this.$t('sql_variable.variable_mgm')
+      this.dialogTitle = this.$t('sql_variable.variable_mgm') + ' '
       this.showVariableMgm = true
     },
     parseVariable(){