Skip to content

Commit

Permalink
feature(Display): WIP: Remain API Debug
Browse files Browse the repository at this point in the history
  • Loading branch information
AndyFong committed Jun 21, 2018
1 parent 1ec77c4 commit 434bf36
Show file tree
Hide file tree
Showing 40 changed files with 2,625 additions and 877 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ swagger-ui/
lib/
tempFiles/
.vscode
node_modules/
16 changes: 11 additions & 5 deletions webapp/app/assets/fonts/iconfont.css

Large diffs are not rendered by default.

Binary file modified webapp/app/assets/fonts/iconfont.eot
Binary file not shown.
9 changes: 9 additions & 0 deletions webapp/app/assets/fonts/iconfont.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified webapp/app/assets/fonts/iconfont.ttf
Binary file not shown.
Binary file modified webapp/app/assets/fonts/iconfont.woff
Binary file not shown.
4 changes: 2 additions & 2 deletions webapp/app/assets/json/displaySettings/chart.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"name": "backgroundColor",
"title": "背景颜色",
"component": "colorPicker",
"default": "#fff",
"default": [255,255,255],
"span": 12
}, {
"name": "opacity",
Expand All @@ -42,7 +42,7 @@
"name": "borderColor",
"title": "边框颜色",
"component": "colorPicker",
"default": "#fff",
"default": [0,0,0],
"span": 12
}, {
"name": "borderWidth",
Expand Down
2 changes: 1 addition & 1 deletion webapp/app/assets/json/displaySettings/display.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"name": "backgroundColor",
"title": "背景颜色",
"component": "colorPicker",
"default": "#fff",
"default": [0,0,0],
"span": 12
}, {
"name": "opacity",
Expand Down
13 changes: 13 additions & 0 deletions webapp/app/assets/json/displaySettings/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,23 @@

import display from './display.json'
import rectangle from './rectangle.json'
import label from './label.json'
import chart from './chart.json'

export default [
display,
rectangle,
label,
chart
]

export function getDefaultDisplayParams () {
const params = display.params
const defaultDisplayParams = {}
params.forEach((param) => {
param.items.forEach((item) => {
defaultDisplayParams[item.name] = item.default || null
})
})
return JSON.stringify(defaultDisplayParams)
}
Loading

0 comments on commit 434bf36

Please sign in to comment.