Commit Graph

3566 Commits

Author SHA1 Message Date
wangjiahao
e5cb790703 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-09 11:04:46 +08:00
fit2cloudrd
dbd782e62d
fix: 修复mysql8.0 flyway执行失败问题
* fix: 修复mysql8.0 flyway执行失败问题

* fix: 修复mysql8.0 flyway执行失败问题

Co-authored-by: wangjiahao <1522128093@qq.com>
2021-12-09 10:53:24 +08:00
wangjiahao
ef1155b78b fix: 修复mysql8.0 flyway执行失败问题 2021-12-09 10:51:27 +08:00
wangjiahao
4870689e5e fix: 修复mysql8.0 flyway执行失败问题 2021-12-09 10:51:09 +08:00
fit2cloud-chenyw
e1e770d61b
Merge pull request #1416 from dataease/pr@dev@fix_mobile_piblic_link
fix: 公共链接适配移动端嵌入
2021-12-09 10:50:48 +08:00
fit2cloud-chenyw
908a14c1f6 fix: 公共链接适配移动端嵌入 2021-12-09 10:49:32 +08:00
junjie
f52b94a0ce feat(视图): 同环比前端UI 2021-12-09 10:43:08 +08:00
XiaJunjie2020
2709602b1f
Merge pull request #1414 from dataease/pr@dev@feat_compare
feat(视图): 同环比前端UI
2021-12-08 18:44:19 +08:00
junjie
dfb83b4a43 feat(视图): 同环比前端UI 2021-12-08 18:42:00 +08:00
fit2cloud-chenyw
6ec3ef8d13
Merge pull request #1413 from dataease/pr@dev@feat_mobile_me
feat: 新增移动端个人中心
2021-12-08 17:41:21 +08:00
fit2cloud-chenyw
d7f1bbbd48 feat: 新增移动端个人中心 2021-12-08 17:40:06 +08:00
王嘉豪
ef357c600b
Merge pull request #1411 from dataease/pr@dev@feat_panel-mobile-layout
Pr@dev@feat panel mobile layout
2021-12-08 15:30:55 +08:00
wangjiahao
11515a5aeb fix: 仪表板预览时右侧边框间隔过大问题 2021-12-08 15:28:54 +08:00
wangjiahao
c98f20a0e9 Merge remote-tracking branch 'origin/v1.5' into feat_panel-mobile-layout 2021-12-08 14:46:05 +08:00
fit2cloud-chenyw
38c2007bb9 refactor: 规范代码 2021-12-07 18:39:08 +08:00
fit2cloud-chenyw
6357941bc6 fix: 第三方iframe嵌入公共链接 2021-12-07 18:38:40 +08:00
fit2cloud-chenyw
322e5c7c7d
Merge pull request #1410 from dataease/pr@dev@feat_mobile_api
feat: 新增移动端目录api
2021-12-07 18:31:13 +08:00
fit2cloud-chenyw
aee31d0d62 feat: 新增移动端目录api 2021-12-07 18:29:08 +08:00
王嘉豪
b83c308325
Merge pull request #1409 from dataease/pr@dev@feat_panel-mobile-layout
feat: 仪表板支持移动端布局展示
2021-12-07 17:35:32 +08:00
wangjiahao
5998a6c286 feat: 仪表板支持移动端布局展示 2021-12-07 17:32:02 +08:00
taojinlong
917e6fe5e7 Merge branch 'v1.5' of github.com:dataease/dataease into v1.5 2021-12-07 17:13:52 +08:00
taojinlong
0bb789db33 fix: sql 拼接错误 2021-12-07 17:13:36 +08:00
taojinlong
d0f24db4b9
Merge pull request #1408 from dataease/pr@dev@db2
Merge branch 'dev' into pr@dev@db2
2021-12-07 17:12:03 +08:00
taojinlong
7b6d444f1a Merge branch 'dev' into pr@dev@db2 2021-12-07 17:11:06 +08:00
taojinlong
ab7b7f541b feat(数据源): 支持 db2 2021-12-07 17:10:16 +08:00
XiaJunjie2020
0a5a93fe1c
Merge pull request #1407 from dataease/pr@dev@refactor_ds_sql
refactor: 数据关联优化
2021-12-07 16:24:09 +08:00
junjie
b4c453b4b5 refactor: 数据关联优化 2021-12-07 16:23:20 +08:00
fit2cloud-chenyw
8cf7ae32cf
Merge pull request #1405 from dataease/pr@v1.5@refactor_format_code
refactor: 规范代码
2021-12-07 11:28:08 +08:00
fit2cloud-chenyw
98ed70ae97 refactor: 规范代码 2021-12-07 11:26:58 +08:00
fit2cloudrd
51fb52a066
Update README.md 2021-12-06 17:37:03 +08:00
fit2cloudrd
514ef4008b
Create LICENSE 2021-12-06 17:28:35 +08:00
taojinlong
c51a41da34 fix: sql 拼接错误 2021-12-06 16:59:54 +08:00
wangjiahao
334c4bd8aa fix: 修复编辑仪表板时,初始化和编辑视图返回组件位置可能变化的问题 2021-12-06 15:40:15 +08:00
wangjiahao
5f46845bc2 fix: 修复对树形结构操作时,可能有其他节点展开的问题 2021-12-06 15:39:38 +08:00
王嘉豪
0d32b1d7b7
Merge pull request #1397 from dataease/pr@dev@fix_panel-edit-layout
fix: 修复编辑仪表板时,初始化和编辑视图返回组件位置可能变化的问题
2021-12-06 15:38:32 +08:00
wangjiahao
58705247ab fix: 修复编辑仪表板时,初始化和编辑视图返回组件位置可能变化的问题 2021-12-06 15:37:04 +08:00
XiaJunjie2020
b21cb8e736
Merge pull request #1396 from dataease/pr@dev@refactor_chart_icon
refactor: 视图优化
2021-12-06 14:42:19 +08:00
junjie
4f10dafec4 refactor: 视图优化 2021-12-06 14:41:12 +08:00
wangjiahao
e95fd0aeee Merge remote-tracking branch 'origin/dev' into dev 2021-12-06 11:54:51 +08:00
wangjiahao
e9404e6d1f fix: 修复对树形结构操作时,可能有其他节点展开的问题 2021-12-06 11:54:34 +08:00
fit2cloud-chenyw
e509c020cf
Merge pull request #1395 from dataease/pr@v1.5@fix_iframe_public_link
fix: 第三方iframe嵌入公共链接
2021-12-06 11:06:42 +08:00
fit2cloud-chenyw
0b1f5fe3b4 fix: 第三方iframe嵌入公共链接 2021-12-06 11:04:55 +08:00
XiaJunjie2020
7a43574326
Merge pull request #1394 from dataease/pr@dev@refactor_calc_field
refactor: 计算字段无需展示原始类型
2021-12-06 10:53:43 +08:00
junjie
297b26ca29 refactor: 计算字段无需展示原始类型 2021-12-06 10:52:57 +08:00
XiaJunjie2020
a6ca1a54f4
Merge pull request #1393 from dataease/pr@dev@fix_rollback
fix: rollback
2021-12-06 10:00:13 +08:00
junjie
5d83ffe0cf fix: rollback 2021-12-06 09:59:00 +08:00
fit2cloud-chenyw
c5e4dfc465
Merge pull request #1389 from dataease/pr@dev@feat_mobile_api
feat: 新增移动端接口
2021-12-03 18:24:34 +08:00
fit2cloud-chenyw
75cd6ec371 feat: 新增移动端接口 2021-12-03 18:23:28 +08:00
wangjiahao
fa5e0d9e19 Merge remote-tracking branch 'origin/dev' into dev 2021-12-03 17:40:52 +08:00
wangjiahao
2ab11e5007 fix: 修复仪表板pdf截图问题 2021-12-03 17:39:24 +08:00