diff --git a/src/views/boardGenerate/index1.vue b/src/views/boardGenerate/index1.vue
index a3b7581..deb74d8 100644
--- a/src/views/boardGenerate/index1.vue
+++ b/src/views/boardGenerate/index1.vue
@@ -721,7 +721,7 @@
:headers="headers"
:on-success="(res)=>nodeAttrForm.backgroundImage = res.data.url"
>
-
+
@@ -764,7 +764,7 @@
-
@@ -775,7 +775,6 @@
-
diff --git a/src/views/boardGenerate/nodes/board/lineNode.vue b/src/views/boardGenerate/nodes/board/lineNode.vue
index 1840b2b..1c9a895 100644
--- a/src/views/boardGenerate/nodes/board/lineNode.vue
+++ b/src/views/boardGenerate/nodes/board/lineNode.vue
@@ -105,29 +105,26 @@ const defaultOption = {
name: props.data?.options?.xName || '',
type: 'category',
axisLine: {
+ show: props.data?.options?.xAxisLineShow || false,
lineStyle: {
- color: '#DCE2E8'
+ color: props.data?.options?.xAxisLineColor || '#DCE2E8'
}
},
axisTick: {
- show: true
- },
- axisLabel: {
- interval: 0,
- textStyle: {
- color: '#fff'
- },
- fontSize: 12,
- margin: 3
- },
- axisPointer: {
- label: {
- padding: [0, 0, 0, 0],
- margin: 0,
- fontSize: 12
+ show: props.data?.options?.xAxisTickShow || false,
+ lineStyle: {
+ color: props.data?.options?.xAxisTickColor || '#DCE2E8'
}
},
- boundaryGap: true
+ axisLabel: {
+ show: props.data?.options?.xAxisLabelShow || false,
+ interval: props.data?.options?.xAxisLabelInterval ? 0 : 'auto',
+ formatter: props.data?.options?.xAxisLabelFormatter || null,
+ color: props.data?.options?.xAxisLabelColor || '#fff',
+ fontSize: props.data?.options?.xAxisLabelFontSize || 12,
+ margin: props.data?.options?.xAxisLabelMargin || 3
+ },
+ boundaryGap: props.data?.options?.boundaryGap || false
}
],
yAxis: [
diff --git a/src/views/boardGenerate/tool.js b/src/views/boardGenerate/tool.js
index b570487..cedec87 100644
--- a/src/views/boardGenerate/tool.js
+++ b/src/views/boardGenerate/tool.js
@@ -10,7 +10,29 @@ const getId = (type) => {
const getOption = (e) => {
if (e === 'line' || e === 'multiLines') {
- return { title: '', yNames: [], gridTop: 30, gridLeft: 5, gridBottom: 10, gridRight: 10, xName: '', yName: '', tooltip:true, legend:true };
+ return {
+ title: '',
+ yNames: [],
+ gridTop: 30,
+ gridLeft: 5,
+ gridBottom: 10,
+ gridRight: 10,
+ xName: '',
+ xAxisLineShow: true,
+ xAxisLineColor: '#DCE2E8',
+ xAxisTickShow: true,
+ xAxisTickColor: '#DCE2E8',
+ xAxisLabelShow: true,
+ xAxisLabelInterval: false,
+ xAxisLabelFormatter: '',
+ xAxisLabelColor: '#fff',
+ xAxisLabelFontSize: 12,
+ xAxisLabelMargin: 3,
+ boundaryGap: true,
+ yName: '',
+ tooltip: true,
+ legend: true
+ };
} else if (e === 'bar' || e === 'multiBars') {
return { title: '', yNames: [], gridTop: 30, gridLeft: 5, gridBottom: 10, gridRight: 10, xName: '', yName: '', tooltip:true, legend:true };
} else if (e === 'backgroundBar') {