Commit Graph

9587 Commits

Author SHA1 Message Date
taojinlong
4485567854 Merge branch 'v1.18' of github.com:dataease/dataease into v1.18 2023-04-17 10:17:28 +08:00
taojinlong
a0582d9545 refactor: 冲突 2023-04-17 10:14:59 +08:00
dataeaseShu
b3e4dd918e
Merge pull request #5047 from dataease/pr@dev_memory_component
Pr@dev memory component
2023-04-16 23:28:22 +08:00
dataeaseShu
db8dd5d213 Merge branch 'dev' into pr@dev_memory_component 2023-04-16 23:26:52 +08:00
dataeaseShu
041c570c5c fix: 修复排序错误导致的异常定时刷新 2023-04-16 23:26:03 +08:00
fit2cloudrd
7134c46dc7
Merge pull request #5043 from dataease/v1.18.6-rc1
V1.18.6 rc1
2023-04-14 16:43:55 +08:00
fit2cloudrd
807bddaee8
Merge pull request #5042 from dataease/dev
merge
2023-04-14 16:41:40 +08:00
taojinlong
9d9c30670b
Merge pull request #5041 from dataease/pr@dev@fixextratdata
fix: qlserver数据集时间过滤date类型过滤不出来结果,其他日期类型正常
2023-04-14 16:40:41 +08:00
taojinlong
73c14748b8 fix(过滤器): 树过滤器在sqlserver和ck数据源不能选择单字段过滤 2023-04-14 16:24:08 +08:00
taojinlong
4c459d69d9 Merge branch 'v1.18' of github.com:dataease/dataease into v1.18 2023-04-14 16:05:56 +08:00
fit2cloud-chenyw
782487db50 fix:【仪表板】sqlserver数据集时间过滤date类型过滤不出来结果 2023-04-14 16:02:06 +08:00
fit2cloudrd
470e659d51
Merge pull request #5035 from dataease/v1.18.6-rc1
V1.18.6 rc1
2023-04-14 13:59:10 +08:00
fit2cloudrd
70e081a6ad
Merge pull request #5034 from dataease/dev
merge dev
2023-04-14 13:58:39 +08:00
fit2cloudrd
0c34c473de
Merge pull request #5032 from dataease/v1.18.6-rc1
V1.18.6 rc1
2023-04-14 11:17:07 +08:00
dataeaseShu
cb1aa6a1a3
Merge pull request #5031 from dataease/pr@dev_memory_component
Pr@dev memory component
2023-04-13 22:57:35 +08:00
dataeaseShu
731825b4d5 Merge branch 'dev' into pr@dev_memory_component 2023-04-13 22:56:28 +08:00
dataeaseShu
431f8a643d fix: 数据集点击过快重名 2023-04-13 22:55:52 +08:00
dataeaseShu
ee566d33d6
Merge pull request #5030 from dataease/pr@dev_memory_component
Pr@dev memory component
2023-04-13 18:51:23 +08:00
dataeaseShu
f01543669d Merge branch 'dev' into pr@dev_memory_component 2023-04-13 18:49:23 +08:00
dataeaseShu
48dabe68c1 fix: 自动刷新 2023-04-13 18:48:47 +08:00
fit2cloudrd
698dc63c5b
Merge pull request #5029 from dataease/dev
merge dev
2023-04-13 18:07:54 +08:00
wisonic-s
29c9e7b279
Merge pull request #5028 from dataease/pr@dev@fix_view_init
fix(视图): 修复部分视图初始化报错
2023-04-13 17:30:22 +08:00
wisonic-s
55bc0b10e1 fix(视图): 修复部分视图初始化报错 2023-04-13 17:28:14 +08:00
wisonic-s
442a956b7f
Merge pull request #5027 from dataease/pr@dev@fix_antv_line_tooltip_format
fix(AntV折线图): 修复多维度下指标的提示格式化不生效
2023-04-13 16:25:02 +08:00
wisonic-s
089e4145ec fix(AntV折线图): 修复多维度下指标的提示格式化不生效 2023-04-13 16:23:30 +08:00
fit2cloud-chenyw
b3e93a2a74
Merge pull request #5025 from dataease/pr@dev@fix_template_report
fix(定时报告): 使用模版导出视图数据报错
2023-04-13 16:12:08 +08:00
fit2cloud-chenyw
deb1219180 fix(定时报告): 使用模版导出视图数据报错 2023-04-13 16:10:46 +08:00
fit2cloud-chenyw
616b0efad1
Merge pull request #5024 from dataease/pr@dev@fix_report_viewname
fix(定时报告): 导出视图名称包含"/"报错
2023-04-13 15:55:50 +08:00
dataeaseShu
5b2564dce5
Merge pull request #5023 from dataease/pr@dev_memory_component
Pr@dev memory component
2023-04-13 15:45:10 +08:00
dataeaseShu
6b56908db7 Merge branch 'dev' into pr@dev_memory_component 2023-04-13 15:43:25 +08:00
dataeaseShu
8c0cfd3eb6 fix: SQL数据集快速点击保存报错 2023-04-13 15:42:47 +08:00
fit2cloud-chenyw
e1ae7dc7fb fix(定时报告): 导出视图名称包含"/"报错 2023-04-13 15:41:59 +08:00
dataeaseShu
ed3ddf8185 fix: 新建计算字段重置 2023-04-13 15:22:59 +08:00
fit2cloud-chenyw
a7c1769713
Merge pull request #5022 from dataease/pr@dev@fix_user_phone-validate
fix(用户管理): 飞书同步的用户手机号无法通过DE表单验证
2023-04-13 15:20:31 +08:00
fit2cloud-chenyw
6cb8e5923b fix(用户管理): 飞书同步的用户手机号无法通过DE表单验证 2023-04-13 15:05:54 +08:00
wisonic-s
7b9431231a
Merge pull request #5021 from dataease/pr@dev@refactor_style
refactor(视图插件): 图表类型选择页面图标对齐
2023-04-13 14:55:51 +08:00
wisonic-s
ebfae7d076 refactor(视图插件): 图表类型选择页面图标对齐 2023-04-13 14:51:53 +08:00
wisonic-s
0f6b981a85 refactor(地图): 选择图表类型时小图标使用原版的 icon 2023-04-13 14:50:56 +08:00
wisonic-s
98cd4356d4 refactor(流向地图): 去除导出按钮 2023-04-13 14:46:53 +08:00
taojinlong
5f60347adc Merge branch 'dev' into v1.18 2023-04-13 12:46:08 +08:00
taojinlong
83aa38b909
Merge pull request #5020 from dataease/pr@dev@fixextratdata
fix: oracle时间过滤组件提示异常
2023-04-13 12:44:06 +08:00
taojinlong
224f53c1c9 fix: oracle时间过滤组件提示异常 2023-04-13 12:42:22 +08:00
fit2cloud-chenyw
a28055e55d
Merge pull request #5019 from dataease/pr@dev@fix_link_export_excel
fix(公共连接): 导出excel没有遮罩没有按钮失效
2023-04-13 12:38:39 +08:00
fit2cloud-chenyw
f7f4dd6400
Merge pull request #5017 from dataease/pr@dev@feat_time_filter_refresh
feat(过滤器): 动态时间过滤器跟随仪表板刷新
2023-04-13 12:37:51 +08:00
fit2cloud-chenyw
5d99219c7c fix(公共连接): 导出excel没有遮罩没有按钮失效 2023-04-13 12:33:01 +08:00
dataeaseShu
955ec94fdf
Merge pull request #5014 from dataease/pr@dev_memory_component
Pr@dev memory component
2023-04-12 18:20:23 +08:00
dataeaseShu
1fe4f07417 Merge branch 'dev' into pr@dev_memory_component 2023-04-12 18:17:24 +08:00
dataeaseShu
cff8b73e30 fix: 数据集字段存在与方法名一致的情况下会替换掉方法名 2023-04-12 18:16:37 +08:00
dataeaseShu
52de89c574
Merge pull request #5007 from dataease/pr@dev_memory_component
Pr@dev memory component
2023-04-12 14:08:27 +08:00
dataeaseShu
4fc5ae248b fix: 拼写检查 2023-04-12 14:06:04 +08:00