Commit Graph

10618 Commits

Author SHA1 Message Date
dataeaseShu
4570877539
Merge pull request #6947 from dataease/pr@dev_one_dot_x
Pr@dev one dot x
2023-11-30 17:45:14 +08:00
dataeaseShu
6dd352ae26 Merge branch 'dev' into pr@dev_one_dot_x 2023-11-30 17:44:41 +08:00
dataeaseShu
905be5a84a fix: 使用数据库数据集新增计算字段,如果点击引用字段输入框中有信息,保存时会提示字段表达式语法错误。 #6919 2023-11-30 17:43:21 +08:00
Junjun
68551c59a5
Merge pull request #6945 from dataease/pr@dev@fix_union
fix: 关联数据集报错 #6894
2023-11-30 16:57:44 +08:00
junjun
c591a8377e fix: 关联数据集报错 #6894 2023-11-30 16:56:53 +08:00
taojinlong
6aedad4bd1
Merge pull request #6944 from dataease/pr@dev@fixSql
fix: API 超时时间
2023-11-30 02:38:48 -06:00
Junjun
58e4c593b2
Merge pull request #6942 from dataease/pr@dev@fix_union
fix: 关联数据集报错 #6894
2023-11-30 16:37:01 +08:00
taojinlong
cba0c4130c fix: API 超时时间 2023-11-30 16:35:54 +08:00
taojinlong
06409a39d1
Merge pull request #6943 from dataease/pr@dev@fixSql
fix: API 丢失null字段
2023-11-30 02:25:45 -06:00
taojinlong
a18015dbbd fix: API 丢失null字段 2023-11-30 16:24:47 +08:00
junjun
c8a4059dd4 fix: 关联数据集保存 #6894 2023-11-30 16:19:59 +08:00
taojinlong
17b9b7c809
Merge pull request #6938 from dataease/pr@dev@fixSql
fix: API 丢失null字段
2023-11-29 22:39:19 -06:00
taojinlong
3e8e910c25 fix: API 丢失null字段 2023-11-30 12:37:59 +08:00
taojinlong
78ae088cca
Merge pull request #6934 from dataease/pr@dev@fixSql
fix: SQL变量误报错 #6624
2023-11-29 05:27:08 -06:00
taojinlong
c22e25ec00 fix: SQL变量误报错 #6624 2023-11-29 19:26:12 +08:00
fit2cloud-chenyw
da3a96de8d
Merge pull request #6920 from dataease/pr@dev@perf_select_first_filter_tab
perf: 下拉过滤器与选项卡交互
2023-11-29 16:25:15 +08:00
fit2cloud-chenyw
f78ab3f29d perf: 下拉过滤器与选项卡交互 2023-11-29 16:23:56 +08:00
ulleo
a11e9a5731
Merge pull request #6918 from ulleo/dev
fix: 在指标设置为“占比”的情况下,钻取可能触发 / by zero 报错
2023-11-29 14:57:22 +08:00
ulleo
b8af080b4d fix: 在指标设置为“占比”的情况下,钻取可能触发 / by zero 报错 2023-11-29 14:47:18 +08:00
fit2cloud-chenyw
515b881558
Merge pull request #6917 from dataease/pr@dev@perf_edit_filter
perf: 下拉过滤器首选项作用于tab中视图(编辑状态)
2023-11-29 14:15:03 +08:00
fit2cloud-chenyw
ed3117af5b perf: 下拉过滤器首选项作用于tab中视图(编辑状态) 2023-11-29 14:12:36 +08:00
taojinlong
70effc90fd
Merge pull request #6914 from dataease/pr@dev@fixSql
Pr@dev@fix sql
2023-11-28 23:03:49 -06:00
taojinlong
2062cfd4e6 fix: SQL变量误报错 #6624 2023-11-29 12:59:43 +08:00
taojinlong
02d678a9b6 fix: 校验查询超时 2023-11-29 12:22:58 +08:00
taojinlong
f337c73c11 fix: 解析sql报错 2023-11-29 12:13:47 +08:00
dataeaseShu
f6ebf7f440
Merge pull request #6913 from dataease/pr@dev_one_dot_x
Pr@dev one dot x
2023-11-29 11:38:55 +08:00
dataeaseShu
5ed6578742 Merge branch 'dev' into pr@dev_one_dot_x 2023-11-29 11:38:25 +08:00
dataeaseShu
0fa959e8d5 test: 微信测试 2023-11-29 11:33:44 +08:00
fit2cloud-chenyw
3bad3b42d5
Merge pull request #6912 from dataease/pr@dev@perf_tab_view_filter
perf: 过滤器设置首项作用于tab内视图预览无效
2023-11-29 11:29:01 +08:00
fit2cloud-chenyw
d7141dfa9a perf: 过滤器设置首项作用于tab内视图预览无效 2023-11-29 11:25:49 +08:00
dataeaseShu
52690e9e83
Merge pull request #6911 from dataease/pr@dev_one_dot_x
Pr@dev one dot x
2023-11-29 11:12:53 +08:00
dataeaseShu
cfb4557b8e Merge branch 'dev' into pr@dev_one_dot_x 2023-11-29 11:12:15 +08:00
dataeaseShu
bba53c048b test: 微信测试 2023-11-29 11:11:03 +08:00
wisonic-s
f64f2b89b2
Merge pull request #6910 from dataease/pr@dev@fix_click_btn_lost
fix(视图): 修复联动跳转选框在全屏预览状态下部分不可见
2023-11-29 10:18:14 +08:00
wisonic-s
63e0c71cf8 fix(视图): 修复联动跳转选框在全屏预览状态下部分不可见 2023-11-29 10:14:08 +08:00
王嘉豪
ab1daeb508
Merge pull request #6907 from dataease/pr@dev@style_UI
style: 样式优化
2023-11-28 23:03:37 +08:00
wangjiahao
5a100ee572 style: 样式优化 2023-11-28 22:59:04 +08:00
wangjiahao
9d7227885f refactor: 优化控制台打印 2023-11-28 19:12:28 +08:00
wisonic-s
b19d2b7fc6
Merge pull request #6905 from dataease/pr@dev@fix_multi_drag
fix(视图): 修复指标/维度多选拖拽未正确删除不符合的项
2023-11-28 17:51:33 +08:00
wisonic-s
79523e343e fix(视图): 修复指标/维度多选拖拽未正确删除不符合的项 2023-11-28 17:50:16 +08:00
taojinlong
47ea8c0784
Merge pull request #6904 from dataease/pr@dev@fixSql
feat: 增加一个同步日志保留时间
2023-11-28 03:40:23 -06:00
王嘉豪
67c94ede43
Merge pull request #6903 from dataease/pr@dev@refactor_layer
refactor: 调整过滤组件边框图层层级,优化外部参数优先级
2023-11-28 17:38:32 +08:00
taojinlong
5a1451be55 feat: 增加一个同步日志保留时间 2023-11-28 17:37:56 +08:00
wangjiahao
09f2a70173 refactor: 调整过滤组件边框图层层级,优化外部参数优先级 2023-11-28 17:36:35 +08:00
fit2cloud-chenyw
9aecfe0960
Merge pull request #6902 from dataease/pr@dev@fix_select_grid_filter
fix: 列表过滤器模糊搜索缺少选项
2023-11-28 17:07:51 +08:00
fit2cloud-chenyw
1fc6a221ad fix: 列表过滤器模糊搜索缺少选项 2023-11-28 17:07:07 +08:00
taojinlong
c29a4bd415
Merge pull request #6901 from dataease/pr@dev@fixSql
refactor: 去掉打印
2023-11-28 03:02:03 -06:00
taojinlong
23e0200ce7 refactor: 回滚 2023-11-28 16:57:48 +08:00
taojinlong
26e2500122 refactor: 去掉打印 2023-11-28 16:40:48 +08:00
王嘉豪
0025bbf245
Merge pull request #6899 from dataease/pr@dev@refactor_outer-params-fiter-tree
fix: 外部参数下拉树不生效问题
2023-11-28 16:35:52 +08:00