From ae7fcf9dfd94b03dcf828c3a3586efce7fa676df Mon Sep 17 00:00:00 2001 From: jack ning Date: Thu, 30 Oct 2025 09:43:08 +0800 Subject: [PATCH] update --- .../kbase/settings/ToolbarSettings.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/settings/ToolbarSettings.java b/modules/kbase/src/main/java/com/bytedesk/kbase/settings/ToolbarSettings.java index 5901c5a750..701a0bea9a 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/settings/ToolbarSettings.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/settings/ToolbarSettings.java @@ -6,8 +6,11 @@ package com.bytedesk.kbase.settings; import java.io.Serializable; +import java.util.Arrays; +import java.util.List; import jakarta.persistence.Embeddable; +import jakarta.persistence.Convert; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.EqualsAndHashCode; @@ -15,6 +18,8 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import com.bytedesk.core.converter.StringListConverter; + @Getter @Setter @EqualsAndHashCode(callSuper = false) @@ -56,4 +61,16 @@ public class ToolbarSettings implements Serializable { @Builder.Default private Boolean tel = true; + + // 工具栏排列顺序(从左到右),未设置则按默认顺序 + // 说明: + // - 仅控制排序,不影响开关是否显示;是否显示由上面的 Boolean 字段决定 + // - 为兼容性与简化持久化,使用 StringListConverter 在单列中以逗号分隔方式持久化 + // - 默认顺序覆盖所有内置项,新增项请追加到末尾 + @Builder.Default + @Convert(converter = StringListConverter.class) + private List order = Arrays.asList( + "smile", "image", "file", "rate", "leavemsg", + "orderSelector", "ticket", "audio", "video", "tel" + ); }