diff --git a/.eslintrc b/.eslintrc index 4dec88fc3e..9c45a5d638 100644 --- a/.eslintrc +++ b/.eslintrc @@ -16,13 +16,6 @@ }, "parser": "@typescript-eslint/parser", "plugins": ["prettier", "@typescript-eslint", "import"], - "parserOptions": { - "ecmaFeatures": { - "jsx": true - }, - "project": "./tsconfig.json", - "sourceType": "module" - }, "settings": { "jest": { "version": 26 diff --git a/packages/s2-core/package.json b/packages/s2-core/package.json index d45daffda7..fac4e92fdd 100644 --- a/packages/s2-core/package.json +++ b/packages/s2-core/package.json @@ -122,6 +122,9 @@ "transform": { "\\.(less|css)$": "jest-less-loader", "\\.svg$": "jest-raw-loader" + }, + "moduleNameMapper": { + "^src/(.*)": "/src/$1" } } } diff --git a/packages/s2-core/src/components/sheets/base-sheet/index.tsx b/packages/s2-core/src/components/sheets/base-sheet/index.tsx index 831dd9d3d4..5d44539994 100644 --- a/packages/s2-core/src/components/sheets/base-sheet/index.tsx +++ b/packages/s2-core/src/components/sheets/base-sheet/index.tsx @@ -1,9 +1,9 @@ import React, { useEffect, useState } from 'react'; import { isEmpty, debounce, isFunction } from 'lodash'; import { Spin } from 'antd'; -import { DataCfg } from '@src/common/interface'; -import { DrillDown } from '@src/components/drill-down'; -import { Header } from '@src/components/header'; +import { DataCfg } from 'src/common/interface'; +import { DrillDown } from '../../drill-down'; +import { Header } from '../../header'; import { KEY_COLUMN_CELL_CLICK, KEY_CORNER_CELL_CLICK, @@ -13,18 +13,18 @@ import { HandleConfigWhenDrillDown, HandleOptions, HandleDrillDown, -} from '@src/index'; +} from 'src/index'; import { KEY_AFTER_HEADER_LAYOUT, KEY_COL_NODE_BORDER_REACHED, KEY_ROW_NODE_BORDER_REACHED, KEY_CELL_SCROLL, KEY_LIST_SORT, -} from '@src/common/constant'; -import BaseSpreadsheet from '@src/sheet-type/base-spread-sheet'; -import SpreadSheet from '@src/sheet-type/spread-sheet'; -import { safetyDataCfg, safetyOptions } from '@src/utils/safety-config'; -import { resetDrillDownCfg } from '@src/utils/drill-down/helper'; +} from 'src/common/constant'; +import BaseSpreadsheet from 'src/sheet-type/base-spread-sheet'; +import SpreadSheet from 'src/sheet-type/spread-sheet'; +import { safetyDataCfg, safetyOptions } from 'src/utils/safety-config'; +import { resetDrillDownCfg } from 'src/utils/drill-down/helper'; import { BaseSheetProps } from '../interface'; export const BaseSheet = (props: BaseSheetProps) => { diff --git a/packages/s2-core/src/components/sheets/interface.ts b/packages/s2-core/src/components/sheets/interface.ts index 460bb51900..e4f07585db 100644 --- a/packages/s2-core/src/components/sheets/interface.ts +++ b/packages/s2-core/src/components/sheets/interface.ts @@ -24,7 +24,7 @@ export interface PartDrillDown { drillItemsNum?: number; // Decide the drill down icon show in which levels according to the row header labels. customDisplayByRowName?: { - //The names of row header labes. + // The names of row header labes. // Using the ID_SEPARATOR('[&]') to join two labels when there are hierarchical relations between them. rowNames: string[]; // omit(default): the all levels included in rowNames would hide the drill down icon. diff --git a/packages/s2-core/tsconfig.json b/packages/s2-core/tsconfig.json index 54ffff7751..56822e9657 100644 --- a/packages/s2-core/tsconfig.json +++ b/packages/s2-core/tsconfig.json @@ -12,6 +12,10 @@ "esModuleInterop": true, "downlevelIteration": true, "resolveJsonModule": true, + "baseUrl": ".", + "paths": { + "src/*": ["./src/*"], + }, "lib": [ "esnext", "dom" diff --git a/packages/s2-core/webpack.config.js b/packages/s2-core/webpack.config.js index 2f3198986d..de71d7afaa 100644 --- a/packages/s2-core/webpack.config.js +++ b/packages/s2-core/webpack.config.js @@ -1,5 +1,6 @@ const webpack = require('webpack'); const resolve = require('path').resolve; +const path = require('path'); const BundleAnalyzerPlugin = require('webpack-bundle-analyzer') .BundleAnalyzerPlugin; @@ -16,6 +17,9 @@ module.exports = { path: resolve(__dirname, './dist'), }, resolve: { + alias: { + src: path.resolve(__dirname, './src'), + }, extensions: ['.tsx', '.ts', '.js', '.less'], }, module: {