Commit Graph

4705 Commits

Author SHA1 Message Date
junjun
9642862e57 refactor: 数据集视图权限 2022-02-27 14:49:59 +08:00
taojinlong
37b5683bcc fix: 数据源、数据集 api 权限 2022-02-26 17:10:22 +08:00
taojinlong
cdaa7c42e3 fix: 数据源、数据集 api 权限 2022-02-26 17:10:02 +08:00
taojinlong
9ac2f35992 Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-02-26 17:08:45 +08:00
taojinlong
afa4b4ed32 fix: 数据源、数据集 api 权限 2022-02-26 17:08:37 +08:00
taojinlong
4eb5d29bed Merge branch 'dev' of github.com:dataease/dataease into dev 2022-02-26 17:07:18 +08:00
taojinlong
4f2fe49bea fix: 数据源、数据集 api 权限 2022-02-26 17:06:15 +08:00
王嘉豪
55962a5be0
Merge pull request #1834 from dataease/v1.8
V1.8
2022-02-25 18:38:45 +08:00
wangjiahao
68b29be9e7 Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-02-25 18:37:01 +08:00
wangjiahao
0ef9e7a001 fix: 仪表板复制后打开的是旧仪表板问题 2022-02-25 18:36:32 +08:00
junjun
1e407b49bb refactor: 去除堆叠柱状图柱间隔选项 2022-02-25 18:29:40 +08:00
junjun
3d458316a9 refactor: 去除堆叠柱状图柱间隔选项 2022-02-25 18:28:49 +08:00
taojinlong
48eec58796 fix: api 数据源有时修改名称弹出二次确认 2022-02-25 17:56:30 +08:00
fit2cloud-chenyw
b2403405d7 refactor: flyway修改拓展插件名称 2022-02-25 17:49:38 +08:00
fit2cloud-chenyw
cf60372f7d
Merge pull request #1833 from dataease/pr@v1.8@refactor_flyway_view_plugin
refactor: flyway修改拓展插件名称
2022-02-25 17:48:52 +08:00
fit2cloud-chenyw
04730cb4ac refactor: flyway修改拓展插件名称 2022-02-25 17:47:44 +08:00
wangjiahao
74bd25a641 Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-02-25 17:44:33 +08:00
wangjiahao
9c7ad6f04a fix: 仪表板保存视图被删的问题 2022-02-25 17:44:15 +08:00
taojinlong
6e1303aa72 fix: api 数据集补全字段 2022-02-25 17:38:53 +08:00
taojinlong
a9eb7b07b5 Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-02-25 17:32:35 +08:00
taojinlong
03a2e92254 fix: api 数据集补全字段 2022-02-25 17:32:17 +08:00
fit2cloud-chenyw
244ff50de9 Merge branch 'dev' into v1.8
合并代码
2022-02-25 17:16:04 +08:00
fit2cloud-chenyw
386cf68cd1 refactor: 重构基础镜像 2022-02-25 16:56:31 +08:00
fit2cloud-chenyw
a7b1645a63
Merge pull request #1830 from dataease/pr@dev@refactor_base_image
refactor: 重构基础镜像
2022-02-25 13:35:42 +08:00
fit2cloud-chenyw
724cd0633f refactor: 重构基础镜像 2022-02-25 13:33:44 +08:00
王嘉豪
84a6cb2ced
Merge pull request #1828 from dataease/v1.8
refactor: 增加svg边框自适应大小属性
2022-02-25 12:18:10 +08:00
wangjiahao
bc0962f27b refactor: 增加svg边框自适应大小属性 2022-02-25 12:17:33 +08:00
王嘉豪
2a3f397737
Merge pull request #1827 from dataease/v1.8
V1.8
2022-02-25 12:03:14 +08:00
wangjiahao
ecba9659f5 Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-02-25 12:00:45 +08:00
wangjiahao
5166facf16 refactor: 初始化时仪表板视图删的时候,不在复制对应的视图 2022-02-25 12:00:28 +08:00
Junjun
4b2a9150f5
Merge pull request #1826 from dataease/pr@v1.8@fix_api_ds
fix: 获取API数据源下表接口报错
2022-02-25 10:36:00 +08:00
junjun
bd62492d49 fix: 获取API数据源下表接口报错 2022-02-25 10:34:30 +08:00
Junjun
b8f8f9450d
Merge pull request #1825 from dataease/pr@dev@fix_api_ds
fix: 获取API数据源下表接口报错
2022-02-25 10:33:53 +08:00
junjun
4747624040 fix: 获取API数据源下表接口报错 2022-02-25 10:32:36 +08:00
fit2cloudrd
3602c397a7
Merge pull request #1824 from dataease/v1.8
V1.8
2022-02-25 09:52:08 +08:00
fit2cloudrd
a369c712b5
chore: 更新版本号 2022-02-25 09:51:29 +08:00
fit2cloudrd
c9d6f62eeb
Merge pull request #1823 from dataease/dev
Dev
2022-02-25 09:41:56 +08:00
wangjiahao
7c97035f71 refactor: 更新可选边框 2022-02-24 22:19:49 +08:00
wangjiahao
b29c00627d feat: 将所有仪表板板视图都归属仪表板 2022-02-24 21:54:03 +08:00
wangjiahao
b6cc7fca7d Merge remote-tracking branch 'origin/dev' into dev 2022-02-24 18:14:47 +08:00
wangjiahao
c32fce753d fix: 历史仪表板的公共链接打不开的问题 2022-02-24 18:14:32 +08:00
fit2cloud-chenyw
a52d4bfa13
Merge pull request #1819 from dataease/pr@dev@fix_tabs_init_error
fix: tabs初始化条件报错
2022-02-24 18:13:11 +08:00
fit2cloud-chenyw
1072f14204 fix: tabs初始化条件报错 2022-02-24 18:11:49 +08:00
wangjiahao
734aa62a31 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	backend/src/main/resources/db/migration/V32__1.8.sql
2022-02-24 17:41:27 +08:00
wangjiahao
c4dfd975f1 refactor: 仪表板复制支持视图、跳转信息、联动信息同步复制 2022-02-24 17:40:51 +08:00
fit2cloud-chenyw
527f5daac2
Merge pull request #1818 from dataease/pr@dev@feat_xpack_api
feat: 增加xpack包内部分api
2022-02-24 17:27:15 +08:00
fit2cloud-chenyw
8484b44ffb feat: 增加xpack包内部分api 2022-02-24 17:25:59 +08:00
taojinlong
64c1ebd11a Merge branch 'dev' of github.com:dataease/dataease into dev 2022-02-24 16:44:10 +08:00
taojinlong
52fcd983ae feat: 显示api数据表的状态 2022-02-24 16:43:54 +08:00
junjun
5e695b3b81 refactor: 漏斗图样式优化 2022-02-24 16:42:31 +08:00