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

cascadeEntities处理时的小bug

This commit is contained in:
Xu Chang 2023-02-20 02:58:51 +08:00
parent eff102bacd
commit 5201a8c2be
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/features/runningTree.js
View File

@ -1969,7 +1969,7 @@ var RunningTree = /** @class */ (function (_super) {
if (parentNode instanceof ListNode) { if (parentNode instanceof ListNode) {
} }
else if (process.env.NODE_ENV === 'development') { else if (process.env.NODE_ENV === 'development') {
console.error("\u521B\u5EFAnode\u65F6\u53D1\u73B0\u5DF2\u6709\u7ED3\u70B9\uFF0C\u4E0D\u80FD\u91CD\u7528\u3002\u300C".concat(fullPath, "\u300D")); console.warn("\u521B\u5EFAnode\u65F6\u53D1\u73B0path[".concat(fullPath, "]\u5DF2\u6709\u7ED3\u70B9\uFF0C\u672C\u7279\u6027\u5C1A\u672A\u6D4B\u8BD5\u5145\u5206\uFF0C\u8BF7\u8C28\u9632\u6709\u5751"));
} }
return this.findNode(fullPath); return this.findNode(fullPath);
} }

8
lib/page.common.js
View File

@ -214,14 +214,14 @@ function reRender(option, extra) {
var _a = typeof item === 'string' ? { action: item, filter: {}, data: {} } : item, action = _a.action, filter = _a.filter, data = _a.data; var _a = typeof item === 'string' ? { action: item, filter: {}, data: {} } : item, action = _a.action, filter = _a.filter, data = _a.data;
if (action === 'create') { if (action === 'create') {
var data2 = Object.assign({}, data, strictFilter); var data2 = Object.assign({}, data, strictFilter);
if (_this.checkOperation(_this.state.oakEntity, 'create', data2, undefined, ['relation', 'row', 'logical', 'logicalRelation'])) { if (_this.checkOperation(e2, 'create', data2, undefined, ['relation', 'row', 'logical', 'logicalRelation'])) {
availableActions.push({ action: action, filter: filter, data: data }); availableActions.push(item);
} }
} }
else { else {
var filter2 = Object.assign({}, filter, strictFilter); var filter2 = Object.assign({}, filter, strictFilter);
if (_this.checkOperation(_this.state.oakEntity, action, undefined, filter2, ['relation', 'row', 'logical', 'logicalRelation'])) { if (_this.checkOperation(e2, action, undefined, filter2, ['relation', 'row', 'logical', 'logicalRelation'])) {
availableActions.push({ action: action, filter: filter, data: data }); availableActions.push(item);
} }
} }
}); });

2
src/features/runningTree.ts
View File

@ -1959,7 +1959,7 @@ export class RunningTree<
if (parentNode instanceof ListNode) { if (parentNode instanceof ListNode) {
} }
else if (process.env.NODE_ENV === 'development') { else if (process.env.NODE_ENV === 'development') {
console.error(`创建node时发现已有结点，不能重用。「${fullPath}」`); console.warn(`创建node时发现path[${fullPath}]已有结点，本特性尚未测试充分，请谨防有坑`);
} }
return this.findNode(fullPath)!; return this.findNode(fullPath)!;
} }

8
src/page.common.ts
View File

@ -225,14 +225,14 @@ export function reRender<
const { action, filter, data } = typeof item === 'string' ? { action: item, filter: {}, data: {}} : item; const { action, filter, data } = typeof item === 'string' ? { action: item, filter: {}, data: {}} : item;
if (action === 'create') { if (action === 'create') {
const data2 = Object.assign({}, data, strictFilter); const data2 = Object.assign({}, data, strictFilter);
if (this.checkOperation(this.state.oakEntity, 'create', data2, undefined, ['relation', 'row', 'logical', 'logicalRelation'])) { if (this.checkOperation(e2 as any, 'create', data2, undefined, ['relation', 'row', 'logical', 'logicalRelation'])) {
availableActions.push({action, filter, data}); availableActions.push(item);
} }
} }
else { else {
const filter2 = Object.assign({}, filter, strictFilter); const filter2 = Object.assign({}, filter, strictFilter);
if (this.checkOperation(this.state.oakEntity, action, undefined, filter2, ['relation', 'row', 'logical', 'logicalRelation'])) { if (this.checkOperation(e2 as any, action, undefined, filter2, ['relation', 'row', 'logical', 'logicalRelation'])) {
availableActions.push({action, filter, data}); availableActions.push(item);
} }
} }
} }