mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-09-22 00:20:47 +02:00
Compare commits
3 commits
de19d69f99
...
ee4ddf89c1
Author | SHA1 | Date | |
---|---|---|---|
![]() |
ee4ddf89c1 | ||
![]() |
d5e7b27a11 | ||
![]() |
9c37468386 |
6 changed files with 44 additions and 22 deletions
|
@ -14,12 +14,7 @@ import {fetchPost, fetchSyncPost} from "../../util/fetch";
|
|||
import {openEmojiPanel, unicode2Emoji} from "../../emoji";
|
||||
import {mountHelp, newNotebook} from "../../util/mount";
|
||||
import {confirmDialog} from "../../dialog/confirmDialog";
|
||||
import {
|
||||
isNotCtrl,
|
||||
isOnlyMeta,
|
||||
setStorageVal,
|
||||
updateHotkeyAfterTip
|
||||
} from "../../protyle/util/compatibility";
|
||||
import {isNotCtrl, isOnlyMeta, setStorageVal, updateHotkeyAfterTip} from "../../protyle/util/compatibility";
|
||||
import {openFileById} from "../../editor/util";
|
||||
import {
|
||||
hasClosestByAttribute,
|
||||
|
@ -1016,6 +1011,12 @@ data-type="navigation-root" data-path="/">
|
|||
} else {
|
||||
sourceElement.remove();
|
||||
}
|
||||
} else {
|
||||
const parentElement = this.element.querySelector(`ul[data-url="${response.data.fromNotebook}"] li[data-path="${pathPosix().dirname(response.data.fromPath)}.sy"]`) as HTMLElement;
|
||||
if (parentElement && parentElement.getAttribute("data-count") === "1") {
|
||||
parentElement.querySelector(".b3-list-item__toggle").classList.add("fn__hidden");
|
||||
parentElement.querySelector(".b3-list-item__arrow").classList.remove("b3-list-item__arrow--open");
|
||||
}
|
||||
}
|
||||
const newElement = this.element.querySelector(`[data-url="${response.data.toNotebook}"] li[data-path="${response.data.toPath}"]`) as HTMLElement;
|
||||
// 更新移动到的新文件夹
|
||||
|
|
|
@ -206,6 +206,12 @@ func DocIAL(absPath string) (ret map[string]string) {
|
|||
return
|
||||
}
|
||||
|
||||
func TreeSize(tree *parse.Tree) (size uint64) {
|
||||
luteEngine := util.NewLute() // 不关注用户的自定义解析渲染选项
|
||||
renderer := render.NewJSONRenderer(tree, luteEngine.RenderOptions)
|
||||
return uint64(len(renderer.Render()))
|
||||
}
|
||||
|
||||
func WriteTree(tree *parse.Tree) (size uint64, err error) {
|
||||
data, filePath, err := prepareWriteTree(tree)
|
||||
if err != nil {
|
||||
|
|
|
@ -473,6 +473,8 @@ func moveTree(tree *parse.Tree) {
|
|||
|
||||
box := Conf.Box(tree.Box)
|
||||
box.renameSubTrees(tree)
|
||||
|
||||
refreshDocInfo(tree)
|
||||
}
|
||||
|
||||
func (box *Box) renameSubTrees(tree *parse.Tree) {
|
||||
|
|
|
@ -933,7 +933,7 @@ func writeTreeUpsertQueue(tree *parse.Tree) (err error) {
|
|||
return
|
||||
}
|
||||
sql.UpsertTreeQueue(tree)
|
||||
refreshDocInfo(tree, size)
|
||||
refreshDocInfoWithSize(tree, size)
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -959,7 +959,7 @@ func renameWriteJSONQueue(tree *parse.Tree) (err error) {
|
|||
}
|
||||
sql.RenameTreeQueue(tree)
|
||||
treenode.UpsertBlockTree(tree)
|
||||
refreshDocInfo(tree, size)
|
||||
refreshDocInfoWithSize(tree, size)
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -1371,6 +1371,8 @@ func moveDoc(fromBox *Box, fromPath string, toBox *Box, toPath string, luteEngin
|
|||
return
|
||||
}
|
||||
|
||||
fromParentTree := loadParentTree(tree)
|
||||
|
||||
moveToRoot := "/" == toPath
|
||||
toBlockID := tree.ID
|
||||
fromFolder := path.Join(path.Dir(fromPath), tree.ID)
|
||||
|
@ -1489,6 +1491,8 @@ func moveDoc(fromBox *Box, fromPath string, toBox *Box, toPath string, luteEngin
|
|||
}
|
||||
evt.Callback = callback
|
||||
util.PushEvent(evt)
|
||||
|
||||
refreshDocInfo(fromParentTree)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
@ -18,7 +18,6 @@ package model
|
|||
|
||||
import (
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
@ -38,25 +37,22 @@ import (
|
|||
"github.com/siyuan-note/siyuan/kernel/util"
|
||||
)
|
||||
|
||||
func refreshDocInfo(tree *parse.Tree, size uint64) {
|
||||
func refreshDocInfo(tree *parse.Tree) {
|
||||
refreshDocInfoWithSize(tree, filesys.TreeSize(tree))
|
||||
}
|
||||
|
||||
func refreshDocInfoWithSize(tree *parse.Tree, size uint64) {
|
||||
refreshDocInfo0(tree, size)
|
||||
refreshParentDocInfo(tree)
|
||||
}
|
||||
|
||||
func refreshParentDocInfo(tree *parse.Tree) {
|
||||
parentTree := loadParentTree(tree)
|
||||
if nil == parentTree {
|
||||
return
|
||||
}
|
||||
|
||||
luteEngine := lute.New()
|
||||
boxDir := filepath.Join(util.DataDir, tree.Box)
|
||||
parentDir := path.Dir(tree.Path)
|
||||
if parentDir == boxDir || parentDir == "/" {
|
||||
return
|
||||
}
|
||||
|
||||
parentPath := parentDir + ".sy"
|
||||
parentTree, err := filesys.LoadTree(tree.Box, parentPath, luteEngine)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
renderer := render.NewJSONRenderer(parentTree, luteEngine.RenderOptions)
|
||||
data := renderer.Render()
|
||||
refreshDocInfo0(parentTree, uint64(len(data)))
|
||||
|
|
|
@ -305,3 +305,16 @@ func indexTreeInFilesystem(rootID string) {
|
|||
sql.IndexTreeQueue(tree)
|
||||
logging.LogInfof("reindexed tree by filesystem [rootID=%s]", rootID)
|
||||
}
|
||||
|
||||
func loadParentTree(tree *parse.Tree) (ret *parse.Tree) {
|
||||
boxDir := filepath.Join(util.DataDir, tree.Box)
|
||||
parentDir := path.Dir(tree.Path)
|
||||
if parentDir == boxDir || parentDir == "/" {
|
||||
return
|
||||
}
|
||||
|
||||
luteEngine := lute.New()
|
||||
parentPath := parentDir + ".sy"
|
||||
ret, _ = filesys.LoadTree(tree.Box, parentPath, luteEngine)
|
||||
return
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue