ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: update tree node (#1812)

Browse Source 
* fix: update tree node

* chore: test
This commit is contained in:
ChengLei Shao 2023-05-06 15:14:05 +08:00 committed by GitHub
parent 258f4e980d
commit 54432a4314
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/core/database/src/repository.ts
View File

@ -471,6 +471,7 @@ export class Repository<TModelAttributes extends {} = any, TCreationAttributes e
records: options.values, records: options.values,
}); });
} }
const transaction = await this.getTransaction(options); const transaction = await this.getTransaction(options);
const guard = UpdateGuard.fromOptions(this.model, { ...options, underscored: this.collection.options.underscored }); const guard = UpdateGuard.fromOptions(this.model, { ...options, underscored: this.collection.options.underscored });

39
packages/core/database/src/tree-repository/adjacency-list-repository.ts
View File

@ -2,7 +2,14 @@ import { FindOptions, Repository } from '../repository';
import lodash from 'lodash'; import lodash from 'lodash';
export class AdjacencyListRepository extends Repository { export class AdjacencyListRepository extends Repository {
async find(options?: FindOptions): Promise<any> { async update(options): Promise<any> {
return super.update({
...(options || {}),
addIndex: false,
});
}
async find(options?: FindOptions & { addIndex?: boolean }): Promise<any> {
const parentNodes = await super.find(lodash.omit(options)); const parentNodes = await super.find(lodash.omit(options));
if (parentNodes.length === 0) { if (parentNodes.length === 0) {
@ -75,34 +82,26 @@ export class AdjacencyListRepository extends Repository {
parent.setDataValue(childrenKey, children); parent.setDataValue(childrenKey, children);
} }
this.addIndex(parentNodes, childrenKey); this.addIndex(parentNodes, childrenKey, options);
return parentNodes; return parentNodes;
} }
private addIndex(treeArray, childrenKey = 'children') { private addIndex(treeArray, childrenKey, options) {
function traverse(node, index) { function traverse(node, index) {
let children; // patch for sequelize toJSON
if (node._options.includeNames && !node._options.includeNames.includes(childrenKey)) {
if (lodash.isPlainObject(node)) { node._options.includeNames.push(childrenKey);
node['__index'] = `${index}`; }
children = node[childrenKey];
if (children.length === 0) {
delete node[childrenKey];
}
} else {
// patch for sequelize toJSON
if (node._options.includeNames && !node._options.includeNames.includes(childrenKey)) {
node._options.includeNames.push(childrenKey);
}
if (options.addIndex !== false) {
node.setDataValue('__index', `${index}`); node.setDataValue('__index', `${index}`);
}
children = node.getDataValue(childrenKey); const children = node.getDataValue(childrenKey);
if (children.length === 0) { if (children.length === 0) {
node.setDataValue(childrenKey, undefined); node.setDataValue(childrenKey, undefined);
}
} }
if (children && children.length > 0) { if (children && children.length > 0) {

16
packages/plugins/collection-manager/src/__tests__/http-api/tree.test.ts
View File

@ -1,7 +1,6 @@
import { MockServer } from '@nocobase/test'; import { MockServer } from '@nocobase/test';
import { Database } from '@nocobase/database'; import { Database } from '@nocobase/database';
import { createApp } from '../index'; import { createApp } from '../index';
import lodash from 'lodash';
describe('tree', () => { describe('tree', () => {
let app: MockServer; let app: MockServer;
@ -67,6 +66,19 @@ describe('tree', () => {
expect(listResponse.statusCode).toBe(200); expect(listResponse.statusCode).toBe(200);
console.log(listResponse.body); // update c1
await db.getRepository('categories').update({
filter: {
name: 'c1',
},
values: {
__index: '1231', // should ignore
name: 'c11',
},
});
await c1.reload();
expect(c1.get('name')).toBe('c11');
}); });
}); });