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

2613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
XiaJunjie2020
1bd0242588
Merge pull request #775 from dataease/pr@dev@feat_chart_yaxis_ext 
feat(视图): 组合图双y轴
 2021-09-06 17:29:04 +08:00
junjie
62759d2b66 feat(视图): 组合图双y轴 2021-09-06 17:27:59 +08:00
XiaJunjie2020
fc90d4b12d
Merge pull request #773 from dataease/pr@dev@feat_chart_yaxis_ext 
feat(视图): 组合图双y轴
 2021-09-06 16:59:23 +08:00
junjie
bcbe24cfe0 feat(视图): 组合图双y轴 2021-09-06 16:58:33 +08:00
XiaJunjie2020
bd747ea5e4
Merge pull request #771 from dataease/pr@dev@feat_chart_info 
feat(视图): 增加明细表
 2021-09-06 14:55:33 +08:00
junjie
c3315de47d feat(视图): 增加明细表 2021-09-06 14:54:31 +08:00
XiaJunjie2020
b12d07e54f
Merge pull request #770 from dataease/pr@dev@feat_ds_table_info 
feat(视图): 各数据源支持明细表计算逻辑
 2021-09-06 14:19:13 +08:00
junjie
b9d10f5899 feat(视图): 各数据源支持明细表计算逻辑 2021-09-06 14:18:27 +08:00
XiaJunjie2020
584b99dde3
Merge pull request #769 from dataease/pr@dev@feat_chart_table_info 
feat(视图): 增加明细表
 2021-09-06 14:06:59 +08:00
junjie
53b6510859 feat(视图): 增加明细表 2021-09-06 14:06:10 +08:00
王嘉豪
cec9a85be0
Merge pull request #767 from dataease/pr@dev@refactor_panel-pdf 
feat:仪表板和仪表板分组允许移动
 2021-09-03 18:00:06 +08:00
wangjiahao
d10e4b5ca6 feat:仪表板和仪表板分组允许移动 2021-09-03 17:59:20 +08:00
taojinlong
3de59dee36 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-09-03 17:31:34 +08:00
taojinlong
6ad719bd5e fix: 处理二进制类型 2021-09-03 17:31:25 +08:00
XiaJunjie2020
6f3f668efc
Merge pull request #766 from dataease/pr@dev@fix_ds_filter 
fix: 过滤时间类型字段可能出错
 2021-09-03 16:59:15 +08:00
junjie
a47c54c2a6 fix: 过滤时间类型字段可能出错 2021-09-03 16:56:51 +08:00
XiaJunjie2020
176742748d
Merge pull request #763 from dataease/pr@dev@fix_ds_filter 
fix: 过滤时间类型字段可能出错
 2021-09-03 16:37:45 +08:00
junjie
bc17daf1ed fix: 过滤时间类型字段可能出错 2021-09-03 16:36:19 +08:00
fit2cloud-chenyw
10565dc9c6
Merge pull request #762 from dataease/pr@dev@fix_二级菜单主题 
fix: 二级菜单选中时候显示主题悬浮色
 2021-09-03 16:30:24 +08:00
fit2cloud-chenyw
e3b93d953a fix: 二级菜单选中时候显示主题悬浮色 2021-09-03 16:28:53 +08:00
fit2cloud-chenyw
ba589d0187
Merge pull request #760 from dataease/pr@dev@feat_theme_switch 
feat: 切换主题基本功能
 2021-09-03 14:49:07 +08:00
fit2cloud-chenyw
b68888bc27
Merge branch 'dev' into pr@dev@feat_theme_switch 2021-09-03 14:48:43 +08:00
fit2cloud-chenyw
9a69f8a23f feat: 主题切换sql依赖 2021-09-03 14:46:06 +08:00
fit2cloud-chenyw
5ca005b336 feat: 切换主题基本功能 2021-09-03 14:40:47 +08:00
XiaJunjie2020
a90de21b1f
Merge pull request #758 from dataease/pr@dev@feat_axis_value 
feat(视图): 坐标轴轴值设置
 2021-09-03 11:21:46 +08:00
