github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/749/head
Ryan Wang 2020-03-29 11:48:37 +08:00 committed by GitHub
parent c353411997
commit b3dafa195a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/run/halo/app/handler/theme/config/impl/YamlThemeConfigResolverImpl.java
View File

@ -113,8 +113,8 @@ public class YamlThemeConfigResolverImpl implements ThemeConfigResolver {
item.setName(itemMap.get("name").toString()); item.setName(itemMap.get("name").toString());
item.setLabel(itemMap.getOrDefault("label", item.getName()).toString()); item.setLabel(itemMap.getOrDefault("label", item.getName()).toString());
Object dataType = itemMap.getOrDefault("data-type", itemMap.get("dataType")); Object dataType = itemMap.getOrDefault("data-type", itemMap.get("dataType"));
item.setDataType(DataType.typeOf(dataType));
item.setType(InputType.typeOf(itemMap.get("type"))); 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.setDefaultValue(itemMap.get("default"));
item.setPlaceholder(itemMap.getOrDefault("placeholder", "").toString()); item.setPlaceholder(itemMap.getOrDefault("placeholder", "").toString());
item.setDescription(itemMap.getOrDefault("description", "").toString()); item.setDescription(itemMap.getOrDefault("description", "").toString());
@ -140,8 +140,8 @@ public class YamlThemeConfigResolverImpl implements ThemeConfigResolver {
item.setName(key.toString()); item.setName(key.toString());
item.setLabel(itemMap.getOrDefault("label", item.getName()).toString()); item.setLabel(itemMap.getOrDefault("label", item.getName()).toString());
Object dataType = itemMap.getOrDefault("data-type", itemMap.get("dataType")); Object dataType = itemMap.getOrDefault("data-type", itemMap.get("dataType"));
item.setDataType(DataType.typeOf(dataType));
item.setType(InputType.typeOf(itemMap.get("type"))); 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.setDefaultValue(itemMap.get("default"));
item.setPlaceholder(itemMap.getOrDefault("placeholder", "").toString()); item.setPlaceholder(itemMap.getOrDefault("placeholder", "").toString());
item.setDescription(itemMap.getOrDefault("description", "").toString()); item.setDescription(itemMap.getOrDefault("description", "").toString());

7
src/main/java/run/halo/app/model/enums/InputType.java
View File

@ -44,7 +44,12 @@ public enum InputType {
/** /**
* Attachment picker input type * Attachment picker input type
*/ */
ATTACHMENT; ATTACHMENT,
/**
* Switch input type, only true or false
*/
SWITCH;
/** /**
* Convert type to input type. * Convert type to input type.