Skip to content

Commit 57d521c

Browse files
Vanessa219Vanessa219
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents 4d32146 + 67f64f7 commit 57d521c

22 files changed

+70
-72
lines changed

‎app/appearance/langs/de_DE.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1110,12 +1110,11 @@
11101110
"export1": "Blockzitat",
11111111
"export2": "Ankertext mit Block-URL",
11121112
"export3": "Nur Ankertext",
1113-
"export4": "Fußnoten",
1113+
"export4": "Fußnoten+Ankerhash",
11141114
"export5": "PDF-Annotation Referenz",
11151115
"export6": "Über die Verarbeitung von Ankertext in PDF-Annotationen beim Exportieren",
11161116
"export7": "Dateiname - Seitennummer - Ankertext",
11171117
"export8": "Nur Ankertext",
1118-
"export9": "Ankerhash",
11191118
"graphConfig2": "Referenzanzahlfilter",
11201119
"selectOpen": "Immer geöffnetes Dokument auswählen",
11211120
"selectOpen1": "Ausgewähltes geöffnetes Dokument",

‎app/appearance/langs/en_US.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1110,12 +1110,11 @@
11101110
"export1": "Blockquote",
11111111
"export2": "Anchor text with block URL",
11121112
"export3": "Just anchor text",
1113-
"export4": "Footnotes",
1113+
"export4": "Footnotes+Anchor hash",
11141114
"export5": "PDF Annotation Ref",
11151115
"export6": "About the handling of anchor text in PDF annotations when exporting",
11161116
"export7": "File Name - Page Number - Anchor Text",
11171117
"export8": "Just anchor text",
1118-
"export9": "Anchor hash",
11191118
"graphConfig2": "Reference Count filter",
11201119
"selectOpen": "Always Select Opened Doc",
11211120
"selectOpen1": "Select Opened Doc",

‎app/appearance/langs/es_ES.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1110,12 +1110,11 @@
11101110
"export1": "Bloque de cita",
11111111
"export2": "Texto de anclaje con URL de bloque",
11121112
"export3": "Sólo texto de anclaje",
1113-
"export4": "Notas a pie de página",
1113+
"export4": "Notas a pie de página+Hash de anclaje",
11141114
"export5": "Ref. de anotación en PDF",
11151115
"export6": "Sobre el manejo del texto ancla en las anotaciones PDF al exportar",
11161116
"export7": "Nombre de archivo - Número de página - Texto ancla",
11171117
"export8": "Sólo texto ancla",
1118-
"export9": "Hash de anclaje",
11191118
"graphConfig2": "Filtro de recuento de referencias",
11201119
"selectOpen": "Seleccionar siempre el documento abierto",
11211120
"selectOpen1": "Seleccionar documento abierto",

‎app/appearance/langs/fr_FR.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1110,12 +1110,11 @@
11101110
"export1": "Citation de bloc",
11111111
"export2": "Texte d'ancrage avec bloc URL",
11121112
"export3": "Juste du texte d'ancrage",
1113-
"export4": "Notes de bas de page",
1113+
"export4": "Notes de bas de page+Hash d'ancrage",
11141114
"export5": "Référence d'annotation PDF",
11151115
"export6": "À propos de la gestion du texte d'ancrage dans les annotations PDF lors de l'exportation",
11161116
"export7": "Nom de fichier - Numéro de page - Texte d'ancrage",
11171117
"export8": "Anchor text only",
1118-
"export9": "Hash d'ancrage",
11191118
"graphConfig2": "Filtre de compte de blocs de référence",
11201119
"selectOpen": "Localisez toujours les documents ouverts",
11211120
"selectOpen1": "Localiser les documents ouverts",

‎app/appearance/langs/he_IL.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1110,12 +1110,11 @@
11101110
"export1": "ציטוט",
11111111
"export2": "טקסט עוגן עם קישור בלוק",
11121112
"export3": "רק טקסט עוגן",
1113-
"export4": "הערות שוליים",
1113+
"export4": "ההאש של העוגן+הערות שוליים",
11141114
"export5": "הערות PDF",
11151115
"export6": "על טיפולי טקסט עוגן בהערות PDF בעת הייצוא",
11161116
"export7": "שם הקובץ - מספר עמוד - טקסט עוגן",
11171117
"export8": "רק טקסט עוגן",
1118-
"export9": "ההאש של העוגן",
11191118
"graphConfig2": "מסנן ספירת הפניות",
11201119
"selectOpen": "בחר תמיד את המסמך הפתוח",
11211120
"selectOpen1": "בחר את המסמך הפתוח",

‎app/appearance/langs/it_IT.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1110,12 +1110,11 @@
11101110
"export1": "Citazione",
11111111
"export2": "Testo dell'ancora con URL del blocco",
11121112
"export3": "Solo testo dell'ancora",
1113-
"export4": "Note a piè di pagina",
1113+
"export4": "Note a piè di pagina+Hash dell'ancora",
11141114
"export5": "Riferimento annotazione PDF",
11151115
"export6": "Riguardo alla gestione del testo dell'ancora nelle annotazioni PDF durante l'esportazione",
11161116
"export7": "Nome file - Numero pagina - Testo dell'ancora",
11171117
"export8": "Solo testo dell'ancora",
1118-
"export9": "Hash dell'ancora",
11191118
"graphConfig2": "Filtro Conteggio Riferimenti",
11201119
"selectOpen": "Seleziona sempre il documento aperto",
11211120
"selectOpen1": "Seleziona Documento Aperto",

‎app/appearance/langs/ja_JP.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1110,12 +1110,11 @@
11101110
"export1": "ブロック参照",
11111111
"export2": "ブロック URL 付きアンカーテキスト",
11121112
"export3": "アンカーテキストのみ",
1113-
"export4": "脚注",
1113+
"export4": "脚注+アンカーハッシュ",
11141114
"export5": "PDF 注釈の参照",
11151115
"export6": "エクスポート時の PDF 注釈内のアンカーテキストの処理方法",
11161116
"export7": "ファイル名 - ページ番号 - アンカーテキスト",
11171117
"export8": "アンカーテキストのみ",
1118-
"export9": "アンカーハッシュ",
11191118
"graphConfig2": "参照カウントフィルタ",
11201119
"selectOpen": "常に開いているドキュメントを選択",
11211120
"selectOpen1": "開いているドキュメントをツリーで選択",

‎app/appearance/langs/pl_PL.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1110,12 +1110,11 @@
11101110
"export1": "Cytat",
11111111
"export2": "Tekst kotwicy z URL bloku",
11121112
"export3": "Tylko tekst kotwicy",
1113-
"export4": "Przypisy",
1113+
"export4": "Przypisy+Hash kotwicy",
11141114
"export5": "Odnośnik do adnotacji PDF",
11151115
"export6": "O sposobie obsługi tekstu kotwicy w adnotacjach PDF podczas eksportu",
11161116
"export7": "Nazwa pliku - Numer strony - Tekst kotwicy",
11171117
"export8": "Tylko tekst kotwicy",
1118-
"export9": "Hash kotwicy",
11191118
"graphConfig2": "Filtr liczby odniesień",
11201119
"selectOpen": "Zawsze wybieraj otwarty dokument",
11211120
"selectOpen1": "Wybierz otwarty dokument",

‎app/appearance/langs/ru_RU.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1110,12 +1110,11 @@
11101110
"export1": "Цитата",
11111111
"export2": "Текст якоря с URL блока",
11121112
"export3": "Просто текст якоря",
1113-
"export4": "Подписи",
1113+
"export4": "Подписи+Якорь хэш",
11141114
"export5": "PDF аннотация ссылка",
11151115
"export6": "О том, как обрабатывать текст якоря в PDF аннотациях при экспорте",
11161116
"export7": "Имя файла - Номер страницы - Текст якоря",
11171117
"export8": "Просто текст якоря",
1118-
"export9": "Якорь хэш",
11191118
"graphConfig2": "Фильтр по количеству ссылок",
11201119
"selectOpen": "Всегда выбирать открытый документ",
11211120
"selectOpen1": "Выбрать открытый документ",

