From 8c175bd4f982326600c4abe4bfd61618846a2ab3 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 1 Jan 2025 09:48:36 +0800 Subject: [PATCH 1/6] :memo: Improve the user guide https://github.com/siyuan-note/siyuan/issues/13691 --- .../20240208172514-9dsv6na.sy | 6 +- .../storage/av/20240208173528-oq4elsj.json | 2 +- .../20240208113259-nykkvaq.sy | 6 +- .../storage/av/20240208163918-rxu3llx.json | 2 +- .../20240208171522-y7dxcno.sy | 6 +- .../storage/av/20240208172113-d44j7tk.json | 2 +- .../20240530101000-3eaevtp.sy | 6 +- .../storage/av/20240530133134-wlxgyny.json | 191 +----------------- 8 files changed, 16 insertions(+), 205 deletions(-) diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.sy index 53ab81c33..a6d621f6f 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20240208172514-9dsv6na.sy @@ -7,7 +7,7 @@ "id": "20240208172514-9dsv6na", "title": "Database", "type": "doc", - "updated": "20240818175612" + "updated": "20250101093657" }, "Children": [ { @@ -451,7 +451,7 @@ "HeadingLevel": 2, "Properties": { "id": "20240208173416-t51ome2", - "updated": "20240818174919" + "updated": "20250101093657" }, "Children": [ { @@ -625,7 +625,7 @@ "Type": "NodeAttributeView", "Properties": { "id": "20240208173526-0q14afa", - "updated": "20240208173644" + "updated": "20250101093657" }, "AttributeViewID": "20240208173528-oq4elsj", "AttributeViewType": "table" diff --git a/app/guide/20210808180117-6v0mkxr/storage/av/20240208173528-oq4elsj.json b/app/guide/20210808180117-6v0mkxr/storage/av/20240208173528-oq4elsj.json index 99a01d7f6..781787409 100644 --- a/app/guide/20210808180117-6v0mkxr/storage/av/20240208173528-oq4elsj.json +++ b/app/guide/20210808180117-6v0mkxr/storage/av/20240208173528-oq4elsj.json @@ -1 +1 @@ -{"spec":0,"id":"20240208173528-oq4elsj","name":"Bills","keyValues":[{"key":{"id":"20240208173528-sr9mgm6","name":"Member","type":"block","icon":"","numberFormat":"","template":""},"values":[{"id":"20240208173547-9x0d8po","keyID":"20240208173528-sr9mgm6","blockID":"20240208173547-veq5qz2","type":"block","isDetached":true,"block":{"id":"20240208173547-veq5qz2","content":"Vanessa","created":1707384947609,"updated":1707385000686}},{"id":"20240208173640-2a2sjas","keyID":"20240208173528-sr9mgm6","blockID":"20240208173640-vtvezcd","type":"block","isDetached":true,"block":{"id":"20240208173640-vtvezcd","content":"Daniel","created":1707385000748,"updated":1707385005315}}]},{"key":{"id":"20240208173602-eb1t8f3","name":"Food","type":"number","icon":"","numberFormat":"","template":""},"values":[{"id":"20240208173634-tgqb4mj","keyID":"20240208173602-eb1t8f3","blockID":"20240208173547-veq5qz2","type":"number","number":{"content":200,"isNotEmpty":true,"format":"","formattedContent":""}},{"id":"20240208173642-zmtnj1n","keyID":"20240208173602-eb1t8f3","blockID":"20240208173640-vtvezcd","type":"number","number":{"content":100,"isNotEmpty":true,"format":"","formattedContent":""}}]},{"key":{"id":"20240208173613-63yyflw","name":"Clothing","type":"number","icon":"","numberFormat":"","template":""},"values":[{"id":"20240208173638-mynirul","keyID":"20240208173613-63yyflw","blockID":"20240208173547-veq5qz2","type":"number","number":{"content":200,"isNotEmpty":true,"format":"","formattedContent":""}},{"id":"20240208173643-tqf89zr","keyID":"20240208173613-63yyflw","blockID":"20240208173640-vtvezcd","type":"number","number":{"content":100,"isNotEmpty":true,"format":"","formattedContent":""}}]},{"key":{"id":"20240208173650-jgh4bsl","name":"Template","type":"template","icon":"","numberFormat":"","template":".action{ addf .Food .Clothing }"}}],"viewID":"20240208173528-mypxa3f","views":[{"id":"20240208173528-mypxa3f","icon":"","name":"Table","type":"table","table":{"spec":0,"id":"20240208173528-ys87y7w","columns":[{"id":"20240208173528-sr9mgm6","wrap":false,"hidden":false,"pin":false,"width":""},{"id":"20240208173602-eb1t8f3","wrap":false,"hidden":false,"pin":false,"width":"110px"},{"id":"20240208173613-63yyflw","wrap":false,"hidden":false,"pin":false,"width":"119px"},{"id":"20240208173650-jgh4bsl","wrap":false,"hidden":false,"pin":false,"width":""}],"rowIds":["20240208173547-veq5qz2","20240208173640-vtvezcd"],"filters":[],"sorts":[],"pageSize":50}}]} \ No newline at end of file +{"spec":1,"id":"20240208173528-oq4elsj","name":"Bills","keyValues":[{"key":{"id":"20240208173528-sr9mgm6","name":"Member","type":"block","icon":"","desc":"","numberFormat":"","template":""},"values":[{"id":"20240208173547-9x0d8po","keyID":"20240208173528-sr9mgm6","blockID":"20240208173547-veq5qz2","type":"block","isDetached":true,"createdAt":1707384947000,"updatedAt":1707384947000,"block":{"id":"20240208173547-veq5qz2","icon":"","content":"Vanessa","created":1707384947609,"updated":1707385000686}},{"id":"20240208173640-2a2sjas","keyID":"20240208173528-sr9mgm6","blockID":"20240208173640-vtvezcd","type":"block","isDetached":true,"createdAt":1707385000000,"updatedAt":1707385000000,"block":{"id":"20240208173640-vtvezcd","icon":"","content":"Daniel","created":1707385000748,"updated":1707385005315}}]},{"key":{"id":"20240208173602-eb1t8f3","name":"Food","type":"number","icon":"","desc":"","numberFormat":"","template":""},"values":[{"id":"20240208173634-tgqb4mj","keyID":"20240208173602-eb1t8f3","blockID":"20240208173547-veq5qz2","type":"number","createdAt":1707384994000,"updatedAt":1707384994000,"number":{"content":200,"isNotEmpty":true,"format":"","formattedContent":""}},{"id":"20240208173642-zmtnj1n","keyID":"20240208173602-eb1t8f3","blockID":"20240208173640-vtvezcd","type":"number","createdAt":1707385002000,"updatedAt":1707385002000,"number":{"content":100,"isNotEmpty":true,"format":"","formattedContent":""}}]},{"key":{"id":"20240208173613-63yyflw","name":"Clothing","type":"number","icon":"","desc":"","numberFormat":"","template":""},"values":[{"id":"20240208173638-mynirul","keyID":"20240208173613-63yyflw","blockID":"20240208173547-veq5qz2","type":"number","createdAt":1707384998000,"updatedAt":1707384998000,"number":{"content":200,"isNotEmpty":true,"format":"","formattedContent":""}},{"id":"20240208173643-tqf89zr","keyID":"20240208173613-63yyflw","blockID":"20240208173640-vtvezcd","type":"number","createdAt":1707385003000,"updatedAt":1707385003000,"number":{"content":100,"isNotEmpty":true,"format":"","formattedContent":""}}]},{"key":{"id":"20240208173650-jgh4bsl","name":"Template","type":"template","icon":"","desc":"","numberFormat":"","template":".action{ addf .Food .Clothing }"}},{"key":{"id":"20250101093657-yrzhsae","name":"Template accessible fields","type":"template","icon":"","desc":"","numberFormat":"","template":".action{ toPrettyJson . }"}}],"keyIDs":null,"viewID":"20240208173528-mypxa3f","views":[{"id":"20240208173528-mypxa3f","icon":"","name":"Table","hideAttrViewName":false,"desc":"","type":"table","table":{"spec":0,"id":"20240208173528-ys87y7w","columns":[{"id":"20240208173528-sr9mgm6","wrap":false,"hidden":false,"pin":false,"width":""},{"id":"20240208173602-eb1t8f3","wrap":false,"hidden":false,"pin":false,"width":"110px"},{"id":"20240208173613-63yyflw","wrap":false,"hidden":false,"pin":false,"width":"119px"},{"id":"20240208173650-jgh4bsl","wrap":false,"hidden":false,"pin":false,"width":""},{"id":"20250101093657-yrzhsae","wrap":false,"hidden":false,"pin":false,"width":""}],"rowIds":["20240208173547-veq5qz2","20240208173640-vtvezcd"],"filters":[],"sorts":[],"pageSize":50}}]} \ No newline at end of file diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.sy index 5688e15c0..5064057cc 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.sy @@ -7,7 +7,7 @@ "id": "20240208113259-nykkvaq", "title": "数据库", "type": "doc", - "updated": "20240818174633" + "updated": "20250101093504" }, "Children": [ { @@ -450,7 +450,7 @@ "HeadingLevel": 2, "Properties": { "id": "20240208120846-72y7j0d", - "updated": "20240208162613" + "updated": "20250101093504" }, "Children": [ { @@ -623,7 +623,7 @@ "Type": "NodeAttributeView", "Properties": { "id": "20240208163916-efx3nkg", - "updated": "20240208165241" + "updated": "20250101093504" }, "AttributeViewID": "20240208163918-rxu3llx", "AttributeViewType": "table" diff --git a/app/guide/20210808180117-czj9bvb/storage/av/20240208163918-rxu3llx.json b/app/guide/20210808180117-czj9bvb/storage/av/20240208163918-rxu3llx.json index 981f56f41..e6729c44c 100644 --- a/app/guide/20210808180117-czj9bvb/storage/av/20240208163918-rxu3llx.json +++ b/app/guide/20210808180117-czj9bvb/storage/av/20240208163918-rxu3llx.json @@ -1 +1 @@ -{"spec":0,"id":"20240208163918-rxu3llx","name":"账单","keyValues":[{"key":{"id":"20240208163918-odyw3i7","name":"成员","type":"block","icon":"","numberFormat":"","template":""},"values":[{"id":"20240208163921-wnf3fqx","keyID":"20240208163918-odyw3i7","blockID":"20240208163920-51nyfyp","type":"block","isDetached":true,"block":{"id":"20240208163920-51nyfyp","content":"Daniel","created":1707381561387,"updated":1707381900674}},{"id":"20240208164408-fwrlt7q","keyID":"20240208163918-odyw3i7","blockID":"20240208164407-q5jgzt1","type":"block","isDetached":true,"block":{"id":"20240208164407-q5jgzt1","content":"Vanessa","created":1707381848145,"updated":1707381890239}}]},{"key":{"id":"20240208164200-aoez2h2","name":"餐饮","type":"number","icon":"","numberFormat":"","template":""},"values":[{"id":"20240208164415-frgrrdi","keyID":"20240208164200-aoez2h2","blockID":"20240208164407-q5jgzt1","type":"number","number":{"content":200,"isNotEmpty":true,"format":"","formattedContent":""}},{"id":"20240208164450-ssb7h5h","keyID":"20240208164200-aoez2h2","blockID":"20240208163920-51nyfyp","type":"number","number":{"content":100,"isNotEmpty":true,"format":"","formattedContent":""}}]},{"key":{"id":"20240208164420-mwu0h5t","name":"服装","type":"number","icon":"","numberFormat":"","template":""},"values":[{"id":"20240208164441-woggrha","keyID":"20240208164420-mwu0h5t","blockID":"20240208164407-q5jgzt1","type":"number","number":{"content":200,"isNotEmpty":true,"format":"","formattedContent":""}},{"id":"20240208164457-fzglttu","keyID":"20240208164420-mwu0h5t","blockID":"20240208163920-51nyfyp","type":"number","number":{"content":100,"isNotEmpty":true,"format":"","formattedContent":""}}]},{"key":{"id":"20240208164505-39qizr5","name":"模板","type":"template","icon":"","numberFormat":"","template":".action{ addf .餐饮 .服装 }"}}],"viewID":"20240208163918-47rg4d7","views":[{"id":"20240208163918-47rg4d7","icon":"","name":"表格","type":"table","table":{"spec":0,"id":"20240208163918-o93ff8j","columns":[{"id":"20240208163918-odyw3i7","wrap":false,"hidden":false,"pin":false,"width":"152px"},{"id":"20240208164200-aoez2h2","wrap":false,"hidden":false,"pin":false,"width":"97px"},{"id":"20240208164420-mwu0h5t","wrap":false,"hidden":false,"pin":false,"width":"126px"},{"id":"20240208164505-39qizr5","wrap":false,"hidden":false,"pin":false,"width":"129px"}],"rowIds":["20240208164407-q5jgzt1","20240208163920-51nyfyp"],"filters":[],"sorts":[],"pageSize":50}}]} \ No newline at end of file +{"spec":1,"id":"20240208163918-rxu3llx","name":"账单","keyValues":[{"key":{"id":"20240208163918-odyw3i7","name":"成员","type":"block","icon":"","desc":"","numberFormat":"","template":""},"values":[{"id":"20240208163921-wnf3fqx","keyID":"20240208163918-odyw3i7","blockID":"20240208163920-51nyfyp","type":"block","isDetached":true,"createdAt":1707381561000,"updatedAt":1707381561000,"block":{"id":"20240208163920-51nyfyp","icon":"","content":"Daniel","created":1707381561387,"updated":1707381900674}},{"id":"20240208164408-fwrlt7q","keyID":"20240208163918-odyw3i7","blockID":"20240208164407-q5jgzt1","type":"block","isDetached":true,"createdAt":1707381848000,"updatedAt":1707381848000,"block":{"id":"20240208164407-q5jgzt1","icon":"","content":"Vanessa","created":1707381848145,"updated":1707381890239}}]},{"key":{"id":"20240208164200-aoez2h2","name":"餐饮","type":"number","icon":"","desc":"","numberFormat":"","template":""},"values":[{"id":"20240208164415-frgrrdi","keyID":"20240208164200-aoez2h2","blockID":"20240208164407-q5jgzt1","type":"number","createdAt":1707381855000,"updatedAt":1707381855000,"number":{"content":200,"isNotEmpty":true,"format":"","formattedContent":""}},{"id":"20240208164450-ssb7h5h","keyID":"20240208164200-aoez2h2","blockID":"20240208163920-51nyfyp","type":"number","createdAt":1707381890000,"updatedAt":1707381890000,"number":{"content":100,"isNotEmpty":true,"format":"","formattedContent":""}}]},{"key":{"id":"20240208164420-mwu0h5t","name":"服装","type":"number","icon":"","desc":"","numberFormat":"","template":""},"values":[{"id":"20240208164441-woggrha","keyID":"20240208164420-mwu0h5t","blockID":"20240208164407-q5jgzt1","type":"number","createdAt":1707381881000,"updatedAt":1707381881000,"number":{"content":200,"isNotEmpty":true,"format":"","formattedContent":""}},{"id":"20240208164457-fzglttu","keyID":"20240208164420-mwu0h5t","blockID":"20240208163920-51nyfyp","type":"number","createdAt":1707381897000,"updatedAt":1707381897000,"number":{"content":100,"isNotEmpty":true,"format":"","formattedContent":""}}]},{"key":{"id":"20240208164505-39qizr5","name":"模板","type":"template","icon":"","desc":"","numberFormat":"","template":".action{ addf .餐饮 .服装 }"}},{"key":{"id":"20250101093504-k2a5hdz","name":"模板可访问字段","type":"template","icon":"","desc":"","numberFormat":"","template":".action{ toPrettyJson . }"}}],"keyIDs":null,"viewID":"20240208163918-47rg4d7","views":[{"id":"20240208163918-47rg4d7","icon":"","name":"表格","hideAttrViewName":false,"desc":"","type":"table","table":{"spec":0,"id":"20240208163918-o93ff8j","columns":[{"id":"20240208163918-odyw3i7","wrap":false,"hidden":false,"pin":false,"width":"152px"},{"id":"20240208164200-aoez2h2","wrap":false,"hidden":false,"pin":false,"width":"97px"},{"id":"20240208164420-mwu0h5t","wrap":false,"hidden":false,"pin":false,"width":"126px"},{"id":"20240208164505-39qizr5","wrap":false,"hidden":false,"pin":false,"width":"129px"},{"id":"20250101093504-k2a5hdz","wrap":false,"hidden":false,"pin":false,"width":"252px"}],"rowIds":["20240208164407-q5jgzt1","20240208163920-51nyfyp"],"filters":[],"sorts":[],"pageSize":50}}]} \ No newline at end of file diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.sy index f9c2597e8..12ce88f60 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.sy @@ -7,7 +7,7 @@ "id": "20240208171522-y7dxcno", "title": "資料庫", "type": "doc", - "updated": "20241018105422" + "updated": "20250101093843" }, "Children": [ { @@ -451,7 +451,7 @@ "HeadingLevel": 2, "Properties": { "id": "20240208172038-fewwv8i", - "updated": "20240818174403" + "updated": "20250101093843" }, "Children": [ { @@ -625,7 +625,7 @@ "Type": "NodeAttributeView", "Properties": { "id": "20240208172110-1izrwj1", - "updated": "20240208172253" + "updated": "20250101093843" }, "AttributeViewID": "20240208172113-d44j7tk", "AttributeViewType": "table" diff --git a/app/guide/20211226090932-5lcq56f/storage/av/20240208172113-d44j7tk.json b/app/guide/20211226090932-5lcq56f/storage/av/20240208172113-d44j7tk.json index f568557ae..db28225fb 100644 --- a/app/guide/20211226090932-5lcq56f/storage/av/20240208172113-d44j7tk.json +++ b/app/guide/20211226090932-5lcq56f/storage/av/20240208172113-d44j7tk.json @@ -1 +1 @@ -{"spec":0,"id":"20240208172113-d44j7tk","name":"帳單","keyValues":[{"key":{"id":"20240208172113-hn7lwco","name":"成員","type":"block","icon":"","numberFormat":"","template":""},"values":[{"id":"20240208172126-ynrrshq","keyID":"20240208172113-hn7lwco","blockID":"20240208172126-neaobxa","type":"block","isDetached":true,"block":{"id":"20240208172126-neaobxa","content":"Vanessa","created":1707384086747,"updated":1707384174445}},{"id":"20240208172240-d3dsy6i","keyID":"20240208172113-hn7lwco","blockID":"20240208172240-uwuu9g9","type":"block","isDetached":true,"block":{"id":"20240208172240-uwuu9g9","content":"Daniel","created":1707384160578,"updated":1707384171749}}]},{"key":{"id":"20240208172135-i3cwvyo","name":"餐飲","type":"number","icon":"","numberFormat":"","template":""},"values":[{"id":"20240208172218-ckk1ev4","keyID":"20240208172135-i3cwvyo","blockID":"20240208172126-neaobxa","type":"number","number":{"content":200,"isNotEmpty":true,"format":"","formattedContent":""}},{"id":"20240208172247-vp8e7wh","keyID":"20240208172135-i3cwvyo","blockID":"20240208172240-uwuu9g9","type":"number","number":{"content":100,"isNotEmpty":true,"format":"","formattedContent":""}}]},{"key":{"id":"20240208172151-pi27t4x","name":"服裝","type":"number","icon":"","numberFormat":"","template":""},"values":[{"id":"20240208172249-lkuwtvh","keyID":"20240208172151-pi27t4x","blockID":"20240208172240-uwuu9g9","type":"number","number":{"content":100,"isNotEmpty":true,"format":"","formattedContent":""}},{"id":"20240208172252-jmq4f98","keyID":"20240208172151-pi27t4x","blockID":"20240208172126-neaobxa","type":"number","number":{"content":200,"isNotEmpty":true,"format":"","formattedContent":""}}]},{"key":{"id":"20240208172201-ray3imv","name":"模板","type":"template","icon":"","numberFormat":"","template":".action{ addf .餐飲 .服裝 }"}}],"viewID":"20240208172113-fg7pq9w","views":[{"id":"20240208172113-fg7pq9w","icon":"","name":"表格","type":"table","table":{"spec":0,"id":"20240208172113-k1s6squ","columns":[{"id":"20240208172113-hn7lwco","wrap":false,"hidden":false,"pin":false,"width":""},{"id":"20240208172135-i3cwvyo","wrap":false,"hidden":false,"pin":false,"width":"106px"},{"id":"20240208172151-pi27t4x","wrap":false,"hidden":false,"pin":false,"width":"119px"},{"id":"20240208172201-ray3imv","wrap":false,"hidden":false,"pin":false,"width":""}],"rowIds":["20240208172126-neaobxa","20240208172240-uwuu9g9"],"filters":[],"sorts":[],"pageSize":50}}]} \ No newline at end of file +{"spec":1,"id":"20240208172113-d44j7tk","name":"帳單","keyValues":[{"key":{"id":"20240208172113-hn7lwco","name":"成員","type":"block","icon":"","desc":"","numberFormat":"","template":""},"values":[{"id":"20240208172126-ynrrshq","keyID":"20240208172113-hn7lwco","blockID":"20240208172126-neaobxa","type":"block","isDetached":true,"createdAt":1707384086000,"updatedAt":1707384086000,"block":{"id":"20240208172126-neaobxa","icon":"","content":"Vanessa","created":1707384086747,"updated":1707384174445}},{"id":"20240208172240-d3dsy6i","keyID":"20240208172113-hn7lwco","blockID":"20240208172240-uwuu9g9","type":"block","isDetached":true,"createdAt":1707384160000,"updatedAt":1707384160000,"block":{"id":"20240208172240-uwuu9g9","icon":"","content":"Daniel","created":1707384160578,"updated":1707384171749}}]},{"key":{"id":"20240208172135-i3cwvyo","name":"餐飲","type":"number","icon":"","desc":"","numberFormat":"","template":""},"values":[{"id":"20240208172218-ckk1ev4","keyID":"20240208172135-i3cwvyo","blockID":"20240208172126-neaobxa","type":"number","createdAt":1707384138000,"updatedAt":1707384138000,"number":{"content":200,"isNotEmpty":true,"format":"","formattedContent":""}},{"id":"20240208172247-vp8e7wh","keyID":"20240208172135-i3cwvyo","blockID":"20240208172240-uwuu9g9","type":"number","createdAt":1707384167000,"updatedAt":1707384167000,"number":{"content":100,"isNotEmpty":true,"format":"","formattedContent":""}}]},{"key":{"id":"20240208172151-pi27t4x","name":"服裝","type":"number","icon":"","desc":"","numberFormat":"","template":""},"values":[{"id":"20240208172249-lkuwtvh","keyID":"20240208172151-pi27t4x","blockID":"20240208172240-uwuu9g9","type":"number","createdAt":1707384169000,"updatedAt":1707384169000,"number":{"content":100,"isNotEmpty":true,"format":"","formattedContent":""}},{"id":"20240208172252-jmq4f98","keyID":"20240208172151-pi27t4x","blockID":"20240208172126-neaobxa","type":"number","createdAt":1707384172000,"updatedAt":1707384172000,"number":{"content":200,"isNotEmpty":true,"format":"","formattedContent":""}}]},{"key":{"id":"20240208172201-ray3imv","name":"模板","type":"template","icon":"","desc":"","numberFormat":"","template":".action{ addf .餐飲 .服裝 }"}},{"key":{"id":"20250101093843-ij8gm0x","name":"模板可存取字段","type":"template","icon":"","desc":"","numberFormat":"","template":".action{ toPrettyJson . }"}}],"keyIDs":null,"viewID":"20240208172113-fg7pq9w","views":[{"id":"20240208172113-fg7pq9w","icon":"","name":"表格","hideAttrViewName":false,"desc":"","type":"table","table":{"spec":0,"id":"20240208172113-k1s6squ","columns":[{"id":"20240208172113-hn7lwco","wrap":false,"hidden":false,"pin":false,"width":""},{"id":"20240208172135-i3cwvyo","wrap":false,"hidden":false,"pin":false,"width":"106px"},{"id":"20240208172151-pi27t4x","wrap":false,"hidden":false,"pin":false,"width":"119px"},{"id":"20240208172201-ray3imv","wrap":false,"hidden":false,"pin":false,"width":""},{"id":"20250101093843-ij8gm0x","wrap":false,"hidden":false,"pin":false,"width":""}],"rowIds":["20240208172126-neaobxa","20240208172240-uwuu9g9"],"filters":[],"sorts":[],"pageSize":50}}]} \ No newline at end of file diff --git a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-3eaevtp.sy b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-3eaevtp.sy index 3ce76604a..f497fb812 100644 --- a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-3eaevtp.sy +++ b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-3eaevtp.sy @@ -8,7 +8,7 @@ "id": "20240530101000-3eaevtp", "title": "データベース", "type": "doc", - "updated": "20240818190253" + "updated": "20250101093828" }, "Children": [ { @@ -488,7 +488,7 @@ "Properties": { "ID": "20240530101000-gdiaw90", "id": "20240530101000-yinvvxy", - "updated": "20240530101000" + "updated": "20250101093828" }, "Children": [ { @@ -670,7 +670,7 @@ "Properties": { "ID": "20240530101000-aw1m47o", "id": "20240530101000-f2texj8", - "updated": "20240530101000" + "updated": "20250101093828" }, "AttributeViewID": "20240530133134-wlxgyny", "AttributeViewType": "table" diff --git a/app/guide/20240530133126-axarxgx/storage/av/20240530133134-wlxgyny.json b/app/guide/20240530133126-axarxgx/storage/av/20240530133134-wlxgyny.json index 4d5567cca..6d1e24c28 100644 --- a/app/guide/20240530133126-axarxgx/storage/av/20240530133134-wlxgyny.json +++ b/app/guide/20240530133126-axarxgx/storage/av/20240530133134-wlxgyny.json @@ -1,190 +1 @@ -{ - "spec": 0, - "ID": "20240530133134-wlxgyny", - "name": "請求書", - "keyValues": [ - { - "key": { - "ID": "20240530101000-sr9mgm6", - "name": "メンバー", - "type": "block", - "icon": "", - "numberFormat": "", - "template": "" - }, - "values": [ - { - "ID": "20240530101000-9x0d8po", - "keyID": "20240530101000-sr9mgm6", - "blockID": "20240530101000-veq5qz2", - "type": "block", - "isDetached": true, - "createdAt": 1707381347000, - "updatedAt": 1707381347000, - "block": { - "ID": "20240530101000-veq5qz2", - "content": "Vanessa", - "created": 1707384947609, - "updated": 1707385000686 - } - }, - { - "ID": "20240530101000-2a2sjas", - "keyID": "20240530101000-sr9mgm6", - "blockID": "20240530101000-vtvezcd", - "type": "block", - "isDetached": true, - "createdAt": 1707381400000, - "updatedAt": 1707381400000, - "block": { - "ID": "20240530101000-vtvezcd", - "content": "Daniel", - "created": 1707385000748, - "updated": 1707385005315 - } - } - ] - }, - { - "key": { - "ID": "20240530101000-eb1t8f3", - "name": "食事代", - "type": "number", - "icon": "", - "numberFormat": "", - "template": "" - }, - "values": [ - { - "ID": "20240530101000-tgqb4mj", - "keyID": "20240530101000-eb1t8f3", - "blockID": "20240530101000-veq5qz2", - "type": "number", - "createdAt": 1707381394000, - "updatedAt": 1707381394000, - "number": { - "content": 200, - "isNotEmpty": true, - "format": "", - "formattedContent": "" - } - }, - { - "ID": "20240530101000-zmtnj1n", - "keyID": "20240530101000-eb1t8f3", - "blockID": "20240530101000-vtvezcd", - "type": "number", - "createdAt": 1707381402000, - "updatedAt": 1707381402000, - "number": { - "content": 100, - "isNotEmpty": true, - "format": "", - "formattedContent": "" - } - } - ] - }, - { - "key": { - "ID": "20240530101000-63yyflw", - "name": "衣装代", - "type": "number", - "icon": "", - "numberFormat": "", - "template": "" - }, - "values": [ - { - "ID": "20240530101000-mynirul", - "keyID": "20240530101000-63yyflw", - "blockID": "20240530101000-veq5qz2", - "type": "number", - "createdAt": 1707381398000, - "updatedAt": 1707381398000, - "number": { - "content": 200, - "isNotEmpty": true, - "format": "", - "formattedContent": "" - } - }, - { - "ID": "20240530101000-tqf89zr", - "keyID": "20240530101000-63yyflw", - "blockID": "20240530101000-vtvezcd", - "type": "number", - "createdAt": 1707381403000, - "updatedAt": 1707381403000, - "number": { - "content": 100, - "isNotEmpty": true, - "format": "", - "formattedContent": "" - } - } - ] - }, - { - "key": { - "ID": "20240530101000-jgh4bsl", - "name": "テンプレート", - "type": "template", - "icon": "", - "numberFormat": "", - "template": ".action{ addf .食事代 .衣装代 }" - } - } - ], - "viewID": "20240530101000-mypxa3f", - "views": [ - { - "ID": "20240530101000-mypxa3f", - "icon": "", - "name": "テーブル", - "hideAttrViewName": false, - "type": "table", - "table": { - "spec": 0, - "ID": "20240530101000-ys87y7w", - "columns": [ - { - "ID": "20240530101000-sr9mgm6", - "wrap": false, - "hidden": false, - "pin": false, - "width": "" - }, - { - "ID": "20240530101000-eb1t8f3", - "wrap": false, - "hidden": false, - "pin": false, - "width": "110px" - }, - { - "ID": "20240530101000-63yyflw", - "wrap": false, - "hidden": false, - "pin": false, - "width": "119px" - }, - { - "ID": "20240530101000-jgh4bsl", - "wrap": false, - "hidden": false, - "pin": false, - "width": "" - } - ], - "rowIds": [ - "20240530101000-veq5qz2", - "20240530101000-vtvezcd" - ], - "filters": [], - "sorts": [], - "pageSize": 50 - } - } - ] -} \ No newline at end of file +{"spec":1,"id":"20240530133134-wlxgyny","name":"請求書","keyValues":[{"key":{"id":"20240530101000-sr9mgm6","name":"メンバー","type":"block","icon":"","desc":"","numberFormat":"","template":""},"values":[{"id":"20240530101000-9x0d8po","keyID":"20240530101000-sr9mgm6","blockID":"20240530101000-veq5qz2","type":"block","isDetached":true,"createdAt":1707381347000,"updatedAt":1707381347000,"block":{"id":"20240530101000-veq5qz2","icon":"","content":"Vanessa","created":1707384947609,"updated":1707385000686}},{"id":"20240530101000-2a2sjas","keyID":"20240530101000-sr9mgm6","blockID":"20240530101000-vtvezcd","type":"block","isDetached":true,"createdAt":1707381400000,"updatedAt":1707381400000,"block":{"id":"20240530101000-vtvezcd","icon":"","content":"Daniel","created":1707385000748,"updated":1707385005315}}]},{"key":{"id":"20240530101000-eb1t8f3","name":"食事代","type":"number","icon":"","desc":"","numberFormat":"","template":""},"values":[{"id":"20240530101000-tgqb4mj","keyID":"20240530101000-eb1t8f3","blockID":"20240530101000-veq5qz2","type":"number","createdAt":1707381394000,"updatedAt":1707381394000,"number":{"content":200,"isNotEmpty":true,"format":"","formattedContent":""}},{"id":"20240530101000-zmtnj1n","keyID":"20240530101000-eb1t8f3","blockID":"20240530101000-vtvezcd","type":"number","createdAt":1707381402000,"updatedAt":1707381402000,"number":{"content":100,"isNotEmpty":true,"format":"","formattedContent":""}}]},{"key":{"id":"20240530101000-63yyflw","name":"衣装代","type":"number","icon":"","desc":"","numberFormat":"","template":""},"values":[{"id":"20240530101000-mynirul","keyID":"20240530101000-63yyflw","blockID":"20240530101000-veq5qz2","type":"number","createdAt":1707381398000,"updatedAt":1707381398000,"number":{"content":200,"isNotEmpty":true,"format":"","formattedContent":""}},{"id":"20240530101000-tqf89zr","keyID":"20240530101000-63yyflw","blockID":"20240530101000-vtvezcd","type":"number","createdAt":1707381403000,"updatedAt":1707381403000,"number":{"content":100,"isNotEmpty":true,"format":"","formattedContent":""}}]},{"key":{"id":"20240530101000-jgh4bsl","name":"テンプレート","type":"template","icon":"","desc":"","numberFormat":"","template":".action{ addf .食事代 .衣装代 }"}},{"key":{"id":"20250101093828-8x9pndd","name":"テンプレートでアクセス可能なフィールド","type":"template","icon":"","desc":"","numberFormat":"","template":".action{ toPrettyJson . }"}}],"keyIDs":null,"viewID":"20240530101000-mypxa3f","views":[{"id":"20240530101000-mypxa3f","icon":"","name":"テーブル","hideAttrViewName":false,"desc":"","type":"table","table":{"spec":0,"id":"20240530101000-ys87y7w","columns":[{"id":"20240530101000-sr9mgm6","wrap":false,"hidden":false,"pin":false,"width":""},{"id":"20240530101000-eb1t8f3","wrap":false,"hidden":false,"pin":false,"width":"110px"},{"id":"20240530101000-63yyflw","wrap":false,"hidden":false,"pin":false,"width":"119px"},{"id":"20240530101000-jgh4bsl","wrap":false,"hidden":false,"pin":false,"width":""},{"id":"20250101093828-8x9pndd","wrap":false,"hidden":false,"pin":false,"width":""}],"rowIds":["20240530101000-veq5qz2","20240530101000-vtvezcd"],"filters":[],"sorts":[],"pageSize":50}}]} \ No newline at end of file From 9db8b0bfab3adc2fe9ee382084283e34d6e7b0a1 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 1 Jan 2025 11:02:16 +0800 Subject: [PATCH 2/6] :art: Improve exporting https://github.com/siyuan-note/siyuan/issues/13685 --- app/appearance/langs/ar_SA.json | 3 ++- app/appearance/langs/de_DE.json | 3 ++- app/appearance/langs/en_US.json | 3 ++- app/appearance/langs/es_ES.json | 3 ++- app/appearance/langs/fr_FR.json | 3 ++- app/appearance/langs/he_IL.json | 3 ++- app/appearance/langs/it_IT.json | 3 ++- app/appearance/langs/ja_JP.json | 3 ++- app/appearance/langs/pl_PL.json | 3 ++- app/appearance/langs/ru_RU.json | 3 ++- app/appearance/langs/zh_CHT.json | 3 ++- app/appearance/langs/zh_CN.json | 3 ++- kernel/model/export.go | 31 +++++++++++++++++++++++-------- 13 files changed, 47 insertions(+), 20 deletions(-) diff --git a/app/appearance/langs/ar_SA.json b/app/appearance/langs/ar_SA.json index 918442538..fe6bd19b1 100644 --- a/app/appearance/langs/ar_SA.json +++ b/app/appearance/langs/ar_SA.json @@ -1582,6 +1582,7 @@ "249": "تعذر الوصول إلى البيانات بسبب خطأ في الإعدادات. الرجاء التحقق من الإعدادات وأذونات التخزين السحابية", "250": "تم تحديد معدل الطلب بواسطة التخزين السحابي. الرجاء التحقق من الإعدادات وأذونات التخزين السحابية", "251": "‫مجموع الأصول غير المستخدمة [%d]، [%d] فقط منها مدرج هنا‬", - "252": "\uD83D\uDEA8 قد يقوم Microsoft Defender بحذف النواة عن طريق الخطأ، وحذف البيانات وتقليل الأداء بشكل كبير. يُوصى بإضافة مسار التثبيت ومسار مساحة العمل الخاصة بـ SiYuan إلى قائمة الاستثناءات" + "252": "\uD83D\uDEA8 قد يقوم Microsoft Defender بحذف النواة عن طريق الخطأ، وحذف البيانات وتقليل الأداء بشكل كبير. يُوصى بإضافة مسار التثبيت ومسار مساحة العمل الخاصة بـ SiYuan إلى قائمة الاستثناءات", + "253": "جارٍ ضغط الملف [%s]، يرجى الانتظار..." } } diff --git a/app/appearance/langs/de_DE.json b/app/appearance/langs/de_DE.json index 06db6117a..cec8addd2 100644 --- a/app/appearance/langs/de_DE.json +++ b/app/appearance/langs/de_DE.json @@ -1582,6 +1582,7 @@ "249": "Aufgrund eines Konfigurationsfehlers kann nicht auf die Daten zugegriffen werden. Bitte überprüfen Sie die Einstellungen und die Berechtigungen für den Cloud-Speicher", "250": "Die Anfrage wurde vom Cloud-Speicher begrenzt. Bitte überprüfen Sie die Einstellungen und die Berechtigungen für den Cloud-Speicher", "251": "Insgesamt ungenutzte Assets [%d], hier nur [%d] aufgeführt", - "252": "\uD83D\uDEA8 Microsoft Defender kann fälschlicherweise den Kernel löschen, Daten löschen und die Leistung erheblich verringern. Es wird empfohlen, den SiYuan-Installationspfad und den Arbeitsbereichspfad zur Ausschlussliste hinzuzufügen" + "252": "\uD83D\uDEA8 Microsoft Defender kann fälschlicherweise den Kernel löschen, Daten löschen und die Leistung erheblich verringern. Es wird empfohlen, den SiYuan-Installationspfad und den Arbeitsbereichspfad zur Ausschlussliste hinzuzufügen", + "253": "Datei [%s] wird komprimiert, bitte warten..." } } diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 03ad38bec..48b926c85 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1582,6 +1582,7 @@ "249": "Unable to access data due to configuration error. Please check the settings and cloud storage permissions", "250": "Request has been rate-limited by cloud storage. Please check the settings and cloud storage permissions", "251": "Total unused assets [%d], only [%d] listed here", - "252": "\uD83D\uDEA8 Microsoft Defender may mistakenly delete the kernel, delete data, and significantly reduce performance. It is recommended to add the SiYuan installation path and workspace path to the exclusion list" + "252": "\uD83D\uDEA8 Microsoft Defender may mistakenly delete the kernel, delete data, and significantly reduce performance. It is recommended to add the SiYuan installation path and workspace path to the exclusion list", + "253": "Compressing file [%s], please wait..." } } diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 6117ccba5..84dec9b3b 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1582,6 +1582,7 @@ "249": "No se puede acceder a los datos debido a un error de configuración. Por favor, verifique las configuraciones y permisos de almacenamiento en la nube", "250": "La solicitud ha sido limitada por el almacenamiento en la nube. Por favor, verifique las configuraciones y permisos de almacenamiento en la nube", "251": "Total de activos no utilizados [%d], solo [%d] listados aquí", - "252": "\uD83D\uDEA8 Microsoft Defender puede eliminar por error el núcleo, eliminar datos y reducir significativamente el rendimiento. Se recomienda agregar la ruta de instalación y el espacio de trabajo de SiYuan a la lista de exclusiones" + "252": "\uD83D\uDEA8 Microsoft Defender puede eliminar por error el núcleo, eliminar datos y reducir significativamente el rendimiento. Se recomienda agregar la ruta de instalación y el espacio de trabajo de SiYuan a la lista de exclusiones", + "253": "Comprimiendo el archivo [%s], por favor espere..." } } diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 337049e39..c16a4eb27 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1582,6 +1582,7 @@ "249": "Impossible d'accéder aux données en raison d'une erreur de configuration. Veuillez vérifier les paramètres et les autorisations de stockage cloud", "250": "La demande a été limitée par le stockage cloud. Veuillez vérifier les paramètres et les autorisations de stockage cloud", "251": "Total des actifs inutilisés [%d], seulement [%d] listés ici", - "252": "\uD83D\uDEA8 Microsoft Defender peut supprimer par erreur le noyau, supprimer des données et réduire considérablement les performances. Il est recommandé d'ajouter le chemin d'installation et l'espace de travail de SiYuan à la liste des exclusions" + "252": "\uD83D\uDEA8 Microsoft Defender peut supprimer par erreur le noyau, supprimer des données et réduire considérablement les performances. Il est recommandé d'ajouter le chemin d'installation et l'espace de travail de SiYuan à la liste des exclusions", + "253": "Compression du fichier [%s], veuillez patienter..." } } diff --git a/app/appearance/langs/he_IL.json b/app/appearance/langs/he_IL.json index 2207aac1b..ff42f96bd 100644 --- a/app/appearance/langs/he_IL.json +++ b/app/appearance/langs/he_IL.json @@ -1582,6 +1582,7 @@ "249": "אין אפשרות לגשת לנתונים עקב שגיאת תצורה. אנא בדוק את ההגדרות והרשאות האחסון בענן", "250": "הבקשה הוגבלה על ידי אחסון הענן. אנא בדוק את ההגדרות והרשאות האחסון בענן", "251": "סך כל הנכסים שלא נעשה בהם שימוש [%d], רק [%d] מופיעים כאן", - "252": "\uD83D\uDEA8 Microsoft Defender עלול למחוק בטעות את הליבה, למחוק נתונים ולהפחית משמעותית את הביצועים. מומלץ להוסיף את נתיב ההתקנה ונתיב סביבת העבודה של SiYuan לרשימת החריגים" + "252": "\uD83D\uDEA8 Microsoft Defender עלול למחוק בטעות את הליבה, למחוק נתונים ולהפחית משמעותית את הביצועים. מומלץ להוסיף את נתיב ההתקנה ונתיב סביבת העבודה של SiYuan לרשימת החריגים", + "253": "דוחס את הקובץ [%s], אנא המתן..." } } diff --git a/app/appearance/langs/it_IT.json b/app/appearance/langs/it_IT.json index 73d20f7a8..3ff032287 100644 --- a/app/appearance/langs/it_IT.json +++ b/app/appearance/langs/it_IT.json @@ -1582,6 +1582,7 @@ "249": "Impossibile accedere ai dati a causa di un errore di configurazione. Si prega di controllare attentamente le impostazioni e le autorizzazioni di archiviazione cloud", "250": "La richiesta è stata limitata dall'archiviazione cloud. Si prega di controllare attentamente le impostazioni e le autorizzazioni di archiviazione cloud", "251": "Totale risorse inutilizzate [%d], qui elencate solo [%d]", - "252": "\uD83D\uDEA8 Microsoft Defender potrebbe eliminare erroneamente il kernel, eliminare i dati e ridurre significativamente le prestazioni. Si consiglia di aggiungere il percorso di installazione e lo spazio di lavoro di SiYuan all'elenco delle esclusioni" + "252": "\uD83D\uDEA8 Microsoft Defender potrebbe eliminare erroneamente il kernel, eliminare i dati e ridurre significativamente le prestazioni. Si consiglia di aggiungere il percorso di installazione e lo spazio di lavoro di SiYuan all'elenco delle esclusioni", + "253": "Compressione del file [%s], attendere prego..." } } diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json index 644098675..67e8ac3ea 100644 --- a/app/appearance/langs/ja_JP.json +++ b/app/appearance/langs/ja_JP.json @@ -1582,6 +1582,7 @@ "249": "設定エラーのためデータにアクセスできません。設定を一つずつ確認し、クラウドストレージの権限を確認してください", "250": "リクエストがクラウドストレージによって制限されました。設定を一つずつ確認し、クラウドストレージの権限を確認してください", "251": "未使用のアセットの合計 [%d]、ここにリストされているのは [%d] のみ", - "252": "\uD83D\uDEA8 Microsoft Defender は、カーネルを誤って削除したり、データを削除したり、パフォーマンスを大幅に低下させたりする可能性があります。SiYuan のインストールパスとワークスペースパスを除外リストに追加することをお勧めします" + "252": "\uD83D\uDEA8 Microsoft Defender は、カーネルを誤って削除したり、データを削除したり、パフォーマンスを大幅に低下させたりする可能性があります。SiYuan のインストールパスとワークスペースパスを除外リストに追加することをお勧めします", + "253": "ファイル [%s] を圧縮しています、お待ちください..." } } diff --git a/app/appearance/langs/pl_PL.json b/app/appearance/langs/pl_PL.json index 4e7d19d90..40f1c8b0b 100644 --- a/app/appearance/langs/pl_PL.json +++ b/app/appearance/langs/pl_PL.json @@ -1582,6 +1582,7 @@ "249": "Z powodu błędu konfiguracji nie można uzyskać dostępu do danych. Proszę dokładnie sprawdzić ustawienia i uprawnienia do przechowywania w chmurze", "250": "Żądanie zostało ograniczone przez przechowywanie w chmurze. Proszę dokładnie sprawdzić ustawienia i uprawnienia do przechowywania w chmurze", "251": "Łączna liczba nieużywanych zasobów [%d], tutaj wymieniono tylko [%d]", - "252": "\uD83D\uDEA8 Microsoft Defender może błędnie usunąć jądro, usunąć dane i znacznie obniżyć wydajność. Zaleca się dodanie ścieżki instalacji i przestrzeni roboczej SiYuan do listy wykluczeń" + "252": "\uD83D\uDEA8 Microsoft Defender może błędnie usunąć jądro, usunąć dane i znacznie obniżyć wydajność. Zaleca się dodanie ścieżki instalacji i przestrzeni roboczej SiYuan do listy wykluczeń", + "253": "Kompresja pliku [%s], proszę czekać..." } } diff --git a/app/appearance/langs/ru_RU.json b/app/appearance/langs/ru_RU.json index e31d14fab..ba34b829e 100644 --- a/app/appearance/langs/ru_RU.json +++ b/app/appearance/langs/ru_RU.json @@ -1582,6 +1582,7 @@ "249": "Из-за ошибки конфигурации невозможно получить доступ к данным. Пожалуйста, проверьте настройки и права доступа к облачному хранилищу", "250": "Запрос был ограничен облачным хранилищем. Пожалуйста, проверьте настройки и права доступа к облачному хранилищу", "251": "Всего неиспользованных активов [%d], здесь перечислены только [%d]", - "252": "\uD83D\uDEA8 Microsoft Defender может ошибочно удалить ядро, удалить данные и значительно снизить производительность. Рекомендуется добавить путь установки и рабочее пространство SiYuan в список исключений" + "252": "\uD83D\uDEA8 Microsoft Defender может ошибочно удалить ядро, удалить данные и значительно снизить производительность. Рекомендуется добавить путь установки и рабочее пространство SiYuan в список исключений", + "253": "Сжатие файла [%s], пожалуйста, подождите..." } } diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 5b2e0e9e2..e8d646b3e 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1582,6 +1582,7 @@ "249": "因配置錯誤導致無法存取數據，請仔細逐個核對配置項，並檢查雲端存儲相關權限配置", "250": "請求已被雲端存儲限流，請仔細逐個核對配置項，並檢查雲端存儲相關權限配置", "251": "未引用資源一共 ${x} 個，這裡僅列出 ${y} 個", - "252": "\uD83D\uDEA8 Microsoft Defender 可能會誤殺內核、誤刪數據和嚴重降低運行性能，建議將思源安裝路徑和工作空間路徑添加到排除列表" + "252": "\uD83D\uDEA8 Microsoft Defender 可能會誤殺內核、誤刪數據和嚴重降低運行性能，建議將思源安裝路徑和工作空間路徑添加到排除列表", + "253": "正在壓縮文件 [%s]，請稍等..." } } diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 34fd2e25a..8392a4dcb 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1582,6 +1582,7 @@ "249": "因配置错误导致无法存取数据，请仔细逐个核对配置项，并检查云端存储相关权限配置", "250": "请求已被云端存储限流，请仔细逐个核对配置项，并检查云端存储相关权限配置", "251": "未引用资源一共 [%d] 个，这里仅列出 [%d] 个", - "252": "\uD83D\uDEA8 Microsoft Defender 可能会误杀内核、误删数据和严重降低运行性能，建议将思源安装路径和工作空间路径添加到排除列表" + "252": "\uD83D\uDEA8 Microsoft Defender 可能会误杀内核、误删数据和严重降低运行性能，建议将思源安装路径和工作空间路径添加到排除列表", + "253": "正在压缩文件 [%s]，请稍等..." } } diff --git a/kernel/model/export.go b/kernel/model/export.go index eae69c03f..ec97a2389 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -504,7 +504,7 @@ func exportData(exportFolder string) (zipPath string, err error) { } zipCallback := func(filename string) { - util.PushEndlessProgress(Conf.language(65) + " " + fmt.Sprintf(Conf.language(70), filename)) + util.PushEndlessProgress(Conf.language(65) + " " + fmt.Sprintf(Conf.language(253), filename)) } if err = zip.AddDirectory(baseFolderName, exportFolder, zipCallback); err != nil { @@ -1465,9 +1465,17 @@ func ExportPandocConvertZip(ids []string, pandocTo, ext string) (name, zipPath s } func ExportNotebookMarkdown(boxID string) (zipPath string) { + util.PushEndlessProgress(Conf.Language(65)) + defer util.ClearPushProgress(100) + box := Conf.Box(boxID) - docFiles := box.ListFiles("/") + if nil == box { + logging.LogErrorf("not found box [%s]", boxID) + return + } + var docPaths []string + docFiles := box.ListFiles("/") for _, docFile := range docFiles { docPaths = append(docPaths, docFile.path) } @@ -1859,7 +1867,7 @@ func exportSYZip(boxID, rootDirPath, baseFolderName string, docPaths []string) ( } zipCallback := func(filename string) { - util.PushEndlessProgress(Conf.language(65) + " " + fmt.Sprintf(Conf.language(70), filename)) + util.PushEndlessProgress(Conf.language(65) + " " + fmt.Sprintf(Conf.language(253), filename)) } if err = zip.AddDirectory(baseFolderName, exportFolder, zipCallback); err != nil { @@ -3069,15 +3077,20 @@ func exportPandocConvertZip(baseFolderName string, docPaths, defBlockIDs []strin logging.LogErrorf("read export markdown folder [%s] failed: %s", exportFolder, err) return "" } + + zipCallback := func(filename string) { + util.PushEndlessProgress(Conf.language(65) + " " + fmt.Sprintf(Conf.language(253), filename)) + } for _, entry := range entries { - entryPath := filepath.Join(exportFolder, entry.Name()) + entryName := entry.Name() + entryPath := filepath.Join(exportFolder, entryName) if gulu.File.IsDir(entryPath) { - err = zip.AddDirectory(entry.Name(), entryPath) + err = zip.AddDirectory(entryName, entryPath, zipCallback) } else { - err = zip.AddEntry(entry.Name(), entryPath) + err = zip.AddEntry(entryName, entryPath, zipCallback) } if err != nil { - logging.LogErrorf("add entry [%s] to zip failed: %s", entry.Name(), err) + logging.LogErrorf("add entry [%s] to zip failed: %s", entryName, err) return "" } } @@ -3108,7 +3121,7 @@ func prepareExportTrees(docPaths []string) (defBlockIDs []string, trees *map[str trees = &map[string]*parse.Tree{} treeCache := &map[string]*parse.Tree{} defBlockIDs = []string{} - for _, p := range docPaths { + for i, p := range docPaths { id := strings.TrimSuffix(path.Base(p), ".sy") if !ast.IsNodeIDPattern(id) { continue @@ -3119,6 +3132,8 @@ func prepareExportTrees(docPaths []string) (defBlockIDs []string, trees *map[str continue } exportRefTrees(tree, &defBlockIDs, trees, treeCache) + + util.PushEndlessProgress(Conf.language(65) + " " + fmt.Sprintf(Conf.language(70), fmt.Sprintf("%d/%d %s", i+1, len(docPaths), tree.Root.IALAttr("title")))) } for _, tree := range *trees { From 47e6e8b74b4b0f201b1426e6cd7a00f18b9555a8 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 1 Jan 2025 12:00:02 +0800 Subject: [PATCH 3/6] :art: Remove `Add` and `Remove` buttons for S3/WebDAV cloud sync directory settings https://github.com/siyuan-note/siyuan/issues/13682 --- app/src/config/repos.ts | 2 +- kernel/go.mod | 2 +- kernel/go.sum | 4 ++-- kernel/model/sync.go | 4 ++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/config/repos.ts b/app/src/config/repos.ts index 712e9b680..53b144695 100644 --- a/app/src/config/repos.ts +++ b/app/src/config/repos.ts @@ -75,7 +75,7 @@ const renderProvider = (provider: number) => {
-
Region
+
Region ID
diff --git a/kernel/go.mod b/kernel/go.mod index 3ab7091b2..2f3e54a6e 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -56,7 +56,7 @@ require ( github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 github.com/sashabaranov/go-openai v1.29.1 github.com/shirou/gopsutil/v4 v4.24.11 - github.com/siyuan-note/dejavu v0.0.0-20241231012438-1b3b69c32ca8 + github.com/siyuan-note/dejavu v0.0.0-20250101034610-eb8ad439dce1 github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4 github.com/siyuan-note/eventbus v0.0.0-20240627125516-396fdb0f0f97 github.com/siyuan-note/filelock v0.0.0-20241212013445-c66518cdacfa diff --git a/kernel/go.sum b/kernel/go.sum index 4fc0c39b5..8234a6977 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -363,8 +363,8 @@ github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+D github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d h1:lvCTyBbr36+tqMccdGMwuEU+hjux/zL6xSmf5S9ITaA= github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw= github.com/simplereach/timeutils v1.2.0/go.mod h1:VVbQDfN/FHRZa1LSqcwo4kNZ62OOyqLLGQKYB3pB0Q8= -github.com/siyuan-note/dejavu v0.0.0-20241231012438-1b3b69c32ca8 h1:76sEch+YA/zAeTGnqUOZNQOQoua+2LGNPxi0zLxzfsg= -github.com/siyuan-note/dejavu v0.0.0-20241231012438-1b3b69c32ca8/go.mod h1:MzsX91uilsrKqH97iXH9A155rZaaCtvQDPusjnmqU4I= +github.com/siyuan-note/dejavu v0.0.0-20250101034610-eb8ad439dce1 h1:dr5YMde+4B6qx8/0FXN/Ur4ruMvWAcNgKCI8T+JSzPg= +github.com/siyuan-note/dejavu v0.0.0-20250101034610-eb8ad439dce1/go.mod h1:MzsX91uilsrKqH97iXH9A155rZaaCtvQDPusjnmqU4I= github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4 h1:kJaw5L/evyW6LcB9IQT8PR4ppx8JVqOFP9Ix3rfwSrc= github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4/go.mod h1:UYcCCY+0wh+GmUoDOaO63j1sV5lgy7laLAk1XhEiUis= github.com/siyuan-note/eventbus v0.0.0-20240627125516-396fdb0f0f97 h1:lM5v8BfNtbOL5jYwhCdMYBcYtr06IYBKjjSLAPMKTM8= diff --git a/kernel/model/sync.go b/kernel/model/sync.go index 91f978fea..d47dfade0 100644 --- a/kernel/model/sync.go +++ b/kernel/model/sync.go @@ -612,6 +612,10 @@ func ListCloudSyncDir() (syncDirs []*Sync, hSize string, err error) { if conf.ProviderSiYuan == Conf.Sync.Provider { hSize = humanize.BytesCustomCeil(uint64(size), 2) } + if conf.ProviderS3 == Conf.Sync.Provider { + Conf.Sync.CloudName = syncDirs[0].CloudName + Conf.Save() + } return } From 6d7feb461f5a2a6e8e3437dfcd1b7a83604f7a98 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 1 Jan 2025 12:09:05 +0800 Subject: [PATCH 4/6] :art: Remove `Add` and `Remove` buttons for S3/WebDAV cloud sync directory settings https://github.com/siyuan-note/siyuan/issues/13682 --- app/src/sync/syncGuide.ts | 4 ++-- app/src/types/config.d.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/sync/syncGuide.ts b/app/src/sync/syncGuide.ts index c64f8de9f..2fb2acd87 100644 --- a/app/src/sync/syncGuide.ts +++ b/app/src/sync/syncGuide.ts @@ -124,7 +124,7 @@ export const getSyncCloudList = (cloudPanelElement: Element, reload = false, cb? ${item.hSize} ${item.updated} - + `; /// #endif @@ -133,7 +133,7 @@ export const getSyncCloudList = (cloudPanelElement: Element, reload = false, cb?
- +
`; } cloudPanelElement.innerHTML = syncListHTML; diff --git a/app/src/types/config.d.ts b/app/src/types/config.d.ts index 11aafbf86..bede2c1db 100644 --- a/app/src/types/config.d.ts +++ b/app/src/types/config.d.ts @@ -1364,6 +1364,7 @@ declare namespace Config { * - `0`: SiYuan official cloud storage service * - `2`: Object storage service compatible with S3 protocol * - `3`: Network storage service using WebDAV protocol + * - `4`: Local file system */ provider: number; s3: ISyncS3; From 2d006a941b8b04367be14bec43a90f62152d84c4 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 1 Jan 2025 12:24:58 +0800 Subject: [PATCH 5/6] :art: Improve display reference counts in the backlink panel https://github.com/siyuan-note/siyuan/issues/13678 --- kernel/model/backlink.go | 2 +- kernel/model/block.go | 2 +- kernel/model/render.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/model/backlink.go b/kernel/model/backlink.go index 9d116cb79..ae8478f0d 100644 --- a/kernel/model/backlink.go +++ b/kernel/model/backlink.go @@ -230,7 +230,7 @@ func buildBacklink(refID string, refTree *parse.Tree, keywords []string, highlig } // 反链面板中显示块引用计数 Display reference counts in the backlink panel https://github.com/siyuan-note/siyuan/issues/13618 - fillBlockRefCount(renderNodes) + fillBlockRefCount(renderNodes, 1) dom := renderBlockDOMByNodes(renderNodes, luteEngine) var blockPaths []*BlockPath diff --git a/kernel/model/block.go b/kernel/model/block.go index 30cbaeb8b..de375eb0a 100644 --- a/kernel/model/block.go +++ b/kernel/model/block.go @@ -900,7 +900,7 @@ func getEmbeddedBlock(trees map[string]*parse.Tree, sqlBlock *sql.Block, heading } // 嵌入块查询结果中显示块引用计数 https://github.com/siyuan-note/siyuan/issues/7191 - fillBlockRefCount(nodes) + fillBlockRefCount(nodes, 0) luteEngine := NewLute() luteEngine.RenderOptions.ProtyleContenteditable = false // 不可编辑 diff --git a/kernel/model/render.go b/kernel/model/render.go index 41168dfe0..5fcace663 100644 --- a/kernel/model/render.go +++ b/kernel/model/render.go @@ -142,7 +142,7 @@ func renderBlockText(node *ast.Node, excludeTypes []string) (ret string) { return } -func fillBlockRefCount(nodes []*ast.Node) { +func fillBlockRefCount(nodes []*ast.Node, minRefCount int) { var defIDs []string for _, n := range nodes { ast.Walk(n, func(n *ast.Node, entering bool) ast.WalkStatus { @@ -164,7 +164,7 @@ func fillBlockRefCount(nodes []*ast.Node) { return ast.WalkContinue } - if cnt := refCount[n.ID]; 0 < cnt { + if cnt := refCount[n.ID]; minRefCount < cnt { n.SetIALAttr("refcount", strconv.Itoa(cnt)) } return ast.WalkContinue From 361b6020d83261a6c8882c861712aa629106b3a9 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 1 Jan 2025 12:43:47 +0800 Subject: [PATCH 6/6] :art: Support one-click addition of Microsoft Defender exclusions https://github.com/siyuan-note/siyuan/issues/13650 --- kernel/model/elevator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/model/elevator.go b/kernel/model/elevator.go index de2995420..b3648991d 100644 --- a/kernel/model/elevator.go +++ b/kernel/model/elevator.go @@ -20,4 +20,4 @@ package model func AddMicrosoftDefenderExclusion() error { return nil } -func AutoProcessMicrosoftDefender() {} +func AutoCheckMicrosoftDefender() {}