From 551f8bad8d9ae425758f2322dc421614293bfda1 Mon Sep 17 00:00:00 2001 From: chenos Date: Thu, 7 Jan 2021 09:31:26 +0800 Subject: [PATCH] feat: improve view mode --- packages/app/src/api/index.ts | 18 ++++--- .../src/api/migrations/add-fields-to-views.ts | 14 +++++- .../src/components/views/Calendar/index.tsx | 16 ++++++- packages/app/src/components/views/Table.tsx | 47 +++++++++++++++---- packages/app/src/components/views/index.tsx | 2 +- .../src/collections/views.ts | 31 +++++++++--- packages/plugin-pages/src/actions/getView.ts | 17 +++---- 7 files changed, 110 insertions(+), 35 deletions(-) diff --git a/packages/app/src/api/index.ts b/packages/app/src/api/index.ts index d5517d6504..a746daf7c5 100644 --- a/packages/app/src/api/index.ts +++ b/packages/app/src/api/index.ts @@ -71,21 +71,21 @@ api.resourcer.use(async (ctx: actions.Context, next) => { } if (table && ['get', 'list'].includes(actionName)) { const except = fields.except || []; - const appends = fields.appends || []; + // const appends = fields.appends || []; for (const [name, field] of table.getFields()) { if (field.options.hidden) { except.push(field.options.name); } - if (field.options.appends) { - appends.push(field.options.name); - } + // if (field.options.appends) { + // appends.push(field.options.name); + // } } if (except.length) { ctx.action.setParam('fields.except', except); } - if (appends.length) { - ctx.action.setParam('fields.appends', appends); - } + // if (appends.length) { + // ctx.action.setParam('fields.appends', appends); + // } // console.log('ctx.action.params.fields', ctx.action.params.fields, except, appends); } await next(); @@ -120,6 +120,10 @@ api.registerPlugin('plugin-file-manager', [path.resolve(__dirname, '../../../plu (async () => { await api.loadPlugins(); + api.database.getModel('users').addHook('beforeUpdate', function (model) { + console.log('users.beforeUpdate', model.get(), model.changed('password' as any)); + }); + api.resourcer.use(async (ctx, next) => { if (process.env.NOCOBASE_ENV !== 'demo') { return next(); diff --git a/packages/app/src/api/migrations/add-fields-to-views.ts b/packages/app/src/api/migrations/add-fields-to-views.ts index e176a100c5..b81db838aa 100644 --- a/packages/app/src/api/migrations/add-fields-to-views.ts +++ b/packages/app/src/api/migrations/add-fields-to-views.ts @@ -7,7 +7,7 @@ import Database from '@nocobase/database'; await api.database.sync({ tables: ['views'], }); - const [Collection, Page, User] = database.getModels(['collections', 'pages', 'users']); + const [Collection, View, User] = database.getModels(['collections', 'views', 'users']); const table = database.getTable('views'); const collection = await Collection.findByName('views'); console.log(table.getOptions().fields); @@ -16,4 +16,16 @@ import Database from '@nocobase/database'; }, { migrate: false, }); + + const views = await View.findAll(); + for (const view of views) { + if (!view.get('mode')) { + if (view.get('template') === 'SimpleTable') { + view.set('mode', 'simple'); + } else { + view.set('mode', 'default'); + } + await view.save(); + } + } })(); diff --git a/packages/app/src/components/views/Calendar/index.tsx b/packages/app/src/components/views/Calendar/index.tsx index 43e0fbf52c..c93f8626bf 100644 --- a/packages/app/src/components/views/Calendar/index.tsx +++ b/packages/app/src/components/views/Calendar/index.tsx @@ -1,6 +1,7 @@ import React, { useEffect, useRef, useState } from 'react'; import { Table as AntdTable, Card, Pagination } from 'antd'; import { Actions } from '@/components/actions'; +import { redirectTo } from '@/components/pages/CollectionLoader/utils'; import ViewFactory from '@/components/views'; import { useRequest } from 'umi'; import api from '@/api-client'; @@ -56,7 +57,7 @@ export function Calendar(props: CalendarProps) { multiple = true, selectedRowKeys: srk, } = props; - const { rowKey = 'id', labelField, startDateField, endDateField, name: viewName, actionDefaultParams = {}, fields = [], rowViewName, actions = [], paginated = true, defaultPerPage = 10 } = schema; + const { rowKey = 'id', mode, defaultTabName, labelField, startDateField, endDateField, name: viewName, actionDefaultParams = {}, fields = [], rowViewName, actions = [], paginated = true, defaultPerPage = 10 } = schema; const { filter: defaultFilter = {} } = actionDefaultParams; const { sourceKey = 'id' } = activeTab.field||{}; const drawerRef = useRef(); @@ -210,6 +211,19 @@ export function Calendar(props: CalendarProps) { setFormMode('update'); drawerRef.current.setVisible(true); drawerRef.current.getData(event[rowKey]); + + if (mode === 'simple') { + drawerRef.current.setVisible(true); + drawerRef.current.getData(event[rowKey]); + } else { + redirectTo({ + ...props.match.params, + [activeTab ? 'newItem' : 'lastItem']: { + itemId: event[rowKey]||event.id, + tabName: defaultTabName, + }, + }); + } // drawerRef.current. }} onRangeChange={(range) => { diff --git a/packages/app/src/components/views/Table.tsx b/packages/app/src/components/views/Table.tsx index 87640fcc04..15390937a3 100644 --- a/packages/app/src/components/views/Table.tsx +++ b/packages/app/src/components/views/Table.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react'; +import React, { useEffect, useState, useRef } from 'react'; import { Table as AntdTable, Card, Pagination } from 'antd'; import { redirectTo } from '@/components/pages/CollectionLoader/utils'; import { Actions } from '@/components/actions'; @@ -6,6 +6,7 @@ import { request, useRequest } from 'umi'; import api from '@/api-client'; import { components, fields2columns } from './SortableTable'; import { LoadingOutlined } from '@ant-design/icons'; +import ViewFactory from '@/components/views'; export const icon = ; @@ -30,7 +31,18 @@ export function Table(props: TableProps) { multiple = true, selectedRowKeys: srk, } = props; - const { name: viewName, fields, actionDefaultParams = {}, defaultTabName, rowKey = 'id', actions = [], paginated = true, defaultPerPage = 10 } = schema; + const { + name: viewName, + mode = 'default', + rowViewName = 'form', + fields, + actionDefaultParams = {}, + defaultTabName, + rowKey = 'id', + actions = [], + paginated = true, + defaultPerPage = 10, + } = schema; // const { data, mutate } = useRequest(() => api.resource(name).list({ // associatedKey, // })); @@ -70,6 +82,7 @@ export function Table(props: TableProps) { defaultPageSize: defaultPerPage, }); const { sourceKey = 'id' } = activeTab.field||{}; + const drawerRef = useRef(); console.log(props); const [selectedRowKeys, setSelectedRowKeys] = useState(srk||[]); const onChange = (selectedRowKeys: React.ReactText[], selectedRows: React.ReactText[]) => { @@ -120,6 +133,17 @@ export function Table(props: TableProps) { } }} /> + {mode === 'simple' && ( + { + refresh(); + }} + /> + )} 快捷模式：点击数据直接打开编辑界面') }}", + tooltip: "常规模式：点击数据进入查看界面，再次点击进入编辑界面
快捷模式：点击数据直接打开编辑界面", type: 'radio', + default: 'default', + showInTable: true, + showInDetail: true, + showInForm: true, + }, + }, + { + interface: 'select', + type: 'string', + name: 'template', + title: '模板', + required: true, + developerMode: true, + dataSource: [ + { label: '表单', value: 'DrawerForm' }, + { label: '常规表格', value: 'Table' }, + { label: '简易表格', value: 'SimpleTable' }, + { label: '日历模板', value: 'Calendar' }, + ], + component: { + type: 'select', default: 'Table', showInTable: true, showInDetail: true, diff --git a/packages/plugin-pages/src/actions/getView.ts b/packages/plugin-pages/src/actions/getView.ts index 2e2c1e5934..db25c86127 100644 --- a/packages/plugin-pages/src/actions/getView.ts +++ b/packages/plugin-pages/src/actions/getView.ts @@ -230,15 +230,12 @@ export default async (ctx, next) => { if (actionNames.length === 0) { actionNames = ['filter', 'create', 'destroy']; } - - if (view.get('type') === 'table') { - const defaultTabs = await collection.getTabs({ - where: { - default: true, - }, - }); - view.setDataValue('defaultTabName', get(defaultTabs, [0, 'name'])); - } + const defaultTabs = await collection.getTabs({ + where: { + default: true, + }, + }); + view.setDataValue('defaultTabName', get(defaultTabs, [0, 'name'])); if (view.get('type') === 'table') { view.setDataValue('rowViewName', 'form'); } @@ -268,7 +265,7 @@ export default async (ctx, next) => { const appends = []; for (const field of fields) { - if (!['subTable', 'linkTo', 'attachment'].includes(field.get('interface'))) { + if (!['subTable', 'linkTo', 'attachment', 'createdBy', 'updatedBy'].includes(field.get('interface'))) { continue; } let showInKey;