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

fix: add sort field to the users table

Browse Source 
* [Fixed]
1、初始化数据表时，没有配置sort
2、增加sort接口类型

* [Fixed]
1、重新提交PR

* [Fixed]
1、重新提交PR

* [Fixed]
1、重新提交PR

* [Fixed]
1、重新提交PR

* [Fixed]
1、重新提交PR
This commit is contained in:
semmywong 2021-10-30 10:55:43 +08:00 committed by GitHub
parent d68196ab20
commit 14f492f414
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/client/src/schemas/calendar/index.tsx
View File

@ -374,7 +374,7 @@ export const fieldsToFilterColumns = (fields: any[], options: any = {}) => {
return; return;
} }
const fieldOption = interfaces.get(field.interface); const fieldOption = interfaces.get(field.interface);
if (!fieldOption.operations) { if (!fieldOption?.operations) {
return; return;
} }
properties[`column${index}`] = { properties[`column${index}`] = {
@ -493,7 +493,7 @@ Calendar.Filter.DesignableBar = () => {
{fields {fields
.filter((collectionField) => { .filter((collectionField) => {
const option = interfaces.get(collectionField.interface); const option = interfaces.get(collectionField.interface);
return option.operations?.length; return option?.operations?.length;
}) })
.map((collectionField) => ( .map((collectionField) => (
<SwitchMenuItem <SwitchMenuItem

6
packages/client/src/schemas/table/index.tsx
View File

@ -1409,7 +1409,7 @@ const fieldsToFilterColumns = (fields: any[], options: any = {}) => {
return; return;
} }
const fieldOption = interfaces.get(field.interface); const fieldOption = interfaces.get(field.interface);
if (!fieldOption.operations) { if (!fieldOption?.operations) {
return; return;
} }
properties[`column${index}`] = { properties[`column${index}`] = {
@ -1436,7 +1436,7 @@ const fieldsToSortColumns = (fields: any[]) => {
fields.forEach((field) => { fields.forEach((field) => {
const fieldOption = interfaces.get(field.interface); const fieldOption = interfaces.get(field.interface);
if (!fieldOption.sortable) { if (!fieldOption?.sortable) {
return; return;
} }
dataSource.push({ dataSource.push({
@ -1546,7 +1546,7 @@ Table.Filter.DesignableBar = () => {
{fields {fields
.filter((collectionField) => { .filter((collectionField) => {
const option = interfaces.get(collectionField.interface); const option = interfaces.get(collectionField.interface);
return option.operations?.length; return option?.operations?.length;
}) })
.map((collectionField) => ( .map((collectionField) => (
<SwitchMenuItem <SwitchMenuItem

6
packages/plugin-collections/src/server.ts
View File

@ -32,9 +32,11 @@ export default {
} }
const config = table.getOptions(); const config = table.getOptions();
const collection = await Collection.create(config); const collection = await Collection.create(config);
// 把当前系统排序字段，排除掉，不写入fields表
const fields = config.fields?.filter((field) => field.type !== 'sort');
await collection.updateAssociations({ await collection.updateAssociations({
generalFields: config.fields.filter((field) => field.state !== 0), generalFields: fields.filter((field) => field.state !== 0),
systemFields: config.fields.filter((field) => field.state === 0), systemFields: fields.filter((field) => field.state === 0),
}); });
// await collection.migrate(); // await collection.migrate();
} }

1
packages/plugin-users/src/collections/users.ts
View File

@ -3,6 +3,7 @@ import { TableOptions } from '@nocobase/database';
export default { export default {
name: 'users', name: 'users',
title: '用户', title: '用户',
sortable: 'sort',
// developerMode: true, // developerMode: true,
// internal: true, // internal: true,
createdBy: false, createdBy: false,