Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev-0.3 #536

Merged
merged 80 commits into from
Oct 26, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
c43cac7
Merge pull request #497 from shanmengm/dev-0.3
RichardShan Oct 16, 2018
9f11a6d
feature drilldown
ruanhan Oct 17, 2018
9a5063c
feat(Display): add Editor or Layers based vertical and horizontal bas…
AndyFong Oct 17, 2018
d6e41f7
Merge pull request #500 from AndyFong/dev-0.3
AndyFong Oct 17, 2018
2c58ab1
drill
ruanhan Oct 17, 2018
970883b
feature drilldown
ruanhan Oct 17, 2018
bebad43
drill
ruanhan Oct 17, 2018
0d10375
Merge branch 'dev-0.3.1' of https://github.com/ruanhan1988/davinci in…
ruanhan Oct 17, 2018
b8fface
Merge pull request #501 from ruanhan/dev-0.3.1
ruanhan Oct 17, 2018
1eb3d6d
feature drillup
ruanhan Oct 18, 2018
15b5705
Merge pull request #502 from ruanhan/dev-0.3.1
ruanhan Oct 18, 2018
822addb
在widgetprops中添加model
scottsut Oct 18, 2018
341358a
Merge pull request #503 from scottsut/dev-0.3
scottsut Oct 18, 2018
c3a71a0
修改Share Dto
RichardShan Oct 18, 2018
c063a2d
Merge pull request #504 from shanmengm/dev-0.3
RichardShan Oct 18, 2018
0ba5359
fix bug drill
ruanhan Oct 18, 2018
f7ff272
Merge pull request #505 from ruanhan/dev-0.3.1
ruanhan Oct 18, 2018
0a79ed9
地图(temp)
yuhouchuhe1 Oct 18, 2018
d56d949
Merge pull request #506 from yuhouchuhe1/dev-0.3
yuhouchuhe1 Oct 18, 2018
c86b17e
chart mode wordCloud & waterfall
scottsut Oct 18, 2018
34fecdf
Merge pull request #507 from scottsut/dev-0.3
scottsut Oct 18, 2018
87635d4
feat(Widget): add basic Parallel, Sankey, Radar diagrams support
AndyFong Oct 18, 2018
e21cbb7
map
scottsut Oct 18, 2018
5f44c88
Merge pull request #508 from scottsut/dev-0.3
scottsut Oct 18, 2018
e68a183
fix(merge): fix merge conflict from upstream/dev-0.3
AndyFong Oct 18, 2018
795d3f1
Merge branch 'dev-0.3' of https://github.com/edp963/davinci into dev-0.3
AndyFong Oct 18, 2018
ee601f7
fix(Widget): change city.json import yo geo.json
AndyFong Oct 18, 2018
25d98e2
fix(Share): fix Display Share SecondaryLayer widget null error
AndyFong Oct 18, 2018
c1a2a7e
Merge pull request #509 from AndyFong/dev-0.3
AndyFong Oct 18, 2018
8294700
feature drill toolbox
ruanhan Oct 18, 2018
cfbc5bf
fix(Display): fix Reducer array reduce initial value error and make a…
AndyFong Oct 19, 2018
ebd490e
fix(Display): fix keyboard move layers no bounds bug
AndyFong Oct 19, 2018
398e502
fix(Display): fix undo/redo via keyboards error
AndyFong Oct 19, 2018
dbd06a0
fix(Widget): fix Parallel diagram multi dimensions data error
AndyFong Oct 19, 2018
51fc4f6
Merge pull request #510 from AndyFong/dev-0.3
AndyFong Oct 19, 2018
74e6b25
some temp fix
scottsut Oct 19, 2018
758afa0
Merge pull request #511 from scottsut/dev-0.3
scottsut Oct 19, 2018
5eb41a4
feature share drill
ruanhan Oct 19, 2018
af682d5
Merge pull request #512 from ruanhan/dev-0.3.1
ruanhan Oct 19, 2018
bedde23
fix share dirll history
ruanhan Oct 19, 2018
5571787
remove console
ruanhan Oct 19, 2018
4bb3e02
Merge pull request #513 from ruanhan/dev-0.3.1
ruanhan Oct 19, 2018
4f3b0f2
add drill swtich
ruanhan Oct 22, 2018
012d00c
Merge pull request #514 from ruanhan/dev-0.3.1
ruanhan Oct 23, 2018
2e96053
合并 getChartData 与 downloadCsv
scottsut Oct 23, 2018
96c7e47
Merge pull request #515 from scottsut/dev-0.3
scottsut Oct 23, 2018
328b708
修改定时发送图片邮件逻辑
RichardShan Oct 23, 2018
dcda44e
Merge pull request #516 from shanmengm/dev-0.3
RichardShan Oct 23, 2018
bb3677a
fix drill data download csv
ruanhan Oct 23, 2018
519af33
Merge pull request #517 from ruanhan/dev-0.3.1
ruanhan Oct 23, 2018
b670b4d
fix phantomjs render error and authorized login css error
scottsut Oct 24, 2018
2c58b4b
Merge pull request #519 from scottsut/dev-0.3
scottsut Oct 24, 2018
e04842a
fix
RichardShan Oct 25, 2018
b15fe8d
Merge pull request #520 from shanmengm/dev-0.3
RichardShan Oct 25, 2018
4e97f86
fix schedule minutes
ruanhan Oct 25, 2018
40ab871
Merge pull request #521 from ruanhan/dev-0.3.1
ruanhan Oct 25, 2018
609ff2f
fix
ruanhan Oct 26, 2018
b54d466
Merge pull request #522 from ruanhan/dev-0.3.1
ruanhan Oct 26, 2018
9166ed1
feat(Widget): add Sankey,Radar,Parallel style config and enrich axis …
AndyFong Oct 26, 2018
8e43f40
Merge branch 'dev-0.3' of https://github.com/edp963/davinci into dev-…
AndyFong Oct 26, 2018
6b58433
Merge pull request #523 from AndyFong/dev-0.3.1
AndyFong Oct 26, 2018
6e8edbb
飞行图
yuhouchuhe1 Oct 26, 2018
35641c9
Merge pull request #524 from yuhouchuhe1/dev-0.3
yuhouchuhe1 Oct 26, 2018
7cae60c
Merge branch 'dev-0.3' of https://github.com/edp963/davinci into dev-…
AndyFong Oct 26, 2018
1459a12
fix
scottsut Oct 26, 2018
4e1b87c
fix
scottsut Oct 26, 2018
19c61cd
Merge pull request #525 from scottsut/dev-0.3
scottsut Oct 26, 2018
4b970bb
fix(Widget): fix parallel multi categories axis label bug
AndyFong Oct 26, 2018
7fa3525
fix(Widget): remove sankey legend config
AndyFong Oct 26, 2018
1632018
Merge branch 'dev-0.3' of https://github.com/edp963/davinci into dev-…
AndyFong Oct 26, 2018
4a70ac5
fix
yuhouchuhe1 Oct 26, 2018
34a610d
Merge pull request #527 from yuhouchuhe1/dev-0.3
yuhouchuhe1 Oct 26, 2018
f00d6f3
Merge branch 'dev-0.3' of https://github.com/edp963/davinci into dev-…
AndyFong Oct 26, 2018
2e5789b
fix(Widget): remove parallel label config and clear chart while prop …
AndyFong Oct 26, 2018
8c643cf
Merge pull request #534 from AndyFong/dev-0.3.1
AndyFong Oct 26, 2018
ff0cfd0
fix
yuhouchuhe1 Oct 26, 2018
27d0c00
Merge pull request #535 from yuhouchuhe1/dev-0.3
yuhouchuhe1 Oct 26, 2018
2f53753
update ui and shell
RichardShan Oct 26, 2018
0f9bc73
Merge branch 'dev-0.3'
RichardShan Oct 26, 2018
836fb54
fix
RichardShan Oct 26, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update ui and shell
  • Loading branch information
