Merge branch 'dev' into master-fetch-dev

src/settings/vchartThemes/axis.theme.json

@@ -1,5 +1,19 @@
 {
   "visible": true,
+  "unit": {
+    "visible": true,
+    "text": "",
+    "style": {
+      "text": "",
+      "fontSize": 12,
+      "fill": "#B9B8CE",
+      "fontFamily": "SimSun",
+      "fontWeight": "normal",
+      "angle": 0,
+      "dx": 0,
+      "dy": 0
+    }
+  },
   "label": {
     "visible": true,
     "style": {
@@ -7,17 +21,25 @@
       "fill": "#B9B8CE",
       "fontFamily": "SimSun",
       "fontWeight": "normal",
-      "angle": 0
+      "angle": 0,
+      "dx": 0,
+      "dy": 0
     }
   },
   "title": {
     "visible": true,
+    "position": "middle",
+    "angle": 0,
+    "padding": [],
     "style": {
       "text": "",
       "fontSize": 12,
       "fill": "#B9B8CE",
       "fontFamily": "SimSun",
-      "fontWeight": "normal"
+      "fontWeight": "normal",
+      "angle": 0,
+      "dx": 0,
+      "dy": 0
     }
   },
   "domainLine": {

src/settings/vchartThemes/index.ts

@@ -6,6 +6,9 @@ export type FontType = {
   fontFamily: string
   fontWeight: string
   fill: string
+  dy?: number
+  dx?: number
+  angle?: number
   [T: string]: any
 }
 export interface vChartGlobalThemeJsonType extends Partial<ThemeJsonType> {