From d564f71fa1125dec2810c541a130cae07301beb7 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Thu, 21 Sep 2023 14:38:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E9=85=8D=E7=BD=AE=E9=9D=A2=E6=9D=BF=EF=BC=8C=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=85=8D=E7=BD=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicComponents/TimePicker/setting.vue    | 36 +++++++++++++++----
 data-room-ui/packages/SettingTitle/index.vue  |  3 --
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/TimePicker/setting.vue b/data-room-ui/packages/BasicComponents/TimePicker/setting.vue
index d13cada7..d1a5cbc8 100644
--- a/data-room-ui/packages/BasicComponents/TimePicker/setting.vue
+++ b/data-room-ui/packages/BasicComponents/TimePicker/setting.vue
@@ -89,6 +89,7 @@
                 v-model="config.customize.formatType"
                 class="bs-el-select"
                 popper-class="bs-el-select"
+                clearable
                 @change="selectFormatType"
               >
                 <el-option
@@ -103,10 +104,22 @@
               v-if="config.customize.formatType === 'custom'"
               label="自定义时间格式"
             >
-              <el-input
-                v-model="config.customize.valueFormat"
-                placeholder="例如：HH:mm:ss"
-              />
+              <div class="time-format-description">
+                <el-input
+                  v-model="config.customize.valueFormat"
+                  placeholder="例如：HH:mm:ss"
+                  clearable
+                />
+                <el-tooltip
+                  content="时间格式示例：HH表示小时（24小时制），mm表示分钟，ss表示秒"
+                  placement="top"
+                >
+                  <span
+                    class="el-icon-question"
+                    style="color:#9e9e9e"
+                  />
+                </el-tooltip>
+              </div>
             </el-form-item>
           </div>
         </el-form>
@@ -175,13 +188,15 @@ export default {
   watch: {},
   mounted () {},
   methods: {
-    selectFormatType (val) {
-      if (val === 'default') {
+    selectFormatType (type) {
+      if (type === 'default') {
         this.config.customize.value = ''
         this.config.customize.valueFormat = ''
-      } else if (val === 'timestamp') {
+      } else if (type === 'timestamp') {
         this.config.customize.value = 0
         this.config.customize.valueFormat = 'timestamp'
+      } else if (type === 'custom') {
+        this.config.customize.valueFormat = 'HH:mm:ss'
       }
     }
   }
@@ -193,4 +208,11 @@ export default {
     width: 97%;
     padding: 16px;
   }
+  .time-format-description{
+    display: flex;
+    align-items: center;
+    .el-tooltip{
+      margin-left: 5px;
+    }
+  }
   </style>
diff --git a/data-room-ui/packages/SettingTitle/index.vue b/data-room-ui/packages/SettingTitle/index.vue
index 02b80ee4..2fc184cc 100644
--- a/data-room-ui/packages/SettingTitle/index.vue
+++ b/data-room-ui/packages/SettingTitle/index.vue
@@ -9,8 +9,6 @@
 <style lang="scss" scoped>
 .lc-field-head {
     height: 30px;
-    // margin-bottom: 12px;
-
     .lc-field-title {
       width: 308px;
         // 文字溢出隐藏
@@ -21,7 +19,6 @@
         padding-left: 12px;
         line-height: 30px;
         height: 30px;
-
         &:after {
             position: absolute;
             left: 0;