王嘉豪
6bd2c603aa
Merge pull request #757 from dataease/pr@dev@refactor_panel-pdf 
feat:仪表板新增复制功能
 2021-09-03 11:20:52 +08:00
junjie
80d63390d9 feat(视图): 坐标轴轴值设置 2021-09-03 11:20:49 +08:00
wangjiahao
de717cd026 feat:仪表板新增复制功能 2021-09-03 11:19:01 +08:00
王嘉豪
14ab9c3515
Merge pull request #755 from dataease/pr@dev@refactor_panel-pdf 
feat:仪表板导出支持模板选择功能
 2021-09-02 19:03:21 +08:00
wangjiahao
139d7ef5f8 feat:仪表板导出支持模板选择功能 2021-09-02 19:02:41 +08:00
王嘉豪
d47921c3e0
Merge pull request #754 from dataease/pr@dev@refactor_panel-pdf 
feat:仪表板导出支持模板选择功能
 2021-09-02 19:01:26 +08:00
wangjiahao
32b8ae4886 feat:仪表板导出支持模板选择功能 2021-09-02 18:59:21 +08:00
taojinlong
c09286183a Merge branch 'dev' of github.com:dataease/dataease into dev 2021-09-02 15:19:41 +08:00
taojinlong
dcfb19fab9 fix: 校验sqlserver schema 非空 2021-09-02 15:19:30 +08:00
fit2cloud-chenyw
ad2e93c63e feat: 尝试增加主题切换功能 2021-09-02 14:28:15 +08:00
XiaJunjie2020
1c83d4ad19
Merge pull request #746 from dataease/pr@dev@feat_chart_mix 
feat: 组合图
 2021-09-01 18:16:01 +08:00
junjie
12b192bcfc feat: 组合图 2021-09-01 18:14:03 +08:00
王嘉豪
5edb7dad3c
Merge pull request #744 from dataease/v1.2 
V1.2
 2021-09-01 16:11:02 +08:00
wangjiahao
06145622db refactor:增加管理员菜单权限 2021-09-01 16:00:02 +08:00
wangjiahao
93e40832fb fix:全屏模式下输入框输入内容自动退出的问题 2021-09-01 15:14:50 +08:00
wangjiahao
7f862b1fc7 refactor:仪表版视图列表组件列表排序方式和视图保持一致 2021-09-01 14:14:22 +08:00
wangjiahao
6cda486cf0 Merge remote-tracking branch 'origin/v1.2' into v1.2 2021-09-01 14:04:27 +08:00
wangjiahao
22e0d8f307 fix:1.重做按钮不生效问题；2.输入文字保存按钮依然是灰的问题 2021-09-01 14:03:55 +08:00
XiaJunjie2020
cbb574d418
Merge pull request #743 from dataease/pr@dev@fix_ds_sql 
fix: 数据源查询计算过滤完善
 2021-09-01 13:33:11 +08:00
junjie
b3e3e667af fix: 数据源查询计算过滤完善 2021-09-01 13:31:12 +08:00
XiaJunjie2020
2040441de3
Merge pull request #742 from dataease/pr@v1.2@fix_ds_sql 
fix: 数据源查询计算过滤完善
 2021-09-01 13:28:51 +08:00
junjie
554e9c1572 fix: 数据源查询计算过滤完善 2021-09-01 13:28:05 +08:00
XiaJunjie2020
fb5b66532e
Merge pull request #741 from dataease/pr@v1.2@fix_ds_sql 
fix: 数据源查询计算过滤完善
 2021-09-01 12:03:20 +08:00
junjie
2d367809d7 fix: 数据源查询计算过滤完善 2021-09-01 12:02:36 +08:00
XiaJunjie2020
ea6dbc3f76
Merge pull request #740 from dataease/pr@dev@fix_ds_sql 
fix: 数据源查询计算过滤完善
 2021-09-01 11:57:37 +08:00