center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
5,985 Commits 1 Branch 86 Tags 417 MiB
8873b8f64c
Commit Graph

2093 Commits

Author SHA1 Message Date
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
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
936310b320 feat: 视图计算字段flyway 2022-06-06 15:10:25 +08:00
wangjiahao
54d8d59c0a fix: 修复不能创建关联数据集问题 2022-06-02 18:25:10 +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
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
631acb29e7 fix: 符号地图明细数据错误 2022-06-01 16:34:44 +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
wangjiahao
702d815215 Merge remote-tracking branch 'origin/dev' into dev 2022-06-01 12:17:18 +08:00
wangjiahao
bf493362a9 fix: 符号地图标志在联动视图选项未显示 2022-06-01 12:15:43 +08:00
fit2cloud-chenyw
87001c3268 fix: 符号地图导出excel缺少字段 2022-06-01 11:15:49 +08:00
taojinlong
6fc0afcfeb Merge branch 'v1.11' of github.com:dataease/dataease into v1.11 2022-06-01 00:50:37 +08:00
taojinlong
f3218fc87d fix: 获取 StarRocks 字段类型 2022-06-01 00:20:07 +08:00
taojinlong
8b9b0e4564 fix: db2 time 类型 2022-06-01 00:17:59 +08:00
taojinlong
2f8beea85b fix: 切换插件类型数据源不生效 2022-05-31 22:17:29 +08:00
taojinlong
8aa0bf2153 fix: 行权限枚举值 2022-05-31 19:03:27 +08:00
wangjiahao
d69ebb8ea7 refactor: 模板导入适配新的视图逻辑 2022-05-31 16:54:19 +08:00
wangjiahao
1810e3481e revert: 代码回退 2022-05-31 15:31:47 +08:00
wangjiahao
edc9878368 refactor: 仪表板保存优化 2022-05-31 13:31:01 +08:00
王嘉豪
23acb3c9c0
Merge pull request #2360 from dataease/pr@dev@refactor_panel-save 
refactor: 优化仪表板保存返回信息
 2022-05-31 12:14:19 +08:00
wangjiahao
38ad5a1922 refactor: 优化仪表板保存返回信息 2022-05-31 12:13:35 +08:00
王嘉豪
feabca531c
Merge pull request #2359 from dataease/refactor_batch-opt-style 
refactor: 缓存清理注解改为异步处理，加快接口处理时间
 2022-05-31 12:05:22 +08:00
wangjiahao
31ba1baa31 refactor: 缓存清理注解改为异步处理，加快接口处理时间 2022-05-31 12:04:43 +08:00
taojinlong
c9bbc2ef2c fix: 自定义驱动 2022-05-30 23:30:40 +08:00
taojinlong
803792fec0 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-30 21:23:10 +08:00
taojinlong
d49f617c91 fix: 自定义驱动 2022-05-30 21:23:03 +08:00
王嘉豪
786a785c8a
Merge pull request #2355 from dataease/pr@dev@refactor_label-color 
fix: 复制仪表板，指标卡颜色丢失
 2022-05-30 18:04:47 +08:00
wangjiahao
57a7d491db fix: 复制仪表板，指标卡颜色丢失 2022-05-30 18:01:31 +08:00
taojinlong
9be4a14b27 fix: 创建数据表时需要指定排序为 utf8mb4_general_ci 2022-05-30 15:08:19 +08:00
taojinlong
2ae62dff1e fix: 替换excel时，提示影响计算字段 2022-05-30 10:40:52 +08:00
taojinlong
7879eed3ff fix: API 数据集校验错误 2022-05-30 10:40:44 +08:00
fit2cloud-chenyw
fb446e3943 fix: 修改log文件名称 2022-05-30 10:24:45 +08:00
fit2cloud-chenyw
d9e4cdd18f fix: 修改log文件名称 2022-05-30 10:22:23 +08:00
fit2cloud-chenyw
5e6e00e84c fix: 操作日志列表查询条件包含多个操作类型结果集逻辑错误 2022-05-30 10:08:38 +08:00
fit2cloud-chenyw
ce1f06705e
Merge pull request #2346 from dataease/pr@dev@fix_log_filter_error 
fix: 操作日志列表查询条件包含多个操作类型结果集逻辑错误
 2022-05-30 10:07:53 +08:00