‎app/appearance/langs/zh_CHT.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1110,12 +1110,11 @@
11101110
"export1": "引述塊",
11111111
"export2": "錨文字塊鏈",
11121112
"export3": "僅錨文字",
1113-
"export4": "註腳",
1113+
"export4": "註腳+錨點哈希",
11141114
"export5": "PDF 標註引用",
11151115
"export6": "導出時關於 PDF 標註引出處錨文字的處理方式",
11161116
"export7": "文件名 - 頁碼 - 錨文字",
11171117
"export8": "僅錨文字",
1118-
"export9": "錨點哈希",
11191118
"graphConfig2": "引用塊次數過濾",
11201119
"selectOpen": "定位打開的文檔",
11211120
"selectOpen1": "定位打開的文檔",

‎app/appearance/langs/zh_CN.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1110,12 +1110,11 @@
11101110
"export1": "引述块",
11111111
"export2": "锚文本块链",
11121112
"export3": "仅锚文本",
1113-
"export4": "脚注",
1113+
"export4": "脚注+锚点哈希",
11141114
"export5": "PDF 标注引用",
11151115
"export6": "导出时关于 PDF 标注引出处锚文本的处理方式",
11161116
"export7": "文件名 - 页码 - 锚文本",
11171117
"export8": "仅锚文本",
1118-
"export9": "锚点哈希",
11191118
"graphConfig2": "引用块次数过滤",
11201119
"selectOpen": "始终定位打开的文档",
11211120
"selectOpen1": "定位打开的文档",

