Commit Graph

10490 Commits

Author SHA1 Message Date
dataeaseShu
cb3b0314c4
Merge pull request #6420 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-10-30 14:33:32 +08:00
dataeaseShu
539e00e358 fix: 仪表板编辑/大屏编辑界面,图片上传控件没有显示「+」号 2023-10-30 14:32:08 +08:00
dataeaseShu
de5208cd01 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-10-30 14:25:35 +08:00
dataeaseShu
b741d53f6c fix: 数据库数据源创建界面,端口号应该放在数据库名之前 2023-10-30 14:24:56 +08:00
dataeaseShu
4530235234
Merge pull request #6417 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-10-30 14:08:04 +08:00
dataeaseShu
a21762efaa Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-10-30 14:07:12 +08:00
dataeaseShu
82f940ea8b fix: 过滤组件参数化获取数据不是最新的 2023-10-30 14:05:38 +08:00
taojinlong
cb9d94639a fix: API数据源API地址错误提示信息优化 2023-10-30 13:00:25 +08:00
王嘉豪
6151a995b9
Merge pull request #6415 from dataease/pr@dev-v2@refactor_screen
refactor: 文案、大屏背景优化
2023-10-30 12:16:02 +08:00
wangjiahao
d470e2b1c9 refactor: 文案、大屏背景优化 2023-10-30 12:01:33 +08:00
taojinlong
27912dfb1b fix: 校验连接池参数 2023-10-30 11:58:04 +08:00
dataeaseShu
69b5bb0a2d
Merge pull request #6414 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-10-30 11:50:06 +08:00
dataeaseShu
3b971cda59 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-10-30 11:49:16 +08:00
dataeaseShu
6637f8b57f fix: 大屏编辑界面缺少图表/组件添加控件,无法添加图表/组件 2023-10-30 11:48:40 +08:00
王嘉豪
fd88f001e9
Merge pull request #6413 from dataease/pr@dev-v2@fix_wheelscroll
refactor: 鼠标滚轮放大效果优化
2023-10-30 11:31:08 +08:00
wangjiahao
9054d175f6 refactor: 鼠标滚轮放大效果优化 2023-10-30 11:29:52 +08:00
王嘉豪
0cbe7782e1
Merge pull request #6412 from dataease/pr@dev-v2@fix_wheelscroll
fix: 修复鼠标滚轮影响大屏画布放大问题
2023-10-30 11:06:02 +08:00
wangjiahao
f1cdab14f6 fix: 修复鼠标滚轮影响大屏画布放大问题 2023-10-30 11:02:10 +08:00
dataeaseShu
f0936ab0cb Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-10-30 10:27:34 +08:00
dataeaseShu
f8c74631de fix: 过滤组件过滤地理位置类型的字段,查询条件展示类型没有对应的类型 2023-10-30 10:25:44 +08:00
fit2cloud-chenyw
84eabc60ae feat: 地理信息配置 2023-10-30 10:20:28 +08:00
dataeaseShu
2f0293aa6f fix: 首次将过滤组件添加至tab组件中不做修改的情况下可以控制tab组件外的图表 2023-10-30 10:05:49 +08:00
dataeaseShu
b9037a7ce3
Merge pull request #6407 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-10-27 17:42:10 +08:00
dataeaseShu
277986698a fix: 视图预览失败,提示资源不存在 2023-10-27 17:41:14 +08:00
dataeaseShu
03a3e933e2 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-10-27 17:39:09 +08:00
dataeaseShu
69fe0169dd fix: 仪表板和数据大屏中无法显示图片 2023-10-27 17:38:36 +08:00
dataeaseShu
e0012c4359
Merge pull request #6403 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-10-27 15:18:25 +08:00
dataeaseShu
f82d9ad3e7 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-10-27 15:17:41 +08:00
dataeaseShu
8bdba6e74b fix: 大屏编辑界面的URL错误 2023-10-27 15:16:29 +08:00
fit2cloud-chenyw
a421f6bdaf
Merge pull request #6402 from dataease/pr@dev-v2@feat_system_setting
feat: 系统参数漏提代码
2023-10-27 14:33:38 +08:00
fit2cloud-chenyw
dda31903e4 feat: 系统参数漏提代码 2023-10-27 14:32:26 +08:00
fit2cloud-chenyw
db5ae8c3c7
Merge pull request #6401 from dataease/pr@dev-v2@feat_sys_setting
feat: 系统设置-系统参数
2023-10-27 13:46:26 +08:00
fit2cloud-chenyw
339630cc22 feat: 系统设置-系统参数 2023-10-27 13:45:08 +08:00
王嘉豪
dfd0400e23
Merge pull request #6400 from dataease/pr@dev-v2@refactor_redo-unode
refactor: 增加redo、undo画布动作监控并可显示保存按钮
2023-10-27 13:34:51 +08:00
wangjiahao
6314e75397 refactor: 增加redo、undo画布动作监控并可显示保存按钮 2023-10-27 13:32:26 +08:00
taojinlong
5ae30cc181
Merge pull request #6399 from dataease/pr@dev-v2@fixDatasource
Pr@dev v2@fix datasource
2023-10-26 23:17:31 -05:00
dataeaseShu
5589442c62
Merge pull request #6398 from dataease/pr@dev-v2_dzz
fix: 过滤组件间距调整
2023-10-27 12:07:54 +08:00
dataeaseShu
73d7911226 fix: 过滤组件间距调整 2023-10-27 12:07:09 +08:00
Junjun
3d8f4b91cd
Merge pull request #6397 from dataease/pr@dev-v2@fix_sql
fix: SQL中order by关键字处理
2023-10-27 12:06:25 +08:00
junjun
cf9d5e5d9c fix: SQL中order by关键字处理 2023-10-27 12:03:06 +08:00
Junjun
a09b928cbf
Merge pull request #6394 from dataease/pr@dev-v2@fix_sql
fix: SQL中order by关键字处理
2023-10-27 11:29:00 +08:00
junjun
073c13ca41 fix: SQL中order by关键字处理 2023-10-27 11:27:09 +08:00
dataeaseShu
ef2489a5eb
Merge pull request #6393 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-10-27 11:03:18 +08:00
dataeaseShu
a92eab74fe Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-10-27 11:02:39 +08:00
dataeaseShu
017af37bfe fix: 过滤组件上一个规则开启参数化再次添加规则时参数化选项自动开启但没有弹窗显示 2023-10-27 11:02:02 +08:00
dataeaseShu
9a2010403a
Merge pull request #6392 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-10-27 10:24:58 +08:00
dataeaseShu
751051d293 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-10-27 10:24:18 +08:00
dataeaseShu
e908613d31 fix: 过滤组件弹窗显示不全 2023-10-27 10:23:03 +08:00
dataeaseShu
7d1d453146 fix: 保存数据集无法搜索到指定目录 2023-10-27 10:22:49 +08:00
fit2cloud-chenyw
66d8f3a354
Merge pull request #6391 from dataease/pr@dev-v2@feat_sys_setting_sql
feat: 系统设置菜单sql
2023-10-27 10:17:40 +08:00