Commit Graph

9292 Commits

Author SHA1 Message Date
taojinlong
752c7f7c59 Merge branch 'dev' into v1.18 2023-02-28 16:11:09 +08:00
taojinlong
2f47c2d6dc
Merge pull request #4665 from dataease/pr@dev@pages
fix: oracle 分页错误
2023-02-28 16:10:30 +08:00
taojinlong
23ded193c4 fix: oracle 分页错误 2023-02-28 16:09:49 +08:00
fit2cloudrd
7c9ab4c3cb
Merge pull request #4664 from dataease/dev
merge dev
2023-02-28 15:56:44 +08:00
王嘉豪
f2cc52b705
Merge pull request #4663 from dataease/pr@dev@refactor_version
refactor: 升级版本号
2023-02-28 15:55:46 +08:00
wangjiahao
f135e538c8 refactor: 升级版本号 2023-02-28 15:52:45 +08:00
王嘉豪
21da299fff
Merge pull request #4661 from dataease/pr@dev@fix_panel-tips
fix(仪表板): 优化新建仪表板目录提示文案  #4619
2023-02-28 15:39:45 +08:00
wangjiahao
abd77f84fd fix(仪表板): 优化新建仪表板目录提示文案 #4619 2023-02-28 15:33:50 +08:00
wangjiahao
d2736f3cb3 Merge branch 'dev' of github.com:dataease/dataease into dev 2023-02-28 15:20:56 +08:00
王嘉豪
9fef1dad66
Merge pull request #4660 from dataease/pr@dev@fix_app-custom
fix(应用): 修复仪表板应用导出时,携带单独数据集定义的组件导入新环境组件会报错问题 #4620
2023-02-28 15:19:02 +08:00
wangjiahao
98e539e0fe Merge branch 'dev' of github.com:dataease/dataease into dev 2023-02-28 15:18:55 +08:00
fit2cloudrd
43ca37054e
Merge pull request #4659 from dataease/dev
merge dev
2023-02-28 15:12:08 +08:00
wangjiahao
d27d7e91d7 fix(应用): 修复仪表板应用导出时,携带单独数据集定义的组件导入新环境组件会报错问题 #4620 2023-02-28 15:11:41 +08:00
Junjun
3093e9200b
Merge pull request #4658 from dataease/pr@dev@fix_custom_sort
fix(视图): 修复自定义排序第二次进入直接确认无效的问题
2023-02-28 15:09:41 +08:00
junjun
3a0c6c9629 fix(视图): 修复自定义排序第二次进入直接确认无效的问题 2023-02-28 15:08:17 +08:00
taojinlong
41c4af8146 Merge branch 'dev' into v1.18 2023-02-28 14:39:27 +08:00
taojinlong
00b8178e7a
Merge pull request #4655 from dataease/pr@dev@pages
refactor: 升级版本号
2023-02-28 14:38:41 +08:00
taojinlong
37cf81a19d refactor: 升级版本号 2023-02-28 14:36:09 +08:00
dataeaseShu
66f46ff7d5
Merge pull request #4653 from dataease/pr@dev_memory_component
Pr@dev memory component
2023-02-28 13:02:40 +08:00
taojinlong
94bdaa8506 Merge branch 'dev' into v1.18 2023-02-28 12:19:05 +08:00
dataeaseShu
4c68054b09 Merge branch 'dev' into pr@dev_memory_component 2023-02-28 10:46:18 +08:00
dataeaseShu
30c32ca8dc fix: SQL数据集编辑界面,没有横向滚动条 #4606 2023-02-28 10:44:26 +08:00
王嘉豪
b8ee001f2a
Merge pull request #4646 from dataease/pr@dev@fix_rich-text
fix(仪表板):修复部分富文本组件样式无法保存问题
2023-02-27 16:32:55 +08:00
wangjiahao
38074db9f2 fix(仪表板):修复部分富文本组件样式无法保存问题 2023-02-27 16:26:49 +08:00
taojinlong
e882889523
Merge pull request #4645 from dataease/pr@dev@pages
fix: 同步mysql数据出错
2023-02-27 16:00:06 +08:00
taojinlong
1088be209f fix: 同步mysql数据出错 2023-02-27 15:37:08 +08:00
taojinlong
0047493dfc Merge branch 'dev' into v1.18 2023-02-27 13:58:32 +08:00
taojinlong
9bc3d05fde Merge branch 'v1.18' of github.com:dataease/dataease into v1.18 2023-02-27 13:58:27 +08:00
taojinlong
f0cadb4f17
Merge pull request #4644 from dataease/pr@dev@pages
fix: 更新demo数据源信息
2023-02-27 13:53:37 +08:00
taojinlong
c2adf7ec5c fix: 更新demo数据源信息 2023-02-27 13:49:52 +08:00
dataeaseShu
a3da449e79
Merge pull request #4625 from dataease/pr@dev_memory_component
Pr@dev memory component
2023-02-24 10:10:42 +08:00
dataeaseShu
4c53acc65a Merge branch 'dev' into pr@dev_memory_component 2023-02-24 10:07:15 +08:00
dataeaseShu
84cf0adc1f fix: 权限管理权限授权框错位 2023-02-24 10:06:14 +08:00
Junjun
19bf2b472e
Merge pull request #4624 from dataease/pr@dev@fix_field
fix(视图): 修复视图计算字段聚合函数报错的问题
2023-02-23 22:55:20 +08:00
junjun
46552707f7 fix(视图): 修复视图计算字段聚合函数报错的问题 2023-02-23 22:53:28 +08:00
fit2cloudrd
66679edc7f
Merge pull request #4621 from dataease/dev
merge dev
2023-02-23 19:14:41 +08:00
dataeaseShu
69e6170445
Merge pull request #4618 from dataease/pr@dev_memory_component
Pr@dev memory component
2023-02-23 18:09:07 +08:00
dataeaseShu
da84841eb7 Merge branch 'dev' into pr@dev_memory_component 2023-02-23 18:00:49 +08:00
dataeaseShu
a711b60ebd fix: 权限管理 选框对齐 2023-02-23 17:59:49 +08:00
王嘉豪
497b454d11
Merge pull request #4617 from dataease/pr@dev@fix_table-export
fix(视图): 修复部分表格全量导出时报错问题
2023-02-23 17:50:35 +08:00
wangjiahao
391e4782e0 fix(视图): 修复部分表格全量导出时报错问题 2023-02-23 17:43:15 +08:00
fit2cloudrd
d6f0e8fef2
Merge pull request #4613 from dataease/dev
Update README.md
2023-02-23 13:15:29 +08:00
fit2cloudrd
aca40cfcde
Update README.md 2023-02-23 13:15:04 +08:00
fit2cloudrd
e6672471ca
Merge pull request #4612 from dataease/dev
merge
2023-02-23 11:03:25 +08:00
dataeaseShu
3a72034203
Merge pull request #4611 from dataease/pr@dev_memory_component
Pr@dev memory component
2023-02-23 10:42:10 +08:00
dataeaseShu
c9556e5d27 Merge branch 'dev' into pr@dev_memory_component 2023-02-23 10:32:07 +08:00
dataeaseShu
345f0c03bf fix: 用户管理重制密码 2023-02-23 10:31:25 +08:00
fit2cloudrd
7c04ff3193
Merge pull request #4609 from dataease/dev
merge dev
2023-02-23 09:50:33 +08:00
wisonic-s
326361f4fe
Merge pull request #4608 from dataease/pr@dev@fix_group_bar_drill
fix(分组柱状图-下钻): 修复分组柱状图子维度下钻问题
2023-02-22 23:15:18 +08:00
wisonic-s
df03e734b5 fix(分组柱状图-下钻): 修复分组柱状图子维度下钻问题
修复分组柱状图在在下钻初始维度为子维度时数据不准确的问题
https://www.tapd.cn/55578866/bugtrace/bugs/view/1155578866001023529
2023-02-22 23:12:26 +08:00