fit2cloud-chenyw
966d7f90a7 fix: 操作日志列表查询条件包含多个操作类型结果集逻辑错误 2022-05-30 10:06:50 +08:00
taojinlong
a4a665203d fix: 替换excel时，提示影响计算字段 2022-05-30 01:11:53 +08:00
吕昊泽
1df069bc28 增加了注释 2022-05-29 22:54:05 +08:00
吕昊泽
2ace1cbb68 修复[issue:2293](https://github.com/dataease/dataease/issues/2293)建议把请求超时时间的设置数值范围加大 2022-05-29 21:42:17 +08:00
吕昊泽
00e7b5f349 修复[issue:2339](https://github.com/dataease/dataease/issues/2339)excel创建关联数据集保留原数据类型 2022-05-29 21:38:20 +08:00
fit2cloud-chenyw
32108e8686 fix: 纯内网环境主题切换失效 2022-05-29 13:39:06 +08:00
fit2cloud-chenyw
127caff11e fix: 纯内网环境主题切换失效 2022-05-29 13:37:26 +08:00
fit2cloud-chenyw
792a86667f fix: 修改个人信息报错 2022-05-29 09:46:29 +08:00
fit2cloud-chenyw
960040be9a fix: 修改个人信息报错 2022-05-29 09:41:09 +08:00
taojinlong
2d1793f3f5 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-28 21:58:06 +08:00
taojinlong
0b468cc22b fix: API 数据集校验错误 2022-05-28 21:57:46 +08:00
fit2cloud-chenyw
319df86b5b fix: 暂时屏蔽视图操作日志 2022-05-28 21:44:55 +08:00
fit2cloud-chenyw
5973f9beac fix: 恢复因为增加日志修改的api 2022-05-28 21:44:36 +08:00
fit2cloud-chenyw
215d262bbf fix: 暂时屏蔽视图操作日志 2022-05-28 21:42:53 +08:00
fit2cloud-chenyw
6fd3ccf91b fix: 恢复因为增加日志修改的api 2022-05-28 21:35:06 +08:00
fit2cloud-chenyw
39ed55c1bb feat: 符号地图插件记录sql 2022-05-28 13:17:53 +08:00
fit2cloud-chenyw
7974ae2abd
Merge pull request #2335 from dataease/pr@dev@feat_symbol_map_plugin_sql 
feat: 符号地图插件记录sql
 2022-05-28 13:14:49 +08:00
fit2cloud-chenyw
acecae5d7a feat: 符号地图插件记录sql 2022-05-28 13:13:24 +08:00
taojinlong
718585f3a0 fix: excel 替换、追加不生效 2022-05-28 10:51:11 +08:00
taojinlong
5f8f93f7d4 fix: excel 替换、追加不生效 2022-05-28 10:49:49 +08:00
taojinlong
25e5fb40f1 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-27 22:02:48 +08:00
taojinlong
33f43369f2 fix: 驱动插件操作日志 2022-05-27 22:02:39 +08:00
wangjiahao
3c6d2fb98f refactor: 使用Gson 替换fastjson 2022-05-27 19:48:05 +08:00
fit2cloud-chenyw
cddde4a4f9 perf: 优化操作日志 2022-05-27 13:30:46 +08:00
fit2cloud-chenyw
7ebbf09dda fix: 移动端查看分享错误 2022-05-27 12:05:11 +08:00
fit2cloud-chenyw
0dd419c7fe fix: 树形没有按照字段先后顺序构建树 2022-05-26 23:30:34 +08:00
fit2cloud-chenyw
bab9634d2e fix: 日志导出增加条件 2022-05-26 22:41:46 +08:00
fit2cloud-chenyw
04fe29a96c
Merge pull request #2324 from dataease/pr@dev@fix_log_i18n 
fix: 操作日志国际化
 2022-05-26 21:23:12 +08:00
fit2cloud-chenyw
791c27910c fix: 操作日志国际化 2022-05-26 21:22:09 +08:00
taojinlong
ac29f9db2b fix: 菜单授权报错 2022-05-26 18:07:04 +08:00
taojinlong
dd2e9a6e6f fix: 删除数据源权限错误 2022-05-26 15:28:04 +08:00
junjun
1d8e2658bf feat: 支持树形过滤器sql 2022-05-26 14:30:03 +08:00
junjun
9068d80516 test: 树形过滤器sql拼接 2022-05-26 13:18:20 +08:00
fit2cloud-chenyw
f5241528ff
Merge pull request #2313 from dataease/pr@dev@feat_tree_select 
feat: 过滤条件增加下拉树
 2022-05-26 12:54:14 +08:00
fit2cloud-chenyw
2cf026edcf feat: 过滤条件增加下拉树 2022-05-26 12:53:18 +08:00
junjun
83081b94e5 test: 树形过滤器sql拼接 2022-05-26 12:38:06 +08:00
taojinlong
626f97935e fix: 优化驱动管理 2022-05-25 23:07:59 +08:00
taojinlong
8f33d3779e fix: 新建同步任务时数据集无数据无需提示“请先完成数据同步” 2022-05-25 20:24:29 +08:00
wangjiahao
73a9a0bd05 Merge remote-tracking branch 'origin/dev' into dev 2022-05-25 10:54:16 +08:00
wangjiahao
d8c73873a2 feat: 仪表板复用时支持选择存量视图 2022-05-25 10:53:50 +08:00
fit2cloud-chenyw
adff099263
Merge pull request #2302 from dataease/pr@dev@fix_about_version 
fix: 关于页面中版本号错误
 2022-05-25 10:10:01 +08:00
fit2cloud-chenyw
ab111a9d32 fix: 关于页面中版本号错误 2022-05-25 10:08:37 +08:00
wangjiahao
1a75c3ed33 Merge remote-tracking branch 'origin/dev' into dev 2022-05-24 22:32:31 +08:00
wangjiahao
da26a5b40f feat: 仪表板编辑时可以按照仪表板复用视图 2022-05-24 22:32:11 +08:00
taojinlong
199e491401 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-24 20:58:47 +08:00
taojinlong
3c6c1f9c03 feat: 添加 presto 插件 2022-05-24 20:58:31 +08:00
fit2cloud-chenyw
b66ed1f96c perf: 优化审计日志图标 2022-05-24 17:59:54 +08:00
fit2cloud-chenyw
43eaf4809c
Merge pull request #2299 from dataease/pr@dev@perf_de_log 
perf: 优化审计日志
 2022-05-24 17:56:50 +08:00
fit2cloud-chenyw
8152848c43 perf: 优化审计日志 2022-05-24 17:55:53 +08:00
taojinlong
3e9abcb9d1 refactor: 打印日志 2022-05-23 19:44:24 +08:00
taojinlong
c657f56c29 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-23 17:22:49 +08:00
taojinlong
ff12a33d87 refactor: 格式化代码 2022-05-23 17:22:27 +08:00
fit2cloud-chenyw
d7a1654ae0
Merge pull request #2294 from dataease/pr@dev@feat_marker_map_sql 
feat: 符号地图sql
 2022-05-23 15:47:53 +08:00
fit2cloud-chenyw
4bb9f244b6 feat: 符号地图sql 2022-05-23 15:46:39 +08:00
taojinlong
8401f4e14f Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-23 13:51:21 +08:00
taojinlong
928713b4e0 refactor: 驱动路径 2022-05-23 13:51:12 +08:00
fit2cloud-chenyw
5a78aa0599
Merge pull request #2291 from dataease/pr@dev@feat_marker_map_label 
feat: 气泡地图增加标签字段设置
 2022-05-23 10:40:28 +08:00
fit2cloud-chenyw
0c25b5f553 feat: 气泡地图增加标签字段设置 2022-05-23 10:38:16 +08:00