RichardShan committed Oct 26, 2018
commit 2f53753f1b840a85e83eb3b949d0fbed7c06a22e
4 changes: 2 additions & 2 deletions bin/start-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if [ -z "$Lib_dir" ]; then
exit
fi

Server=`ps -ef | grep java | grep davinci-server_3.01-0.3.0-SNAPSHOT | grep -v grep | awk '{print $2}'`
Server=`ps -ef | grep java | grep edp.DavinciServerApplication | grep -v grep | awk '{print $2}'`
if [[ $Server -gt 0 ]]; then
echo "[Davinci Server] is already started"
exit
Expand All @@ -41,7 +41,7 @@ fi
cd $DAVINCI3_HOME
TODAY=`date "+%Y-%m-%d"`
LOG_PATH=$DAVINCI3_HOME/logs/davinci.$TODAY.log
nohup java -Dfile.encoding=UTF-8 -cp $JAVA_HOME/lib/*:lib/*:davinci-server_3.01-0.3.0-SNAPSHOT edp.DavinciServerApplication > $LOG_PATH 2>&1 &
nohup java -Dfile.encoding=UTF-8 -cp $JAVA_HOME/lib/*:lib/* edp.DavinciServerApplication > $LOG_PATH 2>&1 &

echo "=========================================="
echo "Starting..., press \`CRTL + C\` to exit log"
Expand Down
2 changes: 1 addition & 1 deletion bin/stop-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# >>


Server=`ps -ef | grep java | grep davinci-server_3.01-0.3.0-SNAPSHOT | grep -v grep | awk '{print $2}'`
Server=`ps -ef | grep java | grep edp.DavinciServerApplication | grep -v grep | awk '{print $2}'`
if [[ $Server -gt 0 ]]; then
kill -9 $Server
else
Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion davinci-ui/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"><link rel="manifest" href="manifest.json"><meta name="mobile-web-app-capable" content="yes"><title>Davinci</title><style>.general-loading{width:100%;height:100%;position:absolute;top:0;left:0}.general-loading .dot-container{width:90px;position:absolute;top:50%;left:50%;transform:translate3d(-50%,-50%,0);display:table}.general-loading .dot-container .dot{width:30px;height:30px;display:table-cell;position:relative}.general-loading .dot-container .dot:after{width:26px;height:26px;background-color:#1b98e0;border-radius:50%;position:absolute;top:2px;left:2px;content:''}.general-loading .dot-container .dot:nth-child(1){animation:loading-1 1s linear infinite}.general-loading .dot-container .dot:nth-child(2){transform:scale(.5,.5);animation:loading-2 1s linear infinite}.general-loading .dot-container .dot:nth-child(3){transform:scale(0,0);animation:loading-3 1s linear infinite}@keyframes loading-1{0%{transform:scale(1,1)}50%{transform:scale(0,0)}100%{transform:scale(1,1)}}@keyframes loading-2{0%{transform:scale(.5,.5)}25%{transform:scale(1,1)}50%{transform:scale(.5,.5)}75%{transform:scale(0,0)}100%{transform:scale(.5,.5)}}@keyframes loading-3{0%{transform:scale(0,0)}50%{transform:scale(1,1)}100%{transform:scale(0,0)}}</style></head><body><noscript>如果你看到这条信息,说明<strong> 你的浏览器禁用了 JavaScript </strong>, 请 <strong>取消禁用</strong> 恢复应用程序正常工作。</noscript><div id="app"><div class="general-loading"><div class="dot-container"><div class="dot"></div><div class="dot"></div><div class="dot"></div></div></div></div><script type="text/javascript" src="/app.1860a2a351207e49e188.js"></script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"><link rel="manifest" href="manifest.json"><meta name="mobile-web-app-capable" content="yes"><title>Davinci</title><style>.general-loading{width:100%;height:100%;position:absolute;top:0;left:0}.general-loading .dot-container{width:90px;position:absolute;top:50%;left:50%;transform:translate3d(-50%,-50%,0);display:table}.general-loading .dot-container .dot{width:30px;height:30px;display:table-cell;position:relative}.general-loading .dot-container .dot:after{width:26px;height:26px;background-color:#1b98e0;border-radius:50%;position:absolute;top:2px;left:2px;content:''}.general-loading .dot-container .dot:nth-child(1){animation:loading-1 1s linear infinite}.general-loading .dot-container .dot:nth-child(2){transform:scale(.5,.5);animation:loading-2 1s linear infinite}.general-loading .dot-container .dot:nth-child(3){transform:scale(0,0);animation:loading-3 1s linear infinite}@keyframes loading-1{0%{transform:scale(1,1)}50%{transform:scale(0,0)}100%{transform:scale(1,1)}}@keyframes loading-2{0%{transform:scale(.5,.5)}25%{transform:scale(1,1)}50%{transform:scale(.5,.5)}75%{transform:scale(0,0)}100%{transform:scale(.5,.5)}}@keyframes loading-3{0%{transform:scale(0,0)}50%{transform:scale(1,1)}100%{transform:scale(0,0)}}</style></head><body><noscript>如果你看到这条信息,说明<strong> 你的浏览器禁用了 JavaScript </strong>, 请 <strong>取消禁用</strong> 恢复应用程序正常工作。</noscript><div id="app"><div class="general-loading"><div class="dot-container"><div class="dot"></div><div class="dot"></div><div class="dot"></div></div></div></div><script type="text/javascript" src="/app.20ae992439d1ac0ae822.js"></script></body></html>

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion davinci-ui/share.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"><link rel="manifest" href="manifest.json"><meta name="mobile-web-app-capable" content="yes"><title>Davinci</title><style>.general-loading{width:100%;height:100%;position:absolute;top:0;left:0}.general-loading .dot-container{width:90px;position:absolute;top:50%;left:50%;transform:translate3d(-50%,-50%,0);display:table}.general-loading .dot-container .dot{width:30px;height:30px;display:table-cell;position:relative}.general-loading .dot-container .dot:after{width:26px;height:26px;background-color:#1b98e0;border-radius:50%;position:absolute;top:2px;left:2px;content:''}.general-loading .dot-container .dot:nth-child(1){animation:loading-1 1s linear infinite}.general-loading .dot-container .dot:nth-child(2){transform:scale(.5,.5);animation:loading-2 1s linear infinite}.general-loading .dot-container .dot:nth-child(3){transform:scale(0,0);animation:loading-3 1s linear infinite}@keyframes loading-1{0%{transform:scale(1,1)}50%{transform:scale(0,0)}100%{transform:scale(1,1)}}@keyframes loading-2{0%{transform:scale(.5,.5)}25%{transform:scale(1,1)}50%{transform:scale(.5,.5)}75%{transform:scale(0,0)}100%{transform:scale(.5,.5)}}@keyframes loading-3{0%{transform:scale(0,0)}50%{transform:scale(1,1)}100%{transform:scale(0,0)}}</style></head><body><noscript>如果你看到这条信息,说明<strong> 你的浏览器禁用了 JavaScript </strong>, 请 <strong>取消禁用</strong> 恢复应用程序正常工作。</noscript><div id="app"><div class="general-loading"><div class="dot-container"><div class="dot"></div><div class="dot"></div><div class="dot"></div></div></div></div><script type="text/javascript" src="/share.fb37b5ad7261ecca69fb.js"></script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"><link rel="manifest" href="manifest.json"><meta name="mobile-web-app-capable" content="yes"><title>Davinci</title><style>.general-loading{width:100%;height:100%;position:absolute;top:0;left:0}.general-loading .dot-container{width:90px;position:absolute;top:50%;left:50%;transform:translate3d(-50%,-50%,0);display:table}.general-loading .dot-container .dot{width:30px;height:30px;display:table-cell;position:relative}.general-loading .dot-container .dot:after{width:26px;height:26px;background-color:#1b98e0;border-radius:50%;position:absolute;top:2px;left:2px;content:''}.general-loading .dot-container .dot:nth-child(1){animation:loading-1 1s linear infinite}.general-loading .dot-container .dot:nth-child(2){transform:scale(.5,.5);animation:loading-2 1s linear infinite}.general-loading .dot-container .dot:nth-child(3){transform:scale(0,0);animation:loading-3 1s linear infinite}@keyframes loading-1{0%{transform:scale(1,1)}50%{transform:scale(0,0)}100%{transform:scale(1,1)}}@keyframes loading-2{0%{transform:scale(.5,.5)}25%{transform:scale(1,1)}50%{transform:scale(.5,.5)}75%{transform:scale(0,0)}100%{transform:scale(.5,.5)}}@keyframes loading-3{0%{transform:scale(0,0)}50%{transform:scale(1,1)}100%{transform:scale(0,0)}}</style></head><body><noscript>如果你看到这条信息,说明<strong> 你的浏览器禁用了 JavaScript </strong>, 请 <strong>取消禁用</strong> 恢复应用程序正常工作。</noscript><div id="app"><div class="general-loading"><div class="dot-container"><div class="dot"></div><div class="dot"></div><div class="dot"></div></div></div></div><script type="text/javascript" src="/share.1393f3b71b7660b578fe.js"></script></body></html>