Skip to content

Commit

Permalink
refactor: icon 位置迁移
Browse files Browse the repository at this point in the history
  • Loading branch information
wjgogogo committed Nov 19, 2024
1 parent 5bb1ae0 commit 1f6e019
Show file tree
Hide file tree
Showing 17 changed files with 41 additions and 53 deletions.
4 changes: 2 additions & 2 deletions packages/s2-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"require": "./lib/index.js"
},
"./extends": {
"import": "./esm/extends.js",
"require": "./lib/extends.js"
"import": "./esm/extends/index.js",
"require": "./lib/extends/index.js"
},
"./*": "./*"
},
Expand Down
10 changes: 0 additions & 10 deletions packages/s2-core/src/shared/icons/dot-icon.svg

This file was deleted.

13 changes: 0 additions & 13 deletions packages/s2-core/src/shared/icons/sort-icon.svg

This file was deleted.

15 changes: 0 additions & 15 deletions packages/s2-core/src/shared/icons/switcher-icon.svg

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { ReactComponent as CalendarIcon } from '@antv/s2/esm/shared/icons/calendar-icon.svg';
import { ReactComponent as ColIcon } from '@antv/s2/esm/shared/icons/col-icon.svg';
import { ReactComponent as LocationIcon } from '@antv/s2/esm/shared/icons/location-icon.svg';
import { ReactComponent as RowIcon } from '@antv/s2/esm/shared/icons/row-icon.svg';
import { ReactComponent as TextIcon } from '@antv/s2/esm/shared/icons/text-icon.svg';
import { ReactComponent as ValueIcon } from '@antv/s2/esm/shared/icons/value-icon.svg';
import './index.less';
import { ReactComponent as CalendarIcon } from './svg/calendar-icon.svg';
import { ReactComponent as ColIcon } from './svg/col-icon.svg';
import { ReactComponent as LocationIcon } from './svg/location-icon.svg';
import { ReactComponent as RowIcon } from './svg/row-icon.svg';
import { ReactComponent as TextIcon } from './svg/text-icon.svg';
import { ReactComponent as ValueIcon } from './svg/value-icon.svg';

export { CalendarIcon, ColIcon, LocationIcon, RowIcon, TextIcon, ValueIcon };
4 changes: 2 additions & 2 deletions packages/s2-react-components/tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"include": ["src/**/*", "./typings.d.ts", "../../global.d.ts"],
"compilerOptions": {
"paths": {
"@antv/s2": ["s2-core/src/index.ts"],
"@antv/s2/*": ["s2-core/src/*"]
"@antv/s2": ["s2-react-components/node_modules/@antv/s2/esm/index.d.ts"],
"@antv/s2/*": ["s2-react-components/node_modules/@antv/s2/esm/*"]
}
}
}
4 changes: 2 additions & 2 deletions packages/s2-react/tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"include": ["src/**/*", "./typings.d.ts", "../../global.d.ts"],
"compilerOptions": {
"paths": {
"@antv/s2/*": ["s2-core/src/*"],
"@antv/s2": ["s2-core/src/index.ts"]
"@antv/s2": ["s2-react/node_modules/@antv/s2/esm/index.d.ts"],
"@antv/s2/*": ["s2-react/node_modules/@antv/s2/esm/*"]
}
}
}
6 changes: 3 additions & 3 deletions packages/s2-vue/src/components/drill-down/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import {
import { Button, Input, Empty, Menu, MenuItem } from 'ant-design-vue';
import type { SelectInfo } from 'ant-design-vue/lib/menu/src/interface';
import { isEmpty } from 'lodash';
import LocationIcon from '@antv/s2/esm/shared/icons/location-icon.svg?component';
import TextIcon from '@antv/s2/esm/shared/icons/text-icon.svg?component';
import CalendarIcon from '@antv/s2/esm/shared/icons/calendar-icon.svg?component';
import type { Key } from 'ant-design-vue/lib/_util/type';
import type { ChangeEvent } from 'ant-design-vue/lib/_util/EventInterface';
import LocationIcon from '../../svg/location-icon.svg?component';
import TextIcon from '../../svg/text-icon.svg?component';
import CalendarIcon from '../../svg/calendar-icon.svg?component';
import {
initDrillDownEmits,
initDrillDownProps,
Expand Down
File renamed without changes
13 changes: 13 additions & 0 deletions packages/s2-vue/src/svg/location-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions packages/s2-vue/src/svg/text-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1f6e019

Please sign in to comment.