github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-17 01:21:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Vanessa 2023-12-27 21:28:56 +08:00
commit c10f04f74f
5 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/config/exportConfig.ts
View File

@ -83,7 +83,7 @@ export const exportConfig = {
<div class="fn__hr"></div> <div class="fn__hr"></div>
<input class="b3-text-field fn__block" id="pdfWatermarkStr"> <input class="b3-text-field fn__block" id="pdfWatermarkStr">
<div class="fn__hr"></div> <div class="fn__hr"></div>
<div class="b3-label__text">${window.siyuan.languages.export29}</div> <div class="b3-label__text"><a href="https://pdfcpu.io/core/watermark#description" target="_blank">${window.siyuan.languages.export29}</a></div>
<div class="fn__hr"></div> <div class="fn__hr"></div>
<textarea class="b3-text-field fn__block" id="pdfWatermarkDesc"></textarea> <textarea class="b3-text-field fn__block" id="pdfWatermarkDesc"></textarea>
</div> </div>

3
app/src/protyle/render/av/cell.ts
View File

@ -322,9 +322,6 @@ export const popTextCell = (protyle: IProtyle, cellElements: HTMLElement[], type
} }
if (type === "block") { if (type === "block") {
inputElement.addEventListener("input", (event: InputEvent) => { inputElement.addEventListener("input", (event: InputEvent) => {
if (event.isComposing) {
return;
}
if (Constants.BLOCK_HINT_KEYS.includes(inputElement.value.substring(0, 2))) { if (Constants.BLOCK_HINT_KEYS.includes(inputElement.value.substring(0, 2))) {
protyle.toolbar.range = document.createRange(); protyle.toolbar.range = document.createRange();
protyle.toolbar.range.selectNodeContents(cellElements[0].lastChild); protyle.toolbar.range.selectNodeContents(cellElements[0].lastChild);

2
kernel/av/av.go
View File

@ -281,7 +281,7 @@ func SaveAttributeView(av *AttributeView) (err error) {
} }
} }
data, err := gulu.JSON.MarshalIndentJSON(av, "", "\t") // TODO: single-line for production data, err := gulu.JSON.MarshalJSON(av)
if nil != err { if nil != err {
logging.LogErrorf("marshal attribute view [%s] failed: %s", av.ID, err) logging.LogErrorf("marshal attribute view [%s] failed: %s", av.ID, err)
return return

2
kernel/model/box.go
View File

@ -501,8 +501,6 @@ func FullReindex() {
task.AppendTask(task.DatabaseIndexFull, fullReindex) task.AppendTask(task.DatabaseIndexFull, fullReindex)
task.AppendTask(task.DatabaseIndexRef, IndexRefs) task.AppendTask(task.DatabaseIndexRef, IndexRefs)
task.AppendTask(task.ReloadUI, util.ReloadUI) task.AppendTask(task.ReloadUI, util.ReloadUI)
// TODO ReindexAssetContent()
} }
func fullReindex() { func fullReindex() {

5
kernel/server/serve.go
View File

@ -80,11 +80,6 @@ func Serve(fastMode bool) {
serveRepoDiff(ginServer) serveRepoDiff(ginServer)
api.ServeAPI(ginServer) api.ServeAPI(ginServer)
// TODO 升级后结束旧内核进程
//if !fastMode && "prod" == util.Mode && util.ContainerStd == util.Container {
// killRunningKernel()
//}
var host string var host string
if model.Conf.System.NetworkServe || util.ContainerDocker == util.Container { if model.Conf.System.NetworkServe || util.ContainerDocker == util.Container {
host = "0.0.0.0" host = "0.0.0.0"