Oak-Team
/
oak-frontend-base
13
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 37 Wiki Activity

Merge branch 'dev' of gitea.51mars.com:Oak-Team/oak-frontend-base into dev

This commit is contained in:
Xu Chang 2024-06-25 12:03:42 +08:00
parent 13b2102b43 3e5ae2f4b9
commit 26a3321729
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
es/features/runningTree.js
View File

@ -26,7 +26,7 @@ function mergeOperation(schema, entity, oper1, oper2) {
oper1.action = action; oper1.action = action;
} }
else { else {
assert(false, '不应当有冲突的update模式'); assert(action === oper1.action, '不应当有冲突的update模式');
} }
} }
const { data: dataMerged } = operMerged; const { data: dataMerged } = operMerged;

2
lib/features/runningTree.js
View File

@ -29,7 +29,7 @@ function mergeOperation(schema, entity, oper1, oper2) {
oper1.action = action; oper1.action = action;
} }
else { else {
(0, assert_1.assert)(false, '不应当有冲突的update模式'); (0, assert_1.assert)(action === oper1.action, '不应当有冲突的update模式');
} }
} }
const { data: dataMerged } = operMerged; const { data: dataMerged } = operMerged;

2
src/features/runningTree.ts
View File

@ -53,7 +53,7 @@ function mergeOperation<ED extends EntityDict & BaseEntityDict, T extends keyof
oper1.action = action; oper1.action = action;
} }
else { else {
assert(false, '不应当有冲突的update模式'); assert(action === oper1.action, '不应当有冲突的update模式');
} }
} }