Merge branch 'dev' into master-fetch-dev

src/settings/vchartThemes/axis.theme.json

@@ -0,0 +1,37 @@
+{
+  "visible": true,
+  "label": {
+    "visible": true,
+    "style": {
+      "fontSize": 12,
+      "fill": "#B9B8CE",
+      "fontFamily": "SimSun",
+      "fontWeight": "normal",
+      "angle": 0
+    }
+  },
+  "title": {
+    "visible": true,
+    "style": {
+      "text": "",
+      "fontSize": 12,
+      "fill": "#B9B8CE",
+      "fontFamily": "SimSun",
+      "fontWeight": "normal"
+    }
+  },
+  "domainLine": {
+    "visible": false,
+    "style": {
+      "lineWidth": 1,
+      "stroke": "#D5D7E2"
+    }
+  },
+  "grid": {
+    "visible": true,
+    "style": {
+      "lineWidth": 1,
+      "stroke": "#FFFFFF24"
+    }
+  }
+}

src/settings/vchartThemes/global.theme.json

@@ -0,0 +1,78 @@
+{
+  "legends": [
+    {
+      "visible": true,
+      "position": "middle",
+      "orient": "bottom",
+      "item": {
+        "visible": true,
+        "align": "left",
+        "shape": "circle",
+        "label": {
+          "style": {
+            "fontSize": 16,
+            "fill": "#B9B8CE",
+            "fontFamily": "SimSun",
+            "fontWeight": "normal"
+          }
+        }
+      }
+    }
+  ],
+  "tooltip": {
+    "visible": true,
+    "style": {
+      "panel": {
+        "padding": {
+          "top": 5,
+          "bottom": 10,
+          "left": 10,
+          "right": 10
+        },
+        "backgroundColor": "rgba(8, 28, 48, 0.95)",
+        "border": {
+          "color": "#CFCFCF",
+          "width": 0,
+          "radius": 2
+        },
+        "shadow": {
+          "x": 0,
+          "y": 4,
+          "blur": 12,
+          "spread": 0,
+          "color": "rgba(0, 0, 0, 0.2)"
+        }
+      },
+      "titleLabel": {
+        "fontSize": 14,
+        "fill": "#FFF",
+        "fontWeight": "bold",
+        "fontFamily": "SimSun",
+        "align": "left",
+        "lineHeight": 18
+      },
+      "keyLabel": {
+        "fontSize": 12,
+        "fill": "rgba(255,255,255,0.65)",
+        "fontWeight": "normal",
+        "fontFamily": "SimSun",
+        "align": "left",
+        "lineHeight": 18
+      },
+      "valueLabel": {
+        "fontSize": 12,
+        "fill": "#FFF",
+        "fontWeight": "normal",
+        "fontFamily": "SimSun",
+        "align": "right",
+        "lineHeight": 18
+      },
+      "shape": {
+        "size": 10,
+        "spacing": 10,
+        "shapeLineWidth": 0
+      },
+      "spaceRow": 10
+    }
+  }
+}

src/settings/vchartThemes/index.ts

@@ -0,0 +1,16 @@
+import themeJson from './global.theme.json'
+
+type ThemeJsonType = typeof themeJson
+export type FontType = {
+  fontSize: number
+  fontFamily: string
+  fontWeight: string
+  fill: string
+  [T: string]: any
+}
+export interface vChartGlobalThemeJsonType extends Partial<ThemeJsonType> {
+  dataset?: any
+  [T: string]: any
+}
+
+export const vChartGlobalThemeJson = { ...themeJson, dataset: null }