center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
2,187 Commits 1 Branch 86 Tags 417 MiB
b79339ce9e
Commit Graph

2187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
XiaJunjie2020
b79339ce9e
Merge pull request #562 from dataease/pr@dev@feat_限制矩形图指标数量 
feat: 限制矩形图指标数量
 2021-08-09 16:57:48 +08:00
junjie
54e0490279 feat: 限制矩形图指标数量 2021-08-09 16:56:49 +08:00
fit2cloud-chenyw
9adde0ca10
Merge pull request #561 from dataease/pr@dev@feat_aksk_sql 
feat: 添加ak,sk的flyway
 2021-08-09 16:53:21 +08:00
fit2cloud-chenyw
8b421b8f91 feat: 添加ak,sk的flyway 2021-08-09 16:52:04 +08:00
XiaJunjie2020
2f77d566c8
Merge pull request #560 from dataease/pr@dev@fix_删除多余代码 
fix: 删除多余代码
 2021-08-09 16:44:44 +08:00
junjie
64f7b943e4 fix: 删除多余代码 2021-08-09 16:43:47 +08:00
XiaJunjie2020
1d04c5c9fa
Merge pull request #559 from dataease/pr@dev@feat_矩形树图 
feat: 矩形树图
 2021-08-09 16:38:14 +08:00
junjie
ed034e59f4 feat: 矩形树图 2021-08-09 16:37:15 +08:00
taojinlong
c7a6378c80 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-09 16:25:56 +08:00
taojinlong
55fc58fda9 fix: 抽取 oralce 数据 2021-08-09 16:25:46 +08:00
fit2cloud-chenyw
c94c02f24b
Merge pull request #558 from dataease/pr@dev@feat_aksk 
feat: 添加ak,sk
 2021-08-09 16:04:02 +08:00
fit2cloud-chenyw
bb711fb406 feat: 添加ak,sk 2021-08-09 16:01:29 +08:00
taojinlong
23f85147d8
Merge pull request #557 from dataease/pr@dev@sqlserver 
feat: sqlserver
 2021-08-09 14:19:00 +08:00
taojinlong
2edef2432e
Merge branch 'dev' into pr@dev@sqlserver 2021-08-09 14:18:54 +08:00
taojinlong
cbe4965485 feat: sqlserver 2021-08-09 14:17:22 +08:00
XiaJunjie2020
5535df32ce
Merge pull request #556 from dataease/pr@dev@refactor_视图返回参数构建 
refactor: 视图返回参数构建
 2021-08-09 13:45:17 +08:00
junjie
f521f2b7a1 refactor: 视图返回参数构建 2021-08-09 13:43:54 +08:00
taojinlong
004e2f72d6
Merge pull request #555 from dataease/pr@dev@sqlserver 
Merge branch 'dev' into pr@dev@sqlserver
 2021-08-09 12:46:50 +08:00
taojinlong
dcbea29b55 Merge branch 'dev' into pr@dev@sqlserver 2021-08-09 12:45:42 +08:00
taojinlong
a5dd1e3698 feat: sqlserver 2021-08-09 12:45:01 +08:00
王嘉豪
f87ac3cabc
Merge pull request #549 from dataease/pr@dev@feat_panel-linkage-set 
feat:仪表板联动设置浮层
 2021-08-06 17:25:14 +08:00
wangjiahao
d46a40dcd2 feat:仪表板联动设置浮层 2021-08-06 17:24:17 +08:00
XiaJunjie2020
4f81ca0f40
Merge pull request #548 from dataease/pr@dev@refactor_scatter优化 
refactor: scatter优化
 2021-08-06 16:47:04 +08:00
junjie
f8980b59e2 refactor: scatter优化 2021-08-06 16:40:48 +08:00
XiaJunjie2020
21a1b6803a
Merge pull request #547 from dataease/pr@dev@feat_散点图、气泡图 
feat: 散点图、气泡图
 2021-08-06 16:16:50 +08:00
junjie
911573673b feat: 散点图、气泡图 2021-08-06 16:15:59 +08:00
taojinlong
4ec3cdb68d Merge branch 'dev' into pr@dev@sqlserver 2021-08-06 12:25:22 +08:00
taojinlong
c983b661ff feat: sqlserver 2021-08-06 12:19:25 +08:00
xuwei-fit2cloud
9ec5e80880 chore: 修改工程属性 2021-08-06 10:27:57 +08:00
taojinlong
1b26790db3 refactor: 恢复覆盖的sql 2021-08-06 10:25:59 +08:00
taojinlong
74b849d0b9 feat: sqlserver 2021-08-06 10:21:50 +08:00
wangjiahao
7598584b07 Merge remote-tracking branch 'origin/dev' into dev 2021-08-05 18:42:03 +08:00
wangjiahao
49ce82cac7 refactor:临时提交 2021-08-05 18:41:47 +08:00
taojinlong
a72c679631 feat: 新增示例数据 2021-08-05 17:58:45 +08:00
wangjiahao
3a2bb24ca8 refactor:设置弹出框优化 2021-08-05 16:54:47 +08:00
wangjiahao
ea72141d45 refactor:代码回退 2021-08-05 14:02:39 +08:00
wangjiahao
9e609dae00 Merge remote-tracking branch 'origin/dev' into dev 2021-08-05 13:48:07 +08:00
wangjiahao
ad42815ca2 refactor:图片修改为自适应，不保持宽高比例 2021-08-05 13:47:48 +08:00
taojinlong
ddb6e767fd feat: sqlserver 2021-08-05 13:43:33 +08:00
王嘉豪
c1a4d084db
Merge pull request #539 from dataease/pr@dev@fix_panel-image 
refactor:优化联动设置
 2021-08-05 13:33:42 +08:00
wangjiahao
4838839e2b refactor:优化联动设置 2021-08-05 13:31:31 +08:00
XiaJunjie2020
4b71d5e81d
Merge pull request #537 from dataease/pr@dev@refactor_指标卡样式选项优化 
refactor: 指标卡样式选项优化
 2021-08-05 11:19:57 +08:00
junjie
5ae6475da7 refactor: 指标卡样式选项优化 2021-08-05 11:19:06 +08:00
XiaJunjie2020
a58fa5bbb7
Merge pull request #534 from dataease/pr@dev@fix_恢复flyway误删 
fix: 恢复flyway误删
 2021-08-05 10:20:47 +08:00
fit2cloud-chenyw
a4abd9deb4
Merge pull request #533 from dataease/pr@dev@refactor_dockerfile_version 
refactor: Dockerfile中version改为动态
 2021-08-05 10:20:41 +08:00
junjie
41259ae347 fix: 恢复flyway误删 2021-08-05 10:19:58 +08:00
fit2cloud-chenyw
d4e3fb938d refactor: Dockerfile中version改为动态 2021-08-05 10:19:31 +08:00
fit2cloud-chenyw
97366b448a
Merge pull request #532 from dataease/pr@dev@feat_modify_version 
feat: dev版本号升1.2.0
 2021-08-05 10:12:12 +08:00
fit2cloud-chenyw
ed0f59097a feat: dev版本号升1.2.0 2021-08-05 10:11:00 +08:00
fit2cloud-chenyw
8c480310f7
Merge pull request #531 from dataease/pr@dev@fix_删除重复flyway 
fix: flywaysql去除重复信息
 2021-08-05 09:50:24 +08:00