0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 Clean code https://github.com/siyuan-note/siyuan/pull/12939

Browse source
This commit is contained in:
Daniel 2024-10-27 22:22:47 +08:00
parent c1a7995862
commit ed4661c4ad
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
kernel/api/icon.go
View file

@ -55,6 +55,8 @@ func getColorScheme(color string) ColorScheme {
}
func getDynamicIcon(c *gin.Context) {
// Add internal kernel API `/api/icon/getDynamicIcon` https://github.com/siyuan-note/siyuan/pull/12939
iconType := c.DefaultQuery("type", "1")
color := c.Query("color") // 不要预设默认值，不然type6返回星期就没法自动设置周末颜色了
date := c.Query("date")
@ -122,7 +124,7 @@ func getDateInfo(dateStr string, lang string, weekdayType string) map[string]int
switch lang {
case "zh_CN":
month = date.Format("1月")
switch weekdayType {
switch weekdayType {
case "1":
weekdays = []string{"周日", "周一", "周二", "周三", "周四", "周五", "周六"}
case "2":
@ -137,7 +139,7 @@ func getDateInfo(dateStr string, lang string, weekdayType string) map[string]int
weekdayStr = weekdays[date.Weekday()]
case "zh_CHT":
month = date.Format("1月")
switch weekdayType {
switch weekdayType {
case "1":
weekdays = []string{"週日", "週一", "週二", "週三", "週四", "週五", "週六"}
case "2":
@ -151,10 +153,9 @@ func getDateInfo(dateStr string, lang string, weekdayType string) map[string]int
}
weekdayStr = weekdays[date.Weekday()]
default:
// 其他语言
switch weekdayType {
switch weekdayType {
case "1":
weekdayStr = date.Format("Mon")
case "2":
@ -314,9 +315,9 @@ func generateTypeSixSVG(color string, lang string, weekdayType string, dateInfo
}
// 动态变化字体大小
var fontSize float64
switch lang{
switch lang {
case "zh_CN", "zh_CHT":
fontSize = 460 / float64(len([]rune(weekday)))
fontSize = 460 / float64(len([]rune(weekday)))
default:
switch weekdayType {
case "1":
@ -390,8 +391,8 @@ func generateTypeSevenSVG(color string, lang string, dateInfo map[string]interfa
}
dayStr := map[string]string{
"zh_CN": "天",
"zh_CHT": "天",
"zh_CN": "天",
"zh_CHT": "天",
"default": "days",
}[lang]
if dayStr == "" {

4
kernel/api/router.go
View file

@ -33,8 +33,8 @@ func ServeAPI(ginServer *gin.Engine) {
ginServer.Handle("POST", "/api/system/loginAuth", model.LoginAuth)
ginServer.Handle("POST", "/api/system/logoutAuth", model.LogoutAuth)
ginServer.Handle("GET", "/api/system/getCaptcha", model.GetCaptcha)
ginServer.Handle("GET", "/api/icon/getDynamicIcon", getDynamicIcon) // 添加动态图标路由
ginServer.Handle("GET", "/api/icon/getDynamicIcon", getDynamicIcon)
// 需要鉴权
ginServer.Handle("POST", "/api/system/getEmojiConf", model.CheckAuth, getEmojiConf)