From af1ea4c47982542edeb7f8a6599da6b28b02959a Mon Sep 17 00:00:00 2001 From: hustcc Date: Mon, 26 Apr 2021 10:47:25 +0800 Subject: [PATCH] chore: add visual dir --- __tests__/unit/{geometry => visual}/attribute/color-spec.ts | 2 +- __tests__/unit/{geometry => visual}/attribute/index-spec.ts | 2 +- .../unit/{geometry => visual}/attribute/position-spec.ts | 2 +- __tests__/unit/{geometry => visual}/attribute/shape-spec.ts | 2 +- __tests__/unit/{geometry => visual}/attribute/size-spec.ts | 2 +- src/util/attribute.ts | 2 +- src/{geometry => visual}/adjust/adjust.ts | 0 src/{geometry => visual}/adjust/index.ts | 0 src/{geometry => visual}/adjust/stack.ts | 0 src/{geometry => visual}/attribute/README.md | 0 src/{geometry => visual}/attribute/attribute.ts | 2 +- src/{geometry => visual}/attribute/color.ts | 0 src/{geometry => visual}/attribute/indentity.ts | 0 src/{geometry => visual}/attribute/index.ts | 0 src/{geometry => visual}/attribute/position.ts | 0 src/{geometry => visual}/attribute/shape.ts | 0 src/{geometry => visual}/attribute/size.ts | 0 src/visual/scale/index.ts | 4 ++++ typings.d.ts | 4 ---- 19 files changed, 11 insertions(+), 11 deletions(-) rename __tests__/unit/{geometry => visual}/attribute/color-spec.ts (73%) rename __tests__/unit/{geometry => visual}/attribute/index-spec.ts (88%) rename __tests__/unit/{geometry => visual}/attribute/position-spec.ts (73%) rename __tests__/unit/{geometry => visual}/attribute/shape-spec.ts (73%) rename __tests__/unit/{geometry => visual}/attribute/size-spec.ts (73%) rename src/{geometry => visual}/adjust/adjust.ts (100%) rename src/{geometry => visual}/adjust/index.ts (100%) rename src/{geometry => visual}/adjust/stack.ts (100%) rename src/{geometry => visual}/attribute/README.md (100%) rename src/{geometry => visual}/attribute/attribute.ts (98%) rename src/{geometry => visual}/attribute/color.ts (100%) rename src/{geometry => visual}/attribute/indentity.ts (100%) rename src/{geometry => visual}/attribute/index.ts (100%) rename src/{geometry => visual}/attribute/position.ts (100%) rename src/{geometry => visual}/attribute/shape.ts (100%) rename src/{geometry => visual}/attribute/size.ts (100%) create mode 100644 src/visual/scale/index.ts delete mode 100644 typings.d.ts diff --git a/__tests__/unit/geometry/attribute/color-spec.ts b/__tests__/unit/visual/attribute/color-spec.ts similarity index 73% rename from __tests__/unit/geometry/attribute/color-spec.ts rename to __tests__/unit/visual/attribute/color-spec.ts index 8d25b7c9e2..0b263e4a1e 100644 --- a/__tests__/unit/geometry/attribute/color-spec.ts +++ b/__tests__/unit/visual/attribute/color-spec.ts @@ -1,4 +1,4 @@ -import { Color } from '../../../../src/geometry/attribute'; +import { Color } from '../../../../src/visual/attribute'; describe('attribute color', () => { it('value', () => { diff --git a/__tests__/unit/geometry/attribute/index-spec.ts b/__tests__/unit/visual/attribute/index-spec.ts similarity index 88% rename from __tests__/unit/geometry/attribute/index-spec.ts rename to __tests__/unit/visual/attribute/index-spec.ts index a7c6d2362a..38dd45763a 100644 --- a/__tests__/unit/geometry/attribute/index-spec.ts +++ b/__tests__/unit/visual/attribute/index-spec.ts @@ -1,4 +1,4 @@ -import { Attribute, Color, Position, Shape, Size } from '../../../../src/geometry/attribute'; +import { Attribute, Color, Position, Shape, Size } from '../../../../src/visual/attribute'; // TODO 单测 100% describe('attribute', () => { diff --git a/__tests__/unit/geometry/attribute/position-spec.ts b/__tests__/unit/visual/attribute/position-spec.ts similarity index 73% rename from __tests__/unit/geometry/attribute/position-spec.ts rename to __tests__/unit/visual/attribute/position-spec.ts index 99c4d253e5..c60c020bc6 100644 --- a/__tests__/unit/geometry/attribute/position-spec.ts +++ b/__tests__/unit/visual/attribute/position-spec.ts @@ -1,4 +1,4 @@ -import { Position } from '../../../../src/geometry/attribute'; +import { Position } from '../../../../src/visual/attribute'; describe('attribute position', () => { it('value', () => { diff --git a/__tests__/unit/geometry/attribute/shape-spec.ts b/__tests__/unit/visual/attribute/shape-spec.ts similarity index 73% rename from __tests__/unit/geometry/attribute/shape-spec.ts rename to __tests__/unit/visual/attribute/shape-spec.ts index 87c0bd135f..bb6b79e612 100644 --- a/__tests__/unit/geometry/attribute/shape-spec.ts +++ b/__tests__/unit/visual/attribute/shape-spec.ts @@ -1,4 +1,4 @@ -import { Shape } from '../../../../src/geometry/attribute'; +import { Shape } from '../../../../src/visual/attribute'; describe('attribute shape', () => { it('value', () => { diff --git a/__tests__/unit/geometry/attribute/size-spec.ts b/__tests__/unit/visual/attribute/size-spec.ts similarity index 73% rename from __tests__/unit/geometry/attribute/size-spec.ts rename to __tests__/unit/visual/attribute/size-spec.ts index 722b052b8c..b2bb5205d8 100644 --- a/__tests__/unit/geometry/attribute/size-spec.ts +++ b/__tests__/unit/visual/attribute/size-spec.ts @@ -1,4 +1,4 @@ -import { Size } from '../../../../src/geometry/attribute'; +import { Size } from '../../../../src/visual/attribute'; describe('attribute color', () => { it('value', () => { diff --git a/src/util/attribute.ts b/src/util/attribute.ts index 4e81c12f2b..3f878c74f0 100644 --- a/src/util/attribute.ts +++ b/src/util/attribute.ts @@ -1,4 +1,4 @@ -import { Color, Indentity, Position, Shape, Size } from '../geometry/attribute'; +import { Color, Indentity, Position, Shape, Size } from '../visual/attribute'; /** * 创建一个 attribute 类型的实例 diff --git a/src/geometry/adjust/adjust.ts b/src/visual/adjust/adjust.ts similarity index 100% rename from src/geometry/adjust/adjust.ts rename to src/visual/adjust/adjust.ts diff --git a/src/geometry/adjust/index.ts b/src/visual/adjust/index.ts similarity index 100% rename from src/geometry/adjust/index.ts rename to src/visual/adjust/index.ts diff --git a/src/geometry/adjust/stack.ts b/src/visual/adjust/stack.ts similarity index 100% rename from src/geometry/adjust/stack.ts rename to src/visual/adjust/stack.ts diff --git a/src/geometry/attribute/README.md b/src/visual/attribute/README.md similarity index 100% rename from src/geometry/attribute/README.md rename to src/visual/attribute/README.md diff --git a/src/geometry/attribute/attribute.ts b/src/visual/attribute/attribute.ts similarity index 98% rename from src/geometry/attribute/attribute.ts rename to src/visual/attribute/attribute.ts index 3a2b2fa091..24c9b58725 100644 --- a/src/geometry/attribute/attribute.ts +++ b/src/visual/attribute/attribute.ts @@ -1,4 +1,4 @@ -import { isArray, isNil, isString } from '@antv/util'; +import { isNil } from '@antv/util'; export type CallbackFunc = (...args: any[]) => any[]; diff --git a/src/geometry/attribute/color.ts b/src/visual/attribute/color.ts similarity index 100% rename from src/geometry/attribute/color.ts rename to src/visual/attribute/color.ts diff --git a/src/geometry/attribute/indentity.ts b/src/visual/attribute/indentity.ts similarity index 100% rename from src/geometry/attribute/indentity.ts rename to src/visual/attribute/indentity.ts diff --git a/src/geometry/attribute/index.ts b/src/visual/attribute/index.ts similarity index 100% rename from src/geometry/attribute/index.ts rename to src/visual/attribute/index.ts diff --git a/src/geometry/attribute/position.ts b/src/visual/attribute/position.ts similarity index 100% rename from src/geometry/attribute/position.ts rename to src/visual/attribute/position.ts diff --git a/src/geometry/attribute/shape.ts b/src/visual/attribute/shape.ts similarity index 100% rename from src/geometry/attribute/shape.ts rename to src/visual/attribute/shape.ts diff --git a/src/geometry/attribute/size.ts b/src/visual/attribute/size.ts similarity index 100% rename from src/geometry/attribute/size.ts rename to src/visual/attribute/size.ts diff --git a/src/visual/scale/index.ts b/src/visual/scale/index.ts new file mode 100644 index 0000000000..6c33e9cf4a --- /dev/null +++ b/src/visual/scale/index.ts @@ -0,0 +1,4 @@ +/** + * 将 @antv/scale 进行针对于 G2 的二次包装,让使用更加容易方便! + */ +class Scale {} diff --git a/typings.d.ts b/typings.d.ts deleted file mode 100644 index 85d6b37e81..0000000000 --- a/typings.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -declare module "*.less" { - const styles: any; - export default styles; -}