Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-17 20:48:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2024-11-04 10:43:06 +08:00
commit b9e62d2b7a
3 changed files with 44 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

34
app/src/layout/dock/Graph.ts
View file

@ -632,37 +632,43 @@ export class Graph extends Model {
iterations: 256,
updateInterval: 64,
onlyDynamicEdges: false,
fit: true
fit: false
},
timestep: 0.5,
adaptiveTimestep: true,
wind: {x: 0, y: 0}
},
};
let j = Math.max(Math.ceil(this.graphData.nodes.length * 0.1), 128);
const nodes = new vis.DataSet(this.graphData.nodes.slice(0, j));
let i = Math.max(Math.ceil(this.graphData.nodes.length * 0.1), 128);
const nodes = new vis.DataSet(this.graphData.nodes.slice(0, i));
const edges = new vis.DataSet();
const network = new vis.Network(this.graphElement, {nodes, edges}, options);
const time = 256;
let intervalNodeTime = Math.max(Math.ceil(time / 8), 32);
let batch = this.graphData.nodes.length / time / 2;
if (batch < 64) {
batch = 64;
if (batch < 32) {
batch = 32;
}
if (batch > 256) {
batch = 256;
if (batch > 128) {
batch = 128;
}
let i = 0;
let count = 0;
const intervalNode = setInterval(() => {
const nodes = this.graphData.nodes.slice(j, j + batch);
const nodes = this.graphData.nodes.slice(i, i + batch);
if (nodes.length === 0) {
clearInterval(intervalNode);
return;
}
network.body.data.nodes.add(nodes);
j += batch;
}, time / 8);
i += batch;
count++;
if (0 === count % (batch / 8)) {
network.fit({animation: false});
}
}, intervalNodeTime);
let j = 0;
const intervalId = setInterval(() => {
const edges = this.graphData.links.slice(i, i + batch);
const edges = this.graphData.links.slice(j, j + batch);
if (edges.length === 0) {
clearInterval(intervalId);
network.fit({
@ -671,7 +677,7 @@ export class Graph extends Model {
return;
}
network.body.data.edges.add(edges);
i += batch;
j += batch;
}, time);
this.network = network;
network.on("stabilizationIterationsDone", () => {
@ -683,7 +689,7 @@ export class Graph extends Model {
network.on("dragEnd", () => {
setTimeout(() => {
network.physics.stopSimulation();
}, 5000);
}, 3000);
});
network.on("click", (params: any) => {
if (params.nodes.length !== 1) {

2
app/src/protyle/util/paste.ts
View file

@ -182,7 +182,7 @@ export const pasteAsPlainText = async (protyle: IProtyle) => {
textPlain = textPlain.replace(/__@sub@__/g, "<sub>").replace(/__@\/sub@__/g, "</sub>");
textPlain = textPlain.replace(/__@sup@__/g, "<sup>").replace(/__@\/sup@__/g, "</sup>");
textPlain = textPlain.replace(/__@kbd@__/g, "<kbd>").replace(/__@\/kbd@__/g, "</kbd>");
textPlain = textPlain.replace(/__@u@__/g, "<u>").replace(/__@\/u@__/g, "</u");
textPlain = textPlain.replace(/__@u@__/g, "<u>").replace(/__@\/u@__/g, "</u>");
const content = protyle.lute.BlockDOM2EscapeMarkerContent(protyle.lute.Md2BlockDOM(textPlain));
// insertHTML 会进行内部反转义