Explorar o código

perf: 去除grid多余配置,添加散点图、热力图的grid

奔跑的面条 %!s(int64=3) %!d(string=hai) anos
pai
achega
fa476b6186

+ 17 - 17
src/components/Pages/ChartItemSetting/GlobalSetting.vue

@@ -21,6 +21,23 @@
     </setting-item-box>
   </collapse-item>
 
+  <collapse-item v-if="grid" name="容器">
+    <setting-item-box name="距离">
+      <setting-item name="左侧距离">
+        <n-input v-model:value="grid.left" size="small"></n-input>
+      </setting-item>
+      <setting-item name="右侧距离">
+        <n-input v-model:value="grid.right" size="small"></n-input>
+      </setting-item>
+      <setting-item name="上侧距离">
+        <n-input v-model:value="grid.top" size="small"></n-input>
+      </setting-item>
+      <setting-item name="下侧距离">
+        <n-input v-model:value="grid.bottom" size="small"></n-input>
+      </setting-item>
+    </setting-item-box>
+  </collapse-item>
+
   <collapse-item v-if="xAxis" name="X轴">
     <template #header>
       <n-switch v-model:value="xAxis.show" size="small"></n-switch>
@@ -216,23 +233,6 @@
     </setting-item-box>
   </collapse-item>
 
-  <collapse-item v-if="grid" name="网格">
-    <setting-item-box name="容器距离">
-      <setting-item name="左侧距离">
-        <n-input v-model:value="grid.left" size="small"></n-input>
-      </setting-item>
-      <setting-item name="右侧距离">
-        <n-input v-model:value="grid.right" size="small"></n-input>
-      </setting-item>
-      <setting-item name="上侧距离">
-        <n-input v-model:value="grid.top" size="small"></n-input>
-      </setting-item>
-      <setting-item name="下侧距离">
-        <n-input v-model:value="grid.bottom" size="small"></n-input>
-      </setting-item>
-    </setting-item-box>
-  </collapse-item>
-
   <collapse-item v-if="visualMap" name="视觉映射">
     <template #header>
       <n-switch v-model:value="visualMap.show" size="small"></n-switch>

+ 1 - 11
src/packages/components/Charts/Bars/BarCommon/config.ts

@@ -28,17 +28,7 @@ export const option = {
       type: 'shadow'
     }
   },
-  legend: {
-    show: true
-  },
-  grid: {
-    show: false,
-    left: '10%',
-    top: '60',
-    right: '10%',
-    bottom: '60'
-  },
-  xAxis: {
+xAxis: {
     show: true,
     type: 'category'
   },

+ 0 - 10
src/packages/components/Charts/Bars/BarCrossrange/config.ts

@@ -28,16 +28,6 @@ export const option = {
       type: 'shadow'
     }
   },
-  legend: {
-    show: true
-  },
-  grid: {
-    show: false,
-    left: '10%',
-    top: '60',
-    right: '10%',
-    bottom: '60'
-  },
   xAxis: {
     show: true,
     type: 'value'

+ 0 - 10
src/packages/components/Charts/Lines/LineCommon/config.ts

@@ -33,16 +33,6 @@ export const option = {
       type: 'line'
     }
   },
-  legend: {
-    show: true
-  },
-  grid: {
-    show: false,
-    left: '10%',
-    top: '60',
-    right: '10%',
-    bottom: '60'
-  },
   xAxis: {
     show: true,
     type: 'category'

+ 0 - 10
src/packages/components/Charts/Lines/LineGradientSingle/config.ts

@@ -15,16 +15,6 @@ const options = {
       type: 'line'
     }
   },
-  legend: {
-    show: true
-  },
-  grid: {
-    show: false,
-    left: '10%',
-    top: '60',
-    right: '10%',
-    bottom: '60'
-  },
   xAxis: {
     show: true,
     type: 'category'

+ 0 - 10
src/packages/components/Charts/Lines/LineGradients/config.ts

@@ -8,16 +8,6 @@ import dataJson from './data.json'
 export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
 
 const option = {
-  legend: {
-    show: true
-  },
-  grid: {
-    show: false,
-    left: '10%',
-    top: '60',
-    right: '10%',
-    bottom: '60'
-  },
   tooltip: {
     show: true,
     trigger: 'axis',

+ 0 - 10
src/packages/components/Charts/Lines/LineLinearSingle/config.ts

@@ -14,16 +14,6 @@ export const option = {
       type: 'line'
     }
   },
-  legend: {
-    show: true
-  },
-  grid: {
-    show: false,
-    left: '10%',
-    top: '60',
-    right: '10%',
-    bottom: '60'
-  },
   xAxis: {
     show: true,
     type: 'category'

+ 1 - 1
src/packages/components/Charts/Mores/Heatmap/config.ts

@@ -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 },

+ 1 - 1
src/packages/components/Charts/Scatters/ScatterCommon/config.ts

@@ -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',

+ 1 - 1
src/packages/components/Charts/Scatters/ScatterLogarithmicRegression/config.ts

@@ -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,