From 5fa516ced96636d89cfdbb0e75eea1fc0208c3c1 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 28 Dec 2023 11:57:31 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core-frontend/src/assets/svg/platform.svg |  4 ++-
 .../system/parameter/basic/BasicEdit.vue      | 29 +++++++++++++++++--
 .../src/views/system/parameter/index.vue      |  5 ++--
 de-xpack                                      |  2 +-
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/assets/svg/platform.svg b/core/core-frontend/src/assets/svg/platform.svg
index 5ebbc21ab9..859d0f933b 100644
--- a/core/core-frontend/src/assets/svg/platform.svg
+++ b/core/core-frontend/src/assets/svg/platform.svg
@@ -1 +1,3 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M314.49 3.082H157.692C70.793 3.082 0 74.073 0 161.271V864.32c0 87.198 70.792 158.189 157.592 158.189H314.49c86.9 0 157.592-70.991 157.592-158.189V702.652h-72.98V864.32c0 46.93-37.98 84.91-84.612 84.91H157.693c-46.731 0-84.613-38.18-84.613-84.91V161.27c0-46.929 37.981-84.91 84.613-84.91h156.896c46.73 0 84.612 38.18 84.612 84.91v159.68h72.98V161.27c-0.1-87.197-70.793-158.188-157.692-158.188z m546.252 0H703.746c-86.899 0-157.592 70.991-157.592 158.189v159.68h72.98V161.27c0-46.93 37.981-84.911 84.612-84.911h156.896c46.731 0 84.613 38.18 84.613 84.91v703.05c0 46.93-37.981 84.91-84.613 84.91H703.746c-46.73 0-84.612-38.18-84.612-84.91V702.652h-72.98V864.32c0 87.198 70.792 158.189 157.592 158.189h156.896c86.9 0 157.592-70.991 157.592-158.189V161.27c0.1-87.197-70.692-158.188-157.492-158.188z m0 0"  /><path d="M191.995 485.602H461.84c-0.596-27.74-23.465-50.31-51.304-50.31H186.129c-28.238 0-51.305 23.166-51.305 51.503v105.492c0 28.337 23.067 51.504 51.305 51.504h224.506c28.237 0 51.305-23.167 51.305-51.504v-1.093H191.995V485.602z m0 0"  /><path d="M395.423 512.447h230.074v46.035H395.423z"  /><path d="M556.395 485.602H826.34v105.492H556.395v1.094c0 28.337 23.067 51.503 51.305 51.503h224.506c28.238 0 51.305-23.166 51.305-51.503V486.696c0-28.337-23.067-51.503-51.305-51.503H607.7c-27.84 0.099-50.708 22.669-51.305 50.41z m0 0"  /></svg>
\ No newline at end of file
+<svg width="20" height="18" viewBox="0 0 20 18" fill="" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.00004 16.1667C5.00004 15.8905 5.2239 15.6667 5.50004 15.6667H14.5C14.7762 15.6667 15 15.8905 15 16.1667V16.8333C15 17.1095 14.7762 17.3333 14.5 17.3333H5.50004C5.2239 17.3333 5.00004 17.1095 5.00004 16.8333V16.1667ZM11.4611 3.94446C11.5609 3.99079 11.6506 4.0564 11.725 4.1375C11.7994 4.21861 11.8571 4.31362 11.8947 4.41707C11.9323 4.52053 11.949 4.63038 11.944 4.74034C11.939 4.85029 11.9123 4.95818 11.8655 5.05779L9.65553 9.77334C9.56079 9.9748 9.39014 10.1306 9.18089 10.2066C8.97163 10.2825 8.7408 10.2726 8.53886 10.1789C8.4393 10.1326 8.34985 10.067 8.27563 9.9861C8.20141 9.90516 8.14387 9.81038 8.10631 9.70718C8.06874 9.60399 8.05189 9.4944 8.05672 9.38469C8.06154 9.27497 8.08794 9.16729 8.13442 9.06779L10.3444 4.35223C10.439 4.15058 10.6095 3.99458 10.8188 3.91836C11.0281 3.84215 11.259 3.85193 11.4611 3.94557V3.94446ZM2.50004 2.74999V12.3333H17.5V2.33332H2.50004V2.74999ZM0.833374 1.66666C0.833374 1.11437 1.28109 0.666656 1.83337 0.666656H18.1667C18.719 0.666656 19.1667 1.11437 19.1667 1.66666V13C19.1667 13.5523 18.719 14 18.1667 14H1.83338C1.28109 14 0.833374 13.5523 0.833374 13V1.66666ZM4.37331 7.70334C4.27934 7.6251 4.20381 7.52705 4.15215 7.41622C4.10048 7.30539 4.07393 7.18451 4.07442 7.06223C4.07393 6.93995 4.10048 6.81907 4.15215 6.70824C4.20381 6.59741 4.27934 6.49937 4.37331 6.42112L5.92664 4.87668C6.08426 4.71981 6.29759 4.63174 6.51997 4.63174C6.74235 4.63174 6.95568 4.71981 7.11331 4.87668C7.19091 4.95409 7.25248 5.04605 7.29449 5.14729C7.3365 5.24853 7.35813 5.35707 7.35813 5.46668C7.35813 5.57629 7.3365 5.68483 7.29449 5.78607C7.25248 5.88731 7.19091 5.97927 7.11331 6.05668L6.1022 7.06223L7.11331 8.06779C7.19095 8.14529 7.25254 8.23735 7.29457 8.33868C7.33659 8.44001 7.35822 8.54864 7.35822 8.65834C7.35822 8.76805 7.33659 8.87667 7.29457 8.97801C7.25254 9.07934 7.19095 9.17139 7.11331 9.2489C6.95568 9.40577 6.74235 9.49383 6.51997 9.49383C6.29759 9.49383 6.08426 9.40577 5.92664 9.2489L4.37331 7.70445V7.70334ZM15.6266 7.70334L14.0733 9.2489C13.9157 9.40577 13.7024 9.49383 13.48 9.49383C13.2576 9.49383 13.0443 9.40577 12.8866 9.2489C12.8089 9.17147 12.7472 9.07944 12.705 8.9781C12.6629 8.87675 12.6413 8.76809 12.6413 8.65834C12.6413 8.5486 12.6629 8.43993 12.705 8.33859C12.7472 8.23725 12.8089 8.14522 12.8866 8.06779L13.8978 7.06223L12.8866 6.05668L12.8833 6.05446C12.7277 5.89776 12.6406 5.68571 12.6413 5.46488C12.6419 5.24404 12.7301 5.03249 12.8866 4.87668C13.0443 4.71981 13.2576 4.63174 13.48 4.63174C13.7024 4.63174 13.9157 4.71981 14.0733 4.87668L15.6266 6.42112C15.7206 6.49937 15.7961 6.59741 15.8478 6.70824C15.8995 6.81907 15.926 6.93995 15.9255 7.06223C15.926 7.18451 15.8995 7.30539 15.8478 7.41622C15.7961 7.52705 15.7206 7.6251 15.6266 7.70334Z" fill=""/>
+</svg>
diff --git a/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue b/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
index 0bafa5c43e..92768c6426 100644
--- a/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
+++ b/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
@@ -92,7 +92,7 @@ const reset = () => {
 }
 
 const showLoading = () => {
-  loadingInstance.value = ElLoading.service({ target: '.basic-info-drawer' })
+  loadingInstance.value = ElLoading.service({ target: '.basic-param-drawer' })
 }
 const closeLoading = () => {
   loadingInstance.value?.close()
@@ -118,7 +118,7 @@ defineExpose({
   <el-drawer
     title="基础设置"
     v-model="dialogVisible"
-    custom-class="basic-info-drawer"
+    custom-class="basic-param-drawer"
     size="600px"
     direction="rtl"
   >
@@ -178,8 +178,31 @@ defineExpose({
     </template>
   </el-drawer>
 </template>
-
+<style lang="less">
+.basic-param-drawer {
+  .ed-drawer__footer {
+    height: 64px !important;
+    padding: 16px 24px !important;
+    .dialog-footer {
+      height: 32px;
+      line-height: 32px;
+    }
+  }
+  .ed-form-item__label {
+    line-height: 22px !important;
+    height: 22px !important;
+  }
+}
+</style>
 <style scoped lang="less">
+.basic-param-drawer {
+  .ed-form-item {
+    margin-bottom: 16px;
+  }
+  .is-error {
+    margin-bottom: 40px !important;
+  }
+}
 .setting-hidden-item {
   display: none !important;
 }
diff --git a/core/core-frontend/src/views/system/parameter/index.vue b/core/core-frontend/src/views/system/parameter/index.vue
index 63ccfb8830..b425076d4e 100644
--- a/core/core-frontend/src/views/system/parameter/index.vue
+++ b/core/core-frontend/src/views/system/parameter/index.vue
@@ -39,7 +39,6 @@ const activeName = ref('basic')
 }
 .sys-setting-p {
   width: 100%;
-  background: var(--ContentBG, #ffffff);
   height: calc(100vh - 176px);
   box-sizing: border-box;
   margin-top: 12px;
@@ -50,7 +49,9 @@ const activeName = ref('basic')
 
 .container-sys-param {
   height: 100%;
-  overflow-y: auto;
+  overflow: hidden;
+  background: var(--ContentBG, #ffffff);
+  border-radius: 4px;
 }
 </style>
 <style lang="less" scoped></style>
diff --git a/de-xpack b/de-xpack
index face6a1c10..f1a3153c2e 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit face6a1c104ea83e746a23a9a5419f7f22b78ff4
+Subproject commit f1a3153c2e3472e3a825cdf443bf7c070501daa7