‎app/src/config/exportConfig.ts

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ export const exportConfig = {
4949
<option value="2" ${window.siyuan.config.export.blockRefMode === 2 ? "selected" : ""}>${window.siyuan.languages.export2}</option>
5050
<option value="3" ${window.siyuan.config.export.blockRefMode === 3 ? "selected" : ""}>${window.siyuan.languages.export3}</option>
5151
<option value="4" ${window.siyuan.config.export.blockRefMode === 4 ? "selected" : ""}>${window.siyuan.languages.export4}</option>
52-
<option value="5" ${window.siyuan.config.export.blockRefMode === 5 ? "selected" : ""}>${window.siyuan.languages.export9}</option>
5352
</select>
5453
</div>
5554
<div class="fn__flex b3-label config__item">

‎kernel/api/router.go

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ func ServeAPI(ginServer *gin.Engine) {
6666
ginServer.Handle("POST", "/api/system/exportConf", model.CheckAuth, model.CheckAdminRole, exportConf)
6767
ginServer.Handle("POST", "/api/system/importConf", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, importConf)
6868
ginServer.Handle("POST", "/api/system/getWorkspaceInfo", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, getWorkspaceInfo)
69+
ginServer.Handle("POST", "/api/system/reloadUI", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, reloadUI)
6970

7071
ginServer.Handle("POST", "/api/storage/setLocalStorage", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, setLocalStorage)
7172
ginServer.Handle("POST", "/api/storage/getLocalStorage", model.CheckAuth, getLocalStorage)

‎kernel/api/system.go

+7
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ import (
3535
"github.com/siyuan-note/siyuan/kernel/util"
3636
)
3737

38+
func reloadUI(c *gin.Context) {
39+
ret := gulu.Ret.NewResult()
40+
defer c.JSON(http.StatusOK, ret)
41+
42+
util.ReloadUI()
43+
}
44+
3845
func getWorkspaceInfo(c *gin.Context) {
3946
ret := gulu.Ret.NewResult()
4047
defer c.JSON(http.StatusOK, ret)

‎kernel/conf/export.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ type Export struct {
2222
// 内容块引用导出模式
2323
// 2：锚文本块链
2424
// 3：仅锚文本
25-
// 4：块引转脚注
26-
// 5：锚点哈希 https://github.com/siyuan-note/siyuan/issues/10265
27-
// （0：使用原始文本，1：使用 Blockquote。0 和 1 都已经废弃 https://github.com/siyuan-note/siyuan/issues/3155）
25+
// 4：块引转脚注+锚点哈希
26+
// （5：锚点哈希 https://github.com/siyuan-note/siyuan/issues/10265 已经废弃 https://github.com/siyuan-note/siyuan/issues/13331）
27+
// （0：使用原始文本，1：使用 Blockquote，都已经废弃 https://github.com/siyuan-note/siyuan/issues/3155）
2828
BlockRefMode int `json:"blockRefMode"`
2929
BlockEmbedMode int `json:"blockEmbedMode"` // 内容块引用导出模式，0：使用原始文本，1：使用 Blockquote
3030
BlockRefTextLeft string `json:"blockRefTextLeft"` // 内容块引用导出锚文本左侧符号，默认留空

‎kernel/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
1111
github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7
1212
github.com/88250/gulu v1.2.3-0.20241127120230-1ae6a9868a2d
13-
github.com/88250/lute v1.7.7-0.20241206153537-408cb4f3fbab
13+
github.com/88250/lute v1.7.7-0.20241208103455-3223b6b5f502
1414
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
1515
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4
1616
github.com/ConradIrwin/font v0.0.0-20240627033111-8567075b2bfe

‎kernel/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT
1414
github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
1515
github.com/88250/gulu v1.2.3-0.20241127120230-1ae6a9868a2d h1:dexFyk3UkR4c2xpyrC4Zk4L28xFbfLYAeowIW/7QYEA=
1616
github.com/88250/gulu v1.2.3-0.20241127120230-1ae6a9868a2d/go.mod h1:MUfzyfmbPrRDZLqxc7aPrVYveatTHRfoUa5TynPS0i8=
17-
github.com/88250/lute v1.7.7-0.20241206153537-408cb4f3fbab h1:TRN5UZIude8Gmks6ODC6bpT6MklMhBCDwjclpsX0YgQ=
18-
github.com/88250/lute v1.7.7-0.20241206153537-408cb4f3fbab/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk=
17+
github.com/88250/lute v1.7.7-0.20241208103455-3223b6b5f502 h1:agB9kKKmVrmMa4iSpI7YAN4O3OyV3W+w09CTwgnY7Z8=
18+
github.com/88250/lute v1.7.7-0.20241208103455-3223b6b5f502/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk=
1919
github.com/88250/pdfcpu v0.3.14-0.20241201033812-5a93b7586a01 h1:AcFe63RXjIh1XtX/dc4Es3U8bYKjlEkvavHd1nFBOHM=
2020
github.com/88250/pdfcpu v0.3.14-0.20241201033812-5a93b7586a01/go.mod h1:fVfOloBzs2+W2VJCCbq60XIxc3yJHAZ0Gahv1oO0gyI=
2121
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

‎kernel/model/conf.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package model
1818

1919
import (
2020
"bytes"
21+
"crypto/sha1"
2122
"fmt"
2223
"os"
2324
"path/filepath"
@@ -266,9 +267,10 @@ func InitConf() {
266267
if nil == Conf.Export {
267268
Conf.Export = conf.NewExport()
268269
}
269-
if 0 == Conf.Export.BlockRefMode || 1 == Conf.Export.BlockRefMode {
270+
if 0 == Conf.Export.BlockRefMode || 1 == Conf.Export.BlockRefMode || 5 == Conf.Export.BlockRefMode {
270271
// 废弃导出选项引用块转换为原始块和引述块 https://github.com/siyuan-note/siyuan/issues/3155
271-
Conf.Export.BlockRefMode = 4 // 改为脚注
272+
// 锚点哈希模式和脚注模式合并 https://github.com/siyuan-note/siyuan/issues/13331
273+
Conf.Export.BlockRefMode = 4 // 改为脚注+锚点哈希
272274
}
273275
if "" == Conf.Export.PandocBin {
274276
Conf.Export.PandocBin = util.PandocBinPath
@@ -391,6 +393,9 @@ func InitConf() {
391393
if 1 > Conf.Repo.RetentionIndexesDaily {
392394
Conf.Repo.RetentionIndexesDaily = 2
393395
}
396+
if 0 < len(Conf.Repo.Key) {
397+
logging.LogInfof("repo key [%x]", sha1.Sum(Conf.Repo.Key))
398+
}
394399

395400
if nil == Conf.Search {
396401
Conf.Search = conf.NewSearch()

0 commit comments

Comments
 (0)