Commit Graph

5510 Commits

Author SHA1 Message Date
fit2cloud-chenyw
7ebbf09dda fix: 移动端查看分享错误 2022-05-27 12:05:11 +08:00
fit2cloud-chenyw
b9562dd9c0
Merge pull request #2326 from dataease/pr@dev@fix_tree_field_sort
fix: 树形没有按照字段先后顺序构建树
2022-05-26 23:31:58 +08:00
fit2cloud-chenyw
0dd419c7fe fix: 树形没有按照字段先后顺序构建树 2022-05-26 23:30:34 +08:00
fit2cloud-chenyw
090e7a0a39
Merge pull request #2325 from dataease/pr@dev@fix_log_export
fix: 日志导出增加条件
2022-05-26 22:42:40 +08:00
fit2cloud-chenyw
bab9634d2e fix: 日志导出增加条件 2022-05-26 22:41:46 +08:00
fit2cloud-chenyw
04fe29a96c
Merge pull request #2324 from dataease/pr@dev@fix_log_i18n
fix: 操作日志国际化
2022-05-26 21:23:12 +08:00
fit2cloud-chenyw
791c27910c fix: 操作日志国际化 2022-05-26 21:22:09 +08:00
王嘉豪
ad830ee8fb
Merge pull request #2323 from dataease/pr@dev@fix_panel-symbol
style: 富文本初始化文案修改
2022-05-26 18:46:42 +08:00
wangjiahao
d50bbe7904 style: 富文本初始化文案修改 2022-05-26 18:46:02 +08:00
王嘉豪
dac21cfa13
Merge pull request #2322 from dataease/pr@dev@fix_panel-symbol
fix: 移动端布局设置时符号地图显示问题
2022-05-26 18:42:47 +08:00
wangjiahao
91ccc41c0b fix: 移动端布局设置时符号地图显示问题 2022-05-26 18:41:34 +08:00
junjun
e048d4cacd Merge remote-tracking branch 'origin/dev' into dev 2022-05-26 18:24:35 +08:00
junjun
57330d34df feat: 自定义颜色 2022-05-26 18:24:17 +08:00
taojinlong
70bed25162 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-26 18:07:12 +08:00
taojinlong
ac29f9db2b fix: 菜单授权报错 2022-05-26 18:07:04 +08:00
fit2cloud-chenyw
d379f11189
Merge pull request #2321 from dataease/pr@dev@style_filter_tree
style: 树形过滤器默认样式
2022-05-26 17:55:24 +08:00
fit2cloud-chenyw
0a677777ae style: 树形过滤器默认样式 2022-05-26 17:51:32 +08:00
fit2cloud-chenyw
d77aef22b8
Merge pull request #2320 from dataease/pr@dev@fix_delete_test_code
fix: 删除测试代码
2022-05-26 17:40:08 +08:00
fit2cloud-chenyw
d9772989b6 fix: 删除测试代码 2022-05-26 17:39:06 +08:00
fit2cloud-chenyw
d1dd787198
Merge pull request #2319 from dataease/pr@dev@perf_base_logic
perf: 优化树形过滤器
2022-05-26 17:37:32 +08:00
fit2cloud-chenyw
5113e93bb2 perf: 优化树形过滤器 2022-05-26 17:35:53 +08:00
junjun
db215743e8 fix: 批量操作配置 2022-05-26 17:12:50 +08:00
dataeaseShu
3b05d47567
Merge pull request #2317 from dataease/pr@dev_feat_filter_width
feat: 【仪表板】筛选框文字支持排列设置(靠上、居中等)宽度自适应
2022-05-26 15:35:51 +08:00
dataeaseShu
4880237964 feat: 【仪表板】筛选框文字支持排列设置(靠上、居中等)宽度自适应 2022-05-26 15:34:07 +08:00
taojinlong
dd2e9a6e6f fix: 删除数据源权限错误 2022-05-26 15:28:04 +08:00
taojinlong
68fb4980a1 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-26 15:17:52 +08:00
junjun
1d8e2658bf feat: 支持树形过滤器sql 2022-05-26 14:30:03 +08:00
王嘉豪
7b29538822
Merge pull request #2315 from dataease/pr@dev@refactor_bat-opt
refator: 批量样式设置显示优化
2022-05-26 14:16:30 +08:00
wangjiahao
b0b46fd4c1 refator: 批量样式设置显示优化 2022-05-26 14:15:48 +08:00
junjun
e6cb841841 Merge remote-tracking branch 'origin/dev' into dev 2022-05-26 13:18:38 +08:00
junjun
9068d80516 test: 树形过滤器sql拼接 2022-05-26 13:18:20 +08:00
fit2cloud-chenyw
e0f6bb0081
Merge pull request #2314 from dataease/pr@dev@perf_base_logic
perf: 树形过滤器基本逻辑
2022-05-26 13:18:02 +08:00
fit2cloud-chenyw
a0fb3a62ad perf: 树形过滤器基本逻辑 2022-05-26 13:15:50 +08:00
fit2cloud-chenyw
f5241528ff
Merge pull request #2313 from dataease/pr@dev@feat_tree_select
feat: 过滤条件增加下拉树
2022-05-26 12:54:14 +08:00
fit2cloud-chenyw
2cf026edcf feat: 过滤条件增加下拉树 2022-05-26 12:53:18 +08:00
junjun
83081b94e5 test: 树形过滤器sql拼接 2022-05-26 12:38:06 +08:00
王嘉豪
653f539c28
Merge pull request #2312 from dataease/pr@dev@refactor_bat-opt
fix: 批量设置视图样式时,若样式菜单过长,则无法滚动选择到底部的样式选项
2022-05-26 12:09:31 +08:00
wangjiahao
ca41d05200 fix: 批量设置视图样式时,若样式菜单过长,则无法滚动选择到底部的样式选项 2022-05-26 12:08:40 +08:00
王嘉豪
4b74619a13
Merge pull request #2311 from dataease/pr@dev@refactor_rich-text
fix: 复用视图,在预览视图时出现显示问题
2022-05-26 11:47:38 +08:00
wangjiahao
72ad660a39 fix: 复用视图,在预览视图时出现显示问题 2022-05-26 11:47:04 +08:00
taojinlong
9f0659d37f Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-26 11:44:44 +08:00
王嘉豪
99d7fb2b98
Merge pull request #2310 from dataease/pr@dev@refactor_rich-text
refactor: 优化富文本工具栏分组
2022-05-26 11:38:24 +08:00
wangjiahao
c1c8f7a18e refactor: 优化富文本工具栏分组 2022-05-26 11:37:33 +08:00
taojinlong
5490dd15bb Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-26 11:35:48 +08:00
taojinlong
f4b52c5489 fix: 国际化错误 2022-05-26 11:35:39 +08:00
dataeaseShu
c7133be62d
Merge pull request #2307 from dataeaseShu/pr@dev_feat_filter_position_text
feat(textattr+deoutwidet): 【仪表板】筛选框文字支持排列设置(靠上、居中等)
2022-05-26 10:18:19 +08:00
dataeaseShu
71dc03b4be feat: 【仪表板】筛选框文字支持排列设置(靠上、居中等) 2022-05-26 10:10:07 +08:00
王嘉豪
539a8993b5
Merge pull request #2308 from dataease/pr@dev@refactor_view-copy
refactor: 复用存量视图自动勾选
2022-05-26 09:59:04 +08:00
wangjiahao
27fe16fd0a refactor: 复用存量视图自动勾选 2022-05-26 09:58:00 +08:00
taojinlong
626f97935e fix: 优化驱动管理 2022-05-25 23:07:59 +08:00