From d99bb92e1a24097f5164ad4a2224c763ea100766 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 28 Nov 2024 15:06:55 +0800
Subject: [PATCH] =?UTF-8?q?style(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0-=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE-=E8=A1=A8=E5=8D=95=E6=96=87=E6=A1=88?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/parameter/basic/BasicEdit.vue      | 42 ++++++++++++++++++-
 .../system/parameter/basic/BasicInfo.vue      | 10 +++--
 de-xpack                                      |  2 +-
 3 files changed, 47 insertions(+), 7 deletions(-)

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 71fda183bf..2ecdac887d 100644
--- a/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
+++ b/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
@@ -1,10 +1,19 @@
 <script lang="ts" setup>
-import { ref, reactive } from 'vue'
+import { ref, reactive, PropType } from 'vue'
 import { ElMessage, ElLoading } from 'element-plus-secondary'
 import { useI18n } from '@/hooks/web/useI18n'
 import type { FormInstance, FormRules } from 'element-plus-secondary'
 import request from '@/config/axios'
+import dvInfo from '@/assets/svg/dv-info.svg'
 const { t } = useI18n()
+
+const props = defineProps({
+  labelTooltips: {
+    type: Array as PropType<any[]>,
+    default: () => []
+  }
+})
+
 const dialogVisible = ref(false)
 const loadingInstance = ref(null)
 const basicForm = ref<FormInstance>()
@@ -48,6 +57,14 @@ const state = reactive({
   ]
 })
 
+const tooltipItem = ref({})
+const formatLabel = () => {
+  props.labelTooltips?.length &&
+    props.labelTooltips.forEach(tooltip => {
+      tooltipItem.value[tooltip.key] = tooltip.val
+    })
+}
+
 const rule = reactive<FormRules>({
   dsIntervalTime: [
     {
@@ -229,6 +246,7 @@ const oidChange = () => {
   state.form['platformRid'] = []
   loadRoleOptions()
 }
+formatLabel()
 defineExpose({
   edit
 })
@@ -255,8 +273,22 @@ defineExpose({
         :key="item.pkey"
         :prop="item.pkey"
         :class="{ 'setting-hidden-item': item.pkey === 'dsExecuteTime' }"
-        :label="t(item.label)"
       >
+        <template v-slot:label>
+          <div class="basic-form-info-tips">
+            <span>{{ t(item.label) }}</span>
+            <el-tooltip
+              v-if="tooltipItem[`setting_basic.${item.pkey}`]"
+              effect="dark"
+              :content="tooltipItem[`setting_basic.${item.pkey}`]"
+              placement="top"
+            >
+              <el-icon
+                ><Icon name="dv-info"><dvInfo class="svg-icon" /></Icon
+              ></el-icon>
+            </el-tooltip>
+          </div>
+        </template>
         <el-switch
           class="de-basic-switch"
           v-if="
@@ -419,6 +451,12 @@ defineExpose({
   .ed-form-item__label {
     line-height: 22px !important;
     height: 22px !important;
+    .basic-form-info-tips {
+      width: fit-content;
+      display: inline-flex;
+      align-items: center;
+      column-gap: 4px;
+    }
   }
   .ed-radio__label {
     font-weight: 400;
diff --git a/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue b/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue
index cd242959ac..b872c1d438 100644
--- a/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue
+++ b/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue
@@ -13,6 +13,7 @@
     "
   />
   <InfoTemplate
+    v-if="loginInoSettings?.length"
     ref="loginTemplate"
     class="login-setting-template"
     :label-tooltips="tooltips"
@@ -28,6 +29,7 @@
   />
 
   <InfoTemplate
+    v-if="thirdInfoSettings?.length"
     ref="thirdTemplate"
     class="login-setting-template"
     :label-tooltips="tooltips"
@@ -41,7 +43,7 @@
       )
     "
   />
-  <basic-edit ref="editor" @saved="refresh" />
+  <basic-edit ref="editor" :label-tooltips="tooltips" @saved="refresh" />
 </template>
 
 <script lang="ts" setup>
@@ -249,9 +251,9 @@ const search = cb => {
 const refresh = () => {
   search(() => {
     nextTick(() => {
-      infoTemplate?.value.init()
-      loginTemplate?.value.init()
-      thirdTemplate?.value.init()
+      infoTemplate?.value?.init()
+      loginTemplate?.value?.init()
+      thirdTemplate?.value?.init()
     })
   })
 }
diff --git a/de-xpack b/de-xpack
index 4315f37ce0..a081d74e3c 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 4315f37ce0309f63aadf1e53b85dedc10adf1533
+Subproject commit a081d74e3ce5b6cb32097a53c058178220c724d1