Commit Graph

5801 Commits

Author SHA1 Message Date
wangjiahao
47a3a04aef refactor: 仪表板编辑页面操作布局优化 2022-06-09 15:51:22 +08:00
fit2cloud-chenyw
aae1fef98b
Merge pull request #2391 from dataease/pr@dev@fix_filter_sort
fix: 过滤器枚举字段去除分组查询
2022-06-07 19:40:52 +08:00
fit2cloud-chenyw
bb1810b1bc fix: 过滤器枚举字段去除分组查询 2022-06-07 19:39:31 +08:00
王嘉豪
a7a37a5043
Merge pull request #2389 from dataease/pr@dev@feat_new-version
fix: 修复部分类型视图无法自定义颜色的问题
2022-06-07 18:15:19 +08:00
wangjiahao
35c175aacc fix: 修复部分类型视图无法自定义颜色的问题 2022-06-07 18:13:50 +08:00
taojinlong
9fa65bcc36 Merge branch 'main' into dev 2022-06-07 17:44:17 +08:00
taojinlong
ba5832b58f
Merge pull request #2345 from Antoniano1963/main
feat:提高请求超时时间的范围,创建关联数据集时保留原数据类型
2022-06-07 17:43:16 +08:00
dataeaseShu
9607973f82
Merge pull request #2388 from dataease/pr@dev_feat_caculate_id_name
Pr@dev feat caculate id name
2022-06-07 16:40:46 +08:00
dataeaseShu
d2c3ecad90 Merge branch 'pr@dev_feat_caculate_id_name' of https://github.com/dataease/dataease into pr@dev_feat_caculate_id_name 2022-06-07 16:39:24 +08:00
dataeaseShu
c45f68bd23 feat: 【数据集】新建计算字段时,将字段的ID显示替换成字段名 2022-06-07 16:39:14 +08:00
taojinlong
98727f00bc Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-07 16:07:26 +08:00
taojinlong
b1a0acad22 fix: 驱动管理只对管理员可见 2022-06-07 16:07:09 +08:00
junjun
555de25308 feat: 轴值格式化 2022-06-07 15:24:49 +08:00
fit2cloud-chenyw
e51b0d766b
Merge pull request #2385 from dataease/pr@dev@feat_filter_sort
feat: 过滤器枚举值排序
2022-06-07 15:05:26 +08:00
fit2cloud-chenyw
fbd0d39002 feat: 过滤器枚举值排序 2022-06-07 15:04:24 +08:00
junjun
3fc0098b65 feat: 增加图表配置默认值 2022-06-07 13:47:17 +08:00
junjun
936310b320 feat: 视图计算字段flyway 2022-06-06 15:10:25 +08:00
王嘉豪
f64b863633
Merge pull request #2379 from dataease/v1.11
V1.11
2022-06-06 11:04:39 +08:00
wangjiahao
6bee78446f fix: 修复不能创建关联数据集问题 2022-06-02 18:26:23 +08:00
wangjiahao
54d8d59c0a fix: 修复不能创建关联数据集问题 2022-06-02 18:25:10 +08:00
wangjiahao
e4aa5cee21 fix: 修复仪表板不能创建最顶层目录问题 2022-06-02 17:32:14 +08:00
wangjiahao
3a1e4db6e0 fix: 修复仪表板不能创建最顶层目录问题 2022-06-02 17:30:50 +08:00
junjun
3d8aee71df fix: 恢复标题位置选项 2022-06-02 15:38:04 +08:00
junjun
222e385ef4 fix: 恢复标题位置选项 2022-06-02 15:36:49 +08:00
fit2cloudrd
3b09317378
Merge pull request #2378 from dataease/dev
docs: 更新README
2022-06-02 13:53:13 +08:00
xuwei-fit2cloud
a2c8d68ab2 docs: 更新README 2022-06-02 13:52:23 +08:00
fit2cloudrd
ac89f08879
Merge pull request #2377 from dataease/dev
Dev
2022-06-02 13:41:48 +08:00
fit2cloudrd
a1fb770919
Merge branch 'main' into dev 2022-06-02 13:41:16 +08:00
fit2cloud-chenyw
abb5073971 fix: 升级版本号1.11.1 2022-06-02 13:40:44 +08:00
fit2cloud-chenyw
8cfa3a744e Merge remote-tracking branch 'origin/v1.11' into v1.11 2022-06-02 13:40:19 +08:00
fit2cloud-chenyw
e04dea30a4 perf: 优化选项卡选择组件提示 2022-06-02 13:39:41 +08:00
fit2cloud-chenyw
ccb2e1e217
Merge pull request #2376 from dataease/pr@dev@fix_version_number
fix: 升级版本号1.11.1
2022-06-02 13:31:35 +08:00
fit2cloud-chenyw
2899983be0 fix: 升级版本号1.11.1 2022-06-02 13:30:30 +08:00
fit2cloud-chenyw
073a73f1e5
Merge pull request #2375 from dataease/pr@dev@perf_detabs
perf: 优化选项卡选择组件提示
2022-06-01 21:48:52 +08:00
fit2cloud-chenyw
4ee6d86251 fix: 插件视图使用带scheme的数据源没有设置scheme导致查询不到数据 2022-06-01 18:58:04 +08:00
fit2cloud-chenyw
3c414d3da2
Merge pull request #2374 from dataease/pr@dev@fix_plugin_view_ds_scheme
fix: 插件视图使用带scheme的数据源没有设置scheme导致查询不到数据
2022-06-01 18:57:11 +08:00
fit2cloud-chenyw
ef86c2a885 fix: 插件视图使用带scheme的数据源没有设置scheme导致查询不到数据 2022-06-01 18:56:02 +08:00
王嘉豪
a6495e3086
Merge pull request #2373 from dataease/dev
fix: 过滤跳转设置中联动视图字段部分数字图标未显示
2022-06-01 17:20:47 +08:00
wangjiahao
29024d4dd4 fix: 过滤跳转设置中联动视图字段部分数字图标未显示 2022-06-01 17:19:51 +08:00
王嘉豪
d511f7ad34
Merge pull request #2372 from dataease/dev
Dev
2022-06-01 16:41:23 +08:00
wangjiahao
4258b29a09 Merge remote-tracking branch 'origin/dev' into dev 2022-06-01 16:40:55 +08:00
wangjiahao
85c6051712 fix: 过滤跳转设置中联动视图查询出现的无用数据 2022-06-01 16:39:46 +08:00
fit2cloud-chenyw
a7179e1820 fix: 符号地图明细数据错误 2022-06-01 16:36:26 +08:00
fit2cloud-chenyw
46f3c70e70
Merge pull request #2371 from dataease/pr@dev@fix_symbol_map_excel
fix: 符号地图明细数据错误
2022-06-01 16:35:37 +08:00
fit2cloud-chenyw
631acb29e7 fix: 符号地图明细数据错误 2022-06-01 16:34:44 +08:00
fit2cloud-chenyw
9518dd7240 fix: 数据源适配group_concat函数 2022-06-01 16:09:51 +08:00
fit2cloud-chenyw
fb541e22ec
Merge pull request #2370 from dataease/pr@dev@fix_datasource_group_concat
fix: 数据源适配group_concat函数
2022-06-01 16:09:04 +08:00
fit2cloud-chenyw
47ac8ce776 fix: 数据源适配group_concat函数 2022-06-01 16:08:06 +08:00
taojinlong
d01a067c32 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-01 15:56:54 +08:00
taojinlong
d176cfd597 fix: 获取枚举值空指针 2022-06-01 15:56:44 +08:00