center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
5,079 Commits 1 Branch 86 Tags 417 MiB
5876c5f0bc
Commit Graph

5079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangjiahao
02df8cb956 feat: 视图所有操作移到仪表板 2022-03-10 11:06:49 +08:00
wangjiahao
fea735fb5d Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/resources/generatorConfig.xml
#	frontend/src/lang/en.js
#	frontend/src/lang/tw.js
#	frontend/src/lang/zh.js
#	frontend/src/views/chart/view/ChartEdit.vue
 2022-03-10 10:48:18 +08:00
wangjiahao
cf55778229 feat: 视图所有操作移到仪表板 2022-03-10 10:38:33 +08:00
junjun
b24a46e6f6 refactor: 颜色优化 2022-03-10 10:10:07 +08:00
taojinlong
8b6dc5c0fa Update ExtractDataService.java 
fix: "kettle job 脚本"
 2022-03-09 20:07:49 +08:00
taojinlong
0609d24555 feat: 支持精简模式 2022-03-09 20:03:50 +08:00
fit2cloud-chenyw
16ac056240
Merge pull request #1900 from dataease/pr@dev@refactor_cache_redis 
refactor: 缓存兼容redis哨兵和分片集群模式
 2022-03-09 17:53:13 +08:00
fit2cloud-chenyw
07e267a702
Merge branch 'dev' into pr@dev@refactor_cache_redis 2022-03-09 17:51:49 +08:00
fit2cloud-chenyw
b388a8f49e refactor: 缓存兼容redis哨兵和分片集群模式 2022-03-09 17:49:23 +08:00
Junjun
50a6a03531
Merge pull request #1899 from dataease/pr@dev@feat_table_total 
feat: 透视表合计、小计
 2022-03-09 15:47:20 +08:00
junjun
e275e533f5 feat: 透视表合计、小计 2022-03-09 15:45:48 +08:00
junjun
62f7cdd5e0 refactor: s2配置调整 2022-03-09 11:06:54 +08:00
fit2cloud-chenyw
a6e47c82a2
Merge pull request #1896 from dataease/pr@dev@refactor_cache_module 
refactor: 缓存兼容redis单机模式
 2022-03-08 18:27:45 +08:00
fit2cloud-chenyw
cb0e2b6a65 refactor: 缓存兼容redis单机模式 2022-03-08 18:26:38 +08:00
junjun
172a0fb004 feat: 仪表盘阈值 2022-03-08 16:42:52 +08:00
junjun
c87f3eadb5 feat: 仪表盘阈值 2022-03-08 16:37:37 +08:00
junjun
5be238fc4f feat: 仪表盘阈值 2022-03-08 16:00:57 +08:00
Junjun
87a924e377
Merge pull request #1895 from dataease/pr@dev@feat_gauge_threshold 
feat: 仪表盘阈值
 2022-03-08 15:51:25 +08:00
junjun
f0a964f98e feat: 仪表盘阈值 2022-03-08 15:50:48 +08:00
junjun
6a36dd456c feat: 仪表盘阈值 2022-03-08 15:44:40 +08:00
fit2cloud-chenyw
6ccc29ebfd
Merge pull request #1888 from dataease/pr@dev@fix_mysql_driver_version 
fix: 升级mysql驱动
 2022-03-08 14:28:07 +08:00
junjun
f347578cc1 refactor: 关联数据集权限校验 2022-03-08 12:22:50 +08:00
xuwei-fit2cloud
8177049f5f refactor: 基于新基础镜像重构Dockerfile 2022-03-08 10:41:24 +08:00
junjun
f456f15d66 build: upgrade AntV dependency 2022-03-07 17:41:19 +08:00
Junjun
8470d02204
Merge pull request #1889 from dataease/pr@dev@feat_chart_senior 
feat: 视图高级设置
 2022-03-07 13:32:23 +08:00
junjun
a84820ba1e feat: 视图高级设置 2022-03-07 13:30:22 +08:00
fit2cloud-chenyw
dac24320b0 fix: 升级mysql驱动 2022-03-07 10:53:24 +08:00
fit2cloud-chenyw
52c6a1b2fe
Merge pull request #1886 from dataease/pr@dev@fix_jdbc_driver 
fix: 升级有安全漏洞的mysql驱动
 2022-03-07 10:06:05 +08:00
fit2cloud-chenyw
ff7273c205 fix: 升级有安全漏洞的mysql驱动 2022-03-07 10:04:49 +08:00
taojinlong
2a7ce9aec7 Merge branch 'v1.8' into dev 2022-03-04 18:21:08 +08:00
taojinlong
f36060de0e Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-03-04 18:20:20 +08:00
taojinlong
7675f9c119 fix: API 数据集增量同步 2022-03-04 15:45:43 +08:00
taojinlong
264efa33bc fix: 自定义数据集支持 API 数据集 2022-03-04 11:38:28 +08:00
Junjun
6703d74966
Merge pull request #1883 from dataease/pr@dev@feat_chart_senior 
feat: 视图高级设置
 2022-03-03 18:32:53 +08:00
junjun
58fd0a56bf feat: 视图高级设置 2022-03-03 18:30:50 +08:00
fit2cloud-chenyw
4de7293303 fix: 缺少直辖市外轮廓地图文件 2022-03-03 16:11:51 +08:00
fit2cloud-chenyw
e2ceda78db
Merge pull request #1881 from dataease/pr@dev@fix_miss_map_file 
fix: 缺少直辖市外轮廓地图文件
 2022-03-03 16:09:53 +08:00
fit2cloud-chenyw
d522ec0595 fix: 缺少直辖市外轮廓地图文件 2022-03-03 15:56:50 +08:00
fit2cloud-chenyw
4e308602a7 fix: 第三方用户登录后总是提示修改密码 2022-03-03 15:00:32 +08:00
fit2cloud-chenyw
cf2bd0ec2f
Merge pull request #1879 from dataease/pr@dev@fix_ldap_init_pwd_tips 
fix: 第三方用户登录后总是提示修改密码
 2022-03-03 14:59:51 +08:00
fit2cloud-chenyw
3986328304 fix: 第三方用户登录后总是提示修改密码 2022-03-03 14:58:55 +08:00
fit2cloud-chenyw
1f9c39c566 fix: tabs选项卡切换后条件无效 2022-03-03 14:35:36 +08:00
fit2cloud-chenyw
0ec378fa51
Merge pull request #1878 from dataease/pr@dev@fix_tabs_switch_filter 
fix: tabs选项卡切换后条件无效
 2022-03-03 14:34:47 +08:00
fit2cloud-chenyw
92961673a6 fix: tabs选项卡切换后条件无效 2022-03-03 14:33:43 +08:00
taojinlong
03d220869a Merge branch 'v1.8' into dev 2022-03-02 22:42:46 +08:00
taojinlong
2b05361788 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-02 22:42:16 +08:00
taojinlong
2f0bbe7c8d perf: 优化启动时，数据集初始化 2022-03-02 22:41:29 +08:00
wangjiahao
0a6e55247a Merge remote-tracking branch 'origin/dev' into dev 2022-03-02 22:34:21 +08:00
wangjiahao
a0a1b1f96e refactor: 修改初始化listener执行顺序 2022-03-02 22:34:05 +08:00
taojinlong
8592c9040e Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-03-02 22:16:00 +08:00