From 077222f141f29ed9190af923a20bd73b1d02c350 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Tue, 29 Nov 2022 14:59:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A1=B5=E9=9D=A2=E6=8A=96=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/data/FieldEdit.vue   | 16 +++-------------
 frontend/src/views/panel/list/PanelList.vue     |  2 +-
 frontend/src/views/system/datasource/DsForm.vue |  1 +
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue
index 2813b87f21..bb7b609979 100644
--- a/frontend/src/views/dataset/data/FieldEdit.vue
+++ b/frontend/src/views/dataset/data/FieldEdit.vue
@@ -148,12 +148,11 @@
                 :disabled="!hasDataPermission('manage', param.privileges)"
                 class="select-type"
                 :options="getFields(scope.row)"
-                @visible-change="getPopPosition"
                 @change="saveEdit(scope.row)"
               >
                 <template slot-scope="{ node, data }">
                   <span
-                    v-if="node.level === 2"
+                    v-if="node.level === 2 && data.label === 'yyyy-MM-dd'"
                     class="format-title"
                     :style="popPosition"
                   >{{ $t('chart.date_format') }}</span>
@@ -488,12 +487,11 @@
                 :disabled="!hasDataPermission('manage', param.privileges)"
                 class="select-type"
                 :options="getFields(scope.row)"
-                @visible-change="getPopPosition"
                 @change="saveEdit(scope.row)"
               >
                 <template slot-scope="{ node, data }">
                   <span
-                    v-if="node.level === 2"
+                    v-if="node.level === 2 && data.label === 'yyyy-MM-dd'"
                     class="format-title"
                     :style="popPosition"
                   >{{ $t('chart.date_format') }}</span>
@@ -807,15 +805,6 @@ export default {
         that.maxHeight = currentHeight - 56 - 30 - 35 - 26 - 10 - 10 + 'px'
       }, 10)
     },
-    getPopPosition(val) {
-      if (!val) return
-      this.$nextTick(() => {
-        const list = document.querySelectorAll('body > .select-date-resolution-format')
-        const ele = list[list.length - 1]
-        const { top, left } = ele?.style
-        this.popPosition = { top: parseInt(top) - 18 + 'px', left: parseInt(left) + 181 + 'px', position: 'fixed' }
-      })
-    },
     initField() {
       fieldListDQ(this.param.id).then((response) => {
         this.tableFields = response.data
@@ -1198,6 +1187,7 @@ span {
     position: fixed;
     display: inline-block;
     height: 30px;
+    transform: translate(-30px, -37px);
     background: #dfe6ec;
     width: 180px;
     padding-left: 30px;
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index 913dac3d1f..b3f5812ab6 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -109,7 +109,7 @@
                       icon="el-icon-delete"
                       :command="beforeClickMore('delete', data, node)"
                     >
-                      {{ $t('emailtask.default') + $t('commons.cancel') }}
+                      {{ $t('commons.cancel') + $t('emailtask.default') }}
                     </el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
diff --git a/frontend/src/views/system/datasource/DsForm.vue b/frontend/src/views/system/datasource/DsForm.vue
index ff73aeeccf..599cfb23ff 100644
--- a/frontend/src/views/system/datasource/DsForm.vue
+++ b/frontend/src/views/system/datasource/DsForm.vue
@@ -708,6 +708,7 @@ export default {
       if (this.form.type === 'oracle') {
         this.$set(this.form.configuration, 'charset', 'Default')
         this.$set(this.form.configuration, 'targetCharset', 'Default')
+        this.$set(this.form.configuration, 'connectionType', 'sid')
       }
     },
     changeEdit() {