From dcab06e7f6cd16c2722c80f8fb9448c3d4e7085d Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Fri, 6 Feb 2026 15:50:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=9D=A1=E4=BB=B6=E6=A0=B7=E5=BC=8F=E6=97=B6?=
 =?UTF-8?q?=E5=88=86=E7=A7=92=E6=A0=BC=E5=BC=8F=E7=9A=84=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/dialog/TableThresholdEdit.vue  | 21 +++++++++++++++++--
 .../components/editor/util/DateFormatUtil.ts  |  2 ++
 .../js/panel/common/common_table.ts           | 13 ++++++++++--
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue
index 0f2fc8282a..95cf157ff2 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue
@@ -273,6 +273,9 @@ const changeThreshold = () => {
 
 const addConditions = item => {
   const newCondition = JSON.parse(JSON.stringify(thresholdCondition))
+  if (item.field.dateStyle === 'H_m_s') {
+    newCondition.value = '00:00:00'
+  }
   // 获取单元格默认背景颜色
   const tableCell = props.chart?.customAttr?.tableCell
   if (tableCell) {
@@ -542,12 +545,26 @@ init()
                 />
                 <el-date-picker
                   v-model="item.value"
-                  v-else-if="[1].includes(fieldItem.field.deType)"
+                  v-else-if="
+                    [1].includes(fieldItem.field.deType) && fieldItem.field.dateStyle !== 'H_m_s'
+                  "
                   :type="datePickerType(fieldItem.field)"
                   :placeholder="t('chart.drag_block_label_value')"
                   :format="datePickerFormat(fieldItem.field)"
                   :value-format="datePickerFormat(fieldItem.field)"
-                  key="start-time-filt"
+                  size="default"
+                  class="value-item"
+                  @change="changeThreshold"
+                  style="width: 100%"
+                />
+                <el-time-picker
+                  v-model="item.value"
+                  v-else-if="
+                    [1].includes(fieldItem.field.deType) && fieldItem.field.dateStyle === 'H_m_s'
+                  "
+                  :placeholder="t('chart.drag_block_label_value')"
+                  :format="datePickerFormat(fieldItem.field)"
+                  :value-format="datePickerFormat(fieldItem.field)"
                   size="default"
                   class="value-item"
                   @change="changeThreshold"
diff --git a/core/core-frontend/src/views/chart/components/editor/util/DateFormatUtil.ts b/core/core-frontend/src/views/chart/components/editor/util/DateFormatUtil.ts
index 27da2fa864..f4bdc19b52 100644
--- a/core/core-frontend/src/views/chart/components/editor/util/DateFormatUtil.ts
+++ b/core/core-frontend/src/views/chart/components/editor/util/DateFormatUtil.ts
@@ -18,6 +18,8 @@ export function transDateFormat(dateStyle: string, datePattern: string): string
       return `YYYY${split}MM${split}DD HH:mm`
     case 'y_M_d_H_m_s':
       return `YYYY${split}MM${split}DD HH:mm:ss`
+    case 'H_m_s':
+      return 'HH:mm:ss'
     default:
       return 'YYYY-MM-DD HH:mm:ss'
   }
diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
index 04501c8f6f..bb0b024b65 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
@@ -830,8 +830,17 @@ export function mappingColor(value, defaultColor, field, type, filedValueMap?, r
       if (!tv || !value) {
         break
       }
-      tv = new Date(tv.replace(/-/g, '/') + ' GMT+8').getTime()
-      const v = new Date(value.replace(/-/g, '/') + ' GMT+8').getTime()
+      // 特殊时间格式不转换, 包含时或者包含时、分时(不包含秒), 直接比较字符串，因为new Date转换会有误差
+      const isSpecialTimeFormat = (dateStyle?: string) =>
+        dateStyle === 'H_m_s' || (dateStyle && dateStyle.length > 5 && dateStyle.length < 11)
+
+      let v: number | string
+      if (isSpecialTimeFormat(field?.field?.dateStyle)) {
+        v = value
+      } else {
+        v = new Date(value.replace(/-/g, '/') + ' GMT+8').getTime()
+        tv = new Date(tv.replace(/-/g, '/') + ' GMT+8').getTime()
+      }
       if (fc.term === 'eq') {
         if (v === tv) {
           color = fc[type]