Commit Graph

1763 Commits

Author SHA1 Message Date
wangjiahao
343a386955 feat: 模板新建仪表板可以更换数据集,未更换显示模板视图数据,并提示 2022-03-16 18:09:16 +08:00
wangjiahao
2feb5138b3 feat: 从模板新建的仪表板支持查看模板缓存数据 2022-03-15 21:41:28 +08:00
wangjiahao
558dfa7d62 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	backend/src/main/java/io/dataease/service/chart/ChartViewService.java
2022-03-15 18:02:19 +08:00
wangjiahao
945f7008a1 feat: 从模板新建的仪表板支持查看模板缓存数据 2022-03-15 18:00:19 +08:00
junjun
63c4f5f2ac feat: 文本卡 2022-03-15 11:11:40 +08:00
taojinlong
39865e1766 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-14 21:20:52 +08:00
taojinlong
5eb54eab52 fix: 修复精简模式下同步数据 2022-03-14 21:20:23 +08:00
wangjiahao
5b363b985b Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	backend/src/main/resources/db/migration/V33__1.9.sql
#	backend/src/main/resources/generatorConfig.xml
2022-03-14 21:16:14 +08:00
wangjiahao
9a8cc0c14a feat: 仪表板模板保存支持保存临时数据 2022-03-14 21:15:33 +08:00
taojinlong
5afa737e36 refactor: 恢复代码 2022-03-14 13:15:22 +08:00
taojinlong
2d1f41df19 feat: 支持精简模式 2022-03-14 12:35:04 +08:00
taojinlong
eae0095db4 refactor: resolve Conflicts 2022-03-14 12:30:20 +08:00
taojinlong
e81138ec5c feat: 支持精简模式 2022-03-14 12:26:24 +08:00
wangjiahao
5ce21e9471 refactor: 仪表板视图操作优化 2022-03-10 21:09:47 +08:00
wangjiahao
48a27b0333 Merge remote-tracking branch 'origin/dev' into dev 2022-03-10 20:26:46 +08:00
wangjiahao
cfe1ed3fdc refactor: 仪表板视图操作优化 2022-03-10 20:26:31 +08:00
fit2cloud-chenyw
3d1c3958f3 feat: 升级版本号1.9.0 2022-03-10 17:10:25 +08:00
wangjiahao
59aa355ed9 refactor: 仪表板保存,防止清理多余视图 2022-03-10 12:08:21 +08:00
wangjiahao
0c0f6d2f8b refactor: 优化新建视图操作 2022-03-10 11:53:18 +08:00
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
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
b388a8f49e refactor: 缓存兼容redis哨兵和分片集群模式 2022-03-09 17:49:23 +08:00
fit2cloud-chenyw
cb0e2b6a65 refactor: 缓存兼容redis单机模式 2022-03-08 18:26:38 +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
fit2cloud-chenyw
dac24320b0 fix: 升级mysql驱动 2022-03-07 10:53:24 +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
junjun
58fd0a56bf feat: 视图高级设置 2022-03-03 18:30:50 +08:00
fit2cloud-chenyw
4e308602a7 fix: 第三方用户登录后总是提示修改密码 2022-03-03 15:00:32 +08:00
fit2cloud-chenyw
3986328304 fix: 第三方用户登录后总是提示修改密码 2022-03-03 14:58:55 +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
3f889ab62d fix: 自助数据集 api 权限校验 2022-03-02 22:15:48 +08:00
taojinlong
d7a52c28e6 fix: mysql 支持视图 2022-03-02 20:47:33 +08:00
taojinlong
48897c2d1e fix: mysql 支持视图 2022-03-02 20:46:18 +08:00
taojinlong
76e759e605 fix: 异常处理 2022-03-02 18:52:05 +08:00
taojinlong
81e90f2ac6 fix: mysql 支持视图 2022-03-02 18:41:58 +08:00
junjun
9f5820cccc fix: 数据源权限 2022-03-02 18:30:34 +08:00
junjun
a0321b9139 fix: 数据源权限 2022-03-02 18:29:03 +08:00
wangjiahao
479081bcee Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-03-02 18:02:26 +08:00
wangjiahao
fa12e77d5a fix: 无法复制空仪表板问题 2022-03-02 18:02:11 +08:00