From 131ec6fff3a7f4e38247f27f156dbf7365239f05 Mon Sep 17 00:00:00 2001 From: roymondchen Date: Fri, 25 Aug 2023 17:44:57 +0800 Subject: [PATCH] =?UTF-8?q?style(data-source):=20=E5=8E=BB=E6=8E=89any?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/data-source/package.json | 1 + packages/data-source/src/DataSourceManager.ts | 5 +++-- packages/data-source/src/createDataSourceManager.ts | 3 ++- packages/data-source/src/types.ts | 3 ++- pnpm-lock.yaml | 3 +++ 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/data-source/package.json b/packages/data-source/package.json index 65b697c1..7ef0d62e 100644 --- a/packages/data-source/package.json +++ b/packages/data-source/package.json @@ -38,6 +38,7 @@ "lodash-es": "^4.17.21" }, "devDependencies": { + "@tmagic/core": "1.3.0-alpha.21", "@types/events": "^3.0.0", "@types/lodash-es": "^4.17.4", "@types/node": "^15.12.4", diff --git a/packages/data-source/src/DataSourceManager.ts b/packages/data-source/src/DataSourceManager.ts index 73837f40..b413e968 100644 --- a/packages/data-source/src/DataSourceManager.ts +++ b/packages/data-source/src/DataSourceManager.ts @@ -20,6 +20,7 @@ import EventEmitter from 'events'; import { cloneDeep, template } from 'lodash-es'; +import type Core from '@tmagic/core'; import type { DataSourceSchema, Id, MNode } from '@tmagic/schema'; import { compiledCond, compiledNode } from '@tmagic/utils'; @@ -37,7 +38,7 @@ class DataSourceManager extends EventEmitter { return DataSourceManager.dataSourceClassMap.get(type); } - public app: any; + public app: Core; public dataSourceMap = new Map(); @@ -48,7 +49,7 @@ class DataSourceManager extends EventEmitter { this.app = app; - app.dsl?.dataSources?.forEach((config: any) => { + app.dsl?.dataSources?.forEach((config) => { this.addDataSource(config); }); } diff --git a/packages/data-source/src/createDataSourceManager.ts b/packages/data-source/src/createDataSourceManager.ts index b41a146a..c589374e 100644 --- a/packages/data-source/src/createDataSourceManager.ts +++ b/packages/data-source/src/createDataSourceManager.ts @@ -17,6 +17,7 @@ */ import { cloneDeep } from 'lodash-es'; +import type Core from '@tmagic/core'; import { getDepNodeIds, getNodes, replaceChildNode } from '@tmagic/utils'; import DataSourceManager from './DataSourceManager'; @@ -27,7 +28,7 @@ import DataSourceManager from './DataSourceManager'; * @param httpDataSourceOptions http 数据源配置 * @returns DataSourceManager */ -export const createDataSourceManager = (app: any) => { +export const createDataSourceManager = (app: Core) => { const { dsl, platform } = app; if (!dsl?.dataSources) return; diff --git a/packages/data-source/src/types.ts b/packages/data-source/src/types.ts index 89f28046..565ca834 100644 --- a/packages/data-source/src/types.ts +++ b/packages/data-source/src/types.ts @@ -1,3 +1,4 @@ +import type Core from '@tmagic/core'; import type { DataSourceSchema } from '@tmagic/schema'; export interface DataSourceOptions { @@ -31,7 +32,7 @@ export interface HttpDataSourceOptions { } export interface DataSourceManagerOptions { - app: any; + app: Core; } export interface DataSourceManagerData { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1d125ec4..c61148c2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -206,6 +206,9 @@ importers: specifier: ^4.17.21 version: 4.17.21 devDependencies: + '@tmagic/core': + specifier: 1.3.0-alpha.21 + version: link:../core '@types/events': specifier: ^3.0.0 version: 3.0.0