From e77880ba00a5a054416c8a75081a2f4391930245 Mon Sep 17 00:00:00 2001 From: zhanghang Date: Wed, 20 Aug 2025 15:02:53 +0800 Subject: [PATCH] feat:dataPanel Signed-off-by: zhanghang Change-Id: Id368b7fec46d1d62497e1fbc1baf094c773994cf --- .../main/resources/base/element/float.json | 4 ++ .../resources/base/element/id_defined.json | 6 ++ .../main/resources/base/element/pattern.json | 2 +- .../main/resources/tv/element/color.json | 72 +++++++++++++++++++ .../main/resources/tv/element/color_sys.json | 2 +- .../main/resources/tv/element/float.json | 16 +++++ 6 files changed, 100 insertions(+), 2 deletions(-) diff --git a/systemres/main/resources/base/element/float.json b/systemres/main/resources/base/element/float.json index 87de0542..449d0eba 100644 --- a/systemres/main/resources/base/element/float.json +++ b/systemres/main/resources/base/element/float.json @@ -648,6 +648,10 @@ "name": "ohos_id_datapanel_circle_thickness", "value": "24.0vp" }, + { + "name": "datapanel_track_shadow_radius", + "value": "20.0vp" + }, { "name": "ohos_id_slider_bubble_to_circle_center_distance", "value": "20.0vp" diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json index 0530150b..3643dc96 100644 --- a/systemres/main/resources/base/element/id_defined.json +++ b/systemres/main/resources/base/element/id_defined.json @@ -33238,6 +33238,12 @@ "type": "color", "name": "segment_button_border_color", "order": 6593 + }, + { + "type": "float", + "name": "datapanel_track_shadow_radius", + "order": 6594, + "flags": "private" } ] } diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json index 459ab496..7a8e0483 100644 --- a/systemres/main/resources/base/element/pattern.json +++ b/systemres/main/resources/base/element/pattern.json @@ -2078,7 +2078,7 @@ }, { "name": "track_shadow_radiu", - "value": "20.0vp" + "value": "$float:datapanel_track_shadow_radius" }, { "name": "datapanel_thickness", diff --git a/systemres/main/resources/tv/element/color.json b/systemres/main/resources/tv/element/color.json index d292657f..fff26fe1 100644 --- a/systemres/main/resources/tv/element/color.json +++ b/systemres/main/resources/tv/element/color.json @@ -523,6 +523,78 @@ { "name": "scrollbar_color_foreground", "value": "#E5E5E5" + }, + { + "name": "ohos_id_color_datapanel_color1_start", + "value": "#F7CE00" + }, + { + "name": "ohos_id_color_datapanel_color2_start", + "value": "#F76223" + }, + { + "name": "ohos_id_color_datapanel_color3_start", + "value": "#F772AC" + }, + { + "name": "ohos_id_color_datapanel_color4_start", + "value": "#A575EB" + }, + { + "name": "ohos_id_color_datapanel_color5_start", + "value": "#7B79F7" + }, + { + "name": "ohos_id_color_datapanel_color6_start", + "value": "#4B8AF3" + }, + { + "name": "ohos_id_color_datapanel_color7_start", + "value": "#73C1E6" + }, + { + "name": "ohos_id_color_datapanel_color8_start", + "value": "#A5D61D" + }, + { + "name": "ohos_id_color_datapanel_color9_start", + "value": "#A2A2B0" + }, + { + "name": "ohos_id_color_datapanel_color1_end", + "value": "#F99B11" + }, + { + "name": "ohos_id_color_datapanel_color2_end", + "value": "#F2400A" + }, + { + "name": "ohos_id_color_datapanel_color3_end", + "value": "#E65392" + }, + { + "name": "ohos_id_color_datapanel_color4_end", + "value": "#A12DF7" + }, + { + "name": "ohos_id_color_datapanel_color5_end", + "value": "#4B48F7" + }, + { + "name": "ohos_id_color_datapanel_color6_end", + "value": "#007DFF" + }, + { + "name": "ohos_id_color_datapanel_color7_end", + "value": "#4FB4E3" + }, + { + "name": "ohos_id_color_datapanel_color8_end", + "value": "#69D14F" + }, + { + "name": "ohos_id_color_datapanel_color9_end", + "value": "#8E8E93" } ] } \ No newline at end of file diff --git a/systemres/main/resources/tv/element/color_sys.json b/systemres/main/resources/tv/element/color_sys.json index fbe49705..b08fb875 100644 --- a/systemres/main/resources/tv/element/color_sys.json +++ b/systemres/main/resources/tv/element/color_sys.json @@ -62,7 +62,7 @@ }, { "name": "dataPanel_color_subheading_separator", - "value": "#33F1F3F5" + "value": "#1AFFFFFF" }, { "name": "textpicker_selected_text_color", diff --git a/systemres/main/resources/tv/element/float.json b/systemres/main/resources/tv/element/float.json index 8d62fea4..a6c89c1f 100644 --- a/systemres/main/resources/tv/element/float.json +++ b/systemres/main/resources/tv/element/float.json @@ -303,6 +303,22 @@ { "name": "menu_item_group_title_text_font_size_token", "value": "18.0vp" + }, + { + "name": "ohos_id_datapanel_trackshadow_offsetx", + "value": "6.0vp" + }, + { + "name": "ohos_id_datapanel_trackshadow_offsety", + "value": "6.0vp" + }, + { + "name": "ohos_id_datapanel_thickness", + "value": "32.0vp" + }, + { + "name": "datapanel_track_shadow_radius", + "value": "18.0vp" } ] } \ No newline at end of file -- Gitee