taojinlong
|
bfde089066
|
Merge branch 'dev' into v1.18
|
2023-07-23 20:29:09 +08:00 |
|
taojinlong
|
e47118e6dd
|
Merge branch 'v1.18' of github.com:dataease/dataease into v1.18
|
2023-07-23 20:29:03 +08:00 |
|
taojinlong
|
766758f64f
|
Merge pull request #5746 from dataease/pr@dev@fixdatasource
fix: 校验数据库名称
|
2023-07-23 19:48:35 +08:00 |
|
taojinlong
|
ddd4bacd1c
|
fix: 校验数据库名称
|
2023-07-23 19:48:01 +08:00 |
|
fit2cloud-chenyw
|
e8045ef6df
|
Merge branch 'v1.18.9-rc1' into v1.18
1.18
|
2023-07-23 17:37:16 +08:00 |
|
fit2cloudrd
|
7a807959d8
|
Merge pull request #5745 from dataease/dev
merge dev
|
2023-07-23 07:41:20 +08:00 |
|
taojinlong
|
60ccf6ed01
|
Merge branch 'dev' into v1.18
|
2023-07-23 00:32:33 +08:00 |
|
taojinlong
|
6e1ad003d8
|
Merge pull request #5744 from dataease/pr@dev@fixdatasource
fix: 判断oracle timestemp类型
|
2023-07-23 00:15:41 +08:00 |
|
taojinlong
|
3ba12e1a5f
|
fix: 判断oracle timestemp类型
|
2023-07-23 00:14:51 +08:00 |
|
taojinlong
|
2c5d3d65c4
|
Merge pull request #5743 from dataease/pr@dev@fixdatasource
fix: 判断oracle timestemp类型
|
2023-07-22 23:48:43 +08:00 |
|
taojinlong
|
031f588fbd
|
fix: 判断oracle timestemp类型
|
2023-07-22 23:47:52 +08:00 |
|
dataeaseShu
|
22a76abfe5
|
Merge pull request #5742 from dataease/pr@dev_st_fix
Pr@dev st fix
|
2023-07-22 12:38:36 +08:00 |
|
dataeaseShu
|
ae1f00248d
|
Merge branch 'dev' into pr@dev_st_fix
|
2023-07-22 12:38:01 +08:00 |
|
dataeaseShu
|
96bffefe7a
|
fix: xss导致页脚属性显示不正常
|
2023-07-22 12:37:13 +08:00 |
|
dataeaseShu
|
5a166ff43c
|
Merge pull request #5741 from dataease/pr@dev_st_fix
Pr@dev st fix
|
2023-07-22 08:56:14 +08:00 |
|
dataeaseShu
|
6de62d5087
|
Merge branch 'dev' into pr@dev_st_fix
|
2023-07-22 08:55:05 +08:00 |
|
dataeaseShu
|
cb8626e8a3
|
fix: xss导致页脚属性显示不正常
|
2023-07-22 08:54:00 +08:00 |
|
fit2cloudrd
|
b9454214ff
|
Merge pull request #5738 from dataease/dev
merge dev
|
2023-07-21 17:02:09 +08:00 |
|
ulleo
|
c48d0773ef
|
Merge pull request #5736 from ulleo/plugin_sql_param
feat: 插件视图支持参数化
|
2023-07-21 15:42:32 +08:00 |
|
ulleo
|
d9b30bafb7
|
feat: 插件视图支持参数化
|
2023-07-21 15:38:17 +08:00 |
|
fit2cloud-chenyw
|
fde0068f97
|
Merge pull request #5734 from dataease/pr@dev@fix_close_window_token
fix: 禁止关闭浏览器注销token功能
|
2023-07-21 14:45:23 +08:00 |
|
fit2cloud-chenyw
|
6718565225
|
fix: 禁止关闭浏览器注销token功能
|
2023-07-21 14:44:31 +08:00 |
|
fit2cloudrd
|
fc026e17cc
|
Merge pull request #5731 from dataease/dev
merge dev
|
2023-07-21 11:02:50 +08:00 |
|
dataeaseShu
|
ea72262b28
|
Merge pull request #5730 from dataease/pr@dev_st_fix
Pr@dev st fix
|
2023-07-21 10:51:14 +08:00 |
|
taojinlong
|
c0cbb15ea2
|
Merge pull request #5729 from dataease/pr@dev@fixdatasource
refactor: 去掉注释代码
|
2023-07-21 10:51:03 +08:00 |
|
dataeaseShu
|
3e2c6b4c4b
|
Merge branch 'dev' into pr@dev_st_fix
|
2023-07-21 10:49:48 +08:00 |
|
dataeaseShu
|
e59a47ca30
|
fix: 符号地图异常
|
2023-07-21 10:48:46 +08:00 |
|
taojinlong
|
9b63799bad
|
refactor: 去掉注释代码
|
2023-07-21 10:47:28 +08:00 |
|
fit2cloudrd
|
33a364bd3d
|
Merge pull request #5727 from dataease/dev
merge dev
|
2023-07-21 09:50:04 +08:00 |
|
taojinlong
|
f7d3bbb2ef
|
Merge pull request #5726 from dataease/pr@dev@fixdatasource
fix: 抽取 excel 数据
|
2023-07-21 09:22:51 +08:00 |
|
taojinlong
|
27fc0b3bc2
|
fix: 抽取 excel 数据
|
2023-07-20 18:46:32 +08:00 |
|
fit2cloudrd
|
b91e212a6a
|
Merge pull request #5725 from dataease/dev
merge dev
|
2023-07-20 17:44:31 +08:00 |
|
fit2cloud-chenyw
|
8db394fb45
|
Merge pull request #5719 from dataease/pr@dev@perf_filter_tooltip
perf(过滤器): 悬浮提示字段所属数据集
|
2023-07-20 14:38:58 +08:00 |
|
fit2cloud-chenyw
|
c93cc4eef4
|
perf(过滤器): 悬浮提示字段所属数据集
|
2023-07-20 14:37:39 +08:00 |
|
fit2cloudrd
|
55318a1113
|
Merge pull request #5717 from dataease/dev
merge dev
|
2023-07-20 13:55:24 +08:00 |
|
王嘉豪
|
f0a7ff88b3
|
Merge pull request #5715 from dataease/pr@dev@fix_panel-tab
fix(仪表板): 修复选项卡后面没有展开的tab页没有加载导致无法过滤的问题
|
2023-07-20 13:19:10 +08:00 |
|
wangjiahao
|
717c3ab7e9
|
fix(仪表板): 修复选项卡后面没有展开的tab页没有加载导致无法过滤的问题
|
2023-07-20 13:18:25 +08:00 |
|
王嘉豪
|
e081d4a849
|
Merge pull request #5714 from dataease/pr@dev@fix_panel-tab
fix(仪表板): 修复选项卡后面没有展开的tab页没有加载导致无法过滤的问题
|
2023-07-20 12:59:39 +08:00 |
|
wangjiahao
|
717c44dca6
|
fix(仪表板): 修复选项卡后面没有展开的tab页没有加载导致无法过滤的问题
|
2023-07-20 12:57:56 +08:00 |
|
fit2cloud-chenyw
|
a2e21bc4b0
|
Merge pull request #5712 from dataease/pr@dev@perf_map
perf(视图): 色彩地图放大点击不提示无钻取字段
|
2023-07-20 12:20:44 +08:00 |
|
fit2cloud-chenyw
|
64ac36b029
|
perf(视图): 色彩地图放大点击不提示无钻取字段
|
2023-07-20 12:19:52 +08:00 |
|
fit2cloud-chenyw
|
9cd170e55c
|
Merge pull request #5711 from dataease/pr@dev@perf_lic_expired_tips
perf(许可): 许可过期提示
|
2023-07-20 12:07:14 +08:00 |
|
fit2cloud-chenyw
|
4e8e7d7934
|
perf(许可): 许可过期提示
|
2023-07-20 12:06:24 +08:00 |
|
fit2cloudrd
|
0eb12e97bf
|
Merge pull request #5708 from dataease/dev
merge dev
|
2023-07-20 10:28:56 +08:00 |
|
fit2cloud-chenyw
|
78cc58929b
|
Merge pull request #5707 from dataease/pr@dev@perf_filter_vague_search
perf(过滤器): 下拉过滤器模糊搜索选项忽略大小写
|
2023-07-20 10:21:43 +08:00 |
|
fit2cloud-chenyw
|
1a8a9e2185
|
perf(过滤器): 下拉过滤器模糊搜索选项忽略大小写
|
2023-07-20 10:19:42 +08:00 |
|
dataeaseShu
|
6ee3c0f93f
|
Merge pull request #5706 from dataease/pr@dev_st_fix
Pr@dev st fix
|
2023-07-20 10:12:26 +08:00 |
|
dataeaseShu
|
6491e9bdc0
|
Merge branch 'dev' into pr@dev_st_fix
|
2023-07-20 10:11:03 +08:00 |
|
dataeaseShu
|
e1b9c0c054
|
fix: 引入tinymce配置 #5686
|
2023-07-20 10:10:29 +08:00 |
|
fit2cloudrd
|
1a16ed31d0
|
Merge pull request #5702 from ChengDaqi2023/oscs_fix_cirtaf8au51v1r8mnpu0
fix(sec): upgrade com.google.guava:guava to 32.0.0-jre
|
2023-07-20 09:47:26 +08:00 |
|