Commit Graph

849 Commits

Author SHA1 Message Date
taojinlong
fda351bb00
Merge pull request #7614 from dataease/pr@dev-v2@feat_timeout
fix: 解析sql出错
2024-01-12 16:24:53 +08:00
taojinlong
a90c2e65b9 fix: 解析sql出错 2024-01-12 16:24:16 +08:00
fit2cloud-chenyw
fac4205974 perf: 同步任务模块api依赖缺失 2024-01-12 11:22:16 +08:00
王嘉豪
5d9b8462d2
Merge pull request #7604 from dataease/pr@dev-v2@fix_console-error
fix: 修复新建可视化资源控制台有异常错误信息问题
2024-01-12 09:52:58 +08:00
wangjiahao
20cd55a1be fix: 修复新建可视化资源控制台有异常错误信息问题 2024-01-12 09:52:14 +08:00
王嘉豪
916a7ec456
Merge pull request #7602 from dataease/pr@dev-v2@feat_panel-sort
feat(仪表板): 仪表板点击组件可连续横向自动占位排列
2024-01-11 17:43:34 +08:00
wangjiahao
00b3f520e0 feat(仪表板): 仪表板点击组件可连续横向自动占位排列 2024-01-11 17:42:49 +08:00
taojinlong
a7c7f0b5da feat: 【系统设置】支持系统参数设置-前端超时时间设置 2024-01-11 17:01:17 +08:00
王嘉豪
88bc16e94c
Merge pull request #7589 from dataease/pr@dev-v2@refactor_tab-length
refactor: 增加Tab标题字符限制长度为50
2024-01-11 15:56:34 +08:00
wangjiahao
cc4af0d423 refactor: 增加Tab标题字符限制长度为50 2024-01-11 15:55:05 +08:00
王嘉豪
4c951b3c93
Merge pull request #7588 from dataease/pr@dev-v2@refactor_size
refactor(数据大屏): 调整屏幕尺寸的上限
2024-01-11 15:49:38 +08:00
wangjiahao
1ef0a58e79 refactor(数据大屏): 调整屏幕尺寸的上限 2024-01-11 15:48:19 +08:00
王嘉豪
c0d01a0a49
Merge pull request #7586 from dataease/pr@dev-v2@revert_commit
revert: 去掉注释代码
2024-01-11 15:12:52 +08:00
wangjiahao
c75cb1ae48 revert: 去掉注释代码 2024-01-11 15:12:05 +08:00
王嘉豪
515aa93af5
Merge pull request #7585 from dataease/pr@dev-v2@refactor_canvas
refactor: 画布样式逻辑调整
2024-01-11 15:11:17 +08:00
wangjiahao
1a0083d285 refactor: 画布样式逻辑调整 2024-01-11 15:09:17 +08:00
fit2cloud-chenyw
a42660c315
Merge pull request #7574 from dataease/pr@dev-v2@sync-task
feat(系统管理-同步管理):
2024-01-11 15:08:29 +08:00
fit2cloud-chenyw
4953bb5d3c
Merge pull request #7583 from dataease/pr@dev-v2@perf_remove_hutool
perf: 移除hutool
2024-01-11 14:44:26 +08:00
fit2cloud-chenyw
c9685da158 perf: 移除hutool 2024-01-11 14:43:23 +08:00
jianneng-fit2cloud
1de9d27115
Merge branch 'dev-v2' into pr@dev-v2@sync-task 2024-01-11 14:02:11 +08:00
dataeaseShu
486688f52f Merge branch 'dev-v2' into pr@dev-v2_dzz 2024-01-11 13:40:34 +08:00
dataeaseShu
e52b5e1b9d fix: 查询条件点击删除后,右侧编辑还存在 2024-01-11 11:37:17 +08:00
dataeaseShu
f125dec4ba fix: Excel数据源替换数据,文件较大时加载时间长,且没有加载图标,体验不佳 2024-01-11 11:36:59 +08:00
王嘉豪
4e531af454
Merge pull request #7580 from dataease/pr@dev-v2@refactor_style
refactor: 可视化资源树水印等样式逻辑调整
2024-01-11 10:43:00 +08:00
wangjiahao
1ce8f6418c refactor: 可视化资源树水印等样式逻辑调整 2024-01-11 10:40:40 +08:00
王嘉豪
9c6ee9b18b
Merge pull request #7519 from ZhaoQian1222/pr@dev-v2@update_table_desc
fix:添加数据库表字段描述
2024-01-11 10:35:31 +08:00
jianneng-fit2cloud
53c9d1731e feat(系统管理-同步管理):
1.添加目标数据源同步到数据准备
2.UI调整
2024-01-10 17:21:08 +08:00
fit2cloud-chenyw
a95fe5ee7b perf: 升级版本号 2024-01-10 15:16:43 +08:00
王嘉豪
33f3949036
Merge pull request #7555 from dataease/pr@dev-v2@feat_watermark
feat: 可视化资源支持显示水印
2024-01-09 17:10:29 +08:00
wangjiahao
f3413e91fa feat: 可视化资源支持显示水印 2024-01-09 17:08:28 +08:00
dataeaseShu
e71f1e1253
Merge pull request #7552 from dataease/pr@dev-v2_dzz
fix: 查询组件,组件间间隔不一致。
2024-01-09 11:47:41 +08:00
dataeaseShu
1c92d25932 fix: 查询组件,组件间间隔不一致。 2024-01-09 11:47:16 +08:00
fit2cloud-chenyw
0e640403cd
Merge pull request #7549 from dataease/pr@dev-v2@feat_log
Pr@dev v2@feat log
2024-01-09 10:56:37 +08:00
fit2cloud-chenyw
ee8db44375 feat: 日志模块 2024-01-09 10:49:38 +08:00
dataeaseShu
1e2d6f7145 Merge branch 'dev-v2' into pr@dev-v2_dzz 2024-01-09 10:36:16 +08:00
dataeaseShu
2b95be6022 fix: 不同数据源同名的表无法做关联(无法选中) 2024-01-09 10:34:38 +08:00
王嘉豪
68ac1e20e7
Merge pull request #7543 from dataease/pr@dev-v2@feat_watermark
feat: 可视化资源支持显示水印
2024-01-08 18:37:20 +08:00
wangjiahao
9497450d58 feat: 可视化资源支持显示水印 2024-01-08 18:34:44 +08:00
dataeaseShu
33a68c46f4 feat: 嵌入式支持嵌入仪表板、数据大屏、数据源、数据集页面(带左侧的树形菜单) 2024-01-08 16:32:23 +08:00
zhaoqian
5a688dd3db fix:修正数据库表字段描述 2024-01-03 16:54:21 +08:00
taojinlong
a0ee331fdc fix:【数据源】重命名数据源名称与编辑数据源名称长度限制规则不一致 2024-01-03 15:54:01 +08:00
taojinlong
a23cb61d64 Merge branch 'dev-v2' into pr@dev-v2@fixDatasource 2024-01-03 15:47:58 +08:00
taojinlong
c63c1c4779 fix: 识别csv 字段类型 2024-01-03 15:39:01 +08:00
dataeaseShu
7ea552fbab
Merge pull request #7483 from dataease/pr@dev-v2_dzz
fix: 数据源名称过长时-创建数据集选择数据源-与名称重叠
2024-01-02 10:29:26 +08:00
dataeaseShu
a5d49551cd fix: 数据源名称过长时-创建数据集选择数据源-与名称重叠 2024-01-02 10:27:56 +08:00
王嘉豪
779a0ab052
Merge pull request #7482 from dataease/pr@dev-v2@refactor_group
refactor: 组合组件预览优化
2023-12-29 19:12:00 +08:00
wangjiahao
d0e91241a5 refactor: 组合组件预览优化 2023-12-29 19:11:05 +08:00
王嘉豪
6732a476ba
Merge pull request #7481 from dataease/pr@dev-v2@refactor_copy
refactor: 优化资源复制
2023-12-29 18:16:05 +08:00
wangjiahao
908a596641 refactor: 优化资源复制 2023-12-29 18:14:35 +08:00
taojinlong
5e83d113b2
Merge pull request #7469 from dataease/pr@dev-v2@fixDatasource
fix:【数据源】-本地Excel文件创建的数据源数据预览为空
2023-12-29 12:20:55 +08:00
taojinlong
237c3c37bc fix:【数据源】-本地Excel文件创建的数据源数据预览为空 2023-12-29 12:16:21 +08:00
dataeaseShu
12f4743eab fix: 建议通过创建完上一个数据源后的继续创建操作的默认文件夹仍然保持为同一个 2023-12-29 11:26:43 +08:00
dataeaseShu
32df66438e fix: 【系统设置】-查看世界村地图数据,加载时间过长,可能导致浏览器崩溃 2023-12-29 10:50:54 +08:00
fit2cloud-chenyw
fe172b1588
Merge pull request #7457 from dataease/pr@dev-v2@fix_embedded_permission
fix: 嵌入式权限
2023-12-28 18:49:58 +08:00
fit2cloud-chenyw
0307b1b3e9 fix: 嵌入式权限 2023-12-28 18:49:02 +08:00
dataeaseShu
6a6bca4d68
Merge pull request #7451 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-12-28 17:42:45 +08:00
dataeaseShu
ad9c38cbaf fix: 数据源删除最后一个参数 2023-12-28 17:39:31 +08:00
dataeaseShu
75fed43c4b fix: 搜索结果页的标题显示与设计稿不符 2023-12-28 17:25:46 +08:00
taojinlong
981758fa01
Merge pull request #7447 from dataease/pr@dev-v2@fixDatasource
fix: 【数据源】重命名数据源名称与编辑数据源名称长度限制规则不一致
2023-12-28 14:52:26 +08:00
ulleo
ff01f21543
Merge pull request #7446 from ulleo/dev-v2
feat: 图表标题右侧图标修改为按比例展示大小
2023-12-28 14:27:52 +08:00
ulleo
b854f44ce3 feat: 图表标题右侧图标修改为按比例展示大小 2023-12-28 14:26:54 +08:00
fit2cloud-chenyw
89c9a6eab8 style: 帮助文档popover使用hover触发 2023-12-28 14:12:50 +08:00
fit2cloud-chenyw
f4b9cf1692
Merge pull request #7442 from dataease/pr@dev-v2@style_toolbox
style: 工具箱样式
2023-12-28 13:39:26 +08:00
fit2cloud-chenyw
128563d07f style: 工具箱样式 2023-12-28 13:38:38 +08:00
junjun
d4f5fb95bf fix: 数据集重名校验 2023-12-28 12:55:07 +08:00
taojinlong
c8cb514ce4 fix: 【数据源】重命名数据源名称与编辑数据源名称长度限制规则不一致 2023-12-28 12:09:38 +08:00
dataeaseShu
868d7721bc fix: 嵌入式字体 2023-12-28 12:01:24 +08:00
fit2cloud-chenyw
6df0fcc93f
Merge pull request #7437 from dataease/pr@dev-v2@style_sys_setting
style: 系统设置样式
2023-12-28 11:59:32 +08:00
fit2cloud-chenyw
5fa516ced9 style: 系统设置样式 2023-12-28 11:57:31 +08:00
dataeaseShu
c0406566d2
Merge pull request #7431 from dataease/pr@dev-v2_dzz
fix: 嵌入式组合图
2023-12-28 11:11:32 +08:00
dataeaseShu
11645edbb9 fix: 嵌入式组合图 2023-12-28 11:10:54 +08:00
dataeaseShu
36a513383f
Merge pull request #7428 from dataease/pr@dev-v2_dzz
fix: 【嵌入式】-视图预览中无法展示数据大屏中组合的图表
2023-12-28 10:39:45 +08:00
dataeaseShu
d90c8abcec fix: 【嵌入式】-视图预览中无法展示数据大屏中组合的图表 2023-12-28 10:37:43 +08:00
fit2cloud-chenyw
9125a25507
Merge pull request #7426 from dataease/pr@dev-v2@perf_template_market_i18n
perf: 模板管理文案
2023-12-28 09:54:00 +08:00
fit2cloud-chenyw
1fd31825fb perf: 模板管理文案 2023-12-28 09:52:22 +08:00
dataeaseShu
0541574096
Merge pull request #7425 from dataease/pr@dev-v2_dzz
Pr@dev v2 dzz
2023-12-28 09:49:30 +08:00
dataeaseShu
df08a6eab8 fix: API数据源数据表请求参数全部填满后最后一条参数无法删除 #7336 2023-12-28 09:48:16 +08:00
wangjiahao
06b4465522 refactor: 缩放优化 2023-12-28 09:46:01 +08:00
dataeaseShu
288343cede fix: 仪表板内/数据大屏内修改仪表板/数据大屏名称-提示内容错误 2023-12-28 09:33:53 +08:00
wangjiahao
2d50f1d87b fix: 修改大屏预览分组位置定位不准确问题 2023-12-27 21:21:14 +08:00
王嘉豪
12eb78f596
Merge pull request #7422 from dataease/pr@dev-v2@fix_group-position
fix: 修改大屏预览分组位置定位不准确问题
2023-12-27 20:58:14 +08:00
wangjiahao
d3b9bb68b9 fix: 修改大屏预览分组位置定位不准确问题 2023-12-27 20:56:23 +08:00
王嘉豪
a635695756
Merge pull request #7421 from dataease/pr@dev-v2@fix_group-info
Pr@dev v2@fix group info
2023-12-27 18:49:19 +08:00
wangjiahao
0711ea8bc2 fix: 解决跨组合快捷键操作问题 2023-12-27 18:47:13 +08:00
wangjiahao
c61b7fcf6e fix: MAC平台,在大屏编辑界面按shift键后,无法使用command键选择图层进行组合 2023-12-27 18:41:45 +08:00
王嘉豪
2668a28555
Merge pull request #7414 from dataease/pr@dev-v2@fix_filter
fix: 在过滤组件使用默认值的情况下,视图过滤放大后展示的是组件默认值 #7314
2023-12-27 17:19:23 +08:00
wangjiahao
aacdcd26bf fix: 在过滤组件使用默认值的情况下,视图过滤放大后展示的是组件默认值 #7314 2023-12-27 17:18:26 +08:00
王嘉豪
b55d457d64
Merge pull request #7413 from dataease/pr@dev-v2@style_label
style: 文案提示修改
2023-12-27 16:28:24 +08:00
wangjiahao
e3bbfbcc15 style: 文案提示修改 2023-12-27 16:25:29 +08:00
wangjiahao
48e17b8b8f revert: 回退依赖 2023-12-27 15:54:46 +08:00
fit2cloud-chenyw
21a694dd55 feat: 升级版本号到2.2.0 2023-12-27 15:53:42 +08:00
王嘉豪
1964142f2a
Merge pull request #7408 from dataease/pr@dev-v2@refactor_mark
style: 样式优化
2023-12-27 15:50:47 +08:00
wangjiahao
fee4c82b43 style: 样式优化 2023-12-27 15:47:39 +08:00
王嘉豪
2a7655e885
Merge branch 'dev-v2' into pr@dev-v2@refactor_label 2023-12-27 15:30:46 +08:00
wisonic-s
85d5e682ed fix(视图-明细表): 分页统一为灰色 2023-12-27 15:25:40 +08:00
wangjiahao
a6639f7b6d refactor: 文案修改 2023-12-27 15:20:29 +08:00
王嘉豪
4d63e9c842
Merge pull request #7402 from dataease/pr@dev-v2@fix_group
fix: 修复部分表格隐藏后打开没有立即渲染问题
2023-12-27 15:15:36 +08:00
wangjiahao
6a66e47ee0 fix: 修复部分表格隐藏后打开没有立即渲染问题 2023-12-27 15:13:32 +08:00
dataeaseShu
cb804c8aff
Merge pull request #7399 from dataease/pr@dev-v2_dzz
fix: 字体
2023-12-27 14:26:37 +08:00
dataeaseShu
acf5a67899 fix: 字体 2023-12-27 14:22:08 +08:00
dataeaseShu
c9aef50d86
Merge pull request #7397 from dataease/pr@dev-v2_dzz
fix: 字体
2023-12-27 13:55:47 +08:00
dataeaseShu
f0820f1cac fix: 字体 2023-12-27 13:55:10 +08:00
Junjun
5f0ae95072
Merge pull request #7395 from dataease/pr@dev-v2@fix_filter
fix: 修复过滤组件过滤时间戳不显示的问题 #7313
2023-12-27 12:36:05 +08:00
junjun
31562676ca fix: 修复过滤组件过滤时间戳不显示的问题 #7313 2023-12-27 12:33:04 +08:00
fit2cloud-chenyw
793a98cff3
Merge pull request #7394 from dataease/pr@dev-v2@perf_mvn_package_script
perf: maven打包脚本
2023-12-27 12:32:49 +08:00
fit2cloud-chenyw
e0661b9228 perf: maven打包脚本 2023-12-27 12:31:42 +08:00
dataeaseShu
612cad625e
Merge pull request #7392 from dataease/pr@dev-v2_dzz
fix: 字体
2023-12-27 12:17:55 +08:00
王嘉豪
3e1cb06eea
Merge pull request #7391 from dataease/pr@dev-v2@style_template-manage
style: 文案提示修改
2023-12-27 12:17:35 +08:00
dataeaseShu
67f1e2cfa3 fix: 字体 2023-12-27 12:17:13 +08:00
wangjiahao
6e25bafd37 style: 文案提示修改 2023-12-27 12:15:19 +08:00
王嘉豪
3ee9ed8c99
Merge pull request #7389 from dataease/pr@dev-v2@style_group
style: 模版管理文案等优化
2023-12-27 12:01:07 +08:00
wangjiahao
d0c5536cfb style: 模版管理文案等优化 2023-12-27 12:00:26 +08:00
dataeaseShu
4fc33761c3
Merge pull request #7388 from dataease/pr@dev-v2_dzz
fix: 字体
2023-12-27 11:47:19 +08:00
dataeaseShu
d4d3c2dc09 fix: 字体 2023-12-27 11:45:06 +08:00
wisonic-s
59f4641d17 fix(视图): 数据集字段过滤包含指标 2023-12-27 11:37:38 +08:00
dataeaseShu
096da3025c fix: 编译报错 2023-12-27 11:20:21 +08:00
dataeaseShu
bfaad953d8 fix: 编译报错 2023-12-27 11:07:16 +08:00
dataeaseShu
ff2edf3826 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-12-27 10:56:56 +08:00
dataeaseShu
acd722d4ba fix: 字体测试 2023-12-27 10:56:09 +08:00
王嘉豪
8a98d5c6bd
Merge pull request #7382 from dataease/pr@dev-v2@fix_group
Pr@dev v2@fix group
2023-12-27 10:37:39 +08:00
wangjiahao
a5b061d74b fix: 修复模版管理重命名失效问题 2023-12-27 10:36:50 +08:00
dataeaseShu
3211485bb2
Merge pull request #7381 from dataease/pr@dev-v2_dzz
fix: 字体测试
2023-12-27 10:24:57 +08:00
dataeaseShu
b06dfc722a fix: 字体测试 2023-12-27 10:24:12 +08:00
fit2cloud-chenyw
d971f44c11
Merge pull request #7380 from dataease/pr@dev-v2@perf_mvn_package
perf: maven打包脚本
2023-12-27 09:56:43 +08:00
fit2cloud-chenyw
84e5067528 perf: maven打包脚本 2023-12-27 09:55:28 +08:00
dataeaseShu
e057c402cb fix: 字体测试 2023-12-27 09:55:12 +08:00
wangjiahao
75f06e4a9d style: 分组区域自适应样式 2023-12-27 09:22:00 +08:00
王嘉豪
9a95e707d4
Merge pull request #7374 from dataease/pr@dev-v2@refactor_group
refactor: 大屏组合支持双击内部组件再解锁移动
2023-12-27 09:12:11 +08:00
wangjiahao
3b26820091 refactor: 大屏组合支持双击内部组件再解锁移动 2023-12-26 22:27:48 +08:00
fit2cloud-chenyw
f8e7898771 perf: maven打包脚本 2023-12-26 18:44:09 +08:00
dataeaseShu
8a75a7281d fix: 字体测试 2023-12-26 16:11:43 +08:00
dataeaseShu
a826467fd5 fix: 字体报错测试 2023-12-26 15:46:59 +08:00
dataeaseShu
d110724024 fix: 【工作台】组件样式不对 2023-12-26 15:12:37 +08:00
dataeaseShu
fae0e2492d fix: 查询组件,组件间间隔不一致。 2023-12-26 14:48:47 +08:00
dataeaseShu
cd7e0938e4 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-12-26 11:15:27 +08:00
dataeaseShu
500cceaf35 fix: 【数据源】API 数据源界面莫名添加行问题 #7335 2023-12-26 11:10:11 +08:00
junjun
f65fde1a78 fix: 拼写错误 2023-12-26 10:58:37 +08:00
dataeaseShu
2693c19434 Merge branch 'dev-v2' into pr@dev-v2_dzz 2023-12-26 10:53:48 +08:00
dataeaseShu
8b11111fc7 fix: 最近使用列表按照最近编辑时间排序错误 2023-12-26 10:52:18 +08:00
junjun
198b690d16 fix: 修复过滤组件过滤时间戳不显示的问题 #7313 2023-12-26 10:00:30 +08:00
王嘉豪
e8a0ebd538
Merge pull request #7344 from dataease/pr@dev-v2@refactor_layer
Pr@dev v2@refactor layer
2023-12-25 21:54:12 +08:00
wangjiahao
6e23a564cb refactor: 大屏拖拽进入的组件图层放在最顶层 2023-12-25 21:52:25 +08:00
wangjiahao
32eea248c3 fix: 修复设置大屏组合内视图编辑时未同步缩放问题 2023-12-25 21:37:07 +08:00
王嘉豪
810576b1c2
Merge pull request #7342 from dataease/pr@dev-v2@refactor_style
Pr@dev v2@refactor style
2023-12-25 20:45:56 +08:00
wangjiahao
92afdd0c64 fix: 修复仪表板大屏资源树操作打开窗口不对问题 2023-12-25 20:39:08 +08:00
wangjiahao
6865bebaff refactor: 修改文案 2023-12-25 20:29:58 +08:00
wangjiahao
21069a148f refactor: 大屏分组锁定时,内部组件同步锁定 2023-12-25 20:23:14 +08:00
王嘉豪
2d0290d001
Merge pull request #7340 from dataease/pr@dev-v2@style_template-manage
style: 样式调整
2023-12-25 20:01:12 +08:00
wangjiahao
fd21624d20 style: 样式调整 2023-12-25 19:59:07 +08:00
fit2cloud-chenyw
1001e72922
Merge pull request #7339 from dataease/pr@dev-v2@feat_front_base_path
Pr@dev v2@feat front base path
2023-12-25 18:51:52 +08:00