style: code formatting

This commit is contained in:
chenos 2021-03-28 13:34:51 +08:00
parent 5e9959b987
commit ce4a22fbb9
275 changed files with 6911 additions and 5067 deletions

View File

@ -2,18 +2,18 @@ import { initDatabase, agent } from './index';
describe('add', () => { describe('add', () => {
let db; let db;
beforeEach(async () => { beforeEach(async () => {
db = await initDatabase(); db = await initDatabase();
}); });
afterAll(() => db.close()); afterAll(() => db.close());
it('belongsToMany1', async () => { it('belongsToMany1', async () => {
const [Post, Tag] = db.getModels(['posts', 'tags']); const [Post, Tag] = db.getModels(['posts', 'tags']);
let post = await Post.create(); let post = await Post.create();
let tag1 = await Tag.create({name: 'tag1'}); let tag1 = await Tag.create({ name: 'tag1' });
let tag2 = await Tag.create({name: 'tag2'}); let tag2 = await Tag.create({ name: 'tag2' });
await agent.post(`/posts/${post.id}/tags:add/${tag1.id}`); await agent.post(`/posts/${post.id}/tags:add/${tag1.id}`);
await agent.post(`/posts/${post.id}/tags:add/${tag2.id}`); await agent.post(`/posts/${post.id}/tags:add/${tag2.id}`);
let [tag01, tag02] = await post.getTags(); let [tag01, tag02] = await post.getTags();

View File

@ -2,11 +2,11 @@ import { initDatabase, agent } from './index';
describe('create', () => { describe('create', () => {
let db; let db;
beforeEach(async () => { beforeEach(async () => {
db = await initDatabase(); db = await initDatabase();
}); });
afterAll(() => db.close()); afterAll(() => db.close());
describe('single', () => { describe('single', () => {
@ -49,11 +49,11 @@ describe('create', () => {
}); });
expect(response.body.sort).toBe(1); expect(response.body.sort).toBe(1);
expect(response.body.user_id).toBe(1); expect(response.body.user_id).toBe(1);
const postWithUser = await agent const postWithUser = await agent
.get(`/posts/${response.body.id}?fields=user`); .get(`/posts/${response.body.id}?fields=user`);
expect(postWithUser.body.user.id).toBe(1); expect(postWithUser.body.user.id).toBe(1);
const user = await agent const user = await agent
.get(`/users/${postWithUser.body.user.id}?fields=profile`); .get(`/users/${postWithUser.body.user.id}?fields=profile`);
expect(user.body.profile).toBe(null); expect(user.body.profile).toBe(null);
@ -96,7 +96,7 @@ describe('create', () => {
}); });
expect(response.body.post_id).toBe(post.id); expect(response.body.post_id).toBe(post.id);
expect(response.body.content).toBe('content1'); expect(response.body.content).toBe('content1');
const comments = await agent const comments = await agent
.get('/comments?fields=id,content'); .get('/comments?fields=id,content');
expect(comments.body.count).toBe(1); expect(comments.body.count).toBe(1);

View File

@ -2,11 +2,11 @@ import { initDatabase, agent } from './index';
describe('destroy', () => { describe('destroy', () => {
let db; let db;
beforeEach(async () => { beforeEach(async () => {
db = await initDatabase(); db = await initDatabase();
}); });
afterAll(() => db.close()); afterAll(() => db.close());
describe('single', () => { describe('single', () => {
@ -18,24 +18,24 @@ describe('destroy', () => {
// console.log(response.body); // console.log(response.body);
expect(response.body.count).toBe(1); expect(response.body.count).toBe(1);
}); });
it('batch delete by filter', async () => { it('batch delete by filter', async () => {
const Post = db.getModel('posts'); const Post = db.getModel('posts');
const posts = await Post.bulkCreate([ const posts = await Post.bulkCreate([
{ title: 'title1', status: 'published'}, { title: 'title1', status: 'published' },
{ title: 'title2', status: 'draft'}, { title: 'title2', status: 'draft' },
{ title: 'title3', status: 'published'}, { title: 'title3', status: 'published' },
{ title: 'title4', status: 'draft'}, { title: 'title4', status: 'draft' },
]); ]);
await agent await agent
.delete('/posts?filter[status]=draft'); .delete('/posts?filter[status]=draft');
const published = await Post.findAll(); const published = await Post.findAll();
expect(published.length).toBe(2); expect(published.length).toBe(2);
expect(published.map(({ title, status }) => ({ title, status }))).toEqual([ expect(published.map(({ title, status }) => ({ title, status }))).toEqual([
{ title: 'title1', status: 'published'}, { title: 'title1', status: 'published' },
{ title: 'title3', status: 'published'} { title: 'title3', status: 'published' }
]); ]);
}); });
}); });
@ -62,7 +62,7 @@ describe('destroy', () => {
const post = await Post.create(); const post = await Post.create();
await post.updateAssociations({ await post.updateAssociations({
comments: [ comments: [
{content: 'content111222'}, { content: 'content111222' },
], ],
}); });
const [comment] = await post.getComments(); const [comment] = await post.getComments();
@ -78,9 +78,9 @@ describe('destroy', () => {
await post.updateAssociations({ await post.updateAssociations({
comments: [ comments: [
{ content: 'content1', status: 'published' }, { content: 'content1', status: 'published' },
{ content: 'content2', status: 'draft'}, { content: 'content2', status: 'draft' },
{ content: 'content3', status: 'published' }, { content: 'content3', status: 'published' },
{ content: 'content4', status: 'draft'}, { content: 'content4', status: 'draft' },
], ],
}); });
await agent await agent
@ -96,7 +96,7 @@ describe('destroy', () => {
const Post = db.getModel('posts'); const Post = db.getModel('posts');
const post = await Post.create(); const post = await Post.create();
await post.updateAssociations({ await post.updateAssociations({
user: {name: 'name121234'}, user: { name: 'name121234' },
}); });
await agent.delete(`/posts/${post.id}/user:destroy`); await agent.delete(`/posts/${post.id}/user:destroy`);
const user = await post.getUser(); const user = await post.getUser();
@ -110,7 +110,7 @@ describe('destroy', () => {
const post = await Post.create(); const post = await Post.create();
await post.updateAssociations({ await post.updateAssociations({
tags: [ tags: [
{name: 'tag112233'}, { name: 'tag112233' },
], ],
}); });
const [tag] = await post.getTags(); const [tag] = await post.getTags();
@ -129,9 +129,9 @@ describe('destroy', () => {
const post = await Post.create(); const post = await Post.create();
await post.updateAssociations({ await post.updateAssociations({
tags: [ tags: [
{ name: 'tag1', status: 'enabled'}, { name: 'tag1', status: 'enabled' },
{ name: 'tag2', status: 'disabled' }, { name: 'tag2', status: 'disabled' },
{ name: 'tag3', status: 'enabled'}, { name: 'tag3', status: 'enabled' },
{ name: 'tag4', status: 'disabled' }, { name: 'tag4', status: 'disabled' },
], ],
}); });

View File

@ -2,11 +2,11 @@ import { initDatabase, agent } from './index';
describe('get', () => { describe('get', () => {
let db; let db;
beforeEach(async () => { beforeEach(async () => {
db = await initDatabase(); db = await initDatabase();
}); });
afterAll(() => db.close()); afterAll(() => db.close());
it('common1', async () => { it('common1', async () => {
@ -45,7 +45,7 @@ describe('get', () => {
const post = await Post.create(); const post = await Post.create();
await post.updateAssociations({ await post.updateAssociations({
comments: [ comments: [
{content: 'content111222'}, { content: 'content111222' },
], ],
}); });
const [comment] = await post.getComments(); const [comment] = await post.getComments();
@ -67,11 +67,11 @@ describe('get', () => {
const Post = db.getModel('posts'); const Post = db.getModel('posts');
const post = await Post.create(); const post = await Post.create();
await post.updateAssociations({ await post.updateAssociations({
user: {name: 'name121234'}, user: { name: 'name121234' },
}); });
const response = await agent const response = await agent
.get(`/posts/${post.id}/user?fields=name`); .get(`/posts/${post.id}/user?fields=name`);
expect(response.body).toEqual({name: 'name121234'}); expect(response.body).toEqual({ name: 'name121234' });
}); });
it('belongsToMany', async () => { it('belongsToMany', async () => {
@ -79,7 +79,7 @@ describe('get', () => {
const post = await Post.create(); const post = await Post.create();
await post.updateAssociations({ await post.updateAssociations({
tags: [ tags: [
{name: 'tag112233'}, { name: 'tag112233' },
], ],
}); });
const [tag] = await post.getTags(); const [tag] = await post.getTags();

View File

@ -40,7 +40,7 @@ const connection = {
define: { define: {
hooks: { hooks: {
beforeCreate(model, options) { beforeCreate(model, options) {
}, },
}, },
}, },

View File

@ -8,7 +8,7 @@ describe('list', () => {
let nowString: string; let nowString: string;
let timestamps: { created_at: Date; updated_at: Date; }; let timestamps: { created_at: Date; updated_at: Date; };
let timestampsStrings; let timestampsStrings;
beforeEach(async () => { beforeEach(async () => {
db = await initDatabase(); db = await initDatabase();
now = new Date(); now = new Date();
@ -16,7 +16,7 @@ describe('list', () => {
timestamps = { created_at: now, updated_at: now }; timestamps = { created_at: now, updated_at: now };
timestampsStrings = { created_at: nowString, updated_at: nowString }; timestampsStrings = { created_at: nowString, updated_at: nowString };
}); });
afterAll(() => db.close()); afterAll(() => db.close());
describe('common', () => { describe('common', () => {
@ -49,7 +49,7 @@ describe('list', () => {
const response = await agent.get('/posts?filter[status]=published'); const response = await agent.get('/posts?filter[status]=published');
expect(response.body.count).toBe(await Post.count({ where: { status: 'published' } })); expect(response.body.count).toBe(await Post.count({ where: { status: 'published' } }));
}); });
it('should be filtered by `title` equal to `title1`', async () => { it('should be filtered by `title` equal to `title1`', async () => {
const Post = db.getModel('posts'); const Post = db.getModel('posts');
const response = await agent.get('/posts?filter[title]=title1'); const response = await agent.get('/posts?filter[title]=title1');
@ -182,22 +182,24 @@ describe('list', () => {
expect(response.body.count).toBe(1); expect(response.body.count).toBe(1);
expect(response.body.rows[0].name).toBe(expected.name); expect(response.body.rows[0].name).toBe(expected.name);
}); });
it('$anyOf for all elements in definition', async () => { it('$anyOf for all elements in definition', async () => {
const User = db.getModel('users'); const User = db.getModel('users');
const expected = await User.findOne({ const expected = await User.findOne({
where: { where: {
nicknames: { [Op.or]: [ nicknames: {
{ [Op.contains]: 'aaa' }, [Op.or]: [
{ [Op.contains]: 'aa' } { [Op.contains]: 'aaa' },
] } { [Op.contains]: 'aa' }
]
}
} }
}); });
const response = await agent.get('/users?filter[nicknames.$anyOf]=aaa,aa'); const response = await agent.get('/users?filter[nicknames.$anyOf]=aaa,aa');
expect(response.body.count).toBe(1); expect(response.body.count).toBe(1);
expect(response.body.rows[0].name).toBe(expected.name); expect(response.body.rows[0].name).toBe(expected.name);
}); });
it('$anyOf for some element not in definition', async () => { it('$anyOf for some element not in definition', async () => {
const User = db.getModel('users'); const User = db.getModel('users');
const expected = await User.findOne({ const expected = await User.findOne({
@ -209,7 +211,7 @@ describe('list', () => {
expect(response.body.count).toBe(1); expect(response.body.count).toBe(1);
expect(response.body.rows[0].name).toBe(expected.name); expect(response.body.rows[0].name).toBe(expected.name);
}); });
it('$anyOf for no element', async () => { it('$anyOf for no element', async () => {
const User = db.getModel('users'); const User = db.getModel('users');
const expected = await User.findAll(); const expected = await User.findAll();
@ -334,27 +336,27 @@ describe('list', () => {
rows: Array(20).fill(null).map((_, index) => ({ title: `title${index}` })), rows: Array(20).fill(null).map((_, index) => ({ title: `title${index}` })),
}); });
}); });
it('page 1 by size(1) should be ok', async () => { it('page 1 by size(1) should be ok', async () => {
const response = await agent.get('/posts?fields=title&page=1&perPage=1'); const response = await agent.get('/posts?fields=title&page=1&perPage=1');
expect(response.body).toEqual({ expect(response.body).toEqual({
count: 25, count: 25,
page: 1, page: 1,
per_page: 1, per_page: 1,
rows: [ { title: 'title0' } ], rows: [{ title: 'title0' }],
}); });
}); });
it('page 2 by size(1) should be ok', async () => { it('page 2 by size(1) should be ok', async () => {
const response = await agent.get('/posts?fields=title&page=2&per_page=1'); const response = await agent.get('/posts?fields=title&page=2&per_page=1');
expect(response.body).toEqual({ expect(response.body).toEqual({
count: 25, count: 25,
page: 2, page: 2,
per_page: 1, per_page: 1,
rows: [ { title: 'title1' } ], rows: [{ title: 'title1' }],
}); });
}); });
it('page 1 by size(101) should be change to 100', async () => { it('page 1 by size(101) should be change to 100', async () => {
const response = await agent.get('/posts?fields=title&page=1&per_page=101'); const response = await agent.get('/posts?fields=title&page=1&per_page=101');
expect(response.body).toEqual({ expect(response.body).toEqual({
@ -364,7 +366,7 @@ describe('list', () => {
rows: Array(25).fill(null).map((_, index) => ({ title: `title${index}` })), rows: Array(25).fill(null).map((_, index) => ({ title: `title${index}` })),
}); });
}); });
it('page 2 by size(101) should be change to 100 and result is empty', async () => { it('page 2 by size(101) should be change to 100 and result is empty', async () => {
const response = await agent.get('/posts?fields=title&page=2&per_page=101'); const response = await agent.get('/posts?fields=title&page=2&per_page=101');
expect(response.body).toEqual({ expect(response.body).toEqual({
@ -374,7 +376,7 @@ describe('list', () => {
rows: [], rows: [],
}); });
}); });
it('default page by size(-1) should be change to 100 and result will be 25 items', async () => { it('default page by size(-1) should be change to 100 and result will be 25 items', async () => {
const response = await agent.get('/posts?fields=title&per_page=-1'); const response = await agent.get('/posts?fields=title&per_page=-1');
expect(response.body).toEqual({ expect(response.body).toEqual({
@ -384,7 +386,7 @@ describe('list', () => {
rows: Array(25).fill(null).map((_, index) => ({ title: `title${index}` })), rows: Array(25).fill(null).map((_, index) => ({ title: `title${index}` })),
}); });
}); });
it('page 2 by size(-1) should be change to 100 and result is empty', async () => { it('page 2 by size(-1) should be change to 100 and result is empty', async () => {
const response = await agent.get('/posts?fields=title&page=2&per_page=-1'); const response = await agent.get('/posts?fields=title&page=2&per_page=-1');
expect(response.body).toEqual({ expect(response.body).toEqual({
@ -395,7 +397,7 @@ describe('list', () => {
}); });
}); });
}); });
describe('fields', () => { describe('fields', () => {
it('custom field', async () => { it('custom field', async () => {
const response = await agent.get('/posts?fields=title&filter[customTitle]=title0'); const response = await agent.get('/posts?fields=title&filter[customTitle]=title0');
@ -403,7 +405,7 @@ describe('list', () => {
count: 1, count: 1,
page: 1, page: 1,
per_page: 20, per_page: 20,
rows: [ { title: 'title0' } ] rows: [{ title: 'title0' }]
}); });
}); });
@ -459,7 +461,8 @@ describe('list', () => {
const response = await agent.get('/posts?fields[only]=title&fields[appends]=user.name&filter[title]=title0'); const response = await agent.get('/posts?fields[only]=title&fields[appends]=user.name&filter[title]=title0');
expect(response.body.rows[0].user.name).toEqual('a'); expect(response.body.rows[0].user.name).toEqual('a');
expect(response.body.rows).toEqual([{ expect(response.body.rows).toEqual([{
title: 'title0', user: { id: 1, nicknames: ['aa', 'aaa'], name: 'a', ...timestampsStrings } }]); title: 'title0', user: { id: 1, nicknames: ['aa', 'aaa'], name: 'a', ...timestampsStrings }
}]);
}); });
}); });
}); });
@ -490,7 +493,7 @@ describe('list', () => {
const response = await agent const response = await agent
.get(`/posts/${post.id}/comments?page=2&perPage=2&sort=content&fields=content&filter[published]=1`); .get(`/posts/${post.id}/comments?page=2&perPage=2&sort=content&fields=content&filter[published]=1`);
expect(response.body).toEqual({ expect(response.body).toEqual({
rows: [ { content: 'content5' } ], rows: [{ content: 'content5' }],
count: 3, count: 3,
page: 2, page: 2,
per_page: 2 per_page: 2
@ -503,7 +506,7 @@ describe('list', () => {
expect(response.body).toEqual({ expect(response.body).toEqual({
rows: [{ rows: [{
title: null, title: null,
comments: [{ content: 'content4' }, { content: 'content2' }, { content: 'content0'}] comments: [{ content: 'content4' }, { content: 'content2' }, { content: 'content0' }]
}], }],
count: 1, count: 1,
page: 1, page: 1,
@ -516,7 +519,7 @@ describe('list', () => {
const post = await Post.findByPk(1); const post = await Post.findByPk(1);
const response = await agent const response = await agent
.get(`/posts/${post.id}/comments?fields=content,user.name&filter[status]=draft&sort=-content&page=1&perPage=2`); .get(`/posts/${post.id}/comments?fields=content,user.name&filter[status]=draft&sort=-content&page=1&perPage=2`);
expect(response.body).toEqual({ expect(response.body).toEqual({
count: 3, count: 3,
page: 1, page: 1,
@ -551,9 +554,9 @@ describe('list', () => {
it('count field in hasMany', async () => { it('count field in hasMany', async () => {
try { try {
const response = await agent const response = await agent
.get(`/users/1?fields=name,posts_count`); .get(`/users/1?fields=name,posts_count`);
console.log(response.body); console.log(response.body);
} catch (err) { } catch (err) {
console.error(err); console.error(err);
} }
@ -561,9 +564,9 @@ describe('list', () => {
it('count field in hasMany', async () => { it('count field in hasMany', async () => {
try { try {
const response = await agent const response = await agent
.get(`/users/1/posts?fields=title,comments_count`); .get(`/users/1/posts?fields=title,comments_count`);
console.log(response.body); console.log(response.body);
} catch (err) { } catch (err) {
console.error(err); console.error(err);
} }
@ -574,24 +577,24 @@ describe('list', () => {
beforeEach(async () => { beforeEach(async () => {
const Tag = db.getModel('tags'); const Tag = db.getModel('tags');
const tags = await Tag.bulkCreate([ const tags = await Tag.bulkCreate([
{name: 'tag1', status: 'published'}, { name: 'tag1', status: 'published' },
{name: 'tag2', status: 'draft'}, { name: 'tag2', status: 'draft' },
{name: 'tag3', status: 'published'}, { name: 'tag3', status: 'published' },
{name: 'tag4', status: 'draft'}, { name: 'tag4', status: 'draft' },
{name: 'tag5', status: 'published'}, { name: 'tag5', status: 'published' },
{name: 'tag6', status: 'draft'}, { name: 'tag6', status: 'draft' },
{name: 'tag7', status: 'published'}, { name: 'tag7', status: 'published' },
{name: 'tag8', status: 'published'}, { name: 'tag8', status: 'published' },
{name: 'tag9', status: 'draft'}, { name: 'tag9', status: 'draft' },
{name: 'tag10', status: 'published'}, { name: 'tag10', status: 'published' },
]); ]);
const Post = db.getModel('posts'); const Post = db.getModel('posts');
const [post1, post2] = await Post.bulkCreate([{}, {}]); const [post1, post2] = await Post.bulkCreate([{}, {}]);
await post1.updateAssociations({ await post1.updateAssociations({
tags: [1,2,3,4,5,6,7] tags: [1, 2, 3, 4, 5, 6, 7]
}); });
await post2.updateAssociations({ await post2.updateAssociations({
tags: [2,5,8] tags: [2, 5, 8]
}); });
const User = db.getModel('users'); const User = db.getModel('users');
const user = await User.create(); const user = await User.create();
@ -606,7 +609,7 @@ describe('list', () => {
const response = await agent const response = await agent
.get(`/posts/${post.id}/tags?page=2&perPage=2&sort=-name&fields=name&filter[status]=published`); .get(`/posts/${post.id}/tags?page=2&perPage=2&sort=-name&fields=name&filter[status]=published`);
expect(response.body).toEqual({ expect(response.body).toEqual({
rows: [ { name: 'tag3' }, { name: 'tag1' } ], rows: [{ name: 'tag3' }, { name: 'tag1' }],
count: 4, count: 4,
page: 2, page: 2,
per_page: 2 per_page: 2

View File

@ -5,7 +5,7 @@ import { initDatabase, agent, resourcer } from './index';
describe('list', () => { describe('list', () => {
let db; let db;
beforeAll(async () => { beforeAll(async () => {
resourcer.define({ resourcer.define({
name: 'articles', name: 'articles',
@ -43,7 +43,7 @@ describe('list', () => {
force: true, force: true,
}); });
}); });
afterAll(() => db.close()); afterAll(() => db.close());
it('create', async () => { it('create', async () => {
@ -58,7 +58,7 @@ describe('list', () => {
it('list', async () => { it('list', async () => {
const response = await agent.get('/articles?fields=title&page=1'); const response = await agent.get('/articles?fields=title&page=1');
expect(response.body).toEqual({ expect(response.body).toEqual({
data: [ { title: 'title1' } ], data: [{ title: 'title1' }],
meta: { count: 1, page: 1, per_page: 20 } meta: { count: 1, page: 1, per_page: 20 }
}); });
}); });

View File

@ -2,11 +2,11 @@ import { initDatabase, agent } from './index';
describe('remove', () => { describe('remove', () => {
let db; let db;
beforeEach(async () => { beforeEach(async () => {
db = await initDatabase(); db = await initDatabase();
}); });
afterAll(() => db.close()); afterAll(() => db.close());
it('hasOne1', async () => { it('hasOne1', async () => {
@ -28,7 +28,7 @@ describe('remove', () => {
const post = await Post.create(); const post = await Post.create();
await post.updateAssociations({ await post.updateAssociations({
comments: [ comments: [
{content: 'content111222'}, { content: 'content111222' },
], ],
}); });
let [comment] = await post.getComments(); let [comment] = await post.getComments();
@ -42,7 +42,7 @@ describe('remove', () => {
const Post = db.getModel('posts'); const Post = db.getModel('posts');
let post = await Post.create(); let post = await Post.create();
await post.updateAssociations({ await post.updateAssociations({
user: {name: 'name121234'}, user: { name: 'name121234' },
}); });
await agent.post(`/posts/${post.id}/user:remove`); await agent.post(`/posts/${post.id}/user:remove`);
post = await Post.findOne({ post = await Post.findOne({

View File

@ -2,11 +2,11 @@ import { initDatabase, agent } from './index';
describe('set', () => { describe('set', () => {
let db; let db;
beforeEach(async () => { beforeEach(async () => {
db = await initDatabase(); db = await initDatabase();
}); });
afterAll(() => db.close()); afterAll(() => db.close());
it('belongsTo1', async () => { it('belongsTo1', async () => {
@ -28,8 +28,8 @@ describe('set', () => {
it.skip('belongsToMany1', async () => { it.skip('belongsToMany1', async () => {
const [Post, Tag] = db.getModels(['posts', 'tags']); const [Post, Tag] = db.getModels(['posts', 'tags']);
let post = await Post.create(); let post = await Post.create();
let tag1 = await Tag.create({name: 'tag1'}); let tag1 = await Tag.create({ name: 'tag1' });
let tag2 = await Tag.create({name: 'tag2'}); let tag2 = await Tag.create({ name: 'tag2' });
await agent.post(`/posts/${post.id}/tags:set/${tag1.id}`); await agent.post(`/posts/${post.id}/tags:set/${tag1.id}`);
// 单独跑 ok和上面的 it 一起跑就无法获取到 // 单独跑 ok和上面的 it 一起跑就无法获取到
const tags = await post.getTags(); const tags = await post.getTags();

View File

@ -2,7 +2,7 @@ import { initDatabase, agent } from './index';
describe('get', () => { describe('get', () => {
let db; let db;
beforeEach(async () => { beforeEach(async () => {
db = await initDatabase(); db = await initDatabase();
const User = db.getModel('users'); const User = db.getModel('users');
@ -23,7 +23,7 @@ describe('get', () => {
})) }))
})), Promise.resolve()); })), Promise.resolve());
}); });
afterAll(() => db.close()); afterAll(() => db.close());
describe('sort value initialization', () => { describe('sort value initialization', () => {
@ -200,7 +200,7 @@ describe('get', () => {
field: 'sort_in_status', field: 'sort_in_status',
target: { id: 8 }, target: { id: 8 },
}); });
const Post = db.getModel('posts'); const Post = db.getModel('posts');
const posts = await Post.findAll({ const posts = await Post.findAll({
where: { where: {

View File

@ -2,11 +2,11 @@ import { initDatabase, agent } from './index';
describe('update', () => { describe('update', () => {
let db; let db;
beforeEach(async () => { beforeEach(async () => {
db = await initDatabase(); db = await initDatabase();
}); });
afterAll(() => db.close()); afterAll(() => db.close());
describe('common', () => { describe('common', () => {
@ -86,7 +86,7 @@ describe('update', () => {
const result = await agent const result = await agent
.get(`/posts/${post.id}`); .get(`/posts/${post.id}`);
expect(result.body.title).toBe(null); expect(result.body.title).toBe(null);
expect(result.body.meta).toEqual({ expect(result.body.meta).toEqual({
location: 'Kunming' location: 'Kunming'
@ -106,7 +106,7 @@ describe('update', () => {
const result = await agent const result = await agent
.get(`/posts/${post.id}`); .get(`/posts/${post.id}`);
expect(result.body.title).toBe('title11112222'); expect(result.body.title).toBe('title11112222');
expect(result.body.meta).toBe(null); expect(result.body.meta).toBe(null);
}); });
@ -140,12 +140,12 @@ describe('update', () => {
const post = await Post.create(); const post = await Post.create();
await post.updateAssociations({ await post.updateAssociations({
comments: [ comments: [
{content: 'content111222'}, { content: 'content111222' },
], ],
}); });
const [comment] = await post.getComments(); const [comment] = await post.getComments();
const response = await agent const response = await agent
.put(`/posts/${post.id}/comments/${comment.id}`).send({content: 'content111222333'}); .put(`/posts/${post.id}/comments/${comment.id}`).send({ content: 'content111222333' });
expect(response.body.post_id).toBe(post.id); expect(response.body.post_id).toBe(post.id);
expect(response.body.content).toBe('content111222333'); expect(response.body.content).toBe('content111222333');
}); });
@ -154,10 +154,10 @@ describe('update', () => {
const Post = db.getModel('posts'); const Post = db.getModel('posts');
const post = await Post.create(); const post = await Post.create();
await post.updateAssociations({ await post.updateAssociations({
user: {name: 'name121234'}, user: { name: 'name121234' },
}); });
const response = await agent const response = await agent
.post(`/posts/${post.id}/user:update`).send({name: 'name1212345'}); .post(`/posts/${post.id}/user:update`).send({ name: 'name1212345' });
expect(response.body.name).toEqual('name1212345'); expect(response.body.name).toEqual('name1212345');
}); });
@ -166,7 +166,7 @@ describe('update', () => {
const post = await Post.create(); const post = await Post.create();
await post.updateAssociations({ await post.updateAssociations({
tags: [ tags: [
{name: 'tag112233'}, { name: 'tag112233' },
], ],
}); });
const [tag] = await post.getTags(); const [tag] = await post.getTags();

View File

@ -24,8 +24,8 @@ export async function set(ctx: Context, next: Next) {
resourceField, resourceField,
associatedName, associatedName,
} = ctx.action.params as { } = ctx.action.params as {
associated: Model, associated: Model,
associatedName: string, associatedName: string,
resourceField: Relation, resourceField: Relation,
values: any, values: any,
}; };
@ -64,8 +64,8 @@ export async function add(ctx: Context, next: Next) {
resourceField, resourceField,
associatedName, associatedName,
} = ctx.action.params as { } = ctx.action.params as {
associated: Model, associated: Model,
associatedName: string, associatedName: string,
resourceField: Relation, resourceField: Relation,
values: any, values: any,
}; };
@ -106,8 +106,8 @@ export async function remove(ctx: Context, next: Next) {
resourceField, resourceField,
associatedName, associatedName,
} = ctx.action.params as { } = ctx.action.params as {
associated: Model, associated: Model,
associatedName: string, associatedName: string,
resourceField: Relation, resourceField: Relation,
values: any, values: any,
}; };
@ -115,7 +115,7 @@ export async function remove(ctx: Context, next: Next) {
if (!(associated instanceof AssociatedModel)) { if (!(associated instanceof AssociatedModel)) {
throw new Error(`${associatedName} associated model invalid`); throw new Error(`${associatedName} associated model invalid`);
} }
const {get: getAccessor, remove: removeAccessor, set: setAccessor} = resourceField.getAccessors(); const { get: getAccessor, remove: removeAccessor, set: setAccessor } = resourceField.getAccessors();
const { resourceKey, resourceKeyAttribute, fields = [] } = ctx.action.params; const { resourceKey, resourceKeyAttribute, fields = [] } = ctx.action.params;
const TargetModel = ctx.db.getModel(resourceField.getTarget()); const TargetModel = ctx.db.getModel(resourceField.getTarget());
const options = TargetModel.parseApiJson({ const options = TargetModel.parseApiJson({
@ -132,7 +132,7 @@ export async function remove(ctx: Context, next: Next) {
context: ctx, context: ctx,
}); });
await associated[removeAccessor](model); await associated[removeAccessor](model);
ctx.body = {id: model.id}; ctx.body = { id: model.id };
} }
await next(); await next();
} }
@ -143,8 +143,8 @@ export async function toggle(ctx: Context, next: Next) {
resourceField, resourceField,
associatedName, associatedName,
} = ctx.action.params as { } = ctx.action.params as {
associated: Model, associated: Model,
associatedName: string, associatedName: string,
resourceField: Relation, resourceField: Relation,
values: any, values: any,
}; };
@ -152,7 +152,7 @@ export async function toggle(ctx: Context, next: Next) {
if (!(associated instanceof AssociatedModel)) { if (!(associated instanceof AssociatedModel)) {
throw new Error(`${associatedName} associated model invalid`); throw new Error(`${associatedName} associated model invalid`);
} }
const {get: getAccessor, remove: removeAccessor, set: setAccessor, add: addAccessor} = resourceField.getAccessors(); const { get: getAccessor, remove: removeAccessor, set: setAccessor, add: addAccessor } = resourceField.getAccessors();
const { resourceKey, resourceKeyAttribute, fields = [] } = ctx.action.params; const { resourceKey, resourceKeyAttribute, fields = [] } = ctx.action.params;
const TargetModel = ctx.db.getModel(resourceField.getTarget()); const TargetModel = ctx.db.getModel(resourceField.getTarget());
const options = TargetModel.parseApiJson({ const options = TargetModel.parseApiJson({

View File

@ -2,7 +2,7 @@ import { Utils, Op, Sequelize } from 'sequelize';
import _ from 'lodash'; import _ from 'lodash';
import { Context, Next } from '.'; import { Context, Next } from '.';
import { import {
Model, Model,
HASONE, HASONE,
HASMANY, HASMANY,
BELONGSTO, BELONGSTO,
@ -187,7 +187,7 @@ export async function list(ctx: Context, next: Next) {
} }
// const getAccessor = resourceField.getAccessors().get; // const getAccessor = resourceField.getAccessors().get;
// const countAccessor = resourceField.getAccessors().count; // const countAccessor = resourceField.getAccessors().count;
options.scope = options.scopes||[]; options.scope = options.scopes || [];
const association = AssociatedModel.associations[resourceField.options.name]; const association = AssociatedModel.associations[resourceField.options.name];
if (resourceField instanceof BELONGSTOMANY) { if (resourceField instanceof BELONGSTOMANY) {
data = await belongsToManyGet.call(association, associated, { data = await belongsToManyGet.call(association, associated, {
@ -213,7 +213,7 @@ export async function list(ctx: Context, next: Next) {
fields, fields,
context: ctx, context: ctx,
}); });
data = await Model.scope(options.scopes||[]).findAndCountAll({ data = await Model.scope(options.scopes || []).findAndCountAll({
...options, ...options,
// @ts-ignore hooks 里添加 context // @ts-ignore hooks 里添加 context
context: ctx, context: ctx,
@ -288,7 +288,7 @@ export async function get(ctx: Context, next: Next) {
resourceKeyAttribute, resourceKeyAttribute,
fields = [] fields = []
} = ctx.action.params; } = ctx.action.params;
console.log({associated, resourceField}) console.log({ associated, resourceField })
if (associated && resourceField) { if (associated && resourceField) {
const AssociatedModel = ctx.db.getModel(associatedName); const AssociatedModel = ctx.db.getModel(associatedName);
if (!(associated instanceof AssociatedModel)) { if (!(associated instanceof AssociatedModel)) {
@ -461,7 +461,7 @@ export async function destroy(ctx: Context, next: Next) {
await transaction.rollback(); await transaction.rollback();
throw new Error(`${associatedName} associated model invalid`); throw new Error(`${associatedName} associated model invalid`);
} }
const {get: getAccessor, remove: removeAccessor, set: setAccessor} = resourceField.getAccessors(); const { get: getAccessor, remove: removeAccessor, set: setAccessor } = resourceField.getAccessors();
const TargetModel = ctx.db.getModel(resourceField.getTarget()); const TargetModel = ctx.db.getModel(resourceField.getTarget());
const { where } = TargetModel.parseApiJson({ filter, context: ctx }); const { where } = TargetModel.parseApiJson({ filter, context: ctx });
if (resourceField instanceof HASONE || resourceField instanceof BELONGSTO) { if (resourceField instanceof HASONE || resourceField instanceof BELONGSTO) {

View File

@ -45,7 +45,7 @@ const api = Api.create({
}); });
api.resourcer.use(associated); api.resourcer.use(associated);
api.resourcer.registerActionHandlers({...actions.common, ...actions.associate}); api.resourcer.registerActionHandlers({ ...actions.common, ...actions.associate });
// api.resourcer.use(async (ctx: actions.Context, next) => { // api.resourcer.use(async (ctx: actions.Context, next) => {
// const token = ctx.get('Authorization').replace(/^Bearer\s+/gi, ''); // const token = ctx.get('Authorization').replace(/^Bearer\s+/gi, '');

View File

@ -21,8 +21,8 @@ export default {
interface: 'radio', interface: 'radio',
title: '性别', title: '性别',
dataSource: [ dataSource: [
{value: 'male', label: '男性'}, { value: 'male', label: '男性' },
{value: 'female', label: '女性'}, { value: 'female', label: '女性' },
], ],
component: { component: {
showInTable: true, showInTable: true,

View File

@ -76,9 +76,9 @@ export default {
interface: 'select', interface: 'select',
title: '下拉', title: '下拉',
dataSource: [ dataSource: [
{value: 'value1', label: '选项1'}, { value: 'value1', label: '选项1' },
{value: 'value2', label: '选项2'}, { value: 'value2', label: '选项2' },
{value: 'value3', label: '选项3'}, { value: 'value3', label: '选项3' },
], ],
component: { component: {
showInTable: true, showInTable: true,
@ -90,9 +90,9 @@ export default {
interface: 'multipleSelect', interface: 'multipleSelect',
title: '下拉多选', title: '下拉多选',
dataSource: [ dataSource: [
{value: 'value1', label: '选项1'}, { value: 'value1', label: '选项1' },
{value: 'value2', label: '选项2'}, { value: 'value2', label: '选项2' },
{value: 'value3', label: '选项3'}, { value: 'value3', label: '选项3' },
], ],
component: { component: {
showInTable: true, showInTable: true,
@ -104,9 +104,9 @@ export default {
interface: 'radio', interface: 'radio',
title: '单选框', title: '单选框',
dataSource: [ dataSource: [
{value: 'value1', label: '选项1'}, { value: 'value1', label: '选项1' },
{value: 'value2', label: '选项2'}, { value: 'value2', label: '选项2' },
{value: 'value3', label: '选项3'}, { value: 'value3', label: '选项3' },
], ],
component: { component: {
showInTable: true, showInTable: true,
@ -118,9 +118,9 @@ export default {
interface: 'checkboxes', interface: 'checkboxes',
title: '多选框', title: '多选框',
dataSource: [ dataSource: [
{value: 'value1', label: '选项1'}, { value: 'value1', label: '选项1' },
{value: 'value2', label: '选项2'}, { value: 'value2', label: '选项2' },
{value: 'value3', label: '选项3'}, { value: 'value3', label: '选项3' },
], ],
component: { component: {
showInTable: true, showInTable: true,

View File

@ -3,7 +3,7 @@ import Database from '@nocobase/database';
(async () => { (async () => {
await api.loadPlugins(); await api.loadPlugins();
await api.database.getModel('collections').load({skipExisting: true}); await api.database.getModel('collections').load({ skipExisting: true });
const database: Database = api.database; const database: Database = api.database;
const [Field] = database.getModels(['fields']); const [Field] = database.getModels(['fields']);

View File

@ -26,54 +26,65 @@ interface Resource {
class ApiClient { class ApiClient {
resource(name: string): Resource { resource(name: string): Resource {
const proxy: any = new Proxy({}, { const proxy: any = new Proxy(
get(target, method, receiver) { {},
return (params: ActionParams = {}) => { {
let { associatedKey, resourceKey, filter, sorter, sort = [], values, ...restParams } = params; get(target, method, receiver) {
let url = `/${name}`; return (params: ActionParams = {}) => {
sort = sort || []; let {
let options: any = { associatedKey,
params: {}, resourceKey,
filter,
sorter,
sort = [],
values,
...restParams
} = params;
let url = `/${name}`;
sort = sort || [];
let options: any = {
params: {},
};
if (['list', 'get'].indexOf(method as string) !== -1) {
options.method = 'get';
options.params = restParams;
} else {
options.method = 'post';
options.params = restParams;
options.data = values;
}
if (associatedKey) {
url = `/${name.split('.').join(`/${associatedKey}/`)}`;
}
url += `:${method as string}`;
// console.log(name, name.split('.'), associatedKey, name.split('.').join(`/${associatedKey}/`));
if (resourceKey) {
url += `/${resourceKey}`;
}
if (filter) {
options.params['filter'] = JSON.stringify(filter);
}
if (sorter) {
const arr = Array.isArray(sorter) ? sorter : [sorter];
arr.forEach(({ order, field }) => {
if (order === 'descend') {
sort.push(`-${field}`);
} else if (order === 'ascend') {
sort.push(field);
}
});
}
if (sort.length === 0) {
delete options.params['sort'];
} else {
options.params['sort'] = sort.join(',');
}
console.log({ url, params });
return request(url, options);
}; };
if (['list', 'get'].indexOf(method as string) !== -1) { },
options.method = 'get'; },
options.params = restParams; );
} else {
options.method = 'post';
options.params = restParams;
options.data = values;
}
if (associatedKey) {
url = `/${name.split('.').join(`/${associatedKey}/`)}`;
}
url += `:${method as string}`;
// console.log(name, name.split('.'), associatedKey, name.split('.').join(`/${associatedKey}/`));
if (resourceKey) {
url += `/${resourceKey}`;
}
if (filter) {
options.params['filter'] = JSON.stringify(filter);
}
if (sorter) {
const arr = Array.isArray(sorter) ? sorter : [sorter];
arr.forEach(({order, field}) => {
if (order === 'descend') {
sort.push(`-${field}`);
} else if (order === 'ascend') {
sort.push(field);
}
});
}
if (sort.length === 0) {
delete options.params['sort'];
} else {
options.params['sort'] = sort.join(',');
}
console.log({url, params});
return request(url, options);
};
}
});
return proxy; return proxy;
} }
} }

View File

@ -12,7 +12,7 @@ configResponsive({
export const request: RequestConfig = { export const request: RequestConfig = {
prefix: process.env.API, prefix: process.env.API,
errorConfig: { errorConfig: {
adaptor: (resData) => { adaptor: resData => {
return { return {
...resData, ...resData,
success: true, success: true,
@ -28,23 +28,21 @@ export const request: RequestConfig = {
headers['Authorization'] = `Bearer ${token}`; headers['Authorization'] = `Bearer ${token}`;
} }
await next(); await next();
} },
], ],
}; };
const pathnames = [ const pathnames = ['/login', '/register', '/lostpassword', '/resetpassword'];
'/login',
'/register',
'/lostpassword',
'/resetpassword',
];
export async function getInitialState() { export async function getInitialState() {
const { pathname, search } = location; const { pathname, search } = location;
console.log(location); console.log(location);
const { data: systemSettings = {} } = await umiRequest('/system_settings:get?fields[appends]=logo,logo.storage', { const { data: systemSettings = {} } = await umiRequest(
method: 'get', '/system_settings:get?fields[appends]=logo,logo.storage',
}); {
method: 'get',
},
);
let redirect = `?redirect=${pathname}${search}`; let redirect = `?redirect=${pathname}${search}`;
if (!pathnames.includes(pathname)) { if (!pathnames.includes(pathname)) {
@ -66,7 +64,7 @@ export async function getInitialState() {
currentUser: data, currentUser: data,
}; };
} catch (error) { } catch (error) {
console.log(error) console.log(error);
history.push('/login' + redirect); history.push('/login' + redirect);
} }
} }
@ -75,4 +73,4 @@ export async function getInitialState() {
systemSettings, systemSettings,
currentUser: {}, currentUser: {},
}; };
} }

View File

@ -27,17 +27,23 @@ export function Create(props) {
const drawerRef = useRef<any>(); const drawerRef = useRef<any>();
return ( return (
<> <>
<ViewFactory <ViewFactory
{...props} {...props}
reference={drawerRef} reference={drawerRef}
viewName={viewName} viewName={viewName}
{...params} {...params}
/> />
<Button icon={<PlusOutlined />} type={'primary'} onClick={() => { <Button
drawerRef.current.setVisible(true); icon={<PlusOutlined />}
}}>{title}</Button> type={'primary'}
onClick={() => {
drawerRef.current.setVisible(true);
}}
>
{title}
</Button>
</> </>
) );
} }
export default Create; export default Create;

View File

@ -10,14 +10,19 @@ export function Destroy(props) {
const drawerRef = useRef<any>(); const drawerRef = useRef<any>();
return ( return (
<> <>
<Popconfirm title="确认删除吗?" onConfirm={() => { <Popconfirm
title="确认删除吗?"
onConfirm={() => {
console.log('destroy', onTrigger); console.log('destroy', onTrigger);
onTrigger && onTrigger(); onTrigger && onTrigger();
}}> }}
<Button icon={<DeleteOutlined />} type={'ghost'} danger>{title}</Button> >
<Button icon={<DeleteOutlined />} type={'ghost'} danger>
{title}
</Button>
</Popconfirm> </Popconfirm>
</> </>
) );
} }
export default Destroy; export default Destroy;

View File

@ -8,7 +8,13 @@ export function Filter(props) {
const drawerRef = useRef<any>(); const drawerRef = useRef<any>();
const [visible, setVisible] = useState(false); const [visible, setVisible] = useState(false);
const { title, viewName, collection_name } = props.schema; const { title, viewName, collection_name } = props.schema;
const { filterCount, activeTab = {}, item = {}, associatedName, associatedKey } = props; const {
filterCount,
activeTab = {},
item = {},
associatedName,
associatedKey,
} = props;
const { associationField } = activeTab; const { associationField } = activeTab;
const params = {}; const params = {};
@ -30,33 +36,40 @@ export function Filter(props) {
trigger="click" trigger="click"
visible={visible} visible={visible}
placement={'bottomLeft'} placement={'bottomLeft'}
onVisibleChange={(visible) => { onVisibleChange={visible => {
setVisible(visible); setVisible(visible);
}} }}
className={'filters-popover'} className={'filters-popover'}
style={{ style={{}}
}}
overlayStyle={{ overlayStyle={{
minWidth: 500 minWidth: 500,
}} }}
content={( content={
<> <>
<div className={'popover-button-mask'} onClick={() => setVisible(false)}></div> <div
<ViewFactory className={'popover-button-mask'}
onClick={() => setVisible(false)}
></div>
<ViewFactory
{...props} {...props}
setVisible={setVisible} setVisible={setVisible}
viewName={'filter'} viewName={'filter'}
{...params} {...params}
/> />
</> </>
)} }
> >
<Button icon={<FilterOutlined />} onClick={() => { <Button
setVisible(true); icon={<FilterOutlined />}
}}>{filterCount ? `${filterCount}${title}` : title}</Button> onClick={() => {
setVisible(true);
}}
>
{filterCount ? `${filterCount}${title}` : title}
</Button>
</Popover> </Popover>
</> </>
) );
} }
export default Filter; export default Filter;

View File

@ -22,19 +22,25 @@ export function Update(props) {
const drawerRef = useRef<any>(); const drawerRef = useRef<any>();
return ( return (
<> <>
<ViewFactory <ViewFactory
{...props} {...props}
reference={drawerRef} reference={drawerRef}
viewName={viewName} viewName={viewName}
mode={'update'} mode={'update'}
{...params} {...params}
/> />
<Button icon={<EditOutlined />} type={'primary'} onClick={() => { <Button
drawerRef.current.setVisible(true); icon={<EditOutlined />}
drawerRef.current.getData(item.itemId || resourceKey); type={'primary'}
}}>{title}</Button> onClick={() => {
drawerRef.current.setVisible(true);
drawerRef.current.getData(item.itemId || resourceKey);
}}
>
{title}
</Button>
</> </>
) );
} }
export default Update; export default Update;

View File

@ -1,4 +1,3 @@
import React from 'react'; import React from 'react';
import Create from './Create'; import Create from './Create';
import Update from './Update'; import Update from './Update';
@ -27,25 +26,27 @@ export function Action(props) {
// cnsole.log(schema); // cnsole.log(schema);
const { type } = schema; const { type } = schema;
const Component = getAction(type); const Component = getAction(type);
return Component && <Component {...props}/>; return Component && <Component {...props} />;
} }
export function Actions(props) { export function Actions(props) {
const { onTrigger = {}, style, schema, actions = [], ...restProps } = props; const { onTrigger = {}, style, schema, actions = [], ...restProps } = props;
console.log(onTrigger); console.log(onTrigger);
return actions.length > 0 && ( return (
<div className={'action-buttons'} style={style}> actions.length > 0 && (
{actions.map(action => ( <div className={'action-buttons'} style={style}>
<div className={`${action.name}-action-button action-button`}> {actions.map(action => (
<Action <div className={`${action.name}-action-button action-button`}>
{...restProps} <Action
view={schema} {...restProps}
schema={action} view={schema}
onTrigger={onTrigger[action.name]} schema={action}
/> onTrigger={onTrigger[action.name]}
</div> />
))} </div>
</div> ))}
</div>
)
); );
} }

View File

@ -12,4 +12,4 @@
left: 24px; left: 24px;
margin-left: 0; margin-left: 0;
} }
} }

View File

@ -1,20 +1,20 @@
import React, { Fragment } from 'react' import React, { Fragment } from 'react';
import { import {
ISchemaFieldComponentProps, ISchemaFieldComponentProps,
SchemaField SchemaField,
} from '@formily/react-schema-renderer' } from '@formily/react-schema-renderer';
import { toArr, isFn, FormPath } from '@formily/shared' import { toArr, isFn, FormPath } from '@formily/shared';
import { ArrayList } from '@formily/react-shared-components' import { ArrayList } from '@formily/react-shared-components';
import { CircleButton } from '../circle-button' import { CircleButton } from '../circle-button';
import { TextButton } from '../text-button' import { TextButton } from '../text-button';
import { Card } from 'antd' import { Card } from 'antd';
import { import {
PlusOutlined, PlusOutlined,
DeleteOutlined, DeleteOutlined,
DownOutlined, DownOutlined,
UpOutlined UpOutlined,
} from '@ant-design/icons' } from '@ant-design/icons';
import styled from 'styled-components' import styled from 'styled-components';
const ArrayComponents = { const ArrayComponents = {
CircleButton, CircleButton,
@ -22,12 +22,12 @@ const ArrayComponents = {
AdditionIcon: () => <PlusOutlined />, AdditionIcon: () => <PlusOutlined />,
RemoveIcon: () => <DeleteOutlined />, RemoveIcon: () => <DeleteOutlined />,
MoveDownIcon: () => <DownOutlined />, MoveDownIcon: () => <DownOutlined />,
MoveUpIcon: () => <UpOutlined /> MoveUpIcon: () => <UpOutlined />,
} };
export const ArrayCards: any = styled( export const ArrayCards: any = styled(
(props: ISchemaFieldComponentProps & { className: string }) => { (props: ISchemaFieldComponentProps & { className: string }) => {
const { value, schema, className, editable, path, mutators } = props const { value, schema, className, editable, path, mutators } = props;
const { const {
renderAddition, renderAddition,
renderRemove, renderRemove,
@ -36,17 +36,17 @@ export const ArrayCards: any = styled(
renderEmpty, renderEmpty,
renderExtraOperations, renderExtraOperations,
...componentProps ...componentProps
} = schema.getExtendsComponentProps() || {} } = schema.getExtendsComponentProps() || {};
const schemaItems = Array.isArray(schema.items) const schemaItems = Array.isArray(schema.items)
? schema.items[schema.items.length - 1] ? schema.items[schema.items.length - 1]
: schema.items : schema.items;
const onAdd = () => { const onAdd = () => {
if (schemaItems) { if (schemaItems) {
mutators.push(schemaItems.getEmptyValue()) mutators.push(schemaItems.getEmptyValue());
} }
} };
return ( return (
<div className={className}> <div className={className}>
<ArrayList <ArrayList
@ -60,7 +60,7 @@ export const ArrayCards: any = styled(
renderRemove, renderRemove,
renderMoveDown, renderMoveDown,
renderMoveUp, renderMoveUp,
renderEmpty renderEmpty,
}} }}
> >
{toArr(value).map((item, index) => { {toArr(value).map((item, index) => {
@ -72,7 +72,8 @@ export const ArrayCards: any = styled(
key={index} key={index}
title={ title={
<span> <span>
{index + 1}<span>.</span> {componentProps.title || schema.title} {index + 1}
<span>.</span> {componentProps.title || schema.title}
</span> </span>
} }
extra={ extra={
@ -102,7 +103,7 @@ export const ArrayCards: any = styled(
/> />
)} )}
</Card> </Card>
) );
})} })}
<ArrayList.Empty> <ArrayList.Empty>
{({ children, allowAddition }) => { {({ children, allowAddition }) => {
@ -110,12 +111,14 @@ export const ArrayCards: any = styled(
<Card <Card
{...componentProps} {...componentProps}
size="small" size="small"
className={`card-list-item card-list-empty ${allowAddition ? 'add-pointer' : ''}`} className={`card-list-item card-list-empty ${
allowAddition ? 'add-pointer' : ''
}`}
onClick={allowAddition ? onAdd : undefined} onClick={allowAddition ? onAdd : undefined}
> >
<div className="empty-wrapper">{children}</div> <div className="empty-wrapper">{children}</div>
</Card> </Card>
) );
}} }}
</ArrayList.Empty> </ArrayList.Empty>
<ArrayList.Addition> <ArrayList.Addition>
@ -125,14 +128,14 @@ export const ArrayCards: any = styled(
<div className="array-cards-addition" onClick={onAdd}> <div className="array-cards-addition" onClick={onAdd}>
{children} {children}
</div> </div>
) );
} }
}} }}
</ArrayList.Addition> </ArrayList.Addition>
</ArrayList> </ArrayList>
</div> </div>
) );
} },
)<ISchemaFieldComponentProps>` )<ISchemaFieldComponentProps>`
width: 100%; width: 100%;
.ant-card { .ant-card {
@ -190,8 +193,8 @@ export const ArrayCards: any = styled(
margin-right: 8px; margin-right: 8px;
} }
} }
` `;
ArrayCards.isFieldComponent = true ArrayCards.isFieldComponent = true;
export default ArrayCards export default ArrayCards;

View File

@ -1 +1 @@
import 'antd/lib/card/style/index' import 'antd/lib/card/style/index';

View File

@ -1,33 +1,37 @@
import React, { useContext } from 'react' import React, { useContext } from 'react';
import { import {
ISchemaFieldComponentProps, ISchemaFieldComponentProps,
SchemaField, SchemaField,
Schema, Schema,
complieExpression, complieExpression,
FormExpressionScopeContext FormExpressionScopeContext,
} from '@formily/react-schema-renderer' } from '@formily/react-schema-renderer';
import { toArr, isFn, isArr, FormPath } from '@formily/shared' import { toArr, isFn, isArr, FormPath } from '@formily/shared';
import { ArrayList, DragListView } from '@formily/react-shared-components' import { ArrayList, DragListView } from '@formily/react-shared-components';
import { CircleButton } from '../circle-button' import { CircleButton } from '../circle-button';
import { TextButton } from '../text-button' import { TextButton } from '../text-button';
import { Table, Form, Button } from 'antd' import { Table, Form, Button } from 'antd';
import { FormItemShallowProvider } from '@formily/antd' import { FormItemShallowProvider } from '@formily/antd';
import { import {
PlusOutlined, PlusOutlined,
DeleteOutlined, DeleteOutlined,
DownOutlined, DownOutlined,
UpOutlined UpOutlined,
} from '@ant-design/icons' } from '@ant-design/icons';
import styled from 'styled-components' import styled from 'styled-components';
const ArrayComponents = { const ArrayComponents = {
CircleButton, CircleButton,
TextButton, TextButton,
AdditionIcon: () => <><PlusOutlined/> </>, AdditionIcon: () => (
<>
<PlusOutlined />
</>
),
RemoveIcon: () => <DeleteOutlined />, RemoveIcon: () => <DeleteOutlined />,
MoveDownIcon: () => <DownOutlined />, MoveDownIcon: () => <DownOutlined />,
MoveUpIcon: () => <UpOutlined /> MoveUpIcon: () => <UpOutlined />,
} };
const DragHandler = styled.span` const DragHandler = styled.span`
width: 7px; width: 7px;
@ -38,12 +42,12 @@ const DragHandler = styled.span`
border-bottom: 0; border-bottom: 0;
cursor: move; cursor: move;
margin-bottom: 24px; margin-bottom: 24px;
` `;
export const ArrayTable: any = styled( export const ArrayTable: any = styled(
(props: ISchemaFieldComponentProps & { className: string }) => { (props: ISchemaFieldComponentProps & { className: string }) => {
const expressionScope = useContext(FormExpressionScopeContext) const expressionScope = useContext(FormExpressionScopeContext);
const { value, schema, className, editable, path, mutators } = props const { value, schema, className, editable, path, mutators } = props;
const { const {
renderAddition, renderAddition,
renderRemove, renderRemove,
@ -55,31 +59,31 @@ export const ArrayTable: any = styled(
operations, operations,
draggable, draggable,
...componentProps ...componentProps
} = schema.getExtendsComponentProps() || {} } = schema.getExtendsComponentProps() || {};
const schemaItems = Array.isArray(schema.items) const schemaItems = Array.isArray(schema.items)
? schema.items[schema.items.length - 1] ? schema.items[schema.items.length - 1]
: schema.items : schema.items;
const onAdd = () => { const onAdd = () => {
if (schemaItems) { if (schemaItems) {
mutators.push(schemaItems.getEmptyValue()) mutators.push(schemaItems.getEmptyValue());
} }
} };
const onMove = (dragIndex, dropIndex) => { const onMove = (dragIndex, dropIndex) => {
mutators.move(dragIndex, dropIndex) mutators.move(dragIndex, dropIndex);
} };
const renderColumns = (items: Schema) => { const renderColumns = (items: Schema) => {
return items.mapProperties((props, key) => { return items.mapProperties((props, key) => {
const itemProps = { const itemProps = {
...props.getExtendsItemProps(), ...props.getExtendsItemProps(),
...props.getExtendsProps() ...props.getExtendsProps(),
} };
return { return {
title: complieExpression(props.title, expressionScope), title: complieExpression(props.title, expressionScope),
...itemProps, ...itemProps,
key, key,
dataIndex: key, dataIndex: key,
render: (value: any, record: any, index: number) => { render: (value: any, record: any, index: number) => {
const newPath = FormPath.parse(path).concat(index, key) const newPath = FormPath.parse(path).concat(index, key);
return ( return (
<FormItemShallowProvider <FormItemShallowProvider
key={newPath.toString()} key={newPath.toString()}
@ -89,19 +93,19 @@ export const ArrayTable: any = styled(
> >
<SchemaField path={newPath} schema={props} /> <SchemaField path={newPath} schema={props} />
</FormItemShallowProvider> </FormItemShallowProvider>
) );
} },
} };
}) });
} };
// 兼容异步items schema传入 // 兼容异步items schema传入
let columns = [] let columns = [];
if (schema.items) { if (schema.items) {
columns = isArr(schema.items) columns = isArr(schema.items)
? schema.items.reduce((buf, items) => { ? schema.items.reduce((buf, items) => {
return buf.concat(renderColumns(items)) return buf.concat(renderColumns(items));
}, []) }, [])
: renderColumns(schema.items) : renderColumns(schema.items);
} }
if (editable && operations !== false) { if (editable && operations !== false) {
columns.push({ columns.push({
@ -130,32 +134,32 @@ export const ArrayTable: any = styled(
: renderExtraOperations} : renderExtraOperations}
</div> </div>
</Form.Item> </Form.Item>
) );
} },
}) });
} }
if (draggable) { if (draggable) {
columns.unshift({ columns.unshift({
width: 20, width: 20,
key: 'dragHandler', key: 'dragHandler',
render: () => { render: () => {
return <DragHandler className="drag-handler" /> return <DragHandler className="drag-handler" />;
} },
}) });
} }
const renderTable = () => { const renderTable = () => {
return ( return (
<Table <Table
{...componentProps} {...componentProps}
rowKey={record => { rowKey={record => {
return toArr(value).indexOf(record) return toArr(value).indexOf(record);
}} }}
pagination={false} pagination={false}
columns={columns} columns={columns}
dataSource={toArr(value)} dataSource={toArr(value)}
></Table> ></Table>
) );
} };
return ( return (
<div className={className}> <div className={className}>
<ArrayList <ArrayList
@ -169,7 +173,7 @@ export const ArrayTable: any = styled(
renderRemove, renderRemove,
renderMoveDown, renderMoveDown,
renderMoveUp, renderMoveUp,
renderEmpty renderEmpty,
}} }}
> >
{draggable ? ( {draggable ? (
@ -191,13 +195,13 @@ export const ArrayTable: any = styled(
{children} {children}
</div> </div>
) )
) );
}} }}
</ArrayList.Addition> </ArrayList.Addition>
</ArrayList> </ArrayList>
</div> </div>
) );
} },
)` )`
width: 100%; width: 100%;
margin-bottom: 10px; margin-bottom: 10px;
@ -227,8 +231,8 @@ export const ArrayTable: any = styled(
margin-right: 8px; margin-right: 8px;
} }
} }
` `;
ArrayTable.isFieldComponent = true ArrayTable.isFieldComponent = true;
export default ArrayTable export default ArrayTable;

View File

@ -1 +1 @@
import 'antd/lib/table/style/index' import 'antd/lib/table/style/index';

View File

@ -1,11 +1,19 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import { Button, Select, DatePicker, Tag, InputNumber, TimePicker, Input } from 'antd'; import {
Button,
Select,
DatePicker,
Tag,
InputNumber,
TimePicker,
Input,
} from 'antd';
import { import {
Select as AntdSelect, Select as AntdSelect,
mapStyledProps, mapStyledProps,
mapTextComponent mapTextComponent,
} from '../shared' } from '../shared';
import moment from 'moment'; import moment from 'moment';
import './style.less'; import './style.less';
import api from '@/api-client'; import api from '@/api-client';
@ -14,12 +22,12 @@ import { useRequest } from 'umi';
export const DateTime = connect({ export const DateTime = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent, getComponent: mapTextComponent,
})((props) => { })(props => {
const { associatedKey, automationType, filter, onChange } = props; const { associatedKey, automationType, filter, onChange } = props;
const [aKey, setaKey] = useState(associatedKey); const [aKey, setaKey] = useState(associatedKey);
const [aType, setaType] = useState(automationType); const [aType, setaType] = useState(automationType);
console.log('Automations.DateTime', aKey, associatedKey) console.log('Automations.DateTime', aKey, associatedKey);
const [value, setValue] = useState(props.value||{}); const [value, setValue] = useState(props.value || {});
const [offsetType, setOffsetType] = useState(() => { const [offsetType, setOffsetType] = useState(() => {
if (!value.offset) { if (!value.offset) {
return 'current'; return 'current';
@ -31,8 +39,8 @@ export const DateTime = connect({
return 'before'; return 'before';
} }
return 'current'; return 'current';
}) });
useEffect(() => { useEffect(() => {
if (associatedKey !== aKey || automationType !== aType) { if (associatedKey !== aKey || automationType !== aType) {
setOffsetType('current'); setOffsetType('current');
@ -48,90 +56,121 @@ export const DateTime = connect({
offset: 0, offset: 0,
unit: undefined, unit: undefined,
}); });
setaKey(associatedKey) setaKey(associatedKey);
} }
}, [ associatedKey, automationType, aKey, aType ]); }, [associatedKey, automationType, aKey, aType]);
const { data = [], loading = true } = useRequest(() => { const { data = [], loading = true } = useRequest(
return associatedKey && automationType !== 'schedule' ? api.resource('collections.fields').list({ () => {
associatedKey, return associatedKey && automationType !== 'schedule'
filter: filter||{ ? api.resource('collections.fields').list({
type: 'date', associatedKey,
}, filter: filter || {
}) : Promise.resolve({data: []}); type: 'date',
}, { },
refreshDeps: [associatedKey, automationType, filter] })
}); : Promise.resolve({ data: [] });
console.log({data}); },
{
refreshDeps: [associatedKey, automationType, filter],
},
);
console.log({ data });
return ( return (
<div> <div>
<div> <div>
{automationType === 'schedule' ? ( {automationType === 'schedule' ? (
<DatePicker showTime onChange={(m, dateString) => { <DatePicker
onChange({value: m.toISOString()}); showTime
setValue({value: m.toISOString()}); onChange={(m, dateString) => {
// console.log('Automations.DateTime', m.toISOString(), {m, dateString}) onChange({ value: m.toISOString() });
}} defaultValue={(() => { setValue({ value: m.toISOString() });
if (!value.value) { // console.log('Automations.DateTime', m.toISOString(), {m, dateString})
return undefined; }}
} defaultValue={(() => {
const m = moment(value.value); if (!value.value) {
return m.isValid() ? m : undefined; return undefined;
})()}/> }
const m = moment(value.value);
return m.isValid() ? m : undefined;
})()}
/>
) : ( ) : (
<Input.Group compact> <Input.Group compact>
<Select style={{width: 120}} value={value.byField} onChange={(v) => { <Select
setValue({...value, byField: v}); style={{ width: 120 }}
onChange({...value, byField: v}); value={value.byField}
}} loading={loading} options={data.map(item => ({ onChange={v => {
value: item.name, setValue({ ...value, byField: v });
label: item.title||item.name, onChange({ ...value, byField: v });
}))} placeholder={'选择日期字段'}></Select> }}
<Select onChange={(offsetType) => { loading={loading}
let values = {...value}; options={data.map(item => ({
switch (offsetType) { value: item.name,
case 'current': label: item.title || item.name,
values = {byField: values.byField, offset: 0}; }))}
break; placeholder={'选择日期字段'}
case 'before': ></Select>
if (values.offset) { <Select
values.offset = -1 * Math.abs(values.offset); onChange={offsetType => {
} let values = { ...value };
break; switch (offsetType) {
case 'after': case 'current':
if (values.offset) { values = { byField: values.byField, offset: 0 };
values.offset = Math.abs(values.offset); break;
} case 'before':
break; if (values.offset) {
} values.offset = -1 * Math.abs(values.offset);
setOffsetType(offsetType); }
setValue(values); break;
onChange(values); case 'after':
}} value={offsetType} placeholder={'选择日期字段'}> if (values.offset) {
values.offset = Math.abs(values.offset);
}
break;
}
setOffsetType(offsetType);
setValue(values);
onChange(values);
}}
value={offsetType}
placeholder={'选择日期字段'}
>
<Select.Option value={'current'}></Select.Option> <Select.Option value={'current'}></Select.Option>
<Select.Option value={'before'}></Select.Option> <Select.Option value={'before'}></Select.Option>
<Select.Option value={'after'}></Select.Option> <Select.Option value={'after'}></Select.Option>
</Select> </Select>
{offsetType !== 'current' && ( {offsetType !== 'current' && (
<InputNumber step={1} min={1} value={Math.abs(value.offset)||undefined} onChange={(offset: number) => { <InputNumber
const values = { step={1}
unit: 'day',...value, min={1}
} value={Math.abs(value.offset) || undefined}
if (offsetType === 'before') { onChange={(offset: number) => {
values.offset = -1 * Math.abs(offset); const values = {
} else if (offsetType === 'after') { unit: 'day',
values.offset = Math.abs(offset); ...value,
} };
setValue(values); if (offsetType === 'before') {
onChange(values); values.offset = -1 * Math.abs(offset);
console.log('Automations.DateTime', values) } else if (offsetType === 'after') {
// console.log(offsetType); values.offset = Math.abs(offset);
}} placeholder={'数字'}/> }
setValue(values);
onChange(values);
console.log('Automations.DateTime', values);
// console.log(offsetType);
}}
placeholder={'数字'}
/>
)} )}
{offsetType !== 'current' && ( {offsetType !== 'current' && (
<Select onChange={(v) => { <Select
setValue({...value, unit: v}); onChange={v => {
onChange({...value, unit: v}); setValue({ ...value, unit: v });
}} value={value.unit} placeholder={'选择单位'}> onChange({ ...value, unit: v });
}}
value={value.unit}
placeholder={'选择单位'}
>
<Select.Option value={'second'}></Select.Option> <Select.Option value={'second'}></Select.Option>
<Select.Option value={'minute'}></Select.Option> <Select.Option value={'minute'}></Select.Option>
<Select.Option value={'hour'}></Select.Option> <Select.Option value={'hour'}></Select.Option>
@ -140,22 +179,27 @@ export const DateTime = connect({
<Select.Option value={'month'}></Select.Option> <Select.Option value={'month'}></Select.Option>
</Select> </Select>
)} )}
{offsetType !== 'current' && value.unit && ['day', 'week', 'month'].indexOf(value.unit) !== -1 && ( {offsetType !== 'current' &&
<TimePicker value={(() => { value.unit &&
const m = moment(value.time, 'HH:mm:ss'); ['day', 'week', 'month'].indexOf(value.unit) !== -1 && (
return m.isValid() ? m : undefined; <TimePicker
})()} onChange={(m, dateString) => { value={(() => {
console.log('Automations.DateTime', m, dateString) const m = moment(value.time, 'HH:mm:ss');
setValue({...value, time: dateString}); return m.isValid() ? m : undefined;
onChange({...value, time: dateString}); })()}
}}/> onChange={(m, dateString) => {
)} console.log('Automations.DateTime', m, dateString);
setValue({ ...value, time: dateString });
onChange({ ...value, time: dateString });
}}
/>
)}
</Input.Group> </Input.Group>
)} )}
</div> </div>
</div> </div>
) );
}) });
const cronmap = { const cronmap = {
none: '不重复', none: '不重复',
@ -171,10 +215,10 @@ const cronmap = {
export const Cron = connect({ export const Cron = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent, getComponent: mapTextComponent,
})((props) => { })(props => {
const { value, onChange } = props; const { value, onChange } = props;
console.log('Automations.DateTime', {value}) console.log('Automations.DateTime', { value });
const re = /every_(\d+)_(.+)/i; const re = /every_(\d+)_(.+)/i;
@ -187,33 +231,42 @@ export const Cron = connect({
return 'none'; return 'none';
} }
return match ? 'custom' : cronmap[value]; return match ? 'custom' : cronmap[value];
}) });
return ( return (
<div> <div>
<Input.Group compact> <Input.Group compact>
<Select value={cron} onChange={(v) => { <Select
setCron(v); value={cron}
onChange(v); onChange={v => {
}}> setCron(v);
onChange(v);
}}
>
{Object.keys(cronmap).map(key => { {Object.keys(cronmap).map(key => {
return ( return <Select.Option value={key}>{cronmap[key]}</Select.Option>;
<Select.Option value={key}>{cronmap[key]}</Select.Option>
);
})} })}
</Select> </Select>
{cron === 'custom' && ( {cron === 'custom' && (
<Input type={'number'} onChange={(e) => { <Input
const v = parseInt(e.target.value); type={'number'}
setNum(v); onChange={e => {
onChange(`every_${v}_${unit}`); const v = parseInt(e.target.value);
}} defaultValue={num} addonBefore={'每'}/> setNum(v);
onChange(`every_${v}_${unit}`);
}}
defaultValue={num}
addonBefore={'每'}
/>
)} )}
{cron === 'custom' && ( {cron === 'custom' && (
<Select onChange={(v) => { <Select
setUnit(v); onChange={v => {
onChange(`every_${num}_${v}`); setUnit(v);
}} defaultValue={unit}> onChange(`every_${num}_${v}`);
}}
defaultValue={unit}
>
<Select.Option value={'seconds'}></Select.Option> <Select.Option value={'seconds'}></Select.Option>
<Select.Option value={'minutes'}></Select.Option> <Select.Option value={'minutes'}></Select.Option>
<Select.Option value={'hours'}></Select.Option> <Select.Option value={'hours'}></Select.Option>
@ -224,13 +277,13 @@ export const Cron = connect({
)} )}
</Input.Group> </Input.Group>
</div> </div>
) );
}) });
export const EndMode = connect({ export const EndMode = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent, getComponent: mapTextComponent,
})((props) => { })(props => {
const { value = 'none', onChange, automationType } = props; const { value = 'none', onChange, automationType } = props;
const re = /after_(\d+)_times/i; const re = /after_(\d+)_times/i;
const match = re.exec(value); const match = re.exec(value);
@ -238,10 +291,13 @@ export const EndMode = connect({
const [mode, setMode] = useState(() => { const [mode, setMode] = useState(() => {
if (automationType === 'schedule' && value === 'byField') { if (automationType === 'schedule' && value === 'byField') {
return 'none'; return 'none';
} else if (automationType === 'collections:schedule' && value === 'customTime') { } else if (
automationType === 'collections:schedule' &&
value === 'customTime'
) {
return 'none'; return 'none';
} }
return match ? 'times' : value; return match ? 'times' : value;
}); });
@ -249,38 +305,57 @@ export const EndMode = connect({
useEffect(() => { useEffect(() => {
if (automationType === 'schedule' && value === 'byField') { if (automationType === 'schedule' && value === 'byField') {
setMode('none') setMode('none');
onChange('none') onChange('none');
} else if (automationType === 'collections:schedule' && value === 'customTime') { } else if (
setMode('none') automationType === 'collections:schedule' &&
onChange('none') value === 'customTime'
) {
setMode('none');
onChange('none');
} }
}, [automationType]); }, [automationType]);
console.log('Automations.DateTime', {value, automationType, mode}) console.log('Automations.DateTime', { value, automationType, mode });
return ( return (
<div> <div>
<Input.Group compact> <Input.Group compact>
<Select style={{width: 150}} value={mode} onChange={(v) => { <Select
setMode(v); style={{ width: 150 }}
onChange(v); value={mode}
}}> onChange={v => {
setMode(v);
onChange(v);
}}
>
<Select.Option value={'none'}></Select.Option> <Select.Option value={'none'}></Select.Option>
<Select.Option value={'times'}></Select.Option> <Select.Option value={'times'}></Select.Option>
{automationType === 'schedule' && <Select.Option value={'customTime'}></Select.Option>} {automationType === 'schedule' && (
{automationType === 'collections:schedule' && <Select.Option value={'byField'}></Select.Option>} <Select.Option value={'customTime'}></Select.Option>
)}
{automationType === 'collections:schedule' && (
<Select.Option value={'byField'}></Select.Option>
)}
</Select> </Select>
{mode === 'times' && <Input type={'number'} onChange={(e) => { {mode === 'times' && (
const v = parseInt(e.target.value); <Input
setNum(v); type={'number'}
onChange(`after_${v}_times`); onChange={e => {
}} defaultValue={num} addonAfter={'次'}/>} const v = parseInt(e.target.value);
setNum(v);
onChange(`after_${v}_times`);
}}
defaultValue={num}
addonAfter={'次'}
/>
)}
</Input.Group> </Input.Group>
</div> </div>
) );
}) });
export const Automations = { export const Automations = {
DateTime, Cron, EndMode DateTime,
Cron,
EndMode,
}; };

View File

@ -2,4 +2,4 @@
.ant-input-group-wrapper { .ant-input-group-wrapper {
width: 120px; width: 120px;
} }
} }

View File

@ -1,18 +1,24 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import { Cascader as AntdCascader } from 'antd' import { Cascader as AntdCascader } from 'antd';
import { useRequest } from 'umi'; import { useRequest } from 'umi';
import api from '@/api-client'; import api from '@/api-client';
import { import {
transformDataSourceKey, transformDataSourceKey,
mapStyledProps, mapStyledProps,
mapTextComponent mapTextComponent,
} from '../shared' } from '../shared';
function findTreeNode(tree, values, { value = 'value', children = 'children' }) { function findTreeNode(
tree,
values,
{ value = 'value', children = 'children' },
) {
let node, i; let node, i;
for (node = tree, i = 0; node && values[i]; i++ ) { for (node = tree, i = 0; node && values[i]; i++) {
node = (node[children] || []).find(item => item[value] === values[i][value]); node = (node[children] || []).find(
item => item[value] === values[i][value],
);
} }
return node; return node;
@ -21,7 +27,7 @@ function findTreeNode(tree, values, { value = 'value', children = 'children' })
export const Cascader = connect({ export const Cascader = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent, getComponent: mapTextComponent,
})(function (props) { })(function(props) {
const { const {
disabled, disabled,
// target, // target,
@ -36,7 +42,7 @@ export const Cascader = connect({
// TODO(feature): 增加静态数据支持 // TODO(feature): 增加静态数据支持
// dataSource: [] // dataSource: []
} = props; } = props;
const { const {
target, target,
targetKey: valueField, targetKey: valueField,
// 值字段 // 值字段
@ -55,71 +61,76 @@ export const Cascader = connect({
// 是否可以不选择到最深一级 // 是否可以不选择到最深一级
// 'x-component-props': { changeOnSelect: true } // 'x-component-props': { changeOnSelect: true }
incompletely: changeOnSelect, incompletely: changeOnSelect,
} = schema; } = schema;
const fieldNames = { const fieldNames = {
label: labelField, label: labelField,
value: valueField, value: valueField,
children: 'children' children: 'children',
}; };
const [options, setOptions] = useState([]); const [options, setOptions] = useState([]);
const { loading, run } = useRequest(async (selectedOptions = []) => { const { loading, run } = useRequest(
if (maxLevel != null && selectedOptions.length >= maxLevel) { async (selectedOptions = []) => {
return; if (maxLevel != null && selectedOptions.length >= maxLevel) {
}
const last = selectedOptions[selectedOptions.length - 1] || null;
if (last) {
if (last.isLeaf) {
return; return;
} }
last.loading = true;
}
return api.resource(target).list({ const last = selectedOptions[selectedOptions.length - 1] || null;
filter: { if (last) {
[parentField]: last && last[valueField] if (last.isLeaf) {
return;
}
last.loading = true;
}
return api.resource(target).list({
filter: {
[parentField]: last && last[valueField],
},
perPage: -1,
sort: [valueField],
});
// TODO(bug): 关联资源加载问题较多,暂时先用 filter 解决
// return api.resource(`${target}.${target}`).list({
// associatedKey: last,
// perPage: -1
// });
},
{
manual: true,
onSuccess(result, [selectedOptions = []]) {
if (!result) {
return;
}
const data = result.map(item => ({
...item,
isLeaf: maxLevel != null && item.level >= maxLevel,
}));
// 找到已有值指向的 options 节点
const root = { [fieldNames.children]: options };
const node = findTreeNode(root, selectedOptions, fieldNames);
if (node && node !== root) {
node.children = data;
node.loading = false;
// use spread array to avoid popup to be collapsed
setOptions([...options]);
} else {
setOptions(data);
}
}, },
perPage: -1, },
sort: [valueField] );
});
// TODO(bug): 关联资源加载问题较多,暂时先用 filter 解决
// return api.resource(`${target}.${target}`).list({
// associatedKey: last,
// perPage: -1
// });
}, {
manual: true,
onSuccess(result, [selectedOptions = []]) {
if (!result) {
return;
}
const data = result.map(item => ({
...item,
isLeaf: maxLevel != null && item.level >= maxLevel
}));
// 找到已有值指向的 options 节点
const root = { [fieldNames.children]: options };
const node = findTreeNode(root, selectedOptions, fieldNames);
if (node && node !== root) {
node.children = data;
node.loading = false;
// use spread array to avoid popup to be collapsed
setOptions([...options]);
} else {
setOptions(data);
}
}
});
// 根据 value 的值,按需预加载相应的数据 // 根据 value 的值,按需预加载相应的数据
useEffect(() => { useEffect(() => {
if (value.length) { if (value.length) {
value.reduce((promise, option, i) => promise.then(() => run(value.slice(0, i))), Promise.resolve()); value.reduce(
(promise, option, i) => promise.then(() => run(value.slice(0, i))),
Promise.resolve(),
);
} else { } else {
run([]); run([]);
} }
@ -143,6 +154,6 @@ export const Cascader = connect({
fieldNames={fieldNames} fieldNames={fieldNames}
/> />
); );
}) });
export default Cascader export default Cascader;

View File

@ -1 +1 @@
import 'antd/lib/cascader/style/index' import 'antd/lib/cascader/style/index';

View File

@ -1,21 +1,19 @@
import { import { connect } from '@formily/react-schema-renderer';
connect import { Checkbox as AntdCheckbox } from 'antd';
} from '@formily/react-schema-renderer'
import { Checkbox as AntdCheckbox } from 'antd'
import { import {
transformDataSourceKey, transformDataSourceKey,
mapStyledProps, mapStyledProps,
mapTextComponent mapTextComponent,
} from '../shared' } from '../shared';
export const Checkbox = connect<'Group'>({ export const Checkbox = connect<'Group'>({
valueName: 'checked', valueName: 'checked',
getProps: mapStyledProps getProps: mapStyledProps,
})(AntdCheckbox) })(AntdCheckbox);
Checkbox.Group = connect({ Checkbox.Group = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent getComponent: mapTextComponent,
})(transformDataSourceKey(AntdCheckbox.Group, 'options')) })(transformDataSourceKey(AntdCheckbox.Group, 'options'));
export default Checkbox export default Checkbox;

View File

@ -1 +1 @@
import 'antd/lib/checkbox/style/index' import 'antd/lib/checkbox/style/index';

View File

@ -1,16 +1,16 @@
import React from 'react' import React from 'react';
import { Button } from 'antd' import { Button } from 'antd';
import { ButtonProps } from 'antd/lib/button' import { ButtonProps } from 'antd/lib/button';
export const CircleButton: React.FC<ButtonProps> = props => { export const CircleButton: React.FC<ButtonProps> = props => {
const hasText = String(props.className || '').indexOf('has-text') > -1 const hasText = String(props.className || '').indexOf('has-text') > -1;
return ( return (
<Button <Button
type={hasText ? 'link' : undefined} type={hasText ? 'link' : undefined}
shape={hasText ? undefined : 'circle'} shape={hasText ? undefined : 'circle'}
{...props} {...props}
/> />
) );
} };
export default CircleButton export default CircleButton;

View File

@ -1 +1 @@
import 'antd/lib/button/style/index' import 'antd/lib/button/style/index';

View File

@ -1,30 +1,29 @@
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import React from 'react'; import React from 'react';
import { Select, Tag } from 'antd'; import { Select, Tag } from 'antd';
import { import {
Select as AntdSelect, Select as AntdSelect,
mapStyledProps, mapStyledProps,
mapTextComponent mapTextComponent,
} from '../shared' } from '../shared';
export const ColorSelect = connect({ export const ColorSelect = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent, getComponent: mapTextComponent,
})((props) => { })(props => {
const colors = { const colors = {
'red': '薄暮', red: '薄暮',
'magenta': '法式洋红', magenta: '法式洋红',
'volcano': '火山', volcano: '火山',
'orange': '日暮', orange: '日暮',
'gold': '金盏花', gold: '金盏花',
'lime': '青柠', lime: '青柠',
'green': '极光绿', green: '极光绿',
'cyan': '明青', cyan: '明青',
'blue': '拂晓蓝', blue: '拂晓蓝',
'geekblue': '极客蓝', geekblue: '极客蓝',
'purple': '酱紫', purple: '酱紫',
'default': '默认' default: '默认',
}; };
return ( return (
@ -35,7 +34,7 @@ export const ColorSelect = connect({
</Select.Option> </Select.Option>
))} ))}
</Select> </Select>
) );
}) });
export default ColorSelect export default ColorSelect;

View File

@ -1,105 +1,105 @@
import React from 'react' import React from 'react';
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import moment from 'moment' import moment from 'moment';
import { DatePicker as AntdDatePicker } from 'antd' import { DatePicker as AntdDatePicker } from 'antd';
import { import {
mapStyledProps, mapStyledProps,
mapTextComponent, mapTextComponent,
compose, compose,
isStr, isStr,
isArr isArr,
} from '../shared' } from '../shared';
class YearPicker extends React.Component { class YearPicker extends React.Component {
public render() { public render() {
return <AntdDatePicker {...this.props} picker={'year'} /> return <AntdDatePicker {...this.props} picker={'year'} />;
} }
} }
const transformMoment = (value, format = 'YYYY-MM-DD HH:mm:ss') => { const transformMoment = (value, format = 'YYYY-MM-DD HH:mm:ss') => {
if (value === '') return undefined if (value === '') return undefined;
return value && value.format ? value.format(format) : value return value && value.format ? value.format(format) : value;
} };
const mapMomentValue = (props: any, fieldProps: any) => { const mapMomentValue = (props: any, fieldProps: any) => {
const { value, showTime = false } = props const { value, showTime = false } = props;
if (!fieldProps.editable) return props if (!fieldProps.editable) return props;
try { try {
if (isStr(value) && value) { if (isStr(value) && value) {
props.value = moment( props.value = moment(
value, value,
showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD' showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD',
) );
} else if (isArr(value) && value.length) { } else if (isArr(value) && value.length) {
props.value = value.map( props.value = value.map(
item => item =>
(item && (item &&
moment(item, showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD')) || moment(item, showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD')) ||
'' '',
) );
} }
} catch (e) { } catch (e) {
throw new Error(e) throw new Error(e);
} }
return props return props;
} };
export const DatePicker = connect< export const DatePicker = connect<
'RangePicker' | 'MonthPicker' | 'YearPicker' | 'WeekPicker' 'RangePicker' | 'MonthPicker' | 'YearPicker' | 'WeekPicker'
>({ >({
getValueFromEvent(_, value) { getValueFromEvent(_, value) {
const props = this.props || {} const props = this.props || {};
return transformMoment( return transformMoment(
value, value,
props.format || (props.showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD') props.format || (props.showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'),
) );
}, },
getProps: compose(mapStyledProps, mapMomentValue), getProps: compose(mapStyledProps, mapMomentValue),
getComponent: mapTextComponent getComponent: mapTextComponent,
})(AntdDatePicker) })(AntdDatePicker);
DatePicker.RangePicker = connect({ DatePicker.RangePicker = connect({
getValueFromEvent(_, [startDate, endDate]) { getValueFromEvent(_, [startDate, endDate]) {
const props = this.props || {} const props = this.props || {};
const format = const format =
props.format || (props.showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD') props.format || (props.showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD');
return [ return [
transformMoment(startDate, format), transformMoment(startDate, format),
transformMoment(endDate, format) transformMoment(endDate, format),
] ];
}, },
getProps: compose(mapStyledProps, mapMomentValue), getProps: compose(mapStyledProps, mapMomentValue),
getComponent: mapTextComponent getComponent: mapTextComponent,
})(AntdDatePicker.RangePicker) })(AntdDatePicker.RangePicker);
DatePicker.MonthPicker = connect({ DatePicker.MonthPicker = connect({
getValueFromEvent(_, value) { getValueFromEvent(_, value) {
return transformMoment(value) return transformMoment(value);
}, },
getProps: compose(mapStyledProps, mapMomentValue), getProps: compose(mapStyledProps, mapMomentValue),
getComponent: mapTextComponent getComponent: mapTextComponent,
})(AntdDatePicker.MonthPicker) })(AntdDatePicker.MonthPicker);
DatePicker.WeekPicker = connect({ DatePicker.WeekPicker = connect({
getValueFromEvent(_, value) { getValueFromEvent(_, value) {
return transformMoment(value, 'gggg-wo') return transformMoment(value, 'gggg-wo');
}, },
getProps: compose(mapStyledProps, props => { getProps: compose(mapStyledProps, props => {
if (isStr(props.value) && props.value) { if (isStr(props.value) && props.value) {
const parsed = props.value.match(/\D*(\d+)\D*(\d+)\D*/) || ['', '', ''] const parsed = props.value.match(/\D*(\d+)\D*(\d+)\D*/) || ['', '', ''];
props.value = moment(parsed[1], 'YYYY').add(parsed[2] - 1, 'weeks') props.value = moment(parsed[1], 'YYYY').add(parsed[2] - 1, 'weeks');
} }
return props return props;
}), }),
getComponent: mapTextComponent getComponent: mapTextComponent,
})(AntdDatePicker.WeekPicker) })(AntdDatePicker.WeekPicker);
DatePicker.YearPicker = connect({ DatePicker.YearPicker = connect({
getValueFromEvent(_, value) { getValueFromEvent(_, value) {
return transformMoment(value, 'YYYY') return transformMoment(value, 'YYYY');
}, },
getProps: compose(mapStyledProps, mapMomentValue), getProps: compose(mapStyledProps, mapMomentValue),
getComponent: mapTextComponent getComponent: mapTextComponent,
})(YearPicker) })(YearPicker);
export default DatePicker export default DatePicker;

View File

@ -1 +1 @@
import 'antd/lib/date-picker/style/index' import 'antd/lib/date-picker/style/index';

View File

@ -1,42 +1,61 @@
import React, { useState } from 'react' import React, { useState } from 'react';
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import moment from 'moment' import moment from 'moment';
import { Select, Table } from 'antd' import { Select, Table } from 'antd';
import get from 'lodash/get'; import get from 'lodash/get';
import { import {
mapStyledProps, mapStyledProps,
mapTextComponent, mapTextComponent,
compose, compose,
isStr, isStr,
isArr isArr,
} from '../shared' } from '../shared';
import { useRequest } from 'umi'; import { useRequest } from 'umi';
import api from '@/api-client'; import api from '@/api-client';
import { Spin } from '@nocobase/client' import { Spin } from '@nocobase/client';
import { fields2columns, components } from '@/components/views/SortableTable' import { fields2columns, components } from '@/components/views/SortableTable';
function DraggableTableComponent(props) { function DraggableTableComponent(props) {
const { mode = 'showInDetail', value, onChange, disabled, rowKey = 'id', fields = [], resourceName, associatedKey, filter, labelField, valueField = 'id', objectValue, placeholder } = props; const {
const { data = [], loading = true, mutate } = useRequest(() => { mode = 'showInDetail',
return api.resource(resourceName).list({ value,
associatedKey, onChange,
filter, disabled,
perPage: -1, rowKey = 'id',
}); fields = [],
}, { resourceName,
refreshDeps: [resourceName, associatedKey] associatedKey,
}); filter,
labelField,
valueField = 'id',
objectValue,
placeholder,
} = props;
const { data = [], loading = true, mutate } = useRequest(
() => {
return api.resource(resourceName).list({
associatedKey,
filter,
perPage: -1,
});
},
{
refreshDeps: [resourceName, associatedKey],
},
);
const [selectedRowKeys, setSelectedRowKeys] = useState([]); const [selectedRowKeys, setSelectedRowKeys] = useState([]);
const onTableChange = (selectedRowKeys: React.ReactText[]) => { const onTableChange = (selectedRowKeys: React.ReactText[]) => {
onChange(selectedRowKeys); onChange(selectedRowKeys);
} };
const tableProps: any = {}; const tableProps: any = {};
tableProps.rowSelection = { tableProps.rowSelection = {
selectedRowKeys: Array.isArray(value) ? value : data.map(item => item[rowKey]), selectedRowKeys: Array.isArray(value)
? value
: data.map(item => item[rowKey]),
onChange: onTableChange, onChange: onTableChange,
} };
const dataSource = data.filter(item => { const dataSource = data.filter(item => {
return get(item, ['component', mode]) return get(item, ['component', mode]);
}); });
// const sortIds = get(value, 'sort')||[]; // const sortIds = get(value, 'sort')||[];
// let values = []; // let values = [];
@ -52,12 +71,12 @@ function DraggableTableComponent(props) {
return ( return (
<> <>
<Table <Table
scroll={{y: 300}} scroll={{ y: 300 }}
size={'small'} size={'small'}
dataSource={dataSource} dataSource={dataSource}
rowKey={rowKey} rowKey={rowKey}
loading={loading} loading={loading}
columns={fields2columns(fields||[])} columns={fields2columns(fields || [])}
pagination={false} pagination={false}
{...tableProps} {...tableProps}
// components={components({ // components={components({
@ -85,6 +104,6 @@ function DraggableTableComponent(props) {
export const DraggableTable = connect({ export const DraggableTable = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent, getComponent: mapTextComponent,
})(DraggableTableComponent) })(DraggableTableComponent);
export default DraggableTable export default DraggableTable;

View File

@ -1,28 +1,30 @@
import React, { useState } from 'react' import React, { useState } from 'react';
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import { Select, Button, Space } from 'antd' import { Select, Button, Space } from 'antd';
import { import {
mapStyledProps, mapStyledProps,
mapTextComponent, mapTextComponent,
compose, compose,
isStr, isStr,
isArr isArr,
} from '../shared' } from '../shared';
import ViewFactory from '@/components/views' import ViewFactory from '@/components/views';
import Drawer from '@/components/pages/AdminLoader/Drawer'; import Drawer from '@/components/pages/AdminLoader/Drawer';
import View from '@/components/pages/AdminLoader/View'; import View from '@/components/pages/AdminLoader/View';
function transform({value, multiple, labelField, valueField = 'id'}) { function transform({ value, multiple, labelField, valueField = 'id' }) {
let selectedKeys = []; let selectedKeys = [];
let selectedValue = []; let selectedValue = [];
const values = Array.isArray(value) ? value : [value]; const values = Array.isArray(value) ? value : [value];
selectedKeys = values.filter(item => item).map(item => item[valueField]); selectedKeys = values.filter(item => item).map(item => item[valueField]);
selectedValue = values.filter(item => item).map(item => { selectedValue = values
return { .filter(item => item)
value: item[valueField], .map(item => {
label: item[labelField], return {
} value: item[valueField],
}); label: item[labelField],
};
});
if (!multiple) { if (!multiple) {
return [selectedKeys.shift(), selectedValue.shift()]; return [selectedKeys.shift(), selectedValue.shift()];
} }
@ -30,14 +32,35 @@ function transform({value, multiple, labelField, valueField = 'id'}) {
} }
export function DrawerSelectComponent(props) { export function DrawerSelectComponent(props) {
const { __parent, size, schema = {}, disabled, viewName, target, multiple, filter, resourceName, associatedKey, valueField = 'id', value, onChange } = props; const {
__parent,
size,
schema = {},
disabled,
viewName,
target,
multiple,
filter,
resourceName,
associatedKey,
valueField = 'id',
value,
onChange,
} = props;
const labelField = props.labelField || schema.labelField; const labelField = props.labelField || schema.labelField;
const [selectedKeys, selectedValue] = transform({value, multiple, labelField, valueField }); const [selectedKeys, selectedValue] = transform({
const [selectedRowKeys, setSelectedRowKeys] = useState(multiple ? selectedKeys : [selectedKeys]); value,
multiple,
labelField,
valueField,
});
const [selectedRowKeys, setSelectedRowKeys] = useState(
multiple ? selectedKeys : [selectedKeys],
);
const [selectedRows, setSelectedRows] = useState(selectedValue); const [selectedRows, setSelectedRows] = useState(selectedValue);
const [options, setOptions] = useState(selectedValue); const [options, setOptions] = useState(selectedValue);
const { title = '' } = schema; const { title = '' } = schema;
console.log({schema}) console.log({ schema });
return ( return (
<> <>
<Select <Select
@ -49,13 +72,13 @@ export function DrawerSelectComponent(props) {
allowClear={true} allowClear={true}
value={options} value={options}
notFoundContent={''} notFoundContent={''}
onChange={(data) => { onChange={data => {
setOptions(data); setOptions(data);
if (Array.isArray(data)) { if (Array.isArray(data)) {
const srks = data.map(item => item.value); const srks = data.map(item => item.value);
onChange(srks); onChange(srks);
setSelectedRowKeys(srks); setSelectedRowKeys(srks);
console.log('datadatadatadata', {data, srks}); console.log('datadatadatadata', { data, srks });
} else if (data && typeof data === 'object') { } else if (data && typeof data === 'object') {
onChange(data.value); onChange(data.value);
setSelectedRowKeys([data.value]); setSelectedRowKeys([data.value]);
@ -69,12 +92,19 @@ export function DrawerSelectComponent(props) {
if (!disabled) { if (!disabled) {
Drawer.open({ Drawer.open({
title: `选择要关联的${title}数据`, title: `选择要关联的${title}数据`,
content: ({resolve}) => { content: ({ resolve }) => {
console.log('valuevaluevaluevaluevaluevalue', selectedRowKeys, selectedRows, options); console.log(
'valuevaluevaluevaluevaluevalue',
selectedRowKeys,
selectedRows,
options,
);
const [rows, setRows] = useState(selectedRows); const [rows, setRows] = useState(selectedRows);
const [rowKeys, setRowKeys] = useState(selectedRowKeys) const [rowKeys, setRowKeys] = useState(selectedRowKeys);
const [selected, setSelected] = useState(Array.isArray(value) ? value : [value]); const [selected, setSelected] = useState(
console.log({selectedRowKeys}); Array.isArray(value) ? value : [value],
);
console.log({ selectedRowKeys });
return ( return (
<> <>
<View <View
@ -83,34 +113,44 @@ export function DrawerSelectComponent(props) {
multiple={multiple} multiple={multiple}
defaultFilter={filter} defaultFilter={filter}
defaultSelectedRowKeys={selectedRowKeys} defaultSelectedRowKeys={selectedRowKeys}
onSelected={(values) => { onSelected={values => {
setSelected(values); setSelected(values);
const [selectedKeys, selectedValue] = transform({value: values, multiple: true, labelField, valueField }); const [selectedKeys, selectedValue] = transform({
value: values,
multiple: true,
labelField,
valueField,
});
setSelectedRows(selectedValue); setSelectedRows(selectedValue);
setRows(selectedValue); setRows(selectedValue);
setSelectedRowKeys(selectedKeys); setSelectedRowKeys(selectedKeys);
setRowKeys(selectedKeys); setRowKeys(selectedKeys);
console.log({ values, selectedValue, selectedKeys }); console.log({ values, selectedValue, selectedKeys });
console.log({selectedRows, selectedRowKeys}); console.log({ selectedRows, selectedRowKeys });
}} }}
viewName={viewName || `${target}.table`} viewName={viewName || `${target}.table`}
/> />
<Drawer.Footer> <Drawer.Footer>
<Space> <Space>
<Button onClick={resolve}></Button> <Button onClick={resolve}></Button>
<Button onClick={() => { <Button
setOptions(rows); onClick={() => {
// console.log('valuevaluevaluevaluevaluevalue', {selectedRowKeys}); setOptions(rows);
onChange(multiple ? selected : selected.shift()); // console.log('valuevaluevaluevaluevaluevalue', {selectedRowKeys});
// console.log({rows, rowKeys}); onChange(multiple ? selected : selected.shift());
resolve(); // console.log({rows, rowKeys});
}} type={'primary'}></Button> resolve();
}}
type={'primary'}
>
</Button>
</Space> </Space>
</Drawer.Footer> </Drawer.Footer>
</> </>
) );
}, },
}) });
// setVisible(true); // setVisible(true);
} }
}} }}
@ -122,6 +162,6 @@ export function DrawerSelectComponent(props) {
export const DrawerSelect = connect({ export const DrawerSelect = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent, getComponent: mapTextComponent,
})(DrawerSelectComponent) })(DrawerSelectComponent);
export default DrawerSelect export default DrawerSelect;

View File

@ -1,9 +1,19 @@
import React, { useCallback, useEffect, useState } from 'react'; import React, { useCallback, useEffect, useState } from 'react';
import { Button, Select, Input, Space, Form, InputNumber, DatePicker, TimePicker, Radio } from 'antd'; import {
Button,
Select,
Input,
Space,
Form,
InputNumber,
DatePicker,
TimePicker,
Radio,
} from 'antd';
import { PlusCircleOutlined, CloseCircleOutlined } from '@ant-design/icons'; import { PlusCircleOutlined, CloseCircleOutlined } from '@ant-design/icons';
import useDynamicList from './useDynamicList'; import useDynamicList from './useDynamicList';
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import { mapStyledProps } from '../shared' import { mapStyledProps } from '../shared';
import get from 'lodash/get'; import get from 'lodash/get';
import moment from 'moment'; import moment from 'moment';
import './style.less'; import './style.less';
@ -11,35 +21,47 @@ import api from '@/api-client';
import { useRequest } from 'umi'; import { useRequest } from 'umi';
export function FilterGroup(props: any) { export function FilterGroup(props: any) {
const { showDeleteButton = true, fields = [], sourceFields = [], onDelete, onChange, onAdd, dataSource = {} } = props; const {
const { list, getKey, push, remove, replace } = useDynamicList<any>(dataSource.list || [ showDeleteButton = true,
{ fields = [],
type: 'item', sourceFields = [],
}, onDelete,
]); onChange,
onAdd,
dataSource = {},
} = props;
const { list, getKey, push, remove, replace } = useDynamicList<any>(
dataSource.list || [
{
type: 'item',
},
],
);
let style: any = { let style: any = {
position: 'relative', position: 'relative',
}; };
if (showDeleteButton) { if (showDeleteButton) {
style = { style = {
...style, ...style,
marginBottom: 14, marginBottom: 14,
padding: 14, padding: 14,
border: '1px dashed #dedede', border: '1px dashed #dedede',
} };
} }
return ( return (
<div style={style}> <div style={style}>
<div style={{marginBottom: 14}}> <div style={{ marginBottom: 14 }}>
{' '}
{' '} <Select
<Select style={{width: 80}} onChange={(value) => { style={{ width: 80 }}
onChange({type: 'group', list, andor: value}); onChange={value => {
}} defaultValue={dataSource.andor||'and'}> onChange({ type: 'group', list, andor: value });
}}
defaultValue={dataSource.andor || 'and'}
>
<Select.Option value={'and'}></Select.Option> <Select.Option value={'and'}></Select.Option>
<Select.Option value={'or'}></Select.Option> <Select.Option value={'or'}></Select.Option>
</Select> </Select>{' '}
{' '}
</div> </div>
<div> <div>
@ -47,47 +69,52 @@ export function FilterGroup(props: any) {
// console.log(item); // console.log(item);
const Component = item.type === 'group' ? FilterGroup : FilterItem; const Component = item.type === 'group' ? FilterGroup : FilterItem;
return ( return (
<div style={{marginBottom: 8}}> <div style={{ marginBottom: 8 }}>
{<Component {
fields={fields} <Component
sourceFields={sourceFields} fields={fields}
dataSource={item} sourceFields={sourceFields}
// showDeleteButton={list.length > 1} dataSource={item}
onChange={(value) => { // showDeleteButton={list.length > 1}
replace(index, value); onChange={value => {
const newList = [...list]; replace(index, value);
newList[index] = value; const newList = [...list];
onChange({...dataSource, list: newList}); newList[index] = value;
// console.log(list, value, index); onChange({ ...dataSource, list: newList });
}} // console.log(list, value, index);
onDelete={() => { }}
remove(index); onDelete={() => {
const newList = [...list]; remove(index);
newList.splice(index, 1); const newList = [...list];
onChange({...dataSource, list: newList}); newList.splice(index, 1);
// console.log(list, index); onChange({ ...dataSource, list: newList });
}} // console.log(list, index);
/>} }}
/>
}
</div> </div>
); );
})} })}
</div> </div>
<div> <div>
<Space> <Space>
<Button style={{padding: 0}} type={'link'} onClick={() => {
const data = {
type: 'item'
};
push(data);
const newList = [...list];
newList.push(data);
onChange({...dataSource, list: newList});
}}>
<PlusCircleOutlined />
</Button>
{' '}
<Button <Button
style={{padding: 0}} style={{ padding: 0 }}
type={'link'}
onClick={() => {
const data = {
type: 'item',
};
push(data);
const newList = [...list];
newList.push(data);
onChange({ ...dataSource, list: newList });
}}
>
<PlusCircleOutlined />
</Button>{' '}
<Button
style={{ padding: 0 }}
type={'link'} type={'link'}
onClick={() => { onClick={() => {
const data = { const data = {
@ -101,16 +128,29 @@ export function FilterGroup(props: any) {
push(data); push(data);
const newList = [...list]; const newList = [...list];
newList.push(data); newList.push(data);
onChange({...dataSource, list: newList}); onChange({ ...dataSource, list: newList });
}} }}
> >
<PlusCircleOutlined /> <PlusCircleOutlined />
</Button> </Button>
{showDeleteButton && <Button className={'filter-remove-link filter-group'} style={{padding: 0, position: 'absolute', top: 0, right: 0, width: 32}} type={'link'} onClick={(e) => { {showDeleteButton && (
onDelete && onDelete(e); <Button
}}> className={'filter-remove-link filter-group'}
<CloseCircleOutlined /> style={{
</Button>} padding: 0,
position: 'absolute',
top: 0,
right: 0,
width: 32,
}}
type={'link'}
onClick={e => {
onDelete && onDelete(e);
}}
>
<CloseCircleOutlined />
</Button>
)}
</Space> </Space>
</div> </div>
</div> </div>
@ -131,72 +171,72 @@ interface FilterItemProps {
const OP_MAP = { const OP_MAP = {
string: [ string: [
{label: '包含', value: '$includes', selected: true}, { label: '包含', value: '$includes', selected: true },
{label: '不包含', value: '$notIncludes'}, { label: '不包含', value: '$notIncludes' },
{label: '等于', value: 'eq'}, { label: '等于', value: 'eq' },
{label: '不等于', value: 'ne'}, { label: '不等于', value: 'ne' },
{label: '非空', value: '$notNull'}, { label: '非空', value: '$notNull' },
{label: '为空', value: '$null'}, { label: '为空', value: '$null' },
], ],
number: [ number: [
{label: '等于', value: 'eq', selected: true}, { label: '等于', value: 'eq', selected: true },
{label: '不等于', value: 'ne'}, { label: '不等于', value: 'ne' },
{label: '大于', value: 'gt'}, { label: '大于', value: 'gt' },
{label: '大于等于', value: 'gte'}, { label: '大于等于', value: 'gte' },
{label: '小于', value: 'lt'}, { label: '小于', value: 'lt' },
{label: '小于等于', value: 'lte'}, { label: '小于等于', value: 'lte' },
// {label: '介于', value: 'between'}, // {label: '介于', value: 'between'},
{label: '非空', value: '$notNull'}, { label: '非空', value: '$notNull' },
{label: '为空', value: '$null'}, { label: '为空', value: '$null' },
], ],
file: [ file: [
{label: '存在', value: 'id.gt'}, { label: '存在', value: 'id.gt' },
{label: '不存在', value: 'id.$null'}, { label: '不存在', value: 'id.$null' },
], ],
boolean: [ boolean: [
{label: '是', value: '$isTruly', selected: true}, { label: '是', value: '$isTruly', selected: true },
{label: '否', value: '$isFalsy'}, { label: '否', value: '$isFalsy' },
], ],
select: [ select: [
{label: '等于', value: 'eq', selected: true}, { label: '等于', value: 'eq', selected: true },
{label: '不等于', value: 'ne'}, { label: '不等于', value: 'ne' },
{label: '包含', value: 'in'}, { label: '包含', value: 'in' },
{label: '不包含', value: 'notIn'}, { label: '不包含', value: 'notIn' },
{label: '非空', value: '$notNull'}, { label: '非空', value: '$notNull' },
{label: '为空', value: '$null'}, { label: '为空', value: '$null' },
], ],
multipleSelect: [ multipleSelect: [
{label: '等于', value: '$match', selected: true}, { label: '等于', value: '$match', selected: true },
{label: '不等于', value: '$notMatch'}, { label: '不等于', value: '$notMatch' },
{label: '包含', value: '$anyOf'}, { label: '包含', value: '$anyOf' },
{label: '不包含', value: '$noneOf'}, { label: '不包含', value: '$noneOf' },
{label: '非空', value: '$notNull'}, { label: '非空', value: '$notNull' },
{label: '为空', value: '$null'}, { label: '为空', value: '$null' },
], ],
datetime: [ datetime: [
{label: '等于', value: '$dateOn', selected: true}, { label: '等于', value: '$dateOn', selected: true },
{label: '不等于', value: '$dateNotOn'}, { label: '不等于', value: '$dateNotOn' },
{label: '早于', value: '$dateBefore'}, { label: '早于', value: '$dateBefore' },
{label: '晚于', value: '$dateAfter'}, { label: '晚于', value: '$dateAfter' },
{label: '不早于', value: '$dateNotBefore'}, { label: '不早于', value: '$dateNotBefore' },
{label: '不晚于', value: '$dateNotAfter'}, { label: '不晚于', value: '$dateNotAfter' },
// {label: '介于', value: 'between'}, // {label: '介于', value: 'between'},
{label: '非空', value: '$notNull'}, { label: '非空', value: '$notNull' },
{label: '为空', value: '$null'}, { label: '为空', value: '$null' },
// {label: '是今天', value: 'now'}, // {label: '是今天', value: 'now'},
// {label: '在今天之前', value: 'before_today'}, // {label: '在今天之前', value: 'before_today'},
// {label: '在今天之后', value: 'after_today'}, // {label: '在今天之后', value: 'after_today'},
], ],
time: [ time: [
{label: '等于', value: 'eq', selected: true}, { label: '等于', value: 'eq', selected: true },
{label: '不等于', value: 'neq'}, { label: '不等于', value: 'neq' },
{label: '大于', value: 'gt'}, { label: '大于', value: 'gt' },
{label: '大于等于', value: 'gte'}, { label: '大于等于', value: 'gte' },
{label: '小于', value: 'lt'}, { label: '小于', value: 'lt' },
{label: '小于等于', value: 'lte'}, { label: '小于等于', value: 'lte' },
// {label: '介于', value: 'between'}, // {label: '介于', value: 'between'},
{label: '非空', value: '$notNull'}, { label: '非空', value: '$notNull' },
{label: '为空', value: '$null'}, { label: '为空', value: '$null' },
// {label: '是今天', value: 'now'}, // {label: '是今天', value: 'now'},
// {label: '在今天之前', value: 'before_today'}, // {label: '在今天之前', value: 'before_today'},
// {label: '在今天之后', value: 'after_today'}, // {label: '在今天之后', value: 'after_today'},
@ -227,22 +267,26 @@ const op = {
attachment: OP_MAP.file, attachment: OP_MAP.file,
}; };
const StringInput = (props) => { const StringInput = props => {
const {value, onChange, ...restProps } = props; const { value, onChange, ...restProps } = props;
return ( return (
<Input {...restProps} defaultValue={value} onChange={(e) => { <Input
onChange(e.target.value); {...restProps}
}}/> defaultValue={value}
onChange={e => {
onChange(e.target.value);
}}
/>
); );
} };
const controls = { const controls = {
string: StringInput, string: StringInput,
textarea: StringInput, textarea: StringInput,
number: InputNumber, number: InputNumber,
percent: (props) => ( percent: props => (
<InputNumber <InputNumber
formatter={value => value ? `${value}%` : ''} formatter={value => (value ? `${value}%` : '')}
parser={value => value.replace('%', '')} parser={value => value.replace('%', '')}
{...props} {...props}
/> />
@ -265,9 +309,13 @@ function DateControl(props: any) {
// } // }
const m = moment(value, format); const m = moment(value, format);
return ( return (
<DatePicker format={format} value={m.isValid() ? m : null} onChange={(value) => { <DatePicker
onChange(value ? value.format('YYYY-MM-DD') : null) format={format}
}}/> value={m.isValid() ? m : null}
onChange={value => {
onChange(value ? value.format('YYYY-MM-DD') : null);
}}
/>
); );
// return ( // return (
// <DatePicker format={format} showTime={field.showTime} value={m.isValid() ? m : null} onChange={(value) => { // <DatePicker format={format} showTime={field.showTime} value={m.isValid() ? m : null} onChange={(value) => {
@ -280,13 +328,15 @@ function TimeControl(props: any) {
const { field, value, onChange, ...restProps } = props; const { field, value, onChange, ...restProps } = props;
let format = field.timeFormat; let format = field.timeFormat;
const m = moment(value, format); const m = moment(value, format);
return <TimePicker return (
value={m.isValid() ? m : null} <TimePicker
format={field.timeFormat} value={m.isValid() ? m : null}
onChange={(value) => { format={field.timeFormat}
onChange(value ? value.format('HH:mm:ss') : null) onChange={value => {
}} onChange(value ? value.format('HH:mm:ss') : null);
/> }}
/>
);
} }
function OptionControl(props) { function OptionControl(props) {
@ -296,19 +346,27 @@ function OptionControl(props) {
mode = undefined; mode = undefined;
} }
return ( return (
<Select style={{ minWidth: 120 }} mode={mode} value={value} onChange={(value) => { <Select
onChange(value); style={{ minWidth: 120 }}
}} options={options}> mode={mode}
</Select> value={value}
onChange={value => {
onChange(value);
}}
options={options}
></Select>
); );
} }
function BooleanControl(props) { function BooleanControl(props) {
const { value, onChange, ...restProps } = props; const { value, onChange, ...restProps } = props;
return ( return (
<Radio.Group value={value} onChange={(e) => { <Radio.Group
onChange(e.target.value); value={value}
}}> onChange={e => {
onChange(e.target.value);
}}
>
<Radio value={true}></Radio> <Radio value={true}></Radio>
<Radio value={false}></Radio> <Radio value={false}></Radio>
</Radio.Group> </Radio.Group>
@ -331,12 +389,20 @@ function getComponentTypeByField(field) {
} }
export function FilterItem(props: FilterItemProps) { export function FilterItem(props: FilterItemProps) {
const { index, fields = [], sourceFields = [], showDeleteButton = true, onDelete, onChange } = props; const {
const defaultField: any = fields.find(field => field.name === props.dataSource.column) || {}; index,
fields = [],
sourceFields = [],
showDeleteButton = true,
onDelete,
onChange,
} = props;
const defaultField: any =
fields.find(field => field.name === props.dataSource.column) || {};
const componentType = getComponentTypeByField(defaultField); const componentType = getComponentTypeByField(defaultField);
const [type, setType] = useState(defaultField.interface || 'string'); const [type, setType] = useState(defaultField.interface || 'string');
const [field, setField] = useState<any>({}); const [field, setField] = useState<any>({});
const [dataSource, setDataSource] = useState(props.dataSource||{}); const [dataSource, setDataSource] = useState(props.dataSource || {});
const [valueType, setValueType] = useState('custom'); const [valueType, setValueType] = useState('custom');
useEffect(() => { useEffect(() => {
const field = fields.find(field => field.name === props.dataSource.column); const field = fields.find(field => field.name === props.dataSource.column);
@ -348,15 +414,15 @@ export function FilterItem(props: FilterItemProps) {
} }
setType(componentType); setType(componentType);
} }
setDataSource({...props.dataSource}); setDataSource({ ...props.dataSource });
if (/^{{.+}}$/.test(props.dataSource.value)) { if (/^{{.+}}$/.test(props.dataSource.value)) {
setValueType('ref'); setValueType('ref');
} }
}, [ }, [props.dataSource, type]);
props.dataSource, type, let ValueControl = controls[componentType] || controls.string;
]); if (
let ValueControl = controls[componentType]||controls.string; ['$null', '$notNull', '$isTruly', '$isFalsy'].indexOf(dataSource.op) !== -1
if (['$null', '$notNull', '$isTruly', '$isFalsy'].indexOf(dataSource.op) !== -1) { ) {
ValueControl = NullControl; ValueControl = NullControl;
} }
if (['boolean', 'checkbox'].indexOf(componentType) !== -1) { if (['boolean', 'checkbox'].indexOf(componentType) !== -1) {
@ -364,12 +430,13 @@ export function FilterItem(props: FilterItemProps) {
} }
// let multiple = true; // let multiple = true;
// if () // if ()
const opOptions = op[defaultField.interface || 'string']||op.string; const opOptions = op[defaultField.interface || 'string'] || op.string;
console.log({componentType, defaultField, field, valueType, opOptions}); console.log({ componentType, defaultField, field, valueType, opOptions });
return ( return (
<Space> <Space>
<Select value={dataSource.column} <Select
onChange={(value) => { value={dataSource.column}
onChange={value => {
const field = fields.find(field => field.name === value); const field = fields.find(field => field.name === value);
let componentType = field.component.type; let componentType = field.component.type;
if (field.component.type === 'select' && field.multiple) { if (field.component.type === 'select' && field.multiple) {
@ -377,17 +444,25 @@ export function FilterItem(props: FilterItemProps) {
} }
setType(componentType); setType(componentType);
setValueType('custom'); setValueType('custom');
onChange({...dataSource, column: value, op: get(op, [componentType, 0, 'value']), value: undefined}); onChange({
...dataSource,
column: value,
op: get(op, [componentType, 0, 'value']),
value: undefined,
});
}} }}
style={{ width: 120 }} style={{ width: 120 }}
placeholder={'选择字段'}> placeholder={'选择字段'}
>
{fields.map(field => ( {fields.map(field => (
<Select.Option value={field.name}>{field.title}</Select.Option> <Select.Option value={field.name}>{field.title}</Select.Option>
))} ))}
</Select> </Select>
<Select value={dataSource.column ? dataSource.op : null} style={{ minWidth: 100 }} <Select
onChange={(value) => { value={dataSource.column ? dataSource.op : null}
onChange({...dataSource, op: value}); style={{ minWidth: 100 }}
onChange={value => {
onChange({ ...dataSource, op: value });
}} }}
// value={get(opOptions, [0, 'value'])} // value={get(opOptions, [0, 'value'])}
options={opOptions} options={opOptions}
@ -399,44 +474,56 @@ export function FilterItem(props: FilterItemProps) {
{sourceFields.length > 0 && ( {sourceFields.length > 0 && (
<Select <Select
style={{ minWidth: 100 }} style={{ minWidth: 100 }}
onChange={(value) => { onChange={value => {
setDataSource({...dataSource, value: undefined}) setDataSource({ ...dataSource, value: undefined });
onChange({...dataSource, value: undefined}); onChange({ ...dataSource, value: undefined });
setValueType(value); setValueType(value);
}} }}
defaultValue={valueType}> defaultValue={valueType}
>
<Select.Option value={'custom'}></Select.Option> <Select.Option value={'custom'}></Select.Option>
<Select.Option value={'ref'}></Select.Option> <Select.Option value={'ref'}></Select.Option>
</Select> </Select>
)} )}
{valueType !== 'ref' ? ( {valueType !== 'ref' ? (
<ValueControl <ValueControl
field={defaultField} field={defaultField}
multiple={componentType === 'checkboxes' || !!defaultField.multiple} multiple={componentType === 'checkboxes' || !!defaultField.multiple}
op={dataSource.op} op={dataSource.op}
options={defaultField.dataSource} options={defaultField.dataSource}
value={dataSource.value} value={dataSource.value}
onChange={(value) => { onChange={value => {
onChange({...dataSource, value: value}); onChange({ ...dataSource, value: value });
}} }}
style={{ width: 180 }} style={{ width: 180 }}
/> />
) : (sourceFields.length > 0 ? ( ) : sourceFields.length > 0 ? (
<Select value={dataSource.value} <Select
onChange={(value) => { value={dataSource.value}
onChange({...dataSource, value: value}); onChange={value => {
onChange({ ...dataSource, value: value });
}} }}
style={{ width: 120 }} style={{ width: 120 }}
placeholder={'选择字段'}> placeholder={'选择字段'}
>
{sourceFields.map(field => ( {sourceFields.map(field => (
<Select.Option value={`{{ ${field.name} }}`}>{field.title}</Select.Option> <Select.Option value={`{{ ${field.name} }}`}>
{field.title}
</Select.Option>
))} ))}
</Select> </Select>
) : null)} ) : null}
{showDeleteButton && ( {showDeleteButton && (
<Button className={'filter-remove-link filter-item'} type={'link'} style={{padding: 0}} onClick={(e) => { <Button
onDelete && onDelete(e); className={'filter-remove-link filter-item'}
}}><CloseCircleOutlined /></Button> type={'link'}
style={{ padding: 0 }}
onClick={e => {
onDelete && onDelete(e);
}}
>
<CloseCircleOutlined />
</Button>
)} )}
</Space> </Space>
); );
@ -447,18 +534,27 @@ function toFilter(values: any) {
let { type, andor = 'and', list = [], column, op, value } = values; let { type, andor = 'and', list = [], column, op, value } = values;
if (type === 'group') { if (type === 'group') {
filter = { filter = {
[andor]: list.map(value => toFilter(value)).filter(Boolean) [andor]: list.map(value => toFilter(value)).filter(Boolean),
} };
} else if (type === 'item' && column && op) { } else if (type === 'item' && column && op) {
if (['id.$null', 'id.$notNull', '$null', '$notNull', '$isTruly', '$isFalsy'].indexOf(op) !== -1) { if (
[
'id.$null',
'id.$notNull',
'$null',
'$notNull',
'$isTruly',
'$isFalsy',
].indexOf(op) !== -1
) {
value = true; value = true;
} }
// if (op === 'id.gt') { // if (op === 'id.gt') {
// value = 0; // value = 0;
// } // }
filter = { filter = {
[`${column}`]: {[op]: value}, [`${column}`]: { [op]: value },
} };
} }
return filter; return filter;
} }
@ -483,45 +579,72 @@ function toValues(filter: any = {}) {
export const Filter = connect({ export const Filter = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
})((props) => { })(props => {
const dataSource = { const dataSource = {
type: 'group', type: 'group',
list: [ list: [
{ {
type: 'item', type: 'item',
} },
], ],
}; };
const { value, onChange, associatedKey, filter = {}, sourceName, sourceFilter = {}, fields = [], ...restProps } = props; const {
console.log('filter', {associatedKey}) value,
const { data = [], loading = true } = useRequest(() => { onChange,
return associatedKey ? api.resource(`collections.fields`).list({ associatedKey,
associatedKey, filter = {},
filter, sourceName,
}) : Promise.resolve({ sourceFilter = {},
data: fields, fields = [],
}); ...restProps
}, { } = props;
refreshDeps: [associatedKey] console.log('filter', { associatedKey });
}); const { data = [], loading = true } = useRequest(
() => {
return associatedKey
? api.resource(`collections.fields`).list({
associatedKey,
filter,
})
: Promise.resolve({
data: fields,
});
},
{
refreshDeps: [associatedKey],
},
);
const { data: sourceFields = [] } = useRequest(
() => {
return sourceName
? api.resource(`collections.fields`).list({
associatedKey: sourceName,
filter: sourceFilter,
})
: Promise.resolve({
data: [],
});
},
{
refreshDeps: [sourceName],
},
);
console.log({ sourceName, sourceFields });
const { data: sourceFields = [] } = useRequest(() => { return (
return sourceName ? api.resource(`collections.fields`).list({ <FilterGroup
associatedKey: sourceName, showDeleteButton={false}
filter: sourceFilter, dataSource={value ? toValues(value) : dataSource}
}) : Promise.resolve({ onChange={values => {
data: [], console.log(values);
}); onChange(toFilter(values));
}, { }}
refreshDeps: [sourceName] {...restProps}
}); sourceFields={sourceFields}
console.log({sourceName, sourceFields}); fields={data.filter(item => item.filterable)}
/>
return <FilterGroup showDeleteButton={false} dataSource={value ? toValues(value) : dataSource} onChange={(values) => { );
console.log(values);
onChange(toFilter(values));
}} {...restProps} sourceFields={sourceFields} fields={data.filter(item => item.filterable)}/>
}); });
export default Filter; export default Filter;

View File

@ -1,3 +1,3 @@
.filter-remove-link { .filter-remove-link {
color:#d9d9d9; color: #d9d9d9;
} }

View File

@ -30,7 +30,7 @@ export default <T>(initialValue: T[]) => {
}; };
const insert = (index: number, obj: T) => { const insert = (index: number, obj: T) => {
setList((l) => { setList(l => {
const temp = [...l]; const temp = [...l];
temp.splice(index, 0, obj); temp.splice(index, 0, obj);
setKey(index); setKey(index);
@ -40,10 +40,11 @@ export default <T>(initialValue: T[]) => {
const getAll = () => list; const getAll = () => list;
const getKey = (index: number) => keyList.current[index]; const getKey = (index: number) => keyList.current[index];
const getIndex = (index: number) => keyList.current.findIndex((ele) => ele === index); const getIndex = (index: number) =>
keyList.current.findIndex(ele => ele === index);
const merge = (index: number, obj: T[]) => { const merge = (index: number, obj: T[]) => {
setList((l) => { setList(l => {
const temp = [...l]; const temp = [...l];
obj.forEach((_, i) => { obj.forEach((_, i) => {
setKey(index + i); setKey(index + i);
@ -54,7 +55,7 @@ export default <T>(initialValue: T[]) => {
}; };
const replace = (index: number, obj: T) => { const replace = (index: number, obj: T) => {
setList((l) => { setList(l => {
const temp = [...l]; const temp = [...l];
temp[index] = obj; temp[index] = obj;
return temp; return temp;
@ -62,7 +63,7 @@ export default <T>(initialValue: T[]) => {
}; };
const remove = (index: number) => { const remove = (index: number) => {
setList((l) => { setList(l => {
const temp = [...l]; const temp = [...l];
temp.splice(index, 1); temp.splice(index, 1);
@ -80,14 +81,16 @@ export default <T>(initialValue: T[]) => {
if (oldIndex === newIndex) { if (oldIndex === newIndex) {
return; return;
} }
setList((l) => { setList(l => {
const newList = [...l]; const newList = [...l];
const temp = newList.filter((_: {}, index: number) => index !== oldIndex); const temp = newList.filter((_: {}, index: number) => index !== oldIndex);
temp.splice(newIndex, 0, newList[oldIndex]); temp.splice(newIndex, 0, newList[oldIndex]);
// move keys if necessary // move keys if necessary
try { try {
const keyTemp = keyList.current.filter((_: {}, index: number) => index !== oldIndex); const keyTemp = keyList.current.filter(
(_: {}, index: number) => index !== oldIndex,
);
keyTemp.splice(newIndex, 0, keyList.current[oldIndex]); keyTemp.splice(newIndex, 0, keyList.current[oldIndex]);
keyList.current = keyTemp; keyList.current = keyTemp;
} catch (e) { } catch (e) {
@ -99,7 +102,7 @@ export default <T>(initialValue: T[]) => {
}; };
const push = (obj: T) => { const push = (obj: T) => {
setList((l) => { setList(l => {
setKey(l.length); setKey(l.length);
return l.concat([obj]); return l.concat([obj]);
}); });
@ -113,11 +116,11 @@ export default <T>(initialValue: T[]) => {
console.error(e); console.error(e);
} }
setList((l) => l.slice(0, l.length - 1)); setList(l => l.slice(0, l.length - 1));
}; };
const unshift = (obj: T) => { const unshift = (obj: T) => {
setList((l) => { setList(l => {
setKey(0); setKey(0);
return [obj].concat(l); return [obj].concat(l);
}); });
@ -127,8 +130,8 @@ export default <T>(initialValue: T[]) => {
result result
.map((item, index) => ({ key: index, item })) // add index into obj .map((item, index) => ({ key: index, item })) // add index into obj
.sort((a, b) => getIndex(a.key) - getIndex(b.key)) // sort based on the index of table .sort((a, b) => getIndex(a.key) - getIndex(b.key)) // sort based on the index of table
.filter((item) => !!item.item) // remove undefined(s) .filter(item => !!item.item) // remove undefined(s)
.map((item) => item.item); // retrive the data .map(item => item.item); // retrive the data
const shift = () => { const shift = () => {
// remove keys if necessary // remove keys if necessary
@ -137,7 +140,7 @@ export default <T>(initialValue: T[]) => {
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }
setList((l) => l.slice(1, l.length)); setList(l => l.slice(1, l.length));
}; };
return { return {

View File

@ -1,8 +1,8 @@
import React from 'react' import React from 'react';
import { createVirtualBox } from '@formily/react-schema-renderer' import { createVirtualBox } from '@formily/react-schema-renderer';
import { Card } from 'antd' import { Card } from 'antd';
import { CardProps } from 'antd/lib/card' import { CardProps } from 'antd/lib/card';
import styled from 'styled-components' import styled from 'styled-components';
export const FormBlock = createVirtualBox<CardProps>( export const FormBlock = createVirtualBox<CardProps>(
'block', 'block',
@ -11,14 +11,14 @@ export const FormBlock = createVirtualBox<CardProps>(
<Card className={className} size="small" {...props}> <Card className={className} size="small" {...props}>
{children} {children}
</Card> </Card>
) );
})` })`
margin-bottom: 10px !important; margin-bottom: 10px !important;
&.ant-card { &.ant-card {
border: none; border: none;
box-shadow: none; box-shadow: none;
} }
` `,
) );
export default FormBlock export default FormBlock;

View File

@ -1 +1 @@
import 'antd/lib/card/style/index' import 'antd/lib/card/style/index';

View File

@ -1,8 +1,8 @@
import React from 'react' import React from 'react';
import { createVirtualBox } from '@formily/react-schema-renderer' import { createVirtualBox } from '@formily/react-schema-renderer';
import { Card } from 'antd' import { Card } from 'antd';
import { CardProps } from 'antd/lib/card' import { CardProps } from 'antd/lib/card';
import styled from 'styled-components' import styled from 'styled-components';
export const FormCard = createVirtualBox<CardProps>( export const FormCard = createVirtualBox<CardProps>(
'card', 'card',
@ -11,10 +11,10 @@ export const FormCard = createVirtualBox<CardProps>(
<Card className={className} size="small" {...props}> <Card className={className} size="small" {...props}>
{children} {children}
</Card> </Card>
) );
})` })`
margin-bottom: 10px !important; margin-bottom: 10px !important;
` `,
) );
export default FormCard export default FormCard;

View File

@ -1 +1 @@
import 'antd/lib/card/style/index' import 'antd/lib/card/style/index';

View File

@ -1,21 +1,30 @@
import React from 'react' import React from 'react';
import { createVirtualBox } from '@formily/react-schema-renderer' import { createVirtualBox } from '@formily/react-schema-renderer';
import { Card } from 'antd' import { Card } from 'antd';
import styled from 'styled-components' import styled from 'styled-components';
import { markdown } from '@/components/views/Field' import { markdown } from '@/components/views/Field';
export const FormDescription = createVirtualBox( export const FormDescription = createVirtualBox(
'description', 'description',
styled(({ schema = {}, children, className, ...props }) => { styled(({ schema = {}, children, className, ...props }) => {
const { title, tooltip } = schema as any; const { title, tooltip } = schema as any;
console.log({schema}) console.log({ schema });
return ( return (
<Card title={title} size={'small'} headStyle={{padding: 0}} bodyStyle={{ <Card
padding: 0, title={title}
}} className={className} {...props}> size={'small'}
{typeof tooltip === 'string' && tooltip && <div dangerouslySetInnerHTML={{__html: markdown(tooltip)}}></div>} headStyle={{ padding: 0 }}
bodyStyle={{
padding: 0,
}}
className={className}
{...props}
>
{typeof tooltip === 'string' && tooltip && (
<div dangerouslySetInnerHTML={{ __html: markdown(tooltip) }}></div>
)}
</Card> </Card>
) );
})` })`
margin-bottom: 24px !important; margin-bottom: 24px !important;
&.ant-card { &.ant-card {
@ -35,7 +44,7 @@ export const FormDescription = createVirtualBox(
margin-bottom: 0; margin-bottom: 0;
} }
} }
` `,
) );
export default FormDescription export default FormDescription;

View File

@ -1,10 +1,10 @@
import React from 'react' import React from 'react';
import { createVirtualBox } from '@formily/react-schema-renderer' import { createVirtualBox } from '@formily/react-schema-renderer';
import { Col } from 'antd' import { Col } from 'antd';
import { ColProps } from 'antd/lib/grid' import { ColProps } from 'antd/lib/grid';
export const FormGridCol = createVirtualBox<ColProps>('grid-col', props => { export const FormGridCol = createVirtualBox<ColProps>('grid-col', props => {
return <Col {...props}>{props.children}</Col> return <Col {...props}>{props.children}</Col>;
}) });
export default FormGridCol export default FormGridCol;

View File

@ -1 +1 @@
import 'antd/lib/col/style/index' import 'antd/lib/col/style/index';

View File

@ -1,25 +1,25 @@
import React from 'react' import React from 'react';
import { AntdSchemaFieldAdaptor, pickFormItemProps } from '@formily/antd' import { AntdSchemaFieldAdaptor, pickFormItemProps } from '@formily/antd';
import { createVirtualBox } from '@formily/react-schema-renderer' import { createVirtualBox } from '@formily/react-schema-renderer';
import { Row } from 'antd' import { Row } from 'antd';
import { RowProps } from 'antd/lib/grid' import { RowProps } from 'antd/lib/grid';
import { FormItemProps as ItemProps } from 'antd/lib/form' import { FormItemProps as ItemProps } from 'antd/lib/form';
import { IItemProps } from '../types' import { IItemProps } from '../types';
export const FormGridRow = createVirtualBox<RowProps & ItemProps & IItemProps>( export const FormGridRow = createVirtualBox<RowProps & ItemProps & IItemProps>(
'grid-row', 'grid-row',
props => { props => {
const { title, label } = props const { title, label } = props;
const grids = <Row {...props}>{props.children}</Row> const grids = <Row {...props}>{props.children}</Row>;
if (title || label) { if (title || label) {
return ( return (
<AntdSchemaFieldAdaptor {...pickFormItemProps(props)}> <AntdSchemaFieldAdaptor {...pickFormItemProps(props)}>
{grids} {grids}
</AntdSchemaFieldAdaptor> </AntdSchemaFieldAdaptor>
) );
} }
return grids return grids;
} },
) );
export default FormGridRow export default FormGridRow;

View File

@ -1 +1 @@
import 'antd/lib/row/style/index' import 'antd/lib/row/style/index';

View File

@ -1,15 +1,15 @@
import React, { Fragment } from 'react' import React, { Fragment } from 'react';
import { import {
AntdSchemaFieldAdaptor, AntdSchemaFieldAdaptor,
pickFormItemProps, pickFormItemProps,
pickNotFormItemProps pickNotFormItemProps,
} from '@formily/antd' } from '@formily/antd';
import { createVirtualBox } from '@formily/react-schema-renderer' import { createVirtualBox } from '@formily/react-schema-renderer';
import { toArr } from '@formily/shared' import { toArr } from '@formily/shared';
import { Row, Col } from 'antd' import { Row, Col } from 'antd';
import { FormItemProps as ItemProps } from 'antd/lib/form' import { FormItemProps as ItemProps } from 'antd/lib/form';
import { IFormItemGridProps, IItemProps } from '../types' import { IFormItemGridProps, IItemProps } from '../types';
import { normalizeCol } from '../shared' import { normalizeCol } from '../shared';
export const FormItemGrid = createVirtualBox< export const FormItemGrid = createVirtualBox<
React.PropsWithChildren<IFormItemGridProps & ItemProps & IItemProps> React.PropsWithChildren<IFormItemGridProps & ItemProps & IItemProps>
@ -18,16 +18,16 @@ export const FormItemGrid = createVirtualBox<
cols: rawCols, cols: rawCols,
// eslint-disable-next-line @typescript-eslint/no-unused-vars // eslint-disable-next-line @typescript-eslint/no-unused-vars
title, title,
label label,
} = props } = props;
const formItemProps = pickFormItemProps(props) const formItemProps = pickFormItemProps(props);
const gridProps = pickNotFormItemProps(props) const gridProps = pickNotFormItemProps(props);
const children = toArr(props.children) const children = toArr(props.children);
const cols = toArr(rawCols).map(col => normalizeCol(col)) const cols = toArr(rawCols).map(col => normalizeCol(col));
const childNum = children.length const childNum = children.length;
if (cols.length < childNum) { if (cols.length < childNum) {
let offset: number = childNum - cols.length let offset: number = childNum - cols.length;
let lastSpan: number = let lastSpan: number =
24 - 24 -
cols.reduce((buf, col) => { cols.reduce((buf, col) => {
@ -35,10 +35,10 @@ export const FormItemGrid = createVirtualBox<
buf + buf +
Number(col.span ? col.span : 0) + Number(col.span ? col.span : 0) +
Number(col.offset ? col.offset : 0) Number(col.offset ? col.offset : 0)
) );
}, 0) }, 0);
for (let i = 0; i < offset; i++) { for (let i = 0; i < offset; i++) {
cols.push({ span: Math.floor(lastSpan / offset) }) cols.push({ span: Math.floor(lastSpan / offset) });
} }
} }
const grids = ( const grids = (
@ -48,21 +48,21 @@ export const FormItemGrid = createVirtualBox<
? buf.concat( ? buf.concat(
<Col key={key} {...cols[key]}> <Col key={key} {...cols[key]}>
{child} {child}
</Col> </Col>,
) )
: buf : buf;
}, [])} }, [])}
</Row> </Row>
) );
if (title || label) { if (title || label) {
return ( return (
<AntdSchemaFieldAdaptor {...formItemProps}> <AntdSchemaFieldAdaptor {...formItemProps}>
{grids} {grids}
</AntdSchemaFieldAdaptor> </AntdSchemaFieldAdaptor>
) );
} }
return <Fragment>{grids}</Fragment> return <Fragment>{grids}</Fragment>;
}) });
export default FormItemGrid export default FormItemGrid;

View File

@ -1,2 +1,2 @@
import 'antd/lib/row/style/index' import 'antd/lib/row/style/index';
import 'antd/lib/col/style/index' import 'antd/lib/col/style/index';

View File

@ -1,19 +1,19 @@
import React from 'react' import React from 'react';
import { FormItemDeepProvider, useDeepFormItem } from '@formily/antd' import { FormItemDeepProvider, useDeepFormItem } from '@formily/antd';
import { createVirtualBox } from '@formily/react-schema-renderer' import { createVirtualBox } from '@formily/react-schema-renderer';
import cls from 'classnames' import cls from 'classnames';
import { IFormItemTopProps } from '../types' import { IFormItemTopProps } from '../types';
export const FormLayout = createVirtualBox<IFormItemTopProps>( export const FormLayout = createVirtualBox<IFormItemTopProps>(
'layout', 'layout',
props => { props => {
const { inline } = useDeepFormItem() const { inline } = useDeepFormItem();
const isInline = props.inline || inline const isInline = props.inline || inline;
const children = const children =
isInline || props.className || props.style ? ( isInline || props.className || props.style ? (
<div <div
className={cls(props.className, { className={cls(props.className, {
'ant-form ant-form-inline': isInline 'ant-form ant-form-inline': isInline,
})} })}
style={props.style} style={props.style}
> >
@ -21,9 +21,9 @@ export const FormLayout = createVirtualBox<IFormItemTopProps>(
</div> </div>
) : ( ) : (
props.children props.children
) );
return <FormItemDeepProvider {...props}>{children}</FormItemDeepProvider> return <FormItemDeepProvider {...props}>{children}</FormItemDeepProvider>;
} },
) );
export default FormLayout export default FormLayout;

View File

@ -1,6 +1,3 @@
import { MegaLayout, FormMegaLayout } from '@formily/antd' import { MegaLayout, FormMegaLayout } from '@formily/antd';
export { export { MegaLayout, FormMegaLayout };
MegaLayout,
FormMegaLayout,
}

View File

@ -1,5 +1,5 @@
import { FormSlot } from '@formily/react-schema-renderer' import { FormSlot } from '@formily/react-schema-renderer';
export { FormSlot } export { FormSlot };
export default FormSlot export default FormSlot;

View File

@ -1,35 +1,35 @@
import React, { useRef, Fragment, useEffect } from 'react' import React, { useRef, Fragment, useEffect } from 'react';
import { import {
createControllerBox, createControllerBox,
ISchemaVirtualFieldComponentProps, ISchemaVirtualFieldComponentProps,
createEffectHook, createEffectHook,
useFormEffects, useFormEffects,
useFieldState, useFieldState,
IVirtualBoxProps IVirtualBoxProps,
} from '@formily/react-schema-renderer' } from '@formily/react-schema-renderer';
import { toArr } from '@formily/shared' import { toArr } from '@formily/shared';
import { Steps } from 'antd' import { Steps } from 'antd';
import { createMatchUpdate } from '../shared' import { createMatchUpdate } from '../shared';
import { IFormStep } from '../types' import { IFormStep } from '../types';
enum StateMap { enum StateMap {
ON_FORM_STEP_NEXT = 'onFormStepNext', ON_FORM_STEP_NEXT = 'onFormStepNext',
ON_FORM_STEP_PREVIOUS = 'onFormStepPrevious', ON_FORM_STEP_PREVIOUS = 'onFormStepPrevious',
ON_FORM_STEP_GO_TO = 'onFormStepGoto', ON_FORM_STEP_GO_TO = 'onFormStepGoto',
ON_FORM_STEP_CURRENT_CHANGE = 'onFormStepCurrentChange', ON_FORM_STEP_CURRENT_CHANGE = 'onFormStepCurrentChange',
ON_FORM_STEP_DATA_SOURCE_CHANGED = 'onFormStepDataSourceChanged' ON_FORM_STEP_DATA_SOURCE_CHANGED = 'onFormStepDataSourceChanged',
} }
const EffectHooks = { const EffectHooks = {
onStepNext$: createEffectHook<void>(StateMap.ON_FORM_STEP_NEXT), onStepNext$: createEffectHook<void>(StateMap.ON_FORM_STEP_NEXT),
onStepPrevious$: createEffectHook<void>(StateMap.ON_FORM_STEP_PREVIOUS), onStepPrevious$: createEffectHook<void>(StateMap.ON_FORM_STEP_PREVIOUS),
onStepGoto$: createEffectHook<void>(StateMap.ON_FORM_STEP_GO_TO), onStepGoto$: createEffectHook<void>(StateMap.ON_FORM_STEP_GO_TO),
onStepCurrentChange$: createEffectHook<{ onStepCurrentChange$: createEffectHook<{
value: number value: number;
preValue: number preValue: number;
}>(StateMap.ON_FORM_STEP_CURRENT_CHANGE) }>(StateMap.ON_FORM_STEP_CURRENT_CHANGE),
} };
type ExtendsProps = StateMap & typeof EffectHooks type ExtendsProps = StateMap & typeof EffectHooks;
export const FormStep: React.FC<IVirtualBoxProps<IFormStep>> & export const FormStep: React.FC<IVirtualBoxProps<IFormStep>> &
ExtendsProps = createControllerBox<IFormStep>( ExtendsProps = createControllerBox<IFormStep>(
@ -39,54 +39,54 @@ export const FormStep: React.FC<IVirtualBoxProps<IFormStep>> &
schema, schema,
path, path,
name, name,
children children,
}: ISchemaVirtualFieldComponentProps) => { }: ISchemaVirtualFieldComponentProps) => {
const { dataSource, ...stepProps } = schema.getExtendsComponentProps() const { dataSource, ...stepProps } = schema.getExtendsComponentProps();
const [{ current }, setFieldState] = useFieldState({ const [{ current }, setFieldState] = useFieldState({
current: stepProps.current || 0 current: stepProps.current || 0,
}) });
const ref = useRef(current) const ref = useRef(current);
const itemsRef = useRef([]) const itemsRef = useRef([]);
itemsRef.current = toArr(dataSource) itemsRef.current = toArr(dataSource);
const matchUpdate = createMatchUpdate(name, path) const matchUpdate = createMatchUpdate(name, path);
const update = (cur: number) => { const update = (cur: number) => {
form.notify(StateMap.ON_FORM_STEP_CURRENT_CHANGE, { form.notify(StateMap.ON_FORM_STEP_CURRENT_CHANGE, {
path, path,
name, name,
value: cur, value: cur,
preValue: current preValue: current,
}) });
setFieldState({ setFieldState({
current: cur current: cur,
}) });
} };
useEffect(() => { useEffect(() => {
form.notify(StateMap.ON_FORM_STEP_DATA_SOURCE_CHANGED, { form.notify(StateMap.ON_FORM_STEP_DATA_SOURCE_CHANGED, {
path, path,
name, name,
value: itemsRef.current value: itemsRef.current,
}) });
}, [itemsRef.current.length]) }, [itemsRef.current.length]);
useFormEffects(($, { setFieldState }) => { useFormEffects(($, { setFieldState }) => {
const updateFields = () => { const updateFields = () => {
itemsRef.current.forEach(({ name }, index) => { itemsRef.current.forEach(({ name }, index) => {
setFieldState(name, (state: any) => { setFieldState(name, (state: any) => {
state.display = index === current state.display = index === current;
}) });
}) });
} };
updateFields() updateFields();
$(StateMap.ON_FORM_STEP_DATA_SOURCE_CHANGED).subscribe( $(StateMap.ON_FORM_STEP_DATA_SOURCE_CHANGED).subscribe(
({ name, path }) => { ({ name, path }) => {
matchUpdate(name, path, () => { matchUpdate(name, path, () => {
updateFields() updateFields();
}) });
} },
) );
$(StateMap.ON_FORM_STEP_CURRENT_CHANGE).subscribe( $(StateMap.ON_FORM_STEP_CURRENT_CHANGE).subscribe(
({ value, name, path }: any = {}) => { ({ value, name, path }: any = {}) => {
@ -95,16 +95,16 @@ export const FormStep: React.FC<IVirtualBoxProps<IFormStep>> &
itemsRef.current.forEach(({ name }, index) => { itemsRef.current.forEach(({ name }, index) => {
if (!name) if (!name)
throw new Error( throw new Error(
'FormStep dataSource must include `name` property' 'FormStep dataSource must include `name` property',
) );
setFieldState(name, (state: any) => { setFieldState(name, (state: any) => {
state.display = index === value state.display = index === value;
}) });
}) });
}) });
}) });
} },
) );
$(StateMap.ON_FORM_STEP_NEXT).subscribe(({ name, path }: any = {}) => { $(StateMap.ON_FORM_STEP_NEXT).subscribe(({ name, path }: any = {}) => {
matchUpdate(name, path, () => { matchUpdate(name, path, () => {
@ -113,45 +113,45 @@ export const FormStep: React.FC<IVirtualBoxProps<IFormStep>> &
update( update(
ref.current + 1 > itemsRef.current.length - 1 ref.current + 1 > itemsRef.current.length - 1
? ref.current ? ref.current
: ref.current + 1 : ref.current + 1,
) );
} }
}) });
}) });
}) });
$(StateMap.ON_FORM_STEP_PREVIOUS).subscribe( $(StateMap.ON_FORM_STEP_PREVIOUS).subscribe(
({ name, path }: any = {}) => { ({ name, path }: any = {}) => {
matchUpdate(name, path, () => { matchUpdate(name, path, () => {
update(ref.current - 1 < 0 ? ref.current : ref.current - 1) update(ref.current - 1 < 0 ? ref.current : ref.current - 1);
}) });
} },
) );
$(StateMap.ON_FORM_STEP_GO_TO).subscribe( $(StateMap.ON_FORM_STEP_GO_TO).subscribe(
({ name, path, value }: any = {}) => { ({ name, path, value }: any = {}) => {
matchUpdate(name, path, () => { matchUpdate(name, path, () => {
if (!(value < 0 || value > itemsRef.current.length)) { if (!(value < 0 || value > itemsRef.current.length)) {
update(value) update(value);
} }
}) });
} },
) );
}) });
ref.current = current ref.current = current;
return ( return (
<Fragment> <Fragment>
<Steps {...stepProps} current={current}> <Steps {...stepProps} current={current}>
{itemsRef.current.map((props, key) => { {itemsRef.current.map((props, key) => {
return <Steps.Step {...props} key={key} /> return <Steps.Step {...props} key={key} />;
})} })}
</Steps>{' '} </Steps>{' '}
{children} {children}
</Fragment> </Fragment>
) );
} },
) as any ) as any;
Object.assign(FormStep, StateMap, EffectHooks) Object.assign(FormStep, StateMap, EffectHooks);
export default FormStep export default FormStep;

View File

@ -1 +1 @@
import 'antd/lib/steps/style/index' import 'antd/lib/steps/style/index';

View File

@ -1,4 +1,4 @@
import React, { Fragment, useEffect, useRef } from 'react' import React, { Fragment, useEffect, useRef } from 'react';
import { import {
createControllerBox, createControllerBox,
ISchemaVirtualFieldComponentProps, ISchemaVirtualFieldComponentProps,
@ -8,140 +8,156 @@ import {
FormEffectHooks, FormEffectHooks,
SchemaField, SchemaField,
FormPath, FormPath,
IVirtualBoxProps IVirtualBoxProps,
} from '@formily/react-schema-renderer' } from '@formily/react-schema-renderer';
import { Tabs, Badge } from 'antd' import { Tabs, Badge } from 'antd';
import { TabPaneProps } from 'antd/lib/tabs' import { TabPaneProps } from 'antd/lib/tabs';
import { IFormTab } from '../types' import { IFormTab } from '../types';
import { createMatchUpdate } from '../shared' import { createMatchUpdate } from '../shared';
enum StateMap { enum StateMap {
ON_FORM_TAB_ACTIVE_KEY_CHANGE = 'onFormTabActiveKeyChange' ON_FORM_TAB_ACTIVE_KEY_CHANGE = 'onFormTabActiveKeyChange',
} }
const { onFormChange$ } = FormEffectHooks const { onFormChange$ } = FormEffectHooks;
const EffectHooks = { const EffectHooks = {
onTabActiveKeyChange$: createEffectHook<{ onTabActiveKeyChange$: createEffectHook<{
name?: string name?: string;
path?: string path?: string;
value?: any value?: any;
}>(StateMap.ON_FORM_TAB_ACTIVE_KEY_CHANGE) }>(StateMap.ON_FORM_TAB_ACTIVE_KEY_CHANGE),
} };
const parseTabItems = (items: any, hiddenKeys?: string[]) => { const parseTabItems = (items: any, hiddenKeys?: string[]) => {
return items.reduce((buf: any, { schema, key }) => { return items.reduce((buf: any, { schema, key }) => {
if (Array.isArray(hiddenKeys)) { if (Array.isArray(hiddenKeys)) {
if (hiddenKeys.includes(key)) { if (hiddenKeys.includes(key)) {
return buf return buf;
} }
} }
if (schema.getExtendsComponent() === 'tabpane') { if (schema.getExtendsComponent() === 'tabpane') {
return buf.concat({ return buf.concat({
props: schema.getExtendsComponentProps(), props: schema.getExtendsComponentProps(),
schema, schema,
key key,
}) });
} }
return buf return buf;
}, []) }, []);
} };
const parseDefaultActiveKey = (hiddenKeys: Array<string> = [], items: any, defaultActiveKey) => { const parseDefaultActiveKey = (
if(!hiddenKeys.includes(defaultActiveKey))return defaultActiveKey hiddenKeys: Array<string> = [],
items: any,
defaultActiveKey,
) => {
if (!hiddenKeys.includes(defaultActiveKey)) return defaultActiveKey;
const index = items.findIndex(item => !hiddenKeys.includes(item.key)) const index = items.findIndex(item => !hiddenKeys.includes(item.key));
return index >= 0 ? items[index].key : '' return index >= 0 ? items[index].key : '';
} };
const parseChildrenErrors = (errors: any, target: string) => { const parseChildrenErrors = (errors: any, target: string) => {
return errors.filter(({ path }) => { return errors.filter(({ path }) => {
return FormPath.parse(path).includes(target) return FormPath.parse(path).includes(target);
}) });
} };
const addErrorBadge = ( const addErrorBadge = (
tab: React.ReactNode, tab: React.ReactNode,
currentPath: FormPath, currentPath: FormPath,
childrenErrors: any[] childrenErrors: any[],
) => { ) => {
const currentErrors = childrenErrors.filter(({ path }) => { const currentErrors = childrenErrors.filter(({ path }) => {
return FormPath.parse(path).includes(currentPath) return FormPath.parse(path).includes(currentPath);
}) });
if (currentErrors.length > 0) { if (currentErrors.length > 0) {
return ( return (
<Badge offset={[12, 0]} count={currentErrors.length}> <Badge offset={[12, 0]} count={currentErrors.length}>
{tab} {tab}
</Badge> </Badge>
) );
} }
return tab return tab;
} };
type ExtendsProps = StateMap & type ExtendsProps = StateMap &
typeof EffectHooks & { typeof EffectHooks & {
TabPane: React.FC<IVirtualBoxProps<TabPaneProps>> TabPane: React.FC<IVirtualBoxProps<TabPaneProps>>;
} };
type ExtendsState = { type ExtendsState = {
activeKey?: string activeKey?: string;
childrenErrors?: any childrenErrors?: any;
} };
export const FormTab: React.FC<IVirtualBoxProps<IFormTab>> & export const FormTab: React.FC<IVirtualBoxProps<IFormTab>> &
ExtendsProps = createControllerBox<IFormTab>( ExtendsProps = createControllerBox<IFormTab>(
'tab', 'tab',
({ form, schema, name, path }: ISchemaVirtualFieldComponentProps) => { ({ form, schema, name, path }: ISchemaVirtualFieldComponentProps) => {
const orderProperties = schema.getOrderProperties() const orderProperties = schema.getOrderProperties();
let { hiddenKeys, defaultActiveKey, ...componentProps } = schema.getExtendsComponentProps() let {
hiddenKeys = hiddenKeys || [] hiddenKeys,
defaultActiveKey,
...componentProps
} = schema.getExtendsComponentProps();
hiddenKeys = hiddenKeys || [];
const [{ activeKey, childrenErrors }, setFieldState] = useFieldState< const [{ activeKey, childrenErrors }, setFieldState] = useFieldState<
ExtendsState ExtendsState
>({ >({
activeKey: parseDefaultActiveKey(hiddenKeys, orderProperties, defaultActiveKey), activeKey: parseDefaultActiveKey(
childrenErrors: [] hiddenKeys,
}) orderProperties,
const itemsRef = useRef([]) defaultActiveKey,
itemsRef.current = parseTabItems(orderProperties, hiddenKeys) ),
childrenErrors: [],
});
const itemsRef = useRef([]);
itemsRef.current = parseTabItems(orderProperties, hiddenKeys);
const update = (cur: string) => { const update = (cur: string) => {
form.notify(StateMap.ON_FORM_TAB_ACTIVE_KEY_CHANGE, { form.notify(StateMap.ON_FORM_TAB_ACTIVE_KEY_CHANGE, {
name, name,
path, path,
value: cur value: cur,
}) });
} };
const matchUpdate = createMatchUpdate(name, path) const matchUpdate = createMatchUpdate(name, path);
useEffect(() => { useEffect(() => {
if (Array.isArray(hiddenKeys)) { if (Array.isArray(hiddenKeys)) {
setFieldState({ setFieldState({
activeKey: parseDefaultActiveKey(hiddenKeys, orderProperties, defaultActiveKey) activeKey: parseDefaultActiveKey(
}) hiddenKeys,
orderProperties,
defaultActiveKey,
),
});
} }
}, [hiddenKeys.length]) }, [hiddenKeys.length]);
useFormEffects(({ hasChanged }) => { useFormEffects(({ hasChanged }) => {
onFormChange$().subscribe(formState => { onFormChange$().subscribe(formState => {
const errorsChanged = hasChanged(formState, 'errors') const errorsChanged = hasChanged(formState, 'errors');
if (errorsChanged) { if (errorsChanged) {
setFieldState({ setFieldState({
childrenErrors: parseChildrenErrors(formState.errors, path) childrenErrors: parseChildrenErrors(formState.errors, path),
}) });
} }
}) });
EffectHooks.onTabActiveKeyChange$().subscribe( EffectHooks.onTabActiveKeyChange$().subscribe(
({ value, name, path }: any = {}) => { ({ value, name, path }: any = {}) => {
if(!itemsRef.current.map(item => item.key).includes(value))return if (!itemsRef.current.map(item => item.key).includes(value)) return;
matchUpdate(name, path, () => { matchUpdate(name, path, () => {
setFieldState({ setFieldState({
activeKey: value activeKey: value,
}) });
}) });
} },
) );
}) });
return ( return (
<Tabs {...componentProps} activeKey={activeKey} onChange={update}> <Tabs {...componentProps} activeKey={activeKey} onChange={update}>
{itemsRef.current.map(({ props, schema, key }) => { {itemsRef.current.map(({ props, schema, key }) => {
const currentPath = FormPath.parse(path).concat(key) const currentPath = FormPath.parse(path).concat(key);
return ( return (
<Tabs.TabPane <Tabs.TabPane
{...props} {...props}
@ -159,20 +175,20 @@ export const FormTab: React.FC<IVirtualBoxProps<IFormTab>> &
onlyRenderProperties onlyRenderProperties
/> />
</Tabs.TabPane> </Tabs.TabPane>
) );
})} })}
</Tabs> </Tabs>
) );
} },
) as any ) as any;
FormTab.TabPane = createControllerBox<TabPaneProps>( FormTab.TabPane = createControllerBox<TabPaneProps>(
'tabpane', 'tabpane',
({ children }) => { ({ children }) => {
return <Fragment>{children}</Fragment> return <Fragment>{children}</Fragment>;
} },
) );
Object.assign(FormTab, StateMap, EffectHooks) Object.assign(FormTab, StateMap, EffectHooks);
export default FormTab export default FormTab;

View File

@ -1,2 +1,2 @@
import 'antd/lib/tabs/style/index' import 'antd/lib/tabs/style/index';
import 'antd/lib/badge/style/index' import 'antd/lib/badge/style/index';

View File

@ -1,64 +1,64 @@
import React, { useRef, useLayoutEffect } from 'react' import React, { useRef, useLayoutEffect } from 'react';
import { createControllerBox, Schema } from '@formily/react-schema-renderer' import { createControllerBox, Schema } from '@formily/react-schema-renderer';
import { IFormTextBox } from '../types' import { IFormTextBox } from '../types';
import { toArr } from '@formily/shared' import { toArr } from '@formily/shared';
import { FormItemProps as ItemProps } from 'antd/lib/form' import { FormItemProps as ItemProps } from 'antd/lib/form';
import { version } from 'antd' import { version } from 'antd';
import { AntdSchemaFieldAdaptor, pickFormItemProps } from '@formily/antd' import { AntdSchemaFieldAdaptor, pickFormItemProps } from '@formily/antd';
import styled from 'styled-components' import styled from 'styled-components';
const isV4 = /^4\./.test(version) const isV4 = /^4\./.test(version);
export const FormTextBox = createControllerBox<IFormTextBox & ItemProps>( export const FormTextBox = createControllerBox<IFormTextBox & ItemProps>(
'text-box', 'text-box',
styled(({ props, form, className, children }) => { styled(({ props, form, className, children }) => {
const schema = new Schema(props) const schema = new Schema(props);
const mergeProps = schema.getExtendsComponentProps() const mergeProps = schema.getExtendsComponentProps();
const { title, label, text, gutter, style } = Object.assign( const { title, label, text, gutter, style } = Object.assign(
{ {
gutter: 5 gutter: 5,
}, },
mergeProps mergeProps,
) );
const formItemProps = pickFormItemProps(mergeProps) const formItemProps = pickFormItemProps(mergeProps);
const ref: React.RefObject<HTMLDivElement> = useRef() const ref: React.RefObject<HTMLDivElement> = useRef();
const arrChildren = toArr(children) const arrChildren = toArr(children);
const split = text.split('%s') const split = text.split('%s');
let index = 0 let index = 0;
useLayoutEffect(() => { useLayoutEffect(() => {
if (ref.current) { if (ref.current) {
const elements = ref.current.querySelectorAll('.text-box-field') const elements = ref.current.querySelectorAll('.text-box-field');
const syncLayouts = Array.prototype.map.call( const syncLayouts = Array.prototype.map.call(
elements, elements,
(el: HTMLElement) => { (el: HTMLElement) => {
return [ return [
el, el,
() => { () => {
const ctrl = el.querySelector('.ant-form-item-children') const ctrl = el.querySelector('.ant-form-item-children');
setTimeout(() => { setTimeout(() => {
if (ctrl) { if (ctrl) {
const editable = form.getFormState(state => state.editable) const editable = form.getFormState(state => state.editable);
el.style.width = editable el.style.width = editable
? ctrl.getBoundingClientRect().width + 'px' ? ctrl.getBoundingClientRect().width + 'px'
: 'auto' : 'auto';
} }
}) });
} },
] ];
} },
) );
syncLayouts.forEach(([el, handler]) => { syncLayouts.forEach(([el, handler]) => {
handler() handler();
el.addEventListener('DOMSubtreeModified', handler) el.addEventListener('DOMSubtreeModified', handler);
}) });
return () => { return () => {
syncLayouts.forEach(([el, handler]) => { syncLayouts.forEach(([el, handler]) => {
el.removeEventListener('DOMSubtreeModified', handler) el.removeEventListener('DOMSubtreeModified', handler);
}) });
} };
} }
}, []) }, []);
const newChildren = split.reduce((buf, item, key) => { const newChildren = split.reduce((buf, item, key) => {
return buf.concat( return buf.concat(
item ? ( item ? (
@ -68,7 +68,7 @@ export const FormTextBox = createControllerBox<IFormTextBox & ItemProps>(
style={{ style={{
marginRight: gutter / 2, marginRight: gutter / 2,
marginLeft: gutter / 2, marginLeft: gutter / 2,
...style ...style,
}} }}
> >
{item} {item}
@ -78,29 +78,29 @@ export const FormTextBox = createControllerBox<IFormTextBox & ItemProps>(
<div key={index++} className="text-box-field"> <div key={index++} className="text-box-field">
{arrChildren[key]} {arrChildren[key]}
</div> </div>
) : null ) : null,
) );
}, []) }, []);
const textChildren = ( const textChildren = (
<div <div
className={`${className} ${mergeProps.className}`} className={`${className} ${mergeProps.className}`}
style={{ style={{
marginRight: -gutter / 2, marginRight: -gutter / 2,
marginLeft: -gutter / 2 marginLeft: -gutter / 2,
}} }}
ref={ref} ref={ref}
> >
{newChildren} {newChildren}
</div> </div>
) );
if (!title && !label) return textChildren if (!title && !label) return textChildren;
return ( return (
<AntdSchemaFieldAdaptor {...formItemProps}> <AntdSchemaFieldAdaptor {...formItemProps}>
{textChildren} {textChildren}
</AntdSchemaFieldAdaptor> </AntdSchemaFieldAdaptor>
) );
})` })`
display: flex; display: flex;
.text-box-words:nth-child(1) { .text-box-words:nth-child(1) {
@ -122,7 +122,7 @@ export const FormTextBox = createControllerBox<IFormTextBox & ItemProps>(
.preview-text { .preview-text {
text-align: center !important; text-align: center !important;
} }
` `,
) );
export default FormTextBox export default FormTextBox;

View File

@ -1,7 +1,7 @@
import React, { useState } from 'react'; import React, { useState } from 'react';
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import { Popover, Button } from 'antd' import { Popover, Button } from 'antd';
import { acceptEnum, mapStyledProps, mapTextComponent } from '../shared' import { acceptEnum, mapStyledProps, mapTextComponent } from '../shared';
import { icons, hasIcon, Icon as IconComponent } from '@/components/icons'; import { icons, hasIcon, Icon as IconComponent } from '@/components/icons';
function IconField(props: any) { function IconField(props: any) {
@ -9,19 +9,33 @@ function IconField(props: any) {
const [visible, setVisible] = useState(false); const [visible, setVisible] = useState(false);
return ( return (
<div> <div>
<Popover placement={'bottom'} visible={visible} onVisibleChange={(val) => { <Popover
setVisible(val) placement={'bottom'}
}} content={( visible={visible}
<div> onVisibleChange={val => {
{[...icons.keys()].map(key => ( setVisible(val);
<span style={{fontSize: 18, marginRight: 10, cursor: 'pointer'}} onClick={() => { }}
onChange(key); content={
setVisible(false) <div>
}}><IconComponent type={key}/></span> {[...icons.keys()].map(key => (
))} <span
</div> style={{ fontSize: 18, marginRight: 10, cursor: 'pointer' }}
)} title="图标" trigger="click"> onClick={() => {
<Button>{ hasIcon(value) ? <IconComponent type={value}/> : '选择图标'}</Button> onChange(key);
setVisible(false);
}}
>
<IconComponent type={key} />
</span>
))}
</div>
}
title="图标"
trigger="click"
>
<Button>
{hasIcon(value) ? <IconComponent type={value} /> : '选择图标'}
</Button>
</Popover> </Popover>
</div> </div>
); );
@ -29,7 +43,7 @@ function IconField(props: any) {
export const Icon = connect({ export const Icon = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent getComponent: mapTextComponent,
})(IconField) })(IconField);
export default Icon export default Icon;

View File

@ -1,30 +1,30 @@
export * from './text-button' export * from './text-button';
export * from './time-picker' export * from './time-picker';
export * from './transfer' export * from './transfer';
export * from './switch' export * from './switch';
export * from './array-cards' export * from './array-cards';
export * from './array-table' export * from './array-table';
export * from './checkbox' export * from './checkbox';
export * from './circle-button' export * from './circle-button';
export * from './date-picker' export * from './date-picker';
export * from './form-block' export * from './form-block';
export * from './form-card' export * from './form-card';
export * from './form-tab' export * from './form-tab';
export * from './form-grid-col' export * from './form-grid-col';
export * from './form-grid-row' export * from './form-grid-row';
export * from './form-item-grid' export * from './form-item-grid';
export * from './form-layout' export * from './form-layout';
export * from './form-mega-layout' export * from './form-mega-layout';
export * from './form-description' export * from './form-description';
export * from './form-step' export * from './form-step';
export * from './form-text-box' export * from './form-text-box';
export * from './form-slot' export * from './form-slot';
export * from './input' export * from './input';
export * from './select' export * from './select';
export * from './number-picker' export * from './number-picker';
export * from './password' export * from './password';
export * from './radio' export * from './radio';
export * from './range' export * from './range';
export * from './rating' export * from './rating';
export * from './upload' export * from './upload';
export * from './registry' export * from './registry';

View File

@ -1,25 +1,31 @@
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import React from 'react'; import React from 'react';
import { Input as AntdInput } from 'antd' import { Input as AntdInput } from 'antd';
import { acceptEnum, mapStyledProps, mapTextComponent } from '../shared' import { acceptEnum, mapStyledProps, mapTextComponent } from '../shared';
export const Input = connect<'TextArea'>({ export const Input = connect<'TextArea'>({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent getComponent: mapTextComponent,
})(acceptEnum(({onChange, ...restProps}) => ( })(
<AntdInput acceptEnum(({ onChange, ...restProps }) => (
autoComplete={'off'} <AntdInput
{...restProps} autoComplete={'off'}
onChange={(e) => { {...restProps}
// 文本字段,如果空要 null 处理 onChange={e => {
onChange(e.target.value ? e : null); // 文本字段,如果空要 null 处理
}} onChange(e.target.value ? e : null);
/> }}
))) />
)),
);
Input.TextArea = connect({ Input.TextArea = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent getComponent: mapTextComponent,
})(acceptEnum((props) => <AntdInput.TextArea autoSize={{minRows: 2, maxRows: 12}} {...props}/>)) })(
acceptEnum(props => (
<AntdInput.TextArea autoSize={{ minRows: 2, maxRows: 12 }} {...props} />
)),
);
export default Input export default Input;

View File

@ -1 +1 @@
import 'antd/lib/input/style/index' import 'antd/lib/input/style/index';

View File

@ -1,11 +1,15 @@
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import React from 'react'; import React from 'react';
import { Input as AntdInput } from 'antd' import { Input as AntdInput } from 'antd';
import { acceptEnum, mapStyledProps, mapTextComponent } from '../shared' import { acceptEnum, mapStyledProps, mapTextComponent } from '../shared';
export const Markdown = connect({ export const Markdown = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent getComponent: mapTextComponent,
})(acceptEnum((props) => <AntdInput.TextArea autoSize={{minRows: 2, maxRows: 12}} {...props}/>)) })(
acceptEnum(props => (
<AntdInput.TextArea autoSize={{ minRows: 2, maxRows: 12 }} {...props} />
)),
);
export default Markdown export default Markdown;

View File

@ -1,22 +1,24 @@
import React from 'react'; import React from 'react';
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import { InputNumber } from 'antd' import { InputNumber } from 'antd';
import { acceptEnum, mapStyledProps, mapTextComponent } from '../shared' import { acceptEnum, mapStyledProps, mapTextComponent } from '../shared';
export const NumberPicker = connect({ export const NumberPicker = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent getComponent: mapTextComponent,
})(acceptEnum(InputNumber)) })(acceptEnum(InputNumber));
export const Percent = connect({ export const Percent = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent getComponent: mapTextComponent,
})(acceptEnum((props) => ( })(
<InputNumber acceptEnum(props => (
formatter={value => value ? `${value}%` : ''} <InputNumber
parser={value => value.replace('%', '')} formatter={value => (value ? `${value}%` : '')}
{...props} parser={value => value.replace('%', '')}
/> {...props}
))) />
)),
);
export default NumberPicker export default NumberPicker;

View File

@ -1 +1 @@
import 'antd/lib/input-number/style/index' import 'antd/lib/input-number/style/index';

View File

@ -1,27 +1,27 @@
import React, { useState } from 'react' import React, { useState } from 'react';
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import { Input } from 'antd' import { Input } from 'antd';
import { PasswordProps } from 'antd/lib/input' import { PasswordProps } from 'antd/lib/input';
import { PasswordStrength } from '@formily/react-shared-components' import { PasswordStrength } from '@formily/react-shared-components';
import styled from 'styled-components' import styled from 'styled-components';
import { mapStyledProps } from '../shared' import { mapStyledProps } from '../shared';
export interface IPasswordProps extends PasswordProps { export interface IPasswordProps extends PasswordProps {
checkStrength: boolean checkStrength: boolean;
} }
export const Password = connect({ export const Password = connect({
getProps: mapStyledProps getProps: mapStyledProps,
})(styled((props: IPasswordProps) => { })(styled((props: IPasswordProps) => {
const { value, className, checkStrength, onChange, ...others } = props const { value, className, checkStrength, onChange, ...others } = props;
return ( return (
<span className={className}> <span className={className}>
<Input.Password <Input.Password
autoComplete={'new-password'} autoComplete={'new-password'}
{...others} {...others}
value={value} value={value}
onChange={(e) => { onChange={e => {
// 密码字段,如果没有设置不处理 // 密码字段,如果没有设置不处理
onChange(e.target.value ? e : undefined); onChange(e.target.value ? e : undefined);
}} }}
@ -38,16 +38,16 @@ export const Password = connect({
<div <div
className="password-strength-bar" className="password-strength-bar"
style={{ style={{
clipPath: `polygon(0 0,${score}% 0,${score}% 100%,0 100%)` clipPath: `polygon(0 0,${score}% 0,${score}% 100%,0 100%)`,
}} }}
/> />
</div> </div>
) );
}} }}
</PasswordStrength> </PasswordStrength>
)} )}
</span> </span>
) );
})` })`
.password-strength-wrapper { .password-strength-wrapper {
background: #e0e0e0; background: #e0e0e0;
@ -83,6 +83,6 @@ export const Password = connect({
margin-top: 5px; margin-top: 5px;
} }
} }
`) `);
export default Password export default Password;

View File

@ -1 +1 @@
import 'antd/lib/input/style/index' import 'antd/lib/input/style/index';

View File

@ -1,7 +1,7 @@
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { Input as AntdInput, Table, Checkbox, Select, Tag } from 'antd' import { Input as AntdInput, Table, Checkbox, Select, Tag } from 'antd';
import { acceptEnum, mapStyledProps, mapTextComponent } from '../shared' import { acceptEnum, mapStyledProps, mapTextComponent } from '../shared';
import api from '@/api-client'; import api from '@/api-client';
import { useRequest } from 'umi'; import { useRequest } from 'umi';
import { useDynamicList } from 'ahooks'; import { useDynamicList } from 'ahooks';
@ -10,132 +10,166 @@ import get from 'lodash/get';
import set from 'lodash/set'; import set from 'lodash/set';
import { DrawerSelectComponent } from '../drawer-select'; import { DrawerSelectComponent } from '../drawer-select';
export const Permissions = {} as {Actions: any, Fields: any, Tabs: any}; export const Permissions = {} as { Actions: any; Fields: any; Tabs: any };
Permissions.Actions = connect({ Permissions.Actions = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent getComponent: mapTextComponent,
})(({onChange, value = [], resourceKey, ...restProps}) => { })(({ onChange, value = [], resourceKey, ...restProps }) => {
const { data = [], loading = true } = useRequest(() => { const { data = [], loading = true } = useRequest(
return api.resource('collections.actions').list({ () => {
associatedKey: resourceKey, return api.resource('collections.actions').list({
perPage: -1, associatedKey: resourceKey,
}); perPage: -1,
}, { });
refreshDeps: [resourceKey] },
}); {
refreshDeps: [resourceKey],
},
);
return <Table size={'small'} pagination={false} dataSource={data} columns={[ return (
{ <Table
title: '操作', size={'small'}
dataIndex: ['title'], pagination={false}
}, dataSource={data}
{ columns={[
title: '类型', {
dataIndex: ['type'], title: '操作',
render: (type) => { dataIndex: ['title'],
return type === 'create' ? <Tag color={'green'}></Tag> : <Tag color={'blue'}></Tag>; },
} {
}, title: '类型',
{ dataIndex: ['type'],
title: '允许操作', render: type => {
dataIndex: ['name'], return type === 'create' ? (
render: (val, record) => { <Tag color={'green'}></Tag>
const values = [...value||[]]; ) : (
const index = findIndex(values, (item: any) => item && item.name === `${resourceKey}:${record.name}`); <Tag color={'blue'}></Tag>
console.log(values); );
return ( },
<Checkbox defaultChecked={index >= 0} onChange={(e) => { },
// const index = findIndex(values, (item: any) => item && item.name === `${resourceKey}:${record.name}`); {
if (index >= 0) { title: '允许操作',
if (!e.target.checked) { dataIndex: ['name'],
values.splice(index, 1); render: (val, record) => {
} const values = [...(value || [])];
} else { const index = findIndex(
values.push({ values,
name: `${resourceKey}:${record.name}`, (item: any) =>
}); item && item.name === `${resourceKey}:${record.name}`,
);
console.log(values);
return (
<Checkbox
defaultChecked={index >= 0}
onChange={e => {
// const index = findIndex(values, (item: any) => item && item.name === `${resourceKey}:${record.name}`);
if (index >= 0) {
if (!e.target.checked) {
values.splice(index, 1);
}
} else {
values.push({
name: `${resourceKey}:${record.name}`,
});
}
onChange(values);
}}
/>
);
},
},
{
title: '可操作的数据范围',
dataIndex: ['scope'],
render: (scope, record) => {
if (['filter', 'create'].indexOf(record.type) !== -1) {
return null;
} }
onChange(values); const values = [...(value || [])];
}}/> const index = findIndex(
) values,
} (item: any) =>
}, item && item.name === `${resourceKey}:${record.name}`,
{ );
title: '可操作的数据范围', console.log(
dataIndex: ['scope'], values,
render: (scope, record) => { index,
if (['filter', 'create'].indexOf(record.type) !== -1) { `${resourceKey}:${record.name}`,
return null; get(values, [index, 'scope']),
} );
const values = [...value||[]]; return (
const index = findIndex(values, (item: any) => item && item.name === `${resourceKey}:${record.name}`); <DrawerSelectComponent
console.log(values, index, `${resourceKey}:${record.name}`, get(values, [index, 'scope'])); schema={{
return ( title: '选择可操作的数据范围',
<DrawerSelectComponent }}
schema={{ size={'small'}
title: '选择可操作的数据范围', associatedKey={resourceKey}
}} viewName={'collections.scopes.table'}
size={'small'} target={'scopes'}
associatedKey={resourceKey} multiple={false}
viewName={'collections.scopes.table'} labelField={'title'}
target={'scopes'} valueField={'id'}
multiple={false} value={get(values, [index, 'scope'])}
labelField={'title'} onChange={data => {
valueField={'id'} const values = [...(value || [])];
value={get(values, [index, 'scope'])} const index = findIndex(
onChange={(data) => { values,
const values = [...value||[]]; (item: any) =>
const index = findIndex(values, (item: any) => item && item.name === `${resourceKey}:${record.name}`); item && item.name === `${resourceKey}:${record.name}`,
if (index === -1) { );
values.push({ if (index === -1) {
name: `${resourceKey}:${record.name}`, values.push({
scope_id: data.id, name: `${resourceKey}:${record.name}`,
}); scope_id: data.id,
} else { });
set(values, [index, 'scope_id'], data.id); } else {
} set(values, [index, 'scope_id'], data.id);
console.log('valvalvalvalval', {values}) }
onChange(values); console.log('valvalvalvalval', { values });
console.log('valvalvalvalval', data); onChange(values);
}} console.log('valvalvalvalval', data);
/> }}
// <Scope />
// resourceTarget={'scopes'} // <Scope
// associatedName={'collections'} // resourceTarget={'scopes'}
// associatedKey={resourceKey} // associatedName={'collections'}
// target={'scopes'} // associatedKey={resourceKey}
// multiple={false} // target={'scopes'}
// labelField={'title'} // multiple={false}
// valueField={'id'} // labelField={'title'}
// value={get(values, [index, 'scope'])} // valueField={'id'}
// onChange={(data) => { // value={get(values, [index, 'scope'])}
// const values = [...value||[]]; // onChange={(data) => {
// const index = findIndex(values, (item: any) => item && item.name === `${resourceKey}:${record.name}`); // const values = [...value||[]];
// if (index === -1) { // const index = findIndex(values, (item: any) => item && item.name === `${resourceKey}:${record.name}`);
// values.push({ // if (index === -1) {
// name: `${resourceKey}:${record.name}`, // values.push({
// scope_id: data, // name: `${resourceKey}:${record.name}`,
// }); // scope_id: data,
// } else { // });
// set(values, [index, 'scope_id'], data); // } else {
// } // set(values, [index, 'scope_id'], data);
// console.log('valvalvalvalval', {values}) // }
// onChange(values); // console.log('valvalvalvalval', {values})
// console.log('valvalvalvalval', data); // onChange(values);
// }} // console.log('valvalvalvalval', data);
// /> // }}
) // />
} );
}, },
]} loading={loading}/> },
}) ]}
loading={loading}
/>
);
});
Permissions.Fields = connect<'TextArea'>({ Permissions.Fields = connect<'TextArea'>({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent getComponent: mapTextComponent,
})(({onChange, value = [], resourceKey, ...restProps}) => { })(({ onChange, value = [], resourceKey, ...restProps }) => {
const actions = {}; const actions = {};
value.forEach(item => { value.forEach(item => {
actions[item.field_id] = item.actions; actions[item.field_id] = item.actions;
@ -143,110 +177,141 @@ Permissions.Fields = connect<'TextArea'>({
// console.log(actions); // console.log(actions);
const [fields, setFields] = useState(value||[]); const [fields, setFields] = useState(value || []);
const { data = [], loading = true } = useRequest(() => { const { data = [], loading = true } = useRequest(
return api.resource('collections.fields').list({ () => {
associatedKey: resourceKey, return api.resource('collections.fields').list({
perPage: -1, associatedKey: resourceKey,
}); perPage: -1,
}, { });
refreshDeps: [resourceKey] },
}); {
console.log({resourceKey, data}); refreshDeps: [resourceKey],
},
);
console.log({ resourceKey, data });
const columns = [ const columns = [
{ {
title: '字段名称', title: '字段名称',
dataIndex: ['title'], dataIndex: ['title'],
}
].concat([
{
title: '查看',
action: `${resourceKey}:list`,
}, },
{ ].concat(
title: '编辑', [
action: `${resourceKey}:update`, {
}, title: '查看',
{ action: `${resourceKey}:list`,
title: '新增', },
action: `${resourceKey}:create`, {
}, title: '编辑',
].map(({title, action}) => { action: `${resourceKey}:update`,
let checked = value.filter(({ actions = [] }) => actions.indexOf(action) !== -1).length === data.length; },
return { {
title: <><Checkbox checked={checked} onChange={(e) => { title: '新增',
const values = data.map(field => { action: `${resourceKey}:create`,
const items = actions[field.id] || []; },
const index = items.indexOf(action); ].map(({ title, action }) => {
if (index > -1) { let checked =
if (!e.target.checked) { value.filter(({ actions = [] }) => actions.indexOf(action) !== -1)
items.splice(index, 1); .length === data.length;
} return {
} else { title: (
if (e.target.checked) { <>
items.push(action); <Checkbox
} checked={checked}
} onChange={e => {
return { const values = data.map(field => {
field_id: field.id, const items = actions[field.id] || [];
actions: items, const index = items.indexOf(action);
} if (index > -1) {
}); if (!e.target.checked) {
// console.log(values); items.splice(index, 1);
setFields([...values]); }
onChange([...values]); } else {
}}/> {title}</>, if (e.target.checked) {
dataIndex: ['id'], items.push(action);
render: (val, record) => { }
const items = actions[record.id]||[] }
// console.log({items}, items.indexOf(action)); return {
return ( field_id: field.id,
<Checkbox checked={items.indexOf(action) !== -1} onChange={e => { actions: items,
const values = [...value]; };
const index = findIndex(values, ({field_id, actions = []}) => { });
return field_id === record.id; // console.log(values);
}); setFields([...values]);
if (e.target.checked && index === -1) { onChange([...values]);
values.push({ }}
field_id: record.id, />{' '}
actions: [action], {title}
}); </>
} else { ),
const items = values[index].actions || []; dataIndex: ['id'],
const actionIndex = items.indexOf(action); render: (val, record) => {
if (!e.target.checked && actionIndex > -1) { const items = actions[record.id] || [];
items.splice(actionIndex, 1); // console.log({items}, items.indexOf(action));
// values[index].actions = items; return (
} else if (e.target.checked && actionIndex === -1) { <Checkbox
items.push(action); checked={items.indexOf(action) !== -1}
} onChange={e => {
} const values = [...value];
onChange(values); const index = findIndex(
setFields(values); values,
}}/> ({ field_id, actions = [] }) => {
) return field_id === record.id;
} },
} );
}) as any) if (e.target.checked && index === -1) {
values.push({
field_id: record.id,
actions: [action],
});
} else {
const items = values[index].actions || [];
const actionIndex = items.indexOf(action);
if (!e.target.checked && actionIndex > -1) {
items.splice(actionIndex, 1);
// values[index].actions = items;
} else if (e.target.checked && actionIndex === -1) {
items.push(action);
}
}
onChange(values);
setFields(values);
}}
/>
);
},
};
}) as any,
);
return <Table size={'small'} loading={loading} pagination={false} dataSource={data} columns={columns}/> return (
}) <Table
size={'small'}
loading={loading}
pagination={false}
dataSource={data}
columns={columns}
/>
);
});
Permissions.Tabs = connect<'TextArea'>({ Permissions.Tabs = connect<'TextArea'>({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent getComponent: mapTextComponent,
})(({onChange, value = [], resourceKey, ...restProps}) => { })(({ onChange, value = [], resourceKey, ...restProps }) => {
const { data = [], loading = true, mutate } = useRequest(
const { data = [], loading = true, mutate } = useRequest(() => { () => {
return api.resource('collections.tabs').list({ return api.resource('collections.tabs').list({
associatedKey: resourceKey, associatedKey: resourceKey,
perPage: -1, perPage: -1,
}); });
}, { },
refreshDeps: [resourceKey] {
}); refreshDeps: [resourceKey],
},
);
// const [checked, setChecked] = useState(false); // const [checked, setChecked] = useState(false);
@ -259,36 +324,53 @@ Permissions.Tabs = connect<'TextArea'>({
// data, // data,
// ]); // ]);
return <Table size={'small'} pagination={false} dataSource={data} columns={[ return (
{ <Table
title: '标签页', size={'small'}
dataIndex: ['title'], pagination={false}
}, dataSource={data}
{ columns={[
title: ( {
<> title: '标签页',
<Checkbox checked={data.length === value.length} onChange={(e) => { dataIndex: ['title'],
onChange(e.target.checked ? data.map(record => record.id) : []); },
}}/> {
</> title: (
), <>
dataIndex: ['id'], <Checkbox
render: (val, record) => { checked={data.length === value.length}
const values = [...value]; onChange={e => {
return ( onChange(
<Checkbox checked={values.indexOf(record.id) !== -1} onChange={(e) => { e.target.checked ? data.map(record => record.id) : [],
const index = values.indexOf(record.id); );
if (index !== -1) { }}
if (!e.target.checked) { />{' '}
values.splice(index, 1);
} </>
} else { ),
values.push(record.id); dataIndex: ['id'],
} render: (val, record) => {
onChange(values); const values = [...value];
}}/> return (
) <Checkbox
} checked={values.indexOf(record.id) !== -1}
}, onChange={e => {
]} loading={loading}/> const index = values.indexOf(record.id);
if (index !== -1) {
if (!e.target.checked) {
values.splice(index, 1);
}
} else {
values.push(record.id);
}
onChange(values);
}}
/>
);
},
},
]}
loading={loading}
/>
);
}); });

View File

@ -1,19 +1,19 @@
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import { Radio as AntdRadio } from 'antd' import { Radio as AntdRadio } from 'antd';
import { import {
transformDataSourceKey, transformDataSourceKey,
mapStyledProps, mapStyledProps,
mapTextComponent mapTextComponent,
} from '../shared' } from '../shared';
export const Radio = connect<'Group'>({ export const Radio = connect<'Group'>({
valueName: 'checked', valueName: 'checked',
getProps: mapStyledProps getProps: mapStyledProps,
})(AntdRadio) })(AntdRadio);
Radio.Group = connect({ Radio.Group = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent getComponent: mapTextComponent,
})(transformDataSourceKey(AntdRadio.Group, 'options')) })(transformDataSourceKey(AntdRadio.Group, 'options'));
export default Radio export default Radio;

View File

@ -1 +1 @@
import 'antd/lib/radio/style/index' import 'antd/lib/radio/style/index';

View File

@ -1,47 +1,47 @@
import React from 'react' import React from 'react';
import { Slider } from 'antd' import { Slider } from 'antd';
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import { mapStyledProps } from '../shared' import { mapStyledProps } from '../shared';
export interface ISliderMarks { export interface ISliderMarks {
[key: number]: [key: number]:
| React.ReactNode | React.ReactNode
| { | {
style: React.CSSProperties style: React.CSSProperties;
label: React.ReactNode label: React.ReactNode;
} };
} }
export declare type SliderValue = number | [number, number] export declare type SliderValue = number | [number, number];
// TODO 并不是方法,最好能引用组件的 typescript 接口定义 // TODO 并不是方法,最好能引用组件的 typescript 接口定义
export interface ISliderProps { export interface ISliderProps {
min?: number min?: number;
max?: number max?: number;
marks?: ISliderMarks marks?: ISliderMarks;
value?: SliderValue value?: SliderValue;
defaultValue?: SliderValue defaultValue?: SliderValue;
onChange?: (value: SliderValue) => void onChange?: (value: SliderValue) => void;
} }
export const Range = connect({ export const Range = connect({
defaultProps: { defaultProps: {
style: { style: {
width: 320 width: 320,
} },
}, },
getProps: mapStyledProps getProps: mapStyledProps,
})( })(
class Component extends React.Component<ISliderProps> { class Component extends React.Component<ISliderProps> {
public render() { public render() {
const { onChange, value, min, max, marks, ...rest } = this.props const { onChange, value, min, max, marks, ...rest } = this.props;
let newMarks = {} let newMarks = {};
if (Array.isArray(marks)) { if (Array.isArray(marks)) {
marks.forEach(mark => { marks.forEach(mark => {
newMarks[mark] = mark newMarks[mark] = mark;
}) });
} else { } else {
newMarks = marks newMarks = marks;
} }
return ( return (
<Slider <Slider
@ -52,9 +52,9 @@ export const Range = connect({
max={max} max={max}
marks={newMarks} marks={newMarks}
/> />
) );
} }
} },
) );
export default Range export default Range;

View File

@ -1 +1 @@
import 'antd/lib/slider/style/index' import 'antd/lib/slider/style/index';

View File

@ -1,9 +1,9 @@
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import { Rate } from 'antd' import { Rate } from 'antd';
import { mapStyledProps } from '../shared' import { mapStyledProps } from '../shared';
export const Rating = connect({ export const Rating = connect({
getProps: mapStyledProps getProps: mapStyledProps,
})(Rate) })(Rate);
export default Rating export default Rating;

View File

@ -1 +1 @@
import 'antd/lib/rate/style/index' import 'antd/lib/rate/style/index';

View File

@ -1,31 +1,31 @@
import { registerFormFields } from '@formily/antd' import { registerFormFields } from '@formily/antd';
import { TimePicker } from './time-picker' import { TimePicker } from './time-picker';
import { Transfer } from './transfer' import { Transfer } from './transfer';
import { Switch } from './switch' import { Switch } from './switch';
import { ArrayCards } from './array-cards' import { ArrayCards } from './array-cards';
import { ArrayTable } from './array-table' import { ArrayTable } from './array-table';
import { Checkbox } from './checkbox' import { Checkbox } from './checkbox';
import { DatePicker } from './date-picker' import { DatePicker } from './date-picker';
import { Input } from './input' import { Input } from './input';
import { NumberPicker, Percent } from './number-picker' import { NumberPicker, Percent } from './number-picker';
import { Password } from './password' import { Password } from './password';
import { Radio } from './radio' import { Radio } from './radio';
import { Range } from './range' import { Range } from './range';
import { Rating } from './rating' import { Rating } from './rating';
import { Upload } from './upload' import { Upload } from './upload';
import { Filter } from './filter' import { Filter } from './filter';
import { RemoteSelect } from './remote-select' import { RemoteSelect } from './remote-select';
import { DrawerSelect } from './drawer-select' import { DrawerSelect } from './drawer-select';
import { SubTable } from './sub-table' import { SubTable } from './sub-table';
import { Cascader } from './cascader' import { Cascader } from './cascader';
import { Icon } from './icons' import { Icon } from './icons';
import { ColorSelect } from './color-select' import { ColorSelect } from './color-select';
import { Permissions } from './permissions' import { Permissions } from './permissions';
import { DraggableTable } from './draggable-table' import { DraggableTable } from './draggable-table';
import { Values } from './values' import { Values } from './values';
import { Automations } from './automations' import { Automations } from './automations';
import { Wysiwyg } from './wysiwyg' import { Wysiwyg } from './wysiwyg';
import { Markdown } from './markdown' import { Markdown } from './markdown';
export const setup = () => { export const setup = () => {
registerFormFields({ registerFormFields({
@ -72,4 +72,4 @@ export const setup = () => {
'automations.endmode': Automations.EndMode, 'automations.endmode': Automations.EndMode,
'automations.cron': Automations.Cron, 'automations.cron': Automations.Cron,
}); });
} };

View File

@ -1,22 +1,35 @@
import React, { useEffect } from 'react' import React, { useEffect } from 'react';
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import moment from 'moment' import moment from 'moment';
import { Select } from 'antd' import { Select } from 'antd';
import { import {
mapStyledProps, mapStyledProps,
mapTextComponent, mapTextComponent,
compose, compose,
isStr, isStr,
isArr isArr,
} from '../shared' } from '../shared';
import { useRequest } from 'umi'; import { useRequest } from 'umi';
import api from '@/api-client'; import api from '@/api-client';
import { Spin } from '@nocobase/client' import { Spin } from '@nocobase/client';
import get from 'lodash/get'; import get from 'lodash/get';
function RemoteSelectComponent(props) { function RemoteSelectComponent(props) {
let { schema = {}, value, onChange, disabled, resourceName, associatedKey, filter, labelField, valueField, objectValue, placeholder, multiple } = props; let {
console.log({schema}); schema = {},
value,
onChange,
disabled,
resourceName,
associatedKey,
filter,
labelField,
valueField,
objectValue,
placeholder,
multiple,
} = props;
console.log({ schema });
if (!resourceName) { if (!resourceName) {
resourceName = get(schema, 'component.resourceName'); resourceName = get(schema, 'component.resourceName');
} }
@ -32,29 +45,32 @@ function RemoteSelectComponent(props) {
if (!valueField) { if (!valueField) {
valueField = 'id'; valueField = 'id';
} }
const { data = [], loading = true } = useRequest(() => { const { data = [], loading = true } = useRequest(
return api.resource(resourceName).list({ () => {
associatedKey, return api.resource(resourceName).list({
filter, associatedKey,
}); filter,
}, { });
refreshDeps: [resourceName, associatedKey] },
}); {
refreshDeps: [resourceName, associatedKey],
},
);
const selectProps: any = {}; const selectProps: any = {};
if (multiple) { if (multiple) {
selectProps.mode = 'multiple' selectProps.mode = 'multiple';
} }
console.log({ data, props, associatedKey }) console.log({ data, props, associatedKey });
return ( return (
<> <>
<Select <Select
{...selectProps} {...selectProps}
placeholder={placeholder} placeholder={placeholder}
disabled={disabled} disabled={disabled}
notFoundContent={loading ? <Spin/> : undefined} notFoundContent={loading ? <Spin /> : undefined}
allowClear allowClear
loading={loading} loading={loading}
value={value && typeof value === 'object' ? value[valueField] : value} value={value && typeof value === 'object' ? value[valueField] : value}
onChange={(value, option) => { onChange={(value, option) => {
if (value === null || typeof value === 'undefined') { if (value === null || typeof value === 'undefined') {
onChange(undefined); onChange(undefined);
@ -65,7 +81,12 @@ function RemoteSelectComponent(props) {
onChange(objectValue ? item : value); onChange(objectValue ? item : value);
}} }}
> >
{!loading && data.map(item => (<Select.Option item={item} value={item[valueField]}>{item[labelField]}</Select.Option>))} {!loading &&
data.map(item => (
<Select.Option item={item} value={item[valueField]}>
{item[labelField]}
</Select.Option>
))}
</Select> </Select>
</> </>
); );
@ -74,6 +95,6 @@ function RemoteSelectComponent(props) {
export const RemoteSelect = connect({ export const RemoteSelect = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent, getComponent: mapTextComponent,
})(RemoteSelectComponent) })(RemoteSelectComponent);
export default RemoteSelect export default RemoteSelect;

View File

@ -1,13 +1,13 @@
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import { import {
Select as AntdSelect, Select as AntdSelect,
mapStyledProps, mapStyledProps,
mapTextComponent mapTextComponent,
} from '../shared' } from '../shared';
export const Select = connect({ export const Select = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent, getComponent: mapTextComponent,
})(AntdSelect) })(AntdSelect);
export default Select export default Select;

View File

@ -1 +1 @@
import 'antd/lib/select/style/index' import 'antd/lib/select/style/index';

View File

@ -1,47 +1,47 @@
import React from 'react' import React from 'react';
import { mapTextComponent, mapStyledProps, normalizeCol } from '@formily/antd' import { mapTextComponent, mapStyledProps, normalizeCol } from '@formily/antd';
import { Select as AntSelect } from 'antd' import { Select as AntSelect } from 'antd';
import { SelectProps as AntSelectProps } from 'antd/lib/select' import { SelectProps as AntSelectProps } from 'antd/lib/select';
import styled from 'styled-components' import styled from 'styled-components';
import { isArr, FormPath } from '@formily/shared' import { isArr, FormPath } from '@formily/shared';
export * from '@formily/shared' export * from '@formily/shared';
export const compose = (...args: any[]) => { export const compose = (...args: any[]) => {
return (payload: any, ...extra: any[]) => { return (payload: any, ...extra: any[]) => {
return args.reduce((buf, fn) => { return args.reduce((buf, fn) => {
return buf !== undefined ? fn(buf, ...extra) : fn(payload, ...extra) return buf !== undefined ? fn(buf, ...extra) : fn(payload, ...extra);
}, payload) }, payload);
} };
} };
interface SelectOption { interface SelectOption {
label: React.ReactText label: React.ReactText;
value: any value: any;
[key: string]: any [key: string]: any;
} }
type SelectProps = AntSelectProps & { type SelectProps = AntSelectProps & {
dataSource?: SelectOption[] dataSource?: SelectOption[];
} };
const createEnum = (enums: any) => { const createEnum = (enums: any) => {
if (isArr(enums)) { if (isArr(enums)) {
return enums.map(item => { return enums.map(item => {
if (typeof item === 'object') { if (typeof item === 'object') {
return { return {
...item ...item,
} };
} else { } else {
return { return {
label: item, label: item,
value: item value: item,
} };
} }
}) });
} }
return [] return [];
} };
export const Select: React.FC<SelectProps> = styled((props: SelectProps) => { export const Select: React.FC<SelectProps> = styled((props: SelectProps) => {
const { dataSource = [], onChange, value, ...others } = props; const { dataSource = [], onChange, value, ...others } = props;
@ -50,7 +50,7 @@ export const Select: React.FC<SelectProps> = styled((props: SelectProps) => {
if (children.length) { if (children.length) {
return ( return (
<AntSelect.OptGroup key={key} label={label}> <AntSelect.OptGroup key={key} label={label}>
{children.map(({value, label, ...others}: any) => ( {children.map(({ value, label, ...others }: any) => (
<AntSelect.Option <AntSelect.Option
key={value} key={value}
{...others} {...others}
@ -72,8 +72,8 @@ export const Select: React.FC<SelectProps> = styled((props: SelectProps) => {
> >
{label} {label}
</AntSelect.Option> </AntSelect.Option>
) );
}) });
return ( return (
<AntSelect <AntSelect
className={props.className} className={props.className}
@ -85,59 +85,59 @@ export const Select: React.FC<SelectProps> = styled((props: SelectProps) => {
isArr(options) isArr(options)
? options.map(item => ({ ? options.map(item => ({
...item, ...item,
props: undefined props: undefined,
})) }))
: { : {
...options, ...options,
props: undefined //干掉循环引用 props: undefined, //干掉循环引用
} },
) );
}} }}
> >
{children} {children}
</AntSelect> </AntSelect>
) );
})` })`
min-width: 100px; min-width: 100px;
width: 100%; width: 100%;
` `;
export const acceptEnum = (component: React.JSXElementConstructor<any>) => { export const acceptEnum = (component: React.JSXElementConstructor<any>) => {
return ({ dataSource, ...others }) => { return ({ dataSource, ...others }) => {
if (dataSource) { if (dataSource) {
return React.createElement(Select, { dataSource, ...others }) return React.createElement(Select, { dataSource, ...others });
} else { } else {
return React.createElement(component, others) return React.createElement(component, others);
} }
} };
} };
export const transformDataSourceKey = (component, dataSourceKey) => { export const transformDataSourceKey = (component, dataSourceKey) => {
return ({ dataSource, ...others }) => { return ({ dataSource, ...others }) => {
return React.createElement(component, { return React.createElement(component, {
[dataSourceKey]: dataSource, [dataSourceKey]: dataSource,
...others ...others,
}) });
} };
} };
export const createMatchUpdate = (name: string, path: string) => ( export const createMatchUpdate = (name: string, path: string) => (
targetName: string, targetName: string,
targetPath: string, targetPath: string,
callback: () => void callback: () => void,
) => { ) => {
if (targetName || targetPath) { if (targetName || targetPath) {
if (targetName) { if (targetName) {
if (FormPath.parse(targetName).matchAliasGroup(name, path)) { if (FormPath.parse(targetName).matchAliasGroup(name, path)) {
callback() callback();
} }
} else if (targetPath) { } else if (targetPath) {
if (FormPath.parse(targetPath).matchAliasGroup(name, path)) { if (FormPath.parse(targetPath).matchAliasGroup(name, path)) {
callback() callback();
} }
} }
} else { } else {
callback() callback();
} }
} };
export { mapTextComponent, mapStyledProps, normalizeCol } export { mapTextComponent, mapStyledProps, normalizeCol };

View File

@ -1,4 +1,10 @@
import React, { useState, useEffect, useImperativeHandle, forwardRef, useRef } from 'react'; import React, {
useState,
useEffect,
useImperativeHandle,
forwardRef,
useRef,
} from 'react';
import { Button, Drawer } from 'antd'; import { Button, Drawer } from 'antd';
import { Tooltip, Input, Space, Modal } from 'antd'; import { Tooltip, Input, Space, Modal } from 'antd';
import isEqual from 'lodash/isEqual'; import isEqual from 'lodash/isEqual';
@ -27,13 +33,12 @@ const actions = createFormActions();
export default forwardRef((props: any, ref) => { export default forwardRef((props: any, ref) => {
console.log(props); console.log(props);
const { const { target, onFinish } = props;
target, const { data: schema = {}, loading } = useRequest(() =>
onFinish, api.resource(target).getView({
} = props; resourceKey: 'form',
const { data: schema = {}, loading } = useRequest(() => api.resource(target).getView({ }),
resourceKey: 'form' );
}));
const [state, setState] = useState<any>({}); const [state, setState] = useState<any>({});
const [form, setForm] = useState<any>({}); const [form, setForm] = useState<any>({});
const [changed, setChanged] = useState(false); const [changed, setChanged] = useState(false);
@ -47,10 +52,10 @@ export default forwardRef((props: any, ref) => {
setTitle, setTitle,
setIndex, setIndex,
})); }));
console.log({onFinish}); console.log({ onFinish });
const { fields = {} } = schema; const { fields = {} } = schema;
if (loading) { if (loading) {
return <Spin/>; return <Spin />;
} }
return ( return (
<Drawer <Drawer
@ -66,7 +71,7 @@ export default forwardRef((props: any, ref) => {
onOk() { onOk() {
setChanged(false); setChanged(false);
setVisible(false); setVisible(false);
} },
}); });
} else { } else {
setChanged(false); setChanged(false);
@ -74,35 +79,44 @@ export default forwardRef((props: any, ref) => {
} }
}} }}
title={title} title={title}
footer={( footer={
<div <div
style={{ style={{
textAlign: 'right', textAlign: 'right',
}} }}
> >
<Space> <Space>
<Button onClick={() => { <Button
setVisible(false); onClick={() => {
setChanged(false); setVisible(false);
}}></Button> setChanged(false);
<Button type={'primary'} onClick={async () => { }}
await form.submit(); >
// const { values = {} } = await actions.submit();
// setVisible(false); </Button>
// onFinish && onFinish(values, index); <Button
}}></Button> type={'primary'}
onClick={async () => {
await form.submit();
// const { values = {} } = await actions.submit();
// setVisible(false);
// onFinish && onFinish(values, index);
}}
>
</Button>
</Space> </Space>
</div> </div>
)} }
> >
<SchemaForm <SchemaForm
colon={true} colon={true}
layout={'vertical'} layout={'vertical'}
initialValues={data} initialValues={data}
onChange={(values) => { onChange={values => {
setChanged(true); setChanged(true);
}} }}
onSubmit={async (values) => { onSubmit={async values => {
setVisible(false); setVisible(false);
setChanged(false); setChanged(false);
onFinish && onFinish(values, index); onFinish && onFinish(values, index);
@ -118,29 +132,29 @@ export default forwardRef((props: any, ref) => {
selector={[ selector={[
LifeCycleTypes.ON_FORM_MOUNT, LifeCycleTypes.ON_FORM_MOUNT,
LifeCycleTypes.ON_FORM_SUBMIT_START, LifeCycleTypes.ON_FORM_SUBMIT_START,
LifeCycleTypes.ON_FORM_SUBMIT_END LifeCycleTypes.ON_FORM_SUBMIT_END,
]} ]}
reducer={(state, action) => { reducer={(state, action) => {
switch (action.type) { switch (action.type) {
case LifeCycleTypes.ON_FORM_SUBMIT_START: case LifeCycleTypes.ON_FORM_SUBMIT_START:
return { return {
...state, ...state,
submitting: true submitting: true,
} };
case LifeCycleTypes.ON_FORM_SUBMIT_END: case LifeCycleTypes.ON_FORM_SUBMIT_END:
return { return {
...state, ...state,
submitting: false submitting: false,
} };
default: default:
return state return state;
} }
}} }}
> >
{({ state, form }) => { {({ state, form }) => {
setState(state) setState(state);
setForm(form); setForm(form);
return <div/> return <div />;
}} }}
</FormSpy> </FormSpy>
</SchemaForm> </SchemaForm>

View File

@ -21,17 +21,21 @@ export interface SimpleTableProps {
} }
export function generateIndex(): string { export function generateIndex(): string {
return `${Math.random().toString(36).replace('0.', '').slice(-4).padStart(4, '0')}`; return `${Math.random()
.toString(36)
.replace('0.', '')
.slice(-4)
.padStart(4, '0')}`;
} }
export default function Table(props: SimpleTableProps) { export default function Table(props: SimpleTableProps) {
const { schema = {}, associatedKey, value, onChange, __index } = props; const { schema = {}, associatedKey, value, onChange, __index } = props;
const { collection_name, name } = schema; const { collection_name, name } = schema;
const viewName = `${collection_name}.${name}.${schema.viewName||'table'}`; const viewName = `${collection_name}.${name}.${schema.viewName || 'table'}`;
console.log({props, associatedKey, schema, __index, viewName, schema}) console.log({ props, associatedKey, schema, __index, viewName, schema });
return ( return (
<> <>
<View <View
// __parent={__parent} // __parent={__parent}
data={value} data={value}
onChange={onChange} onChange={onChange}
@ -40,5 +44,5 @@ export default function Table(props: SimpleTableProps) {
type={'subTable'} type={'subTable'}
/> />
</> </>
) );
} }

View File

@ -1,20 +1,20 @@
import React, { useRef } from 'react' import React, { useRef } from 'react';
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import moment from 'moment' import moment from 'moment';
import { Select, Button, Table as AntdTable } from 'antd' import { Select, Button, Table as AntdTable } from 'antd';
import { import {
mapStyledProps, mapStyledProps,
mapTextComponent, mapTextComponent,
compose, compose,
isStr, isStr,
isArr isArr,
} from '../shared' } from '../shared';
import ViewFactory from '@/components/views'; import ViewFactory from '@/components/views';
import Table from './Table'; import Table from './Table';
export const SubTable = connect({ export const SubTable = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
getComponent: mapTextComponent, getComponent: mapTextComponent,
})(Table) })(Table);
export default SubTable export default SubTable;

View File

@ -1,10 +1,10 @@
import { Switch as AntdSwitch } from 'antd' import { Switch as AntdSwitch } from 'antd';
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import { acceptEnum, mapStyledProps } from '../shared' import { acceptEnum, mapStyledProps } from '../shared';
export const Switch = connect({ export const Switch = connect({
valueName: 'checked', valueName: 'checked',
getProps: mapStyledProps getProps: mapStyledProps,
})(acceptEnum(AntdSwitch)) })(acceptEnum(AntdSwitch));
export default Switch; export default Switch;

View File

@ -1 +1 @@
import 'antd/lib/switch/style/index' import 'antd/lib/switch/style/index';

View File

@ -1,9 +1,9 @@
import React from 'react' import React from 'react';
import { Button } from 'antd' import { Button } from 'antd';
import { ButtonProps } from 'antd/lib/button' import { ButtonProps } from 'antd/lib/button';
export const TextButton: React.FC<ButtonProps> = props => ( export const TextButton: React.FC<ButtonProps> = props => (
<Button type="link" {...props} /> <Button type="link" {...props} />
) );
export default TextButton export default TextButton;

View File

@ -1 +1 @@
import 'antd/lib/button/style/index' import 'antd/lib/button/style/index';

View File

@ -1,50 +1,48 @@
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import moment from 'moment' import moment from 'moment';
import { TimePicker as AntdTimePicker } from 'antd' import { TimePicker as AntdTimePicker } from 'antd';
import { import {
mapStyledProps, mapStyledProps,
mapTextComponent, mapTextComponent,
compose, compose,
isStr, isStr,
isArr, isArr,
} from '../shared' } from '../shared';
const transformMoment = (value) => { const transformMoment = value => {
if (value === '') return undefined if (value === '') return undefined;
return value return value;
} };
const mapMomentValue = (props: any, fieldProps: any) => { const mapMomentValue = (props: any, fieldProps: any) => {
const { value } = props const { value } = props;
if (!fieldProps.editable) return props if (!fieldProps.editable) return props;
try { try {
if (isStr(value) && value) { if (isStr(value) && value) {
props.value = moment(value, 'HH:mm:ss') props.value = moment(value, 'HH:mm:ss');
} else if (isArr(value) && value.length) { } else if (isArr(value) && value.length) {
props.value = value.map( props.value = value.map(item => (item && moment(item, 'HH:mm:ss')) || '');
(item) => (item && moment(item, 'HH:mm:ss')) || ''
)
} }
} catch (e) { } catch (e) {
throw new Error(e) throw new Error(e);
} }
return props return props;
} };
export const TimePicker = connect<'RangePicker'>({ export const TimePicker = connect<'RangePicker'>({
getValueFromEvent(_, value) { getValueFromEvent(_, value) {
return transformMoment(value) return transformMoment(value);
}, },
getProps: compose(mapStyledProps, mapMomentValue), getProps: compose(mapStyledProps, mapMomentValue),
getComponent: mapTextComponent, getComponent: mapTextComponent,
})(AntdTimePicker) })(AntdTimePicker);
TimePicker.RangePicker = connect({ TimePicker.RangePicker = connect({
getValueFromEvent(_, [startDate, endDate]) { getValueFromEvent(_, [startDate, endDate]) {
return [transformMoment(startDate), transformMoment(endDate)] return [transformMoment(startDate), transformMoment(endDate)];
}, },
getProps: compose(mapStyledProps, mapMomentValue), getProps: compose(mapStyledProps, mapMomentValue),
getComponent: mapTextComponent, getComponent: mapTextComponent,
})(AntdTimePicker.RangePicker) })(AntdTimePicker.RangePicker);
export default TimePicker export default TimePicker;

View File

@ -1 +1 @@
import 'antd/lib/time-picker/style/index' import 'antd/lib/time-picker/style/index';

View File

@ -1,10 +1,10 @@
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import { Transfer as AntdTransfer } from 'antd' import { Transfer as AntdTransfer } from 'antd';
import { mapStyledProps } from '../shared' import { mapStyledProps } from '../shared';
export const Transfer = connect({ export const Transfer = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
valueName: 'targetKeys' valueName: 'targetKeys',
})(AntdTransfer) })(AntdTransfer);
export default Transfer export default Transfer;

View File

@ -1 +1 @@
import 'antd/lib/transfer/style/index' import 'antd/lib/transfer/style/index';

View File

@ -1,20 +1,20 @@
import { ButtonProps } from 'antd/lib/button' import { ButtonProps } from 'antd/lib/button';
import { FormProps, FormItemProps as ItemProps } from 'antd/lib/form' import { FormProps, FormItemProps as ItemProps } from 'antd/lib/form';
import { import {
StepsProps as StepProps, StepsProps as StepProps,
StepProps as StepItemProps StepProps as StepItemProps,
} from 'antd/lib/steps' } from 'antd/lib/steps';
import { TabsProps } from 'antd/lib/tabs' import { TabsProps } from 'antd/lib/tabs';
import { import {
ISchemaFormProps, ISchemaFormProps,
IMarkupSchemaFieldProps, IMarkupSchemaFieldProps,
ISchemaFieldComponentProps, ISchemaFieldComponentProps,
FormPathPattern FormPathPattern,
} from '@formily/react-schema-renderer' } from '@formily/react-schema-renderer';
import { PreviewTextConfigProps } from '@formily/react-shared-components' import { PreviewTextConfigProps } from '@formily/react-shared-components';
import { StyledComponent } from 'styled-components' import { StyledComponent } from 'styled-components';
type ColSpanType = number | string type ColSpanType = number | string;
export type IAntdSchemaFormProps = Omit< export type IAntdSchemaFormProps = Omit<
FormProps, FormProps,
@ -22,18 +22,18 @@ export type IAntdSchemaFormProps = Omit<
> & > &
IFormItemTopProps & IFormItemTopProps &
PreviewTextConfigProps & PreviewTextConfigProps &
ISchemaFormProps ISchemaFormProps;
export type IAntdSchemaFieldProps = IMarkupSchemaFieldProps export type IAntdSchemaFieldProps = IMarkupSchemaFieldProps;
export interface ISubmitProps extends ButtonProps { export interface ISubmitProps extends ButtonProps {
onSubmit?: ISchemaFormProps['onSubmit'] onSubmit?: ISchemaFormProps['onSubmit'];
showLoading?: boolean showLoading?: boolean;
} }
export interface IResetProps extends ButtonProps { export interface IResetProps extends ButtonProps {
forceClear?: boolean forceClear?: boolean;
validate?: boolean validate?: boolean;
} }
export type IFormItemTopProps = React.PropsWithChildren< export type IFormItemTopProps = React.PropsWithChildren<
@ -41,63 +41,63 @@ export type IFormItemTopProps = React.PropsWithChildren<
Pick<ItemProps, 'prefixCls' | 'labelCol' | 'wrapperCol' | 'labelAlign'>, Pick<ItemProps, 'prefixCls' | 'labelCol' | 'wrapperCol' | 'labelAlign'>,
'labelCol' | 'wrapperCol' 'labelCol' | 'wrapperCol'
> & { > & {
inline?: boolean inline?: boolean;
className?: string className?: string;
style?: React.CSSProperties style?: React.CSSProperties;
labelCol?: number | { span: number; offset?: number } labelCol?: number | { span: number; offset?: number };
wrapperCol?: number | { span: number; offset?: number } wrapperCol?: number | { span: number; offset?: number };
} }
> >;
export type ISchemaFieldAdaptorProps = Omit< export type ISchemaFieldAdaptorProps = Omit<
ItemProps, ItemProps,
'labelCol' | 'wrapperCol' 'labelCol' | 'wrapperCol'
> & > &
Partial<ISchemaFieldComponentProps> & { Partial<ISchemaFieldComponentProps> & {
labelCol?: number | { span: number; offset?: number } labelCol?: number | { span: number; offset?: number };
wrapperCol?: number | { span: number; offset?: number } wrapperCol?: number | { span: number; offset?: number };
} };
export type StyledCP<P extends {}> = StyledComponent< export type StyledCP<P extends {}> = StyledComponent<
(props: React.PropsWithChildren<P>) => React.ReactElement, (props: React.PropsWithChildren<P>) => React.ReactElement,
any, any,
{}, {},
never never
> >;
export type StyledCC<Props, Statics = {}> = StyledCP<Props> & Statics export type StyledCC<Props, Statics = {}> = StyledCP<Props> & Statics;
export interface IFormButtonGroupProps { export interface IFormButtonGroupProps {
sticky?: boolean sticky?: boolean;
style?: React.CSSProperties style?: React.CSSProperties;
itemStyle?: React.CSSProperties itemStyle?: React.CSSProperties;
className?: string className?: string;
align?: 'left' | 'right' | 'start' | 'end' | 'top' | 'bottom' | 'center' align?: 'left' | 'right' | 'start' | 'end' | 'top' | 'bottom' | 'center';
triggerDistance?: number triggerDistance?: number;
zIndex?: number zIndex?: number;
span?: ColSpanType span?: ColSpanType;
offset?: ColSpanType offset?: ColSpanType;
} }
export interface IItemProps { export interface IItemProps {
title?: React.ReactText title?: React.ReactText;
description?: React.ReactText description?: React.ReactText;
} }
export interface IFormItemGridProps extends IItemProps { export interface IFormItemGridProps extends IItemProps {
cols?: Array<number | { span: number; offset: number }> cols?: Array<number | { span: number; offset: number }>;
gutter?: number gutter?: number;
} }
export interface IFormTextBox extends IItemProps { export interface IFormTextBox extends IItemProps {
text?: string text?: string;
gutter?: number gutter?: number;
} }
export interface IFormStep extends StepProps { export interface IFormStep extends StepProps {
dataSource: Array<StepItemProps & { name: FormPathPattern }> dataSource: Array<StepItemProps & { name: FormPathPattern }>;
} }
export interface IFormTab extends TabsProps { export interface IFormTab extends TabsProps {
hiddenKeys?: string[] hiddenKeys?: string[];
} }

View File

@ -1,14 +1,14 @@
import React, { useState } from 'react' import React, { useState } from 'react';
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import { Button, Upload as AntdUpload, Popconfirm } from 'antd' import { Button, Upload as AntdUpload, Popconfirm } from 'antd';
import { toArr, isArr, isEqual, mapStyledProps } from '../shared' import { toArr, isArr, isEqual, mapStyledProps } from '../shared';
import { import {
LoadingOutlined, LoadingOutlined,
PlusOutlined, PlusOutlined,
UploadOutlined, UploadOutlined,
InboxOutlined InboxOutlined,
} from '@ant-design/icons' } from '@ant-design/icons';
const { Dragger: UploadDragger } = AntdUpload const { Dragger: UploadDragger } = AntdUpload;
import get from 'lodash/get'; import get from 'lodash/get';
import findIndex from 'lodash/findIndex'; import findIndex from 'lodash/findIndex';
import Lightbox from 'react-image-lightbox'; import Lightbox from 'react-image-lightbox';
@ -16,77 +16,77 @@ import Lightbox from 'react-image-lightbox';
const exts = [ const exts = [
{ {
ext: /\.docx?$/i, ext: /\.docx?$/i,
icon: '//img.alicdn.com/tfs/TB1n8jfr1uSBuNjy1XcXXcYjFXa-200-200.png' icon: '//img.alicdn.com/tfs/TB1n8jfr1uSBuNjy1XcXXcYjFXa-200-200.png',
}, },
{ {
ext: /\.pptx?$/i, ext: /\.pptx?$/i,
icon: '//img.alicdn.com/tfs/TB1ItgWr_tYBeNjy1XdXXXXyVXa-200-200.png' icon: '//img.alicdn.com/tfs/TB1ItgWr_tYBeNjy1XdXXXXyVXa-200-200.png',
}, },
{ {
ext: /\.jpe?g$/i, ext: /\.jpe?g$/i,
icon: '//img.alicdn.com/tfs/TB1wrT5r9BYBeNjy0FeXXbnmFXa-200-200.png' icon: '//img.alicdn.com/tfs/TB1wrT5r9BYBeNjy0FeXXbnmFXa-200-200.png',
}, },
{ {
ext: /\.pdf$/i, ext: /\.pdf$/i,
icon: '//img.alicdn.com/tfs/TB1GwD8r9BYBeNjy0FeXXbnmFXa-200-200.png' icon: '//img.alicdn.com/tfs/TB1GwD8r9BYBeNjy0FeXXbnmFXa-200-200.png',
}, },
{ {
ext: /\.png$/i, ext: /\.png$/i,
icon: '//img.alicdn.com/tfs/TB1BHT5r9BYBeNjy0FeXXbnmFXa-200-200.png' icon: '//img.alicdn.com/tfs/TB1BHT5r9BYBeNjy0FeXXbnmFXa-200-200.png',
}, },
{ {
ext: /\.eps$/i, ext: /\.eps$/i,
icon: '//img.alicdn.com/tfs/TB1G_iGrVOWBuNjy0FiXXXFxVXa-200-200.png' icon: '//img.alicdn.com/tfs/TB1G_iGrVOWBuNjy0FiXXXFxVXa-200-200.png',
}, },
{ {
ext: /\.ai$/i, ext: /\.ai$/i,
icon: '//img.alicdn.com/tfs/TB1B2cVr_tYBeNjy1XdXXXXyVXa-200-200.png' icon: '//img.alicdn.com/tfs/TB1B2cVr_tYBeNjy1XdXXXXyVXa-200-200.png',
}, },
{ {
ext: /\.gif$/i, ext: /\.gif$/i,
icon: '//img.alicdn.com/tfs/TB1DTiGrVOWBuNjy0FiXXXFxVXa-200-200.png' icon: '//img.alicdn.com/tfs/TB1DTiGrVOWBuNjy0FiXXXFxVXa-200-200.png',
}, },
{ {
ext: /\.svg$/i, ext: /\.svg$/i,
icon: '//img.alicdn.com/tfs/TB1uUm9rY9YBuNjy0FgXXcxcXXa-200-200.png' icon: '//img.alicdn.com/tfs/TB1uUm9rY9YBuNjy0FgXXcxcXXa-200-200.png',
}, },
{ {
ext: /\.xlsx?$/i, ext: /\.xlsx?$/i,
icon: '//img.alicdn.com/tfs/TB1any1r1OSBuNjy0FdXXbDnVXa-200-200.png' icon: '//img.alicdn.com/tfs/TB1any1r1OSBuNjy0FdXXbDnVXa-200-200.png',
}, },
{ {
ext: /\.psd?$/i, ext: /\.psd?$/i,
icon: '//img.alicdn.com/tfs/TB1_nu1r1OSBuNjy0FdXXbDnVXa-200-200.png' icon: '//img.alicdn.com/tfs/TB1_nu1r1OSBuNjy0FdXXbDnVXa-200-200.png',
}, },
{ {
ext: /\.(wav|aif|aiff|au|mp1|mp2|mp3|ra|rm|ram|mid|rmi)$/i, ext: /\.(wav|aif|aiff|au|mp1|mp2|mp3|ra|rm|ram|mid|rmi)$/i,
icon: '//img.alicdn.com/tfs/TB1jPvwr49YBuNjy0FfXXXIsVXa-200-200.png' icon: '//img.alicdn.com/tfs/TB1jPvwr49YBuNjy0FfXXXIsVXa-200-200.png',
}, },
{ {
ext: /\.(avi|wmv|mpg|mpeg|vob|dat|3gp|mp4|mkv|rm|rmvb|mov|flv)$/i, ext: /\.(avi|wmv|mpg|mpeg|vob|dat|3gp|mp4|mkv|rm|rmvb|mov|flv)$/i,
icon: '//img.alicdn.com/tfs/TB1FrT5r9BYBeNjy0FeXXbnmFXa-200-200.png' icon: '//img.alicdn.com/tfs/TB1FrT5r9BYBeNjy0FeXXbnmFXa-200-200.png',
}, },
{ {
ext: /\.(zip|rar|arj|z|gz|iso|jar|ace|tar|uue|dmg|pkg|lzh|cab)$/i, ext: /\.(zip|rar|arj|z|gz|iso|jar|ace|tar|uue|dmg|pkg|lzh|cab)$/i,
icon: '//img.alicdn.com/tfs/TB10jmfr29TBuNjy0FcXXbeiFXa-200-200.png' icon: '//img.alicdn.com/tfs/TB10jmfr29TBuNjy0FcXXbeiFXa-200-200.png',
}, },
{ {
ext: /\.[^.]+$/i, ext: /\.[^.]+$/i,
icon: '//img.alicdn.com/tfs/TB10.R4r3mTBuNjy1XbXXaMrVXa-200-200.png' icon: '//img.alicdn.com/tfs/TB10.R4r3mTBuNjy1XbXXaMrVXa-200-200.png',
} },
] ];
const testOpts = (ext, options) => { const testOpts = (ext, options) => {
if (options && isArr(options.include)) { if (options && isArr(options.include)) {
return options.include.some(url => ext.test(url)) return options.include.some(url => ext.test(url));
} }
if (options && isArr(options.exclude)) { if (options && isArr(options.exclude)) {
return !options.exclude.some(url => ext.test(url)) return !options.exclude.some(url => ext.test(url));
} }
return true return true;
} };
export const testUrl = (url, options) => { export const testUrl = (url, options) => {
for (let i = 0; i < exts.length; i++) { for (let i = 0; i < exts.length; i++) {
@ -96,24 +96,24 @@ export const testUrl = (url, options) => {
} }
return true; return true;
} };
export const getImageByUrl = (url, options) => { export const getImageByUrl = (url, options) => {
for (let i = 0; i < exts.length; i++) { for (let i = 0; i < exts.length; i++) {
if (exts[i].ext.test(url) && testOpts(exts[i].ext, options)) { if (exts[i].ext.test(url) && testOpts(exts[i].ext, options)) {
return exts[i].icon || url return exts[i].icon || url;
} }
} }
return url return url;
} };
function toFileObject(item) { function toFileObject(item) {
console.log(item); console.log(item);
if (typeof item === 'number') { if (typeof item === 'number') {
return { return {
id: item, id: item,
} };
} }
if (item.id && item.uid && item.url) { if (item.id && item.uid && item.url) {
return item; return item;
@ -145,7 +145,7 @@ function toValue(item) {
if (typeof item === 'number') { if (typeof item === 'number') {
return { return {
id: item, id: item,
} };
} }
if (item.id && item.uid && item.url) { if (item.id && item.uid && item.url) {
return item; return item;
@ -176,14 +176,18 @@ function toValues(fileList) {
export function getImgUrls(value) { export function getImgUrls(value) {
const values = Array.isArray(value) ? value : [value]; const values = Array.isArray(value) ? value : [value];
return values.filter(item => testUrl(item.url, { return values
exclude: ['.png', '.jpg', '.jpeg', '.gif'] .filter(item =>
})).map(item => toValue(item)); testUrl(item.url, {
exclude: ['.png', '.jpg', '.jpeg', '.gif'],
}),
)
.map(item => toValue(item));
} }
export const Upload = connect({ export const Upload = connect({
getProps: mapStyledProps getProps: mapStyledProps,
})((props) => { })(props => {
const { multiple = true, value, onChange } = props; const { multiple = true, value, onChange } = props;
const [visible, setVisible] = useState(false); const [visible, setVisible] = useState(false);
const [imgIndex, setImgIndex] = useState(0); const [imgIndex, setImgIndex] = useState(0);
@ -193,13 +197,13 @@ export const Upload = connect({
action: `${process.env.API}/attachments:upload`, action: `${process.env.API}/attachments:upload`,
onChange({ fileList }) { onChange({ fileList }) {
console.log(fileList); console.log(fileList);
setFileList((fileList)); setFileList(fileList);
const list = toValues(fileList); const list = toValues(fileList);
onChange(multiple ? list : (list.shift()||null)); onChange(multiple ? list : list.shift() || null);
}, },
}; };
const images = getImgUrls(fileList); const images = getImgUrls(fileList);
console.log({fileList}); console.log({ fileList });
return ( return (
<div> <div>
<AntdUpload <AntdUpload
@ -207,14 +211,14 @@ export const Upload = connect({
{...uploadProps} {...uploadProps}
fileList={fileList} fileList={fileList}
multiple={true} multiple={true}
onPreview={(file) => { onPreview={file => {
const value = toValue(file)||{}; const value = toValue(file) || {};
const index = findIndex(images, image => image.id === value.id); const index = findIndex(images, image => image.id === value.id);
if (index >= 0) { if (index >= 0) {
setImgIndex(index); setImgIndex(index);
setVisible(true); setVisible(true);
} else { } else {
window.open(value.url) window.open(value.url);
// window.location.href = value.url; // window.location.href = value.url;
} }
}} }}
@ -228,7 +232,7 @@ export const Upload = connect({
// ); // );
// }} // }}
// onRemove={(file) => { // onRemove={(file) => {
// }} // }}
> >
{(multiple || fileList.length < 1) && ( {(multiple || fileList.length < 1) && (
@ -237,20 +241,22 @@ export const Upload = connect({
</> </>
)} )}
</AntdUpload> </AntdUpload>
{visible && <Lightbox {visible && (
mainSrc={get(images, [imgIndex, 'url'])} <Lightbox
nextSrc={get(images, [imgIndex + 1, 'url'])} mainSrc={get(images, [imgIndex, 'url'])}
prevSrc={get(images, [imgIndex - 1, 'url'])} nextSrc={get(images, [imgIndex + 1, 'url'])}
onCloseRequest={() => setVisible(false)} prevSrc={get(images, [imgIndex - 1, 'url'])}
onMovePrevRequest={() => { onCloseRequest={() => setVisible(false)}
setImgIndex((imgIndex + images.length - 1) % images.length); onMovePrevRequest={() => {
}} setImgIndex((imgIndex + images.length - 1) % images.length);
onMoveNextRequest={() => { }}
setImgIndex((imgIndex + 1) % images.length); onMoveNextRequest={() => {
}} setImgIndex((imgIndex + 1) % images.length);
/>} }}
/>
)}
</div> </div>
) );
}); });
export default Upload; export default Upload;

View File

@ -1 +1 @@
import 'antd/lib/upload/style/index' import 'antd/lib/upload/style/index';

View File

@ -1,9 +1,19 @@
import React, { useCallback, useEffect, useState } from 'react'; import React, { useCallback, useEffect, useState } from 'react';
import { Button, Select, Input, Space, Form, InputNumber, DatePicker, TimePicker, Radio } from 'antd'; import {
Button,
Select,
Input,
Space,
Form,
InputNumber,
DatePicker,
TimePicker,
Radio,
} from 'antd';
import { PlusCircleOutlined, CloseCircleOutlined } from '@ant-design/icons'; import { PlusCircleOutlined, CloseCircleOutlined } from '@ant-design/icons';
import useDynamicList from './useDynamicList'; import useDynamicList from './useDynamicList';
import { connect } from '@formily/react-schema-renderer' import { connect } from '@formily/react-schema-renderer';
import { mapStyledProps } from '../shared' import { mapStyledProps } from '../shared';
import get from 'lodash/get'; import get from 'lodash/get';
import moment from 'moment'; import moment from 'moment';
import './style.less'; import './style.less';
@ -11,8 +21,17 @@ import api from '@/api-client';
import { useRequest } from 'umi'; import { useRequest } from 'umi';
export function FilterGroup(props: any) { export function FilterGroup(props: any) {
const { fields = [], sourceFields = [], onDelete, onChange, onAdd, dataSource = [] } = props; const {
const { list, getKey, push, remove, replace } = useDynamicList<any>(dataSource); fields = [],
sourceFields = [],
onDelete,
onChange,
onAdd,
dataSource = [],
} = props;
const { list, getKey, push, remove, replace } = useDynamicList<any>(
dataSource,
);
let style: any = { let style: any = {
position: 'relative', position: 'relative',
}; };
@ -23,40 +42,46 @@ export function FilterGroup(props: any) {
// console.log(item); // console.log(item);
// const Component = item.type === 'group' ? FilterGroup : FilterItem; // const Component = item.type === 'group' ? FilterGroup : FilterItem;
return ( return (
<div style={{marginBottom: 8}}> <div style={{ marginBottom: 8 }}>
{<FilterItem {
fields={fields} <FilterItem
sourceFields={sourceFields} fields={fields}
dataSource={item} sourceFields={sourceFields}
// showDeleteButton={list.length > 1} dataSource={item}
onChange={(value) => { // showDeleteButton={list.length > 1}
replace(index, value); onChange={value => {
const newList = [...list]; replace(index, value);
newList[index] = value; const newList = [...list];
onChange(newList); newList[index] = value;
// console.log(list, value, index); onChange(newList);
}} // console.log(list, value, index);
onDelete={() => { }}
remove(index); onDelete={() => {
const newList = [...list]; remove(index);
newList.splice(index, 1); const newList = [...list];
onChange(newList); newList.splice(index, 1);
// console.log(list, index); onChange(newList);
}} // console.log(list, index);
/>} }}
/>
}
</div> </div>
); );
})} })}
</div> </div>
<div> <div>
<Space> <Space>
<Button style={{padding: 0}} type={'link'} onClick={() => { <Button
const data = {}; style={{ padding: 0 }}
push(data); type={'link'}
const newList = [...list]; onClick={() => {
newList.push(data); const data = {};
onChange(newList); push(data);
}}> const newList = [...list];
newList.push(data);
onChange(newList);
}}
>
<PlusCircleOutlined /> <PlusCircleOutlined />
</Button> </Button>
</Space> </Space>
@ -79,72 +104,72 @@ interface FilterItemProps {
const OP_MAP = { const OP_MAP = {
string: [ string: [
{label: '包含', value: '$includes', selected: true}, { label: '包含', value: '$includes', selected: true },
{label: '不包含', value: '$notIncludes'}, { label: '不包含', value: '$notIncludes' },
{label: '等于', value: 'eq'}, { label: '等于', value: 'eq' },
{label: '不等于', value: 'ne'}, { label: '不等于', value: 'ne' },
{label: '非空', value: '$notNull'}, { label: '非空', value: '$notNull' },
{label: '为空', value: '$null'}, { label: '为空', value: '$null' },
], ],
number: [ number: [
{label: '等于', value: 'eq', selected: true}, { label: '等于', value: 'eq', selected: true },
{label: '不等于', value: 'ne'}, { label: '不等于', value: 'ne' },
{label: '大于', value: 'gt'}, { label: '大于', value: 'gt' },
{label: '大于等于', value: 'gte'}, { label: '大于等于', value: 'gte' },
{label: '小于', value: 'lt'}, { label: '小于', value: 'lt' },
{label: '小于等于', value: 'lte'}, { label: '小于等于', value: 'lte' },
// {label: '介于', value: 'between'}, // {label: '介于', value: 'between'},
{label: '非空', value: '$notNull'}, { label: '非空', value: '$notNull' },
{label: '为空', value: '$null'}, { label: '为空', value: '$null' },
], ],
file: [ file: [
{label: '存在', value: 'id.gt'}, { label: '存在', value: 'id.gt' },
{label: '不存在', value: 'id.$null'}, { label: '不存在', value: 'id.$null' },
], ],
boolean: [ boolean: [
{label: '是', value: '$isTruly', selected: true}, { label: '是', value: '$isTruly', selected: true },
{label: '否', value: '$isFalsy'}, { label: '否', value: '$isFalsy' },
], ],
select: [ select: [
{label: '等于', value: 'eq', selected: true}, { label: '等于', value: 'eq', selected: true },
{label: '不等于', value: 'ne'}, { label: '不等于', value: 'ne' },
{label: '包含', value: 'in'}, { label: '包含', value: 'in' },
{label: '不包含', value: 'notIn'}, { label: '不包含', value: 'notIn' },
{label: '非空', value: '$notNull'}, { label: '非空', value: '$notNull' },
{label: '为空', value: '$null'}, { label: '为空', value: '$null' },
], ],
multipleSelect: [ multipleSelect: [
{label: '等于', value: '$match', selected: true}, { label: '等于', value: '$match', selected: true },
{label: '不等于', value: '$notMatch'}, { label: '不等于', value: '$notMatch' },
{label: '包含', value: '$anyOf'}, { label: '包含', value: '$anyOf' },
{label: '不包含', value: '$noneOf'}, { label: '不包含', value: '$noneOf' },
{label: '非空', value: '$notNull'}, { label: '非空', value: '$notNull' },
{label: '为空', value: '$null'}, { label: '为空', value: '$null' },
], ],
datetime: [ datetime: [
{label: '等于', value: '$dateOn', selected: true}, { label: '等于', value: '$dateOn', selected: true },
{label: '不等于', value: '$dateNotOn'}, { label: '不等于', value: '$dateNotOn' },
{label: '早于', value: '$dateBefore'}, { label: '早于', value: '$dateBefore' },
{label: '晚于', value: '$dateAfter'}, { label: '晚于', value: '$dateAfter' },
{label: '不早于', value: '$dateNotBefore'}, { label: '不早于', value: '$dateNotBefore' },
{label: '不晚于', value: '$dateNotAfter'}, { label: '不晚于', value: '$dateNotAfter' },
// {label: '介于', value: 'between'}, // {label: '介于', value: 'between'},
{label: '非空', value: '$notNull'}, { label: '非空', value: '$notNull' },
{label: '为空', value: '$null'}, { label: '为空', value: '$null' },
// {label: '是今天', value: 'now'}, // {label: '是今天', value: 'now'},
// {label: '在今天之前', value: 'before_today'}, // {label: '在今天之前', value: 'before_today'},
// {label: '在今天之后', value: 'after_today'}, // {label: '在今天之后', value: 'after_today'},
], ],
time: [ time: [
{label: '等于', value: 'eq', selected: true}, { label: '等于', value: 'eq', selected: true },
{label: '不等于', value: 'neq'}, { label: '不等于', value: 'neq' },
{label: '大于', value: 'gt'}, { label: '大于', value: 'gt' },
{label: '大于等于', value: 'gte'}, { label: '大于等于', value: 'gte' },
{label: '小于', value: 'lt'}, { label: '小于', value: 'lt' },
{label: '小于等于', value: 'lte'}, { label: '小于等于', value: 'lte' },
// {label: '介于', value: 'between'}, // {label: '介于', value: 'between'},
{label: '非空', value: '$notNull'}, { label: '非空', value: '$notNull' },
{label: '为空', value: '$null'}, { label: '为空', value: '$null' },
// {label: '是今天', value: 'now'}, // {label: '是今天', value: 'now'},
// {label: '在今天之前', value: 'before_today'}, // {label: '在今天之前', value: 'before_today'},
// {label: '在今天之后', value: 'after_today'}, // {label: '在今天之后', value: 'after_today'},
@ -175,22 +200,26 @@ const op = {
attachment: OP_MAP.file, attachment: OP_MAP.file,
}; };
const StringInput = (props) => { const StringInput = props => {
const {value, onChange, ...restProps } = props; const { value, onChange, ...restProps } = props;
return ( return (
<Input {...restProps} defaultValue={value} onChange={(e) => { <Input
onChange(e.target.value); {...restProps}
}}/> defaultValue={value}
onChange={e => {
onChange(e.target.value);
}}
/>
); );
} };
const controls = { const controls = {
string: StringInput, string: StringInput,
textarea: StringInput, textarea: StringInput,
number: InputNumber, number: InputNumber,
percent: (props) => ( percent: props => (
<InputNumber <InputNumber
formatter={value => value ? `${value}%` : ''} formatter={value => (value ? `${value}%` : '')}
parser={value => value.replace('%', '')} parser={value => value.replace('%', '')}
{...props} {...props}
/> />
@ -213,9 +242,13 @@ function DateControl(props: any) {
// } // }
const m = moment(value, format); const m = moment(value, format);
return ( return (
<DatePicker format={format} value={m.isValid() ? m : null} onChange={(value) => { <DatePicker
onChange(value ? value.format('YYYY-MM-DD') : null) format={format}
}}/> value={m.isValid() ? m : null}
onChange={value => {
onChange(value ? value.format('YYYY-MM-DD') : null);
}}
/>
); );
// return ( // return (
// <DatePicker format={format} showTime={field.showTime} value={m.isValid() ? m : null} onChange={(value) => { // <DatePicker format={format} showTime={field.showTime} value={m.isValid() ? m : null} onChange={(value) => {
@ -228,13 +261,15 @@ function TimeControl(props: any) {
const { field, value, onChange, ...restProps } = props; const { field, value, onChange, ...restProps } = props;
let format = field.timeFormat; let format = field.timeFormat;
const m = moment(value, format); const m = moment(value, format);
return <TimePicker return (
value={m.isValid() ? m : null} <TimePicker
format={field.timeFormat} value={m.isValid() ? m : null}
onChange={(value) => { format={field.timeFormat}
onChange(value ? value.format('HH:mm:ss') : null) onChange={value => {
}} onChange(value ? value.format('HH:mm:ss') : null);
/> }}
/>
);
} }
function OptionControl(props) { function OptionControl(props) {
@ -244,19 +279,27 @@ function OptionControl(props) {
mode = undefined; mode = undefined;
} }
return ( return (
<Select style={{ minWidth: 120 }} mode={mode} value={value} onChange={(value) => { <Select
onChange(value); style={{ minWidth: 120 }}
}} options={options}> mode={mode}
</Select> value={value}
onChange={value => {
onChange(value);
}}
options={options}
></Select>
); );
} }
function BooleanControl(props) { function BooleanControl(props) {
const { value, onChange, ...restProps } = props; const { value, onChange, ...restProps } = props;
return ( return (
<Radio.Group value={value} onChange={(e) => { <Radio.Group
onChange(e.target.value); value={value}
}}> onChange={e => {
onChange(e.target.value);
}}
>
<Radio value={true}></Radio> <Radio value={true}></Radio>
<Radio value={false}></Radio> <Radio value={false}></Radio>
</Radio.Group> </Radio.Group>
@ -268,10 +311,17 @@ function NullControl(props) {
} }
export function FilterItem(props: FilterItemProps) { export function FilterItem(props: FilterItemProps) {
const { index, fields = [], sourceFields = [], showDeleteButton = true, onDelete, onChange } = props; const {
index,
fields = [],
sourceFields = [],
showDeleteButton = true,
onDelete,
onChange,
} = props;
const [type, setType] = useState('string'); const [type, setType] = useState('string');
const [field, setField] = useState<any>({}); const [field, setField] = useState<any>({});
const [dataSource, setDataSource] = useState(props.dataSource||{}); const [dataSource, setDataSource] = useState(props.dataSource || {});
useEffect(() => { useEffect(() => {
const field = fields.find(field => field.name === props.dataSource.column); const field = fields.find(field => field.name === props.dataSource.column);
if (field) { if (field) {
@ -282,59 +332,68 @@ export function FilterItem(props: FilterItemProps) {
} }
setType(componentType); setType(componentType);
} }
setDataSource({...props.dataSource}); setDataSource({ ...props.dataSource });
}, [ }, [props.dataSource, type]);
props.dataSource, type, let ValueControl = controls[type] || controls.string;
]);
let ValueControl = controls[type]||controls.string;
if (['truncate'].indexOf(dataSource.op) !== -1) { if (['truncate'].indexOf(dataSource.op) !== -1) {
ValueControl = NullControl; ValueControl = NullControl;
} else if (dataSource.op === 'ref') { } else if (dataSource.op === 'ref') {
ValueControl = () => { ValueControl = () => {
return ( return (
<Select value={dataSource.value} <Select
onChange={(value) => { value={dataSource.value}
onChange({...dataSource, value: value}); onChange={value => {
onChange({ ...dataSource, value: value });
}} }}
style={{ width: 120 }} style={{ width: 120 }}
placeholder={'选择字段'}> placeholder={'选择字段'}
>
{sourceFields.map(field => ( {sourceFields.map(field => (
<Select.Option value={field.name}>{field.title}</Select.Option> <Select.Option value={field.name}>{field.title}</Select.Option>
))} ))}
</Select> </Select>
) );
} };
} }
// let multiple = true; // let multiple = true;
// if () // if ()
// const opOptions = op[type]||op.string; // const opOptions = op[type]||op.string;
const opOptions = [ const opOptions = [
{label: '自定义填写', value: 'eq', selected: true}, { label: '自定义填写', value: 'eq', selected: true },
{label: '等于触发数据', value: 'ref'}, { label: '等于触发数据', value: 'ref' },
{label: '清空数据', value: 'truncate'}, { label: '清空数据', value: 'truncate' },
]; ];
console.log({field, dataSource, type, ValueControl}); console.log({ field, dataSource, type, ValueControl });
return ( return (
<Space> <Space>
<Select value={dataSource.column} <Select
onChange={(value) => { value={dataSource.column}
onChange={value => {
const field = fields.find(field => field.name === value); const field = fields.find(field => field.name === value);
let componentType = field.component.type; let componentType = field.component.type;
if (field.component.type === 'select' && field.multiple) { if (field.component.type === 'select' && field.multiple) {
componentType = 'multipleSelect'; componentType = 'multipleSelect';
} }
setType(componentType); setType(componentType);
onChange({...dataSource, column: value, op: get(opOptions, [0, 'value']), value: undefined}); onChange({
...dataSource,
column: value,
op: get(opOptions, [0, 'value']),
value: undefined,
});
}} }}
style={{ width: 120 }} style={{ width: 120 }}
placeholder={'选择字段'}> placeholder={'选择字段'}
>
{fields.map(field => ( {fields.map(field => (
<Select.Option value={field.name}>{field.title}</Select.Option> <Select.Option value={field.name}>{field.title}</Select.Option>
))} ))}
</Select> </Select>
<Select value={dataSource.column ? dataSource.op : null} style={{ minWidth: 130 }} <Select
onChange={(value) => { value={dataSource.column ? dataSource.op : null}
onChange({...dataSource, op: value, value: undefined}); style={{ minWidth: 130 }}
onChange={value => {
onChange({ ...dataSource, op: value, value: undefined });
}} }}
defaultValue={get(opOptions, [0, 'value'])} defaultValue={get(opOptions, [0, 'value'])}
options={opOptions} options={opOptions}
@ -343,21 +402,28 @@ export function FilterItem(props: FilterItemProps) {
<Select.Option value={option.value}>{option.label}</Select.Option> <Select.Option value={option.value}>{option.label}</Select.Option>
))} */} ))} */}
</Select> </Select>
<ValueControl <ValueControl
field={field} field={field}
multiple={type === 'checkboxes' || !!field.multiple} multiple={type === 'checkboxes' || !!field.multiple}
op={dataSource.op} op={dataSource.op}
options={field.dataSource} options={field.dataSource}
value={dataSource.value} value={dataSource.value}
onChange={(value) => { onChange={value => {
onChange({...dataSource, value: value}); onChange({ ...dataSource, value: value });
}} }}
style={{ width: 180 }} style={{ width: 180 }}
/> />
{showDeleteButton && ( {showDeleteButton && (
<Button className={'filter-remove-link filter-item'} type={'link'} style={{padding: 0}} onClick={(e) => { <Button
onDelete && onDelete(e); className={'filter-remove-link filter-item'}
}}><CloseCircleOutlined /></Button> type={'link'}
style={{ padding: 0 }}
onClick={e => {
onDelete && onDelete(e);
}}
>
<CloseCircleOutlined />
</Button>
)} )}
</Space> </Space>
); );
@ -365,35 +431,65 @@ export function FilterItem(props: FilterItemProps) {
export const Values = connect({ export const Values = connect({
getProps: mapStyledProps, getProps: mapStyledProps,
})((props) => { })(props => {
const {
const { value = [], onChange, associatedKey, sourceName, sourceFilter = {}, filter = {}, fields = [], ...restProps } = props; value = [],
onChange,
associatedKey,
sourceName,
sourceFilter = {},
filter = {},
fields = [],
...restProps
} = props;
const { data = [], loading = true } = useRequest(() => { const { data = [], loading = true } = useRequest(
return associatedKey ? api.resource(`collections.fields`).list({ () => {
associatedKey, return associatedKey
filter, ? api.resource(`collections.fields`).list({
}) : Promise.resolve({ associatedKey,
data: fields, filter,
}); })
}, { : Promise.resolve({
refreshDeps: [associatedKey] data: fields,
}); });
},
{
refreshDeps: [associatedKey],
},
);
const { data: sourceFields = [] } = useRequest(() => { const { data: sourceFields = [] } = useRequest(
return sourceName ? api.resource(`collections.fields`).list({ () => {
associatedKey: sourceName, return sourceName
filter: sourceFilter, ? api.resource(`collections.fields`).list({
}) : Promise.resolve({ associatedKey: sourceName,
data: [], filter: sourceFilter,
}); })
}, { : Promise.resolve({
refreshDeps: [sourceName] data: [],
}); });
},
{
refreshDeps: [sourceName],
},
);
return <FilterGroup dataSource={Array.isArray(value) ? value.filter(item => Object.keys(item).length) : []} onChange={(values) => { return (
onChange(values.filter(item => Object.keys(item).length)); <FilterGroup
}} {...restProps} fields={data} sourceFields={sourceFields}/> dataSource={
Array.isArray(value)
? value.filter(item => Object.keys(item).length)
: []
}
onChange={values => {
onChange(values.filter(item => Object.keys(item).length));
}}
{...restProps}
fields={data}
sourceFields={sourceFields}
/>
);
}); });
export default Values; export default Values;

Some files were not shown because too many files have changed in this diff Show More