github/go-view
4
0
Fork 0
mirror of https://gitee.com/dromara/go-view.git synced 2026-04-23 00:00:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-commet

Browse Source
This commit is contained in:
tnt group
2022-10-15 18:37:12 +08:00
parent fbfac4b82c fa476b6186
commit af50a00111
12 changed files with 94 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/packages/components/Charts/Bars/BarCommon/config.ts
+5 -8
View File
@@ -4,15 +4,15 @@ import { CreateComponentType } from '@/packages/index.d'
import cloneDeep from 'lodash/cloneDeep'
import dataJson from './data.json'
export const includes = ['legend', 'xAxis', 'yAxis']
export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
export const seriesItem = {
type: 'bar',
barWidth: 15,
label:{
label: {
show: true,
position: 'top',
color: "#fff",
fontSize: 12,
color: '#fff',
fontSize: 12
},
itemStyle: {
color: null,
@@ -28,10 +28,7 @@ export const option = {
type: 'shadow'
}
},
legend: {
show: true
},
xAxis: {
xAxis: {
show: true,
type: 'category'
},
src/packages/components/Charts/Bars/BarCrossrange/config.ts
+1 -4
View File
@@ -4,7 +4,7 @@ import { CreateComponentType } from '@/packages/index.d'
import cloneDeep from 'lodash/cloneDeep'
import dataJson from './data.json'
export const includes = ['legend', 'xAxis', 'yAxis']
export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
export const seriesItem = {
type: 'bar',
barWidth: null,
@@ -28,9 +28,6 @@ export const option = {
type: 'shadow'
}
},
legend: {
show: true
},
xAxis: {
show: true,
type: 'value'
src/packages/components/Charts/Lines/LineCommon/config.ts
+3 -6
View File
@@ -4,7 +4,7 @@ import { CreateComponentType } from '@/packages/index.d'
import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index'
import dataJson from './data.json'
export const includes = ['legend', 'xAxis', 'yAxis']
export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
export const seriesItem = {
type: 'line',
label: {
@@ -13,7 +13,7 @@ export const seriesItem = {
color: '#fff',
fontSize: 12
},
symbolSize: 5, //设定实心点的大小
symbolSize: 5, //设定实心点的大小
itemStyle: {
color: null,
borderRadius: 0
@@ -21,7 +21,7 @@ export const seriesItem = {
lineStyle: {
type: 'solid',
width: 3,
color: null,
color: null
}
}
@@ -33,9 +33,6 @@ export const option = {
type: 'line'
}
},
legend: {
show: true
},
xAxis: {
show: true,
type: 'category'
src/packages/components/Charts/Lines/LineGradientSingle/config.ts
+7 -11
View File
@@ -5,7 +5,7 @@ import { graphic } from 'echarts/core'
import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index'
import dataJson from './data.json'
export const includes = ['legend', 'xAxis', 'yAxis']
export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
const options = {
tooltip: {
@@ -15,12 +15,9 @@ const options = {
type: 'line'
}
},
legend: {
show: true
},
xAxis: {
show: true,
type: 'category',
type: 'category'
},
yAxis: {
show: true,
@@ -31,12 +28,12 @@ const options = {
{
type: 'line',
smooth: false,
symbolSize: 5, //设定实心点的大小
label:{
symbolSize: 5, //设定实心点的大小
label: {
show: true,
position: 'top',
color: "#fff",
fontSize: 12,
color: '#fff',
fontSize: 12
},
lineStyle: {
type: 'solid',
@@ -59,8 +56,7 @@ const options = {
]
}
export default class Config extends PublicConfigClass
implements CreateComponentType {
export default class Config extends PublicConfigClass implements CreateComponentType {
public key: string = LineGradientSingleConfig.key
public chartConfig = LineGradientSingleConfig
// 图表配置项
src/packages/components/Charts/Lines/LineGradients/config.ts
+2 -5
View File
@@ -5,12 +5,9 @@ import { graphic } from 'echarts/core'
import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index'
import dataJson from './data.json'
export const includes = ['legend', 'xAxis', 'yAxis']
export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
const option = {
legend: {
show: true
},
tooltip: {
show: true,
trigger: 'axis',
@@ -31,7 +28,7 @@ const option = {
{
type: 'line',
smooth: false,
symbolSize: 5, //设定实心点的大小
symbolSize: 5, //设定实心点的大小
label: {
show: true,
position: 'top',
src/packages/components/Charts/Lines/LineLinearSingle/config.ts
+2 -5
View File
@@ -4,7 +4,7 @@ import { CreateComponentType } from '@/packages/index.d'
import { defaultTheme, chartColorsSearch } from '@/settings/chartThemes/index'
import dataJson from './data.json'
export const includes = ['legend', 'xAxis', 'yAxis']
export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
export const option = {
tooltip: {
@@ -14,9 +14,6 @@ export const option = {
type: 'line'
}
},
legend: {
show: true
},
xAxis: {
show: true,
type: 'category'
@@ -29,7 +26,7 @@ export const option = {
series: [
{
type: 'line',
symbolSize: 5, //设定实心点的大小
symbolSize: 5, //设定实心点的大小
lineStyle: {
type: 'solid',
width: 3,
src/packages/components/Charts/Mores/Heatmap/config.ts
+1 -1
View File
@@ -4,7 +4,7 @@ import { CreateComponentType } from '@/packages/index.d'
import { cloneDeep } from 'lodash'
import dataJson from './data.json'
export const includes = ['xAxis', 'yAxis']
export const includes = ['xAxis', 'yAxis', 'grid']
export const option = {
dataset: { ...dataJson },
src/packages/components/Charts/Scatters/ScatterCommon/config.ts
+1 -1
View File
@@ -4,7 +4,7 @@ import { CreateComponentType } from '@/packages/index.d'
import cloneDeep from 'lodash/cloneDeep'
import dataJson from './data.json'
export const includes = ['legend', 'xAxis', 'yAxis']
export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
export const seriesItem = {
type: 'scatter',
src/packages/components/Charts/Scatters/ScatterLogarithmicRegression/config.ts
+1 -1
View File
@@ -4,7 +4,7 @@ import { CreateComponentType } from '@/packages/index.d'
import cloneDeep from 'lodash/cloneDeep'
import dataJson from './data.json'
export const includes = ['legend', 'xAxis', 'yAxis']
export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
export const option = {
dataset: dataJson,