Commit Graph

548 Commits

Author SHA1 Message Date
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
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
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
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
wangjiahao
81d9941794 fix: 外部参数下拉树不生效问题 2023-11-28 16:33:50 +08:00
dataeaseShu
adb51f5f84
Merge pull request #6897 from dataease/pr@dev_one_dot_x
Pr@dev one dot x
2023-11-28 16:06:08 +08:00
dataeaseShu
c3348c1b81 fix: 代码冲突 2023-11-28 16:05:33 +08:00
fit2cloud-chenyw
da4df430d2
Merge pull request #6896 from dataease/pr@dev@perf_filter
perf: 过滤器在编辑页面触发两次请求
2023-11-28 16:04:25 +08:00
fit2cloud-chenyw
50b03eef6a perf: 过滤器在编辑页面触发两次请求 2023-11-28 16:01:00 +08:00
dataeaseShu
7135cdcb9b Merge branch 'dev' into pr@dev_one_dot_x 2023-11-28 16:00:01 +08:00
dataeaseShu
a1ec52406d fix: 全屏预览模式下视图标题的备注无法显示 #6207 2023-11-28 15:58:16 +08:00
ulleo
bf8b4c5558
Merge pull request #6895 from ulleo/dev
feat: 组合图默认第一个指标为柱状图,第二个指标为折线图
2023-11-28 15:29:40 +08:00
ulleo
9920be094b feat: 组合图默认第一个指标为柱状图,第二个指标为折线图 2023-11-28 15:27:11 +08:00
王嘉豪
679d2d95ad
Merge pull request #6893 from dataease/pr@dev@refactor_outer-params-filter
refactor: 优化外部参数过滤组件配置名称显示
2023-11-28 15:17:36 +08:00
wangjiahao
5ef1e4970a refactor: 优化外部参数过滤组件配置名称显示 2023-11-28 15:14:21 +08:00
wangjiahao
34ea49b15a fix: 修复外部参数数字区间过滤组件数值匹配不正确问题 2023-11-28 15:01:24 +08:00
ulleo
a9c596458b
Merge pull request #6891 from ulleo/dev
feat: AntV散点图类别支持重命名
2023-11-28 14:35:46 +08:00
ulleo
67805111cb feat: AntV散点图类别支持重命名 2023-11-28 14:34:23 +08:00
taojinlong
dafba5d930
Merge pull request #6861 from dataease/pr@dev@fixSql
fix: 去掉数据库名
2023-11-27 23:40:45 -06:00
fit2cloud-chenyw
b3fe0814c5 feat: 内置账号转uid接口 2023-11-28 11:15:07 +08:00
fit2cloud-chenyw
82cfba4863 perf: 使用默认密码登录提示但还可以切换路由 2023-11-28 09:37:59 +08:00
fit2cloud-chenyw
cac151a493 perf(过滤器): 树过滤器跨数据集多字段错误信息国际化 2023-11-27 21:07:58 +08:00
fit2cloud-chenyw
35c87788be perf(过滤器): 树过滤器改变排序方式后默认值重置 2023-11-27 20:36:36 +08:00
fit2cloud-chenyw
343e272895 perf(过滤器): 树过滤器废弃限制1000条 2023-11-27 18:42:30 +08:00
fit2cloud-chenyw
1929f17a0c perf(过滤器): 树过滤器添加排序字段后会多出一级 2023-11-27 18:27:56 +08:00
fit2cloud-chenyw
9954795df3 perf(过滤器): 过滤器弹窗搜索数据集错误 2023-11-27 17:49:33 +08:00
fit2cloud-chenyw
bfb98c0a6d
Merge pull request #6869 from dataease/pr@dev@perf_ds_like_search
perf(数据源): 模糊搜索以及1000条限制排序
2023-11-27 17:27:12 +08:00
fit2cloud-chenyw
97a7321fd4 perf(数据源): 模糊搜索以及1000条限制排序 2023-11-27 17:24:13 +08:00
taojinlong
ba26066860 fix: [Bug]API数[Bug]权限问题,demo用户无权限管理驱动,但可通过接口调用实现驱动添加 #6812 2023-11-27 17:11:29 +08:00
taojinlong
ad83d80746 fix: [Bug]API数据源数据结构不含暂时为空的字段 #6234 2023-11-27 16:27:31 +08:00
wisonic-s
0f5ce0d67c fix(视图-echarts表格): 修复序号列宽度调整无效 2023-11-27 14:35:58 +08:00
taojinlong
693f83ad6d fix: 去掉数据库名 2023-11-27 12:30:27 +08:00
wisonic-s
8e4d32b8c9 fix(视图-雷达图): 雷达图最小值取实际最小值 2023-11-24 16:34:19 +08:00
taojinlong
88b47ca368
Merge pull request #6839 from dataease/pr@dev@fixSql
Pr@dev@fix sql
2023-11-24 02:02:27 -06:00
wisonic-s
e42143ee5a fix(视图-明细表): 修复非直连模式下明细表分页由小变大不显示数据 2023-11-24 15:28:53 +08:00
taojinlong
597d897473 fix: Excel数据集字段重复提示信息多了一个“:” 2023-11-24 12:19:01 +08:00
taojinlong
a5e8a72c7a fix: API数据源优化提示信息 2023-11-24 12:17:58 +08:00
taojinlong
6426f86695 fix: 【数据集】替换数据集,有的字段导入失败 2023-11-24 11:56:08 +08:00
wisonic-s
7f25d8d535 feat: 维度/指标多选拖拽 2023-11-23 21:59:29 +08:00
ulleo
f485899163 fix: antv散点图跳转无效 2023-11-23 16:48:04 +08:00
ulleo
d7009f46f8 fix: 明细表无法添加指标字段 2023-11-23 15:30:54 +08:00
ulleo
90775b7197
Merge pull request #6814 from ulleo/dev
fix: AntV散点图指标维度计算占比提示异常
2023-11-23 14:43:13 +08:00
ulleo
9884d1e976 fix: AntV散点图指标维度计算占比提示异常 2023-11-23 14:42:22 +08:00
王嘉豪
317e186d51
Merge pull request #6803 from dataease/pr@dev@fix_mobile-show
fix: 修复移动端设计界面待选组件区域字体显示比例过大问题
2023-11-22 19:14:05 +08:00
wangjiahao
3e689d9fea fix: 修复移动端设计界面待选组件区域字体显示比例过大问题 2023-11-22 19:12:26 +08:00
ulleo
6491512389 fix: AntV散点图自定义排序显示内容不正确 2023-11-22 18:14:08 +08:00
wangjiahao
d8b1238409 style: 画布组件自适应按钮优化 2023-11-22 17:00:06 +08:00
ulleo
e268ff5c24
Merge pull request #6794 from ulleo/dev
fix: echarts散点图类别轴拖入类型错误
2023-11-22 15:01:43 +08:00
ulleo
87cf205f24 fix: echarts散点图类别轴拖入类型错误 2023-11-22 15:01:06 +08:00
王嘉豪
987814a004
Merge pull request #6793 from dataease/pr@dev@fix_subject-tab
fix: 优化编辑状态Tab加载方式改为实时加载,防止未加载视图对主题改变不响应问题 #6644
2023-11-22 14:55:58 +08:00
wangjiahao
7faefef74b fix: 优化编辑状态Tab加载方式改为实时加载,防止未加载视图对主题改变不响应问题 #6644 2023-11-22 14:54:26 +08:00
王嘉豪
d06d2210b4
Merge pull request #6792 from dataease/pr@dev@refactor_panel-tab-change
fix: 修复Tab页中的不同画布之间的过滤组件可能相互影响问题
2023-11-22 14:27:20 +08:00
ulleo
fea6462197
Merge pull request #6791 from ulleo/dev
feat: 针对antv散点图横轴内有纬度的情况,切换图表类型清空横轴
2023-11-22 14:26:38 +08:00
wangjiahao
1409d06b29 fix: 修复Tab页中的不同画布之间的过滤组件可能相互影响问题 2023-11-22 14:26:14 +08:00
ulleo
eb25dfb58b Merge remote-tracking branch 'origin/dev' into dev 2023-11-22 14:25:39 +08:00
ulleo
774099d65f feat: 针对antv散点图横轴内有纬度的情况,切换图表类型清空横轴 2023-11-22 14:25:24 +08:00
wangjiahao
110c6857c8 fix: 修复将图表和过滤组件添加到选项卡内过滤组件的默认值筛选将不生效问题 #6777 2023-11-22 13:49:33 +08:00
wangjiahao
27976ad1b4 style: 工具栏样式调整 2023-11-22 12:46:27 +08:00
taojinlong
fd0fe7dff4 fix: 使用视图插件的和数据源插件,两者组合制作仪表板视图时,视图查看异常 #6223 2023-11-21 18:28:26 +08:00
taojinlong
80a5c893fd
Merge pull request #6772 from dataease/pr@dev@fixSql
refactor: 回滚
2023-11-20 20:50:55 -06:00
taojinlong
9a639a1cf2 refactor: 回滚 2023-11-21 10:04:01 +08:00
taojinlong
775c42f833
Merge pull request #6769 from dataease/pr@dev@fixSql
Pr@dev@fix sql
2023-11-20 04:43:15 -06:00
taojinlong
3fbb8db02e fix: [Bug]修改已存在数据源保存时提示已存在相同配置数据源 #6267 2023-11-20 18:42:30 +08:00
ulleo
3349d6b89b fix: 对成柱状图维度错位
#6745
2023-11-20 18:10:03 +08:00
taojinlong
c189301915 fix: 升级 jsqlparser 2023-11-20 18:06:52 +08:00
taojinlong
56008051ea fix: oracle数据库使用数据库数据集,保存数据集后没有数据 2023-11-20 17:51:25 +08:00
ulleo
c177583b60
Merge pull request #6766 from ulleo/dev
feat: 隐藏对称柱状图的纵轴名称设置
2023-11-20 17:35:59 +08:00
ulleo
8f00d8678c feat: 隐藏对称柱状图的纵轴名称设置 2023-11-20 17:35:10 +08:00
taojinlong
5194cc61ad fix: API 数据集同步任务增量更新修改为全量更新不生效 2023-11-20 17:11:19 +08:00
taojinlong
977afdef15 fix: 设置API超时时间后依然给出提示 2023-11-20 16:09:38 +08:00
taojinlong
e0bea05f10
Merge pull request #6760 from dataease/pr@dev@fixSql
fix: 编辑sql数据集,设置参数出错
2023-11-19 21:50:58 -06:00
taojinlong
4605b862b4 fix: 编辑sql数据集,设置参数出错 2023-11-20 11:49:57 +08:00
wisonic-s
c14e2e2ecf
Merge pull request #6744 from dataease/pr@dev@fix_table_page_size_change
fix: 明细表分页由小变大时不显示数据
2023-11-17 16:31:36 +08:00
wisonic-s
6ec48192af fix: 明细表分页由小变大时不显示数据 2023-11-17 16:27:32 +08:00
taojinlong
03b727c4ac fix: sqlserver 下拉组件有排序时筛选报错 2023-11-17 16:19:39 +08:00
wisonic-s
89f439a091 fix: antv 提示偏移 2023-11-16 18:46:15 +08:00
wisonic-s
5be7ab1d2a refactor: 雷达图编辑属性修改。 2023-11-16 16:13:34 +08:00
wisonic-s
0399b64304 feat: echarts雷达图自定义最大值最小值。 2023-11-16 16:03:28 +08:00
王嘉豪
dd071d57e4
Merge pull request #6721 from dataease/pr@dev@fix_outer-params
fix(仪表板): 修复部分外部参数添加按钮点击没反应问题
2023-11-16 16:01:24 +08:00
wangjiahao
a0aada709f fix(仪表板): 修复部分外部参数添加按钮点击没反应问题 2023-11-16 15:54:23 +08:00
ulleo
4f1b0daf34 feat: 调整AntV表格斑马纹颜色配置与Echarts统一 2023-11-16 14:45:53 +08:00
wisonic-s
6ae686d72e fix: antv汇总表序号列斑马纹不生效 2023-11-15 21:28:41 +08:00
wisonic-s
e290b4a489 fix: echarts表格隐藏表头同时隐藏统计行 2023-11-15 21:10:32 +08:00
ulleo
dd89657d6c
Merge pull request #6706 from ulleo/dev
feat: 去除指标卡大小设置中多余的分割线
2023-11-15 17:59:16 +08:00
ulleo
24f8db7ad9 feat: 去除指标卡大小设置中多余的分割线 2023-11-15 17:58:50 +08:00
wisonic-s
f777cad41a
Merge pull request #6704 from dataease/pr@dev@feat_custom_sort_top_and_find
feat: 维度自定义排序支持置顶和搜索#6288
2023-11-15 17:00:37 +08:00
wisonic-s
5c5aced547 feat: 维度自定义排序支持置顶和搜索#6288 2023-11-15 16:58:53 +08:00
王嘉豪
671b6d2b0c
Merge pull request #6703 from dataease/pr@dev@refactor_rich-text-view
refactor(视图): 富文本视图点击编辑按钮文本区域进入编辑状态
2023-11-15 16:42:45 +08:00
wangjiahao
b7f29ce38c refactor(视图): 富文本视图点击编辑按钮文本区域进入编辑状态 2023-11-15 16:40:06 +08:00
王嘉豪
dbb2dc8564
Merge pull request #6702 from dataease/pr@dev@style_error-message
style: 调整视图错误提示样式
2023-11-15 16:10:01 +08:00
wangjiahao
0951a31a0b style: 调整视图错误提示样式 2023-11-15 16:08:09 +08:00
ulleo
7c8f228d31
Merge pull request #6699 from ulleo/dev
fix: 动态排序图中“分组/维度”使用计算字段时,视图显示异常
2023-11-15 15:57:32 +08:00
ulleo
a356c6c484 fix: 动态排序图中“分组/维度”使用计算字段时,视图显示异常
#6218
2023-11-15 15:56:48 +08:00
王嘉豪
4b347a3f7c
Merge pull request #6698 from dataease/pr@dev@feat_outerparams-adptor
feat(仪表板): 仪表板外部参数支持匹配过滤组件,兼容多选范围组件 #5891
2023-11-15 15:48:58 +08:00
wangjiahao
07f24aed1c feat(仪表板): 仪表板外部参数支持匹配过滤组件,兼容多选范围组件 #5891 2023-11-15 15:46:25 +08:00
xuwei-fit2cloud
28c68881e7 chore: 升级版本号至1.18.13 2023-11-15 15:22:54 +08:00
wisonic-s
7d23c5ff0d fix: 指标卡/文本卡字体在 mac 上不生效 2023-11-15 11:57:03 +08:00
wisonic-s
19c2ecb02c refactor: echarts指标卡位置属性调整 2023-11-15 11:56:28 +08:00
wisonic-s
11b020162b fix: 指标卡后缀字体大小不统一 2023-11-15 11:55:55 +08:00
王嘉豪
b4a145bbda
Merge pull request #6694 from dataease/pr@dev@feat_outerparams
feat(仪表板): 仪表板外部参数支持匹配过滤组件 #5891
2023-11-15 11:31:16 +08:00
wangjiahao
d37e7c57ab feat(仪表板): 仪表板外部参数支持匹配过滤组件 #5891 2023-11-15 11:30:04 +08:00
fit2cloud-chenyw
5adbb85ae5 perf: doris数据源下拉过滤器选项模糊搜索 2023-11-15 11:10:40 +08:00
fit2cloud-chenyw
c3dbc0e4f4
Merge pull request #6690 from dataease/pr@dev@perf_doris_filter_sort
perf: doris数据源过滤器选项排序
2023-11-15 10:32:57 +08:00
fit2cloud-chenyw
7c8a3e231a perf: doris数据源过滤器选项排序 2023-11-15 10:32:02 +08:00
王嘉豪
90f1ee1970
Merge pull request #6687 from dataease/pr@dev@fix_tab-lazy
fix(仪表板): 修复通过仪表板样式中部分属性更新,tab组件中非当前页中组件未生效问题 #6644
2023-11-15 09:35:16 +08:00
wangjiahao
afe7bffd9b fix(仪表板): 修复通过仪表板样式中部分属性更新,tab组件中非当前页中组件未生效问题 #6644 2023-11-15 09:34:09 +08:00
wisonic-s
ef9ab063cd feat: 指标卡支持空值处理和后缀 #5413 #5576 2023-11-14 19:21:16 +08:00
王嘉豪
c1b69d2de6
Merge pull request #6680 from dataease/pr@dev@refactor_custom-color
refactor(仪表板): 优化自定义颜色数据加载时机,改为需要配置时加载,防止初始化即加载导致请求时间过长 #6638
2023-11-14 16:37:42 +08:00
wangjiahao
f04671ee7a refactor(仪表板): 优化自定义颜色数据加载时机,改为需要配置时加载,防止初始化即加载导致请求时间过长 #6638 2023-11-14 16:30:26 +08:00
fit2cloud-chenyw
a1e9eb6b6b fix: 日志api未校验对应菜单权限 2023-11-14 16:18:12 +08:00
fit2cloud-chenyw
7a774d29be
Merge pull request #6678 from dataease/pr@dev@_perf_filter_selector_options
perf: 下拉过滤器使用后台模糊搜索
2023-11-14 16:05:46 +08:00