From b741d53f6c449da6cc29f912b8196ba28a72e233 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 30 Oct 2023 14:24:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E5=BA=93=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E5=88=9B=E5=BB=BA=E7=95=8C=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E5=8F=B7=E5=BA=94=E8=AF=A5=E6=94=BE=E5=9C=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=90=8D=E4=B9=8B=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/datasource/form/EditorDetail.vue     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
index b6f66c75fc..d1246637a4 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
@@ -614,6 +614,18 @@ defineExpose({
               autocomplete="off"
             />
           </el-form-item>
+          <el-form-item :label="t('datasource.port')" prop="configuration.port">
+            <el-input-number
+              v-model="form.configuration.port"
+              autocomplete="off"
+              step-strictly
+              class="text-left"
+              :min="0"
+              :placeholder="t('common.inputText') + t('datasource.port')"
+              controls-position="right"
+              type="number"
+            />
+          </el-form-item>
           <el-form-item :label="t('datasource.data_base')" prop="configuration.dataBase">
             <el-input
               v-model="form.configuration.dataBase"
@@ -687,18 +699,6 @@ defineExpose({
               autocomplete="off"
             />
           </el-form-item>
-          <el-form-item :label="t('datasource.port')" prop="configuration.port">
-            <el-input-number
-              v-model="form.configuration.port"
-              autocomplete="off"
-              step-strictly
-              class="text-left"
-              :min="0"
-              :placeholder="t('common.inputText') + t('datasource.port')"
-              controls-position="right"
-              type="number"
-            />
-          </el-form-item>
           <el-form-item
             v-if="form.type == 'oracle'"
             :label="t('datasource.connection_mode')"

From 539e00e3584442ccef8c51988429be65bd1c3845 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 30 Oct 2023 14:32:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91/=E5=A4=A7=E5=B1=8F=E7=BC=96=E8=BE=91=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E3=80=8C+?=
 =?UTF-8?q?=E3=80=8D=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/pages/panel/main.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/pages/panel/main.ts b/core/core-frontend/src/pages/panel/main.ts
index c9d62f3081..f3c9fd6065 100644
--- a/core/core-frontend/src/pages/panel/main.ts
+++ b/core/core-frontend/src/pages/panel/main.ts
@@ -57,7 +57,7 @@ import AppElement from './App.vue'
 import { setupI18n } from '@/plugins/vue-i18n'
 import { setupStore } from '@/store'
 import { useUserStoreWithOut } from '@/store/modules/user'
-import { setupElementPlus } from '@/plugins/element-plus'
+import { setupElementPlus, setupElementPlusIcons } from '@/plugins/element-plus'
 import { setupRouter } from '@/router'
 
 const setupAll = async (dom: string, componentName: string): Promise<App<Element>> => {
@@ -66,6 +66,7 @@ const setupAll = async (dom: string, componentName: string): Promise<App<Element
   setupStore(app)
   setupRouter(app)
   setupElementPlus(app)
+  setupElementPlusIcons(app)
   const userStore = useUserStoreWithOut()
   await userStore.setUser()
   app.mount(dom)