Merge branch 'dev' of gitea.51mars.com:Oak-Team/oak-memory-tree-store into dev

This commit is contained in:
Xu Chang 2024-10-08 22:02:02 +08:00
commit 43b2b04136
4 changed files with 7 additions and 4 deletions

View File

@ -150,7 +150,8 @@ export default class TreeStore extends CascadeStore {
if (context.getCurrentTxnId() && node.$txnId === context.getCurrentTxnId()) {
if (!node.$next) {
// 如果要求返回delete数据返回带$$deleteAt$$的行
if (option?.includedDeleted) {
// bug fixed这里如果是自己create再删除data也是null
if (data && option?.includedDeleted) {
return Object.assign({}, data, {
[DeleteAtAttribute]: 1,
});

View File

@ -152,7 +152,8 @@ class TreeStore extends CascadeStore_1.CascadeStore {
if (context.getCurrentTxnId() && node.$txnId === context.getCurrentTxnId()) {
if (!node.$next) {
// 如果要求返回delete数据返回带$$deleteAt$$的行
if (option?.includedDeleted) {
// bug fixed这里如果是自己create再删除data也是null
if (data && option?.includedDeleted) {
return Object.assign({}, data, {
[Entity_1.DeleteAtAttribute]: 1,
});

View File

@ -1,6 +1,6 @@
{
"name": "oak-memory-tree-store",
"version": "3.3.7",
"version": "3.3.8",
"description": "oak框架中内存级store的实现",
"author": {
"name": "XuChang"

View File

@ -221,7 +221,8 @@ export default class TreeStore<ED extends EntityDict & BaseEntityDict> extends C
if (context.getCurrentTxnId() && node.$txnId === context.getCurrentTxnId()) {
if (!node.$next) {
// 如果要求返回delete数据返回带$$deleteAt$$的行
if (option?.includedDeleted) {
// bug fixed这里如果是自己create再删除data也是null
if (data && option?.includedDeleted) {
return Object.assign({}, data, {
[DeleteAtAttribute]: 1,
});