Skip to content

fix: update axis theme of semi theme #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zamhown merged 1 commit into from
Apr 11, 2024
Merged

fix: update axis theme of semi theme #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
822 changes: 411 additions & 411 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions packages/vchart-arco-theme/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"test-watch": "DEBUG_MODE=1 jest --watch"
},
"peerDependencies": {
"@visactor/vchart": "~1.10.2"
"@visactor/vchart": "~1.10.4"
},
"dependencies": {
"@visactor/vchart-theme-utils": "workspace:1.10.2"
Expand Down Expand Up @@ -77,8 +77,8 @@
"react-router-dom": "^5.2.0",
"react-device-detect": "^2.2.2",
"redux": "^4.1.2",
"@visactor/vchart": "~1.10.2",
"@visactor/react-vchart": "~1.10.2",
"@visactor/vchart": "~1.10.4",
"@visactor/react-vchart": "~1.10.4",
"@arco-design/webpack-plugin": "^1.6.0",
"@arco-plugins/vite-plugin-svgr": "^0.7.2",
"@svgr/webpack": "^5.5.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/vchart-semi-theme/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"test-watch": "DEBUG_MODE=1 jest --watch"
},
"peerDependencies": {
"@visactor/vchart": "~1.10.2"
"@visactor/vchart": "~1.10.4"
},
"dependencies": {
"@visactor/vchart-theme-utils": "workspace:1.10.2"
Expand Down Expand Up @@ -63,8 +63,8 @@
"vite": "^4.5.0",
"vite-plugin-svgr": "^4.1.0",
"@babel/runtime": "latest",
"@visactor/vchart": "~1.10.2",
"@visactor/react-vchart": "~1.10.2",
"@visactor/vchart": "~1.10.4",
"@visactor/react-vchart": "~1.10.4",
"@douyinfe/semi-ui": "^2.51.3",
"@douyinfe/semi-icons": "latest",
"@douyinfe/semi-icons-lab": "latest"
Expand Down
9 changes: 9 additions & 0 deletions packages/vchart-semi-theme/src/common/series/funnel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import type { ISeriesTheme } from '@visactor/vchart';

export const funnel: ISeriesTheme['funnel'] = {
transform: {
style: {
fill: { type: 'palette', key: 'axisGridColor', a: 0.5 }
}
}
};
4 changes: 3 additions & 1 deletion packages/vchart-semi-theme/src/common/series/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import { line } from './line';
import { pie } from './pie';
import { area } from './area';
import { radar } from './radar';
import { funnel } from './funnel';

export const series: ISeriesTheme = {
bar,
line,
pie,
area,
radar
radar,
funnel
};
8 changes: 4 additions & 4 deletions packages/vchart-semi-theme/src/common/token-map.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ export const paletteTokenMap: PaletteTokenMap = {
/** 第三字色 */
tertiaryFontColor: '--semi-color-text-2',
/** 轴标签字色 */
axisLabelFontColor: '--semi-color-text-0',
axisLabelFontColor: '--semi-color-text-2',
/** 禁用字色 */
disableFontColor: '--semi-color-disabled-text',
/** 轴高亮标记字色 */
axisMarkerFontColor: '--semi-color-bg-0',

/** 轴网格线颜色 */
axisGridColor: '--semi-color-line-2',
axisGridColor: '--semi-grey-2', //用上边定义的lineColor2
/** 轴线颜色 */
axisDomainColor: '--semi-color-line-1',
axisDomainColor: '--semi-grey-3', //用上边定义的lineColor1

/** 十字准星背景色 */
crosshairBackgroundColor: '--semi-color-fill-0',
Expand All @@ -59,7 +59,7 @@ export const paletteTokenMap: PaletteTokenMap = {
/** 标注标签背景颜色 */
markLabelBackgroundColor: '--semi-color-border',
/** 标注线颜色 */
markLineStrokeColor: '--semi-color-line-0',
markLineStrokeColor: '--semi-grey-5', //用上边定义的lineColor0

/** 危险色 */
dangerColor: '--semi-color-danger',
Expand Down
6 changes: 3 additions & 3 deletions packages/vchart-theme-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"test-watch": "DEBUG_MODE=1 jest --watch"
},
"peerDependencies": {
"@visactor/vchart": "~1.10.2"
"@visactor/vchart": "~1.10.4"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
Expand All @@ -36,8 +36,8 @@
"ts-jest": "~29.1.0",
"@types/jest": "~29.5.0",
"@rushstack/eslint-patch": "~1.1.4",
"@visactor/vchart": "~1.10.2",
"@visactor/vchart-types": "~1.10.2",
"@visactor/vchart": "~1.10.4",
"@visactor/vchart-types": "~1.10.4",
"eslint": "~8.18.0",
"vite": "^4.5.0",
"typescript": "4.9.5",
Expand Down
6 changes: 3 additions & 3 deletions packages/vchart-theme/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"test-watch": "DEBUG_MODE=1 jest --watch"
},
"peerDependencies": {
"@visactor/vchart": "~1.10.2"
"@visactor/vchart": "~1.10.4"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
Expand All @@ -38,8 +38,8 @@
"ts-jest": "~29.1.0",
"@types/jest": "~29.5.0",
"@rushstack/eslint-patch": "~1.1.4",
"@visactor/vchart": "~1.10.2",
"@visactor/vchart-types": "~1.10.2",
"@visactor/vchart": "~1.10.4",
"@visactor/vchart-types": "~1.10.4",
"eslint": "~8.18.0",
"vite": "^4.5.0",
"typescript": "4.9.5",
Expand Down
6 changes: 3 additions & 3 deletions packages/vchart-tt-platform-theme/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"test-watch": "DEBUG_MODE=1 jest --watch"
},
"peerDependencies": {
"@visactor/vchart": "~1.10.2"
"@visactor/vchart": "~1.10.4"
},
"dependencies": {
"@visactor/vchart-semi-theme": "workspace:1.10.2",
Expand Down Expand Up @@ -65,8 +65,8 @@
"vite-plugin-svgr": "^4.1.0",
"node-sass": "^9.0.0",
"@babel/runtime": "latest",
"@visactor/vchart": "~1.10.2",
"@visactor/react-vchart": "~1.10.2",
"@visactor/vchart": "~1.10.4",
"@visactor/react-vchart": "~1.10.4",
"@douyinfe/semi-ui": "^2.51.3",
"@douyinfe/semi-icons": "latest",
"@douyinfe/semi-icons-lab": "latest",
Expand Down
6 changes: 3 additions & 3 deletions packages/vchart-ve-o-theme/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"test-watch": "DEBUG_MODE=1 jest --watch"
},
"peerDependencies": {
"@visactor/vchart": "~1.10.2"
"@visactor/vchart": "~1.10.4"
},
"dependencies": {
"@visactor/vchart-arco-theme": "workspace:1.10.2",
Expand Down Expand Up @@ -74,8 +74,8 @@
"react-redux": "^7.2.6",
"react-device-detect": "^2.2.2",
"redux": "^4.1.2",
"@visactor/vchart": "~1.10.2",
"@visactor/react-vchart": "~1.10.2",
"@visactor/vchart": "~1.10.4",
"@visactor/react-vchart": "~1.10.4",
"@arco-design/webpack-plugin": "^1.6.0",
"@arco-plugins/vite-plugin-svgr": "^0.7.2",
"@svgr/webpack": "^5.5.0",
Expand Down
6 changes: 3 additions & 3 deletions share/chart-demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"test-watch": "DEBUG_MODE=1 jest --watch"
},
"peerDependencies": {
"@visactor/vchart": "~1.10.2"
"@visactor/vchart": "~1.10.4"
},
"devDependencies": {
"@visactor/vchart": "~1.10.2",
"@visactor/vchart-types": "~1.10.2",
"@visactor/vchart": "~1.10.4",
"@visactor/vchart-types": "~1.10.4",
"@internal/bundler": "workspace:*",
"@internal/eslint-config": "workspace:*",
"@internal/ts-config": "workspace:*",
Expand Down