Skip to content

Commit

Permalink
Merge pull request #3595 from GordonSmith/ICON_PALETTE
Browse files Browse the repository at this point in the history
feat(Axis): Add label / icon mapping
  • Loading branch information
GordonSmith committed May 14, 2020
2 parents 5be2b74 + 259c06a commit 0d04236
Show file tree
Hide file tree
Showing 11 changed files with 313 additions and 286 deletions.
40 changes: 14 additions & 26 deletions demos/gallery/.vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,16 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"type": "shell",
"label": "watch",
"command": "./node_modules/.bin/tsc",
"windows": {
"command": ".\\node_modules\\.bin\\tsc.cmd"
},
"args": [
"--build",
"--verbose",
"--watch"
],
"isBackground": true,
"problemMatcher": [
"$tsc-watch"
],
"group": {
"kind": "build",
"isDefault": true
}
}
]
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "compile-umd-watch",
"problemMatcher": [
"$tsc-watch"
],
"group": "build",
"label": "npm: compile-umd-watch",
"detail": "npm run compile-umd -- -w",
"isBackground": true
}
]
}
1 change: 1 addition & 0 deletions demos/gallery/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"scripts": {
"clean": "rimraf types dist *.tsbuildinfo",
"compile-umd": "tsc --module umd --outDir ./src-umd",
"compile-umd-watch": "npm run compile-umd -- -w",
"gen-filejson": "node ./util/dir2json ./samples",
"build": "run-s compile-umd gen-filejson",
"test": "mocha-chrome --chrome-flags \"[\\\"--allow-file-access-from-files\\\", \\\"--no-sandbox\\\"]\" ./test.html"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Column } from "@hpcc-js/chart";
import { Bar } from "@hpcc-js/chart";

new Column()
new Bar()
.target("target")
.columns(["Category", "Series-1"])
.data([
Expand All @@ -18,5 +18,4 @@ new Column()
.yAxisType("linear")
.xAxisType("ordinal")
.xAxisTitle("Category")
.render()
;
.render();
20 changes: 20 additions & 0 deletions demos/gallery/samples/chart/Bar/Inner Text With Icons.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { Bar } from "@hpcc-js/chart";

new Bar()
.target("target")
.columns(["A", "B", "C"])
.data([
["lorem ipsum", 2, -3],
["dolor sit amet", 5, -6],
["consectetur adipisicing elit", 8, 9],
])
.showValue(true)
.showInnerText(true)
.xAxisFontSize(28)
.xAxisFontFamily("FontAwesome")
.xAxisLabelMapping({
"lorem ipsum": "",
"dolor sit amet": "",
"consectetur adipisicing elit": ""
})
.render();
13 changes: 13 additions & 0 deletions demos/gallery/samples/chart/Bar/Inner Text.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { Bar } from "@hpcc-js/chart";

new Bar()
.target("target")
.columns(["A", "B", "C"])
.data([
["lorem ipsum", 2, -3],
["dolor sit amet", 5, -6],
["consectetur adipisicing elit", 8, 9],
])
.showValue(true)
.showInnerText(true)
.render();
14 changes: 0 additions & 14 deletions demos/gallery/samples/chart/InnerTextBar.js

This file was deleted.

0 comments on commit 0d04236

Please sign in to comment.