From 1c058ad8b0ea4f25ad46105b45546aa376e7b617 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 25 Nov 2021 16:47:01 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=20hive=20=E5=AD=97=E6=AE=B5=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/provider/datasource/JdbcProvider.java     | 3 +++
 .../io/dataease/provider/query/hive/HiveQueryProvider.java     | 1 +
 2 files changed, 4 insertions(+)

diff --git a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
index 1417f17ca4..1c24daab9c 100644
--- a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
+++ b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
@@ -121,6 +121,9 @@ public class JdbcProvider extends DatasourceProvider {
                             row[j] = rs.getDate(j + 1).toString();
                         }
                         break;
+                    case Types.BOOLEAN:
+                        row[j] = rs.getBoolean(j + 1) ? "1" : "0";
+                        break;
                     default:
                         row[j] = rs.getString(j + 1);
                         break;
diff --git a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
index 5ec8fee2b8..dbed986959 100644
--- a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
@@ -40,6 +40,7 @@ public class HiveQueryProvider extends QueryProvider {
 
     @Override
     public Integer transFieldType(String field) {
+        field = field.toLowerCase();
         switch (field) {
             case "varchar":
             case "string":

From 04871b182b1f70bc0b4391d2c4ceb4af5a9ce6e8 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 25 Nov 2021 17:39:28 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE=E6=BA=90=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E6=B8=85=E7=90=86=E9=A1=B5=E9=9D=A2=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/datasource/DsTree.vue | 1 +
 frontend/src/views/system/datasource/form.vue   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue
index 2cb93d3caf..8020009b78 100644
--- a/frontend/src/views/system/datasource/DsTree.vue
+++ b/frontend/src/views/system/datasource/DsTree.vue
@@ -241,6 +241,7 @@ export default {
       }).then(() => {
         delDs(datasource.id).then(res => {
           this.$success(this.$t('commons.delete_success'))
+          this.switchMain('DataHome')
           this.refreshType(datasource)
         })
       }).catch(() => {
diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue
index ea0ae25d56..4476565b81 100644
--- a/frontend/src/views/system/datasource/form.vue
+++ b/frontend/src/views/system/datasource/form.vue
@@ -10,7 +10,7 @@
 
       <el-form ref="dsForm" :model="form" :rules="rule" size="small"
                :disabled="params && params.id && params.showModel && params.showModel === 'show' && !canEdit "
-               label-width="auto" label-position="right">
+               label-width="180px" label-position="right">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"/>
         </el-form-item>

From f4e23f7f604d0d68a63594e8543c34af9dc1e920 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 26 Nov 2021 10:28:43 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=A0=87=E9=A2=98=E9=94=99=E4=BD=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/SubjectSetting/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/panel/SubjectSetting/index.vue b/frontend/src/views/panel/SubjectSetting/index.vue
index 2df60a5c4d..ac7bca73a1 100644
--- a/frontend/src/views/panel/SubjectSetting/index.vue
+++ b/frontend/src/views/panel/SubjectSetting/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-row class="slider-container">
     <div
-      style="height: 40px; line-height: 40px; padding-left: 15px; text-align: left; white-space: pre; text-overflow: ellipsis; left: 0px; right: 0px; top: 0px; font-weight: 700"
+      style="height: 40px; padding-left: 15px; text-align: left; white-space: pre; text-overflow: ellipsis; left: 0px; right: 0px; top: 0px; font-weight: 700"
     >
       {{ $t('panel.dashboard_theme') }}
     </div>

From 06b4d0624d78e4bdaa0a15a9a356b4880bb715fe Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 26 Nov 2021 10:56:45 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=AE=80=E5=8D=95?=
 =?UTF-8?q?=E8=A1=A8=E7=9B=98=E5=A4=8D=E5=88=B6=E5=90=8E=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/widget/DeWidget/DeShowDate.vue  | 8 ++++----
 frontend/src/components/widget/DeWidget/TimeComplex.vue | 4 ++--
 frontend/src/components/widget/DeWidget/TimeSimple.vue  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeShowDate.vue b/frontend/src/components/widget/DeWidget/DeShowDate.vue
index 6b95c13419..5b71e6a3d5 100644
--- a/frontend/src/components/widget/DeWidget/DeShowDate.vue
+++ b/frontend/src/components/widget/DeWidget/DeShowDate.vue
@@ -1,12 +1,12 @@
 <template>
   <div style="height: 100%">
-    <time-default v-if="element.formatInfo.openMode === '0'" :ref="element.id" :element="element" />
+    <time-default v-if="element.formatInfo.openMode === '0'"  :ref="element.id" :element="element" />
 
-    <time-elec v-if="element.formatInfo.openMode === '1'" :ref="element.id" :element="element" />
+    <time-elec v-if="element.formatInfo.openMode === '1'"  :ref="element.id" :element="element" />
 
-    <time-simple v-if="element.formatInfo.openMode === '2'" :ref="element.id" :element="element" />
+    <time-simple v-if="element.formatInfo.openMode === '2'"  :ref="element.id" :element="element" />
 
-    <time-complex v-if="element.formatInfo.openMode === '3'" :ref="element.id" :element="element" />
+    <time-complex v-if="element.formatInfo.openMode === '3'"  :ref="element.id" :element="element" />
   </div>
 </template>
 
diff --git a/frontend/src/components/widget/DeWidget/TimeComplex.vue b/frontend/src/components/widget/DeWidget/TimeComplex.vue
index 62179bac4d..e7b95c1346 100644
--- a/frontend/src/components/widget/DeWidget/TimeComplex.vue
+++ b/frontend/src/components/widget/DeWidget/TimeComplex.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <canvas id="canvas" width="500" height="500" />
+    <canvas :id="'complex_canvas'+element.id" width="500" height="500" />
   </div>
 </template>
 
@@ -30,7 +30,7 @@ export default {
     }
   },
   mounted() {
-    this.canvas = document.getElementById('canvas')
+    this.canvas = document.getElementById('complex_canvas' + this.element.id)
     this.initCtx()
     this.initCtxBack()
     this.initNumBack()
diff --git a/frontend/src/components/widget/DeWidget/TimeSimple.vue b/frontend/src/components/widget/DeWidget/TimeSimple.vue
index a611e1b67f..260d6a25bc 100644
--- a/frontend/src/components/widget/DeWidget/TimeSimple.vue
+++ b/frontend/src/components/widget/DeWidget/TimeSimple.vue
@@ -2,7 +2,7 @@
   <div :style="{ 'height': containerHeight}">
     <div ref="canvasContainer" class="time-s-class" style="height: calc(100% - 50px);" :style="{'margin':timeMargin +'px'}">
       <canvas
-        id="canvas"
+        :id="'simple-canvas'+element.id"
         class="de-canvas"
         :width="canvas_width"
         :height="canvas_height"
@@ -47,7 +47,7 @@ export default {
     }
   },
   mounted() {
-    this.canvas = document.getElementById('canvas')
+    this.canvas = document.getElementById('simple-canvas' + this.element.id)
     this.draw = this.canvas.getContext('2d')
     this.canvas_width = this.element.style.width
     this.canvas_height = this.element.style.height