feat: add switch type for theme settings. (halo-dev#735)

zjq000100 · Mar 29, 2020 · b3dafa1 · b3dafa1
1 parent c353411
commit b3dafa1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/run/halo/app/handler/theme/config/impl/YamlThemeConfigResolverImpl.java b/src/main/java/run/halo/app/handler/theme/config/impl/YamlThemeConfigResolverImpl.java
@@ -113,8 +113,8 @@ private List<Item> handleItems(@Nullable Object items) {
                 item.setName(itemMap.get("name").toString());
                 item.setLabel(itemMap.getOrDefault("label", item.getName()).toString());
                 Object dataType = itemMap.getOrDefault("data-type", itemMap.get("dataType"));
-                item.setDataType(DataType.typeOf(dataType));
                 item.setType(InputType.typeOf(itemMap.get("type")));
+                item.setDataType(item.getType().equals(InputType.SWITCH) ? DataType.BOOL : DataType.typeOf(dataType));
                 item.setDefaultValue(itemMap.get("default"));
                 item.setPlaceholder(itemMap.getOrDefault("placeholder", "").toString());
                 item.setDescription(itemMap.getOrDefault("description", "").toString());
@@ -140,8 +140,8 @@ private List<Item> handleItems(@Nullable Object items) {
                 item.setName(key.toString());
                 item.setLabel(itemMap.getOrDefault("label", item.getName()).toString());
                 Object dataType = itemMap.getOrDefault("data-type", itemMap.get("dataType"));
-                item.setDataType(DataType.typeOf(dataType));
                 item.setType(InputType.typeOf(itemMap.get("type")));
+                item.setDataType(item.getType().equals(InputType.SWITCH) ? DataType.BOOL : DataType.typeOf(dataType));
                 item.setDefaultValue(itemMap.get("default"));
                 item.setPlaceholder(itemMap.getOrDefault("placeholder", "").toString());
                 item.setDescription(itemMap.getOrDefault("description", "").toString());

diff --git a/src/main/java/run/halo/app/model/enums/InputType.java b/src/main/java/run/halo/app/model/enums/InputType.java
@@ -44,7 +44,12 @@ public enum InputType {
     /**
      * Attachment picker input type
      */
-    ATTACHMENT;
+    ATTACHMENT,
+
+    /**
+     * Switch input type, only true or false
+     */
+    SWITCH;
 
     /**
      * Convert type to input type.