diff --git a/packages/core/server/src/application.ts b/packages/core/server/src/application.ts index b8b82b6984..97ba288666 100644 --- a/packages/core/server/src/application.ts +++ b/packages/core/server/src/application.ts @@ -58,6 +58,8 @@ import packageJson from '../package.json'; import { MainDataSource } from './main-data-source'; import validateFilterParams from './middlewares/validate-filter-params'; import path from 'path'; +import { parseVariables } from './middlewares'; +import { dataTemplate } from './middlewares/data-template'; export type PluginType = string | typeof Plugin; export type PluginConfiguration = PluginType | [PluginType, any]; @@ -1111,6 +1113,12 @@ export class Application exten this._dataSourceManager.use(this._authManager.middleware(), { tag: 'auth' }); this._dataSourceManager.use(validateFilterParams, { tag: 'validate-filter-params', before: ['auth'] }); + this._dataSourceManager.use(parseVariables, { + group: 'parseVariables', + after: 'acl', + }); + this._dataSourceManager.use(dataTemplate, { group: 'dataTemplate', after: 'acl' }); + this._locales = new Locale(createAppProxy(this)); if (options.perfHooks) { diff --git a/packages/core/server/src/main-data-source.ts b/packages/core/server/src/main-data-source.ts index 136a71fb34..77f7408a16 100644 --- a/packages/core/server/src/main-data-source.ts +++ b/packages/core/server/src/main-data-source.ts @@ -8,8 +8,6 @@ */ import { DataSourceOptions, SequelizeDataSource } from '@nocobase/data-source-manager'; -import { parseVariables } from './middlewares'; -import { dateTemplate } from './middlewares/data-template'; export class MainDataSource extends SequelizeDataSource { init(options: DataSourceOptions = {}) { @@ -30,12 +28,5 @@ export class MainDataSource extends SequelizeDataSource { if (options.useACL !== false) { this.resourceManager.use(this.acl.middleware(), { group: 'acl', after: 'auth' }); } - - this.resourceManager.use(parseVariables, { - group: 'parseVariables', - after: 'acl', - }); - - this.resourceManager.use(dateTemplate, { group: 'dateTemplate', after: 'acl' }); } } diff --git a/packages/core/server/src/middlewares/data-template.ts b/packages/core/server/src/middlewares/data-template.ts index f795a4613b..09a5d5c4aa 100644 --- a/packages/core/server/src/middlewares/data-template.ts +++ b/packages/core/server/src/middlewares/data-template.ts @@ -10,7 +10,7 @@ import { Context } from '@nocobase/actions'; import { Collection } from '@nocobase/database'; -export const dateTemplate = async (ctx: Context, next) => { +export const dataTemplate = async (ctx: Context, next) => { const { resourceName, actionName } = ctx.action; const { isTemplate, fields } = ctx.action.params;