chenxiaopei/StructV2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：修复外部指针问题

Browse Source
This commit is contained in:
黎智洲 2022-05-08 00:15:46 +08:00
parent a297a38adc
commit 7d25ea01b4
4 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
node_modules
test
dist
资料

1
src/Model/SVNode.ts
View File

@ -16,7 +16,6 @@ export class SVNode extends SVModel {
};
private label: string | string[];
private disable: boolean;
public appendages: { [key: string]: SVNodeAppendage[] };
constructor(

1
src/Model/SVNodeAppendage.ts
View File

@ -196,6 +196,7 @@ export class SVMarker extends SVNodeAppendage {
label: this.label,
style: Util.objectClone<Style>(options.style),
labelCfg: Util.objectClone<NodeLabelOption>(options.labelOptions),
targetSourceNode: this.target.sourceNode
};
}

46
src/View/reconcile.ts
View File

@ -23,7 +23,7 @@ export class Reconcile {
private engine: Engine;
private renderer: Renderer;
private isFirstPatch: boolean;
private prevUpdate: string[][] = [];
private prevUpdate: string[][] = [];
constructor(engine: Engine, renderer: Renderer) {
this.engine = engine;
@ -168,13 +168,13 @@ export class Reconcile {
return removedModels;
}
private getModelsById(ids: string[], modelList: SVModel[]): SVModel[] {
private getModelsById(ids: string[], modelList: SVModel[]): SVModel[] {
return modelList.filter(item =>
ids?.find(id => {
return id === item.id;
})
);
}
}
/**
* 找出重新指向的外部指针
@ -240,9 +240,9 @@ export class Reconcile {
return freedNodes;
}
public setPrevUpdateId(prevUpdateId: string[]) {
this.prevUpdate.push(prevUpdateId);
}
public setPrevUpdateId(prevUpdateId: string[]) {
this.prevUpdate.push(prevUpdateId);
}
// ------------------------------------------------------------------------------------------------
@ -406,29 +406,29 @@ export class Reconcile {
modelList: SVModel[],
accumulateLeakModels: SVModel[],
isDiffLeak: boolean,
hasTriggerLastStep: boolean
hasTriggerLastStep: boolean
): DiffResult {
if (hasTriggerLastStep) {
this.prevUpdate.pop();
}
if (hasTriggerLastStep) {
this.prevUpdate.pop();
}
const continuousModels: SVModel[] = this.getContinuousModels(prevModelList, modelList);
const leakModels: SVModel[] = isDiffLeak ? [] : this.getLeakModels(layoutGroupTable, prevModelList, modelList);
const appendModels: SVModel[] = this.getAppendModels(prevModelList, modelList, accumulateLeakModels);
const removeModels: SVModel[] = this.getRemoveModels(prevModelList, modelList, accumulateLeakModels);
const updateModels: SVModel[] = hasTriggerLastStep ? [...this.getModelsById(this.prevUpdate.pop(), modelList)]: [
...this.getReTargetMarkers(prevModelList, modelList),
...this.getLabelChangeModels(prevModelList, modelList),
...this.filterUnChangeModelsOfAppend(appendModels, prevModelList),
...leakModels,
];
const updateModels: SVModel[] = hasTriggerLastStep
? [...this.getModelsById(this.prevUpdate.pop(), modelList)]
: [
...this.getReTargetMarkers(prevModelList, modelList),
...this.getLabelChangeModels(prevModelList, modelList),
...this.filterUnChangeModelsOfAppend(appendModels, prevModelList),
...leakModels,
];
let UpdateModelsId: string [] =[];
for (let model of updateModels) {
UpdateModelsId.push(model.id);
}
this.prevUpdate?.push(UpdateModelsId);
console.log(this.prevUpdate);
let UpdateModelsId: string[] = [];
for (let model of updateModels) {
UpdateModelsId.push(model.id);
}
this.prevUpdate?.push(UpdateModelsId);
const freedModels: SVNode[] = this.getFreedModels(prevModelList, modelList);