Merge branch 'dev' of gitea.51mars.com:Oak-Team/oak-memory-tree-store into dev
This commit is contained in:
commit
43b2b04136
|
|
@ -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,
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "oak-memory-tree-store",
|
||||
"version": "3.3.7",
|
||||
"version": "3.3.8",
|
||||
"description": "oak框架中内存级store的实现",
|
||||
"author": {
|
||||
"name": "XuChang"
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue