Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
efcba48f90
2 changed files with 6 additions and 1 deletions
|
@ -688,6 +688,10 @@ func RemoveUnusedAssets() (ret []string) {
|
|||
for _, p := range unusedAssets {
|
||||
historyPath := filepath.Join(historyDir, p)
|
||||
if p = filepath.Join(util.DataDir, p); filelock.IsExist(p) {
|
||||
if filelock.IsHidden(p) {
|
||||
continue
|
||||
}
|
||||
|
||||
if err = filelock.Copy(p, historyPath); nil != err {
|
||||
return
|
||||
}
|
||||
|
|
|
@ -400,11 +400,12 @@ func SearchRefBlock(id, rootID, keyword string, beforeLen int, isSquareBrackets,
|
|||
|
||||
if !isDatabase {
|
||||
// 如果非数据库中搜索块引,则不允许新建重名文档
|
||||
// 如果是数据库中搜索绑定块,则允许新建重名文档 https://github.com/siyuan-note/siyuan/issues/11713
|
||||
if block := treenode.GetBlockTree(id); nil != block {
|
||||
p := path.Join(block.HPath, keyword)
|
||||
newDoc = nil == treenode.GetBlockTreeRootByHPath(block.BoxID, p)
|
||||
}
|
||||
} else { // 如果是数据库中搜索绑定块,则允许新建重名文档 https://github.com/siyuan-note/siyuan/issues/11713
|
||||
newDoc = true
|
||||
}
|
||||
|
||||
// 在 hPath 中加入笔记本名 Show notebooks in hpath of block ref search list results https://github.com/siyuan-note/siyuan/issues/9378
|
||||
|
|
Loading…
Add table
Reference in a new issue