center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
9,662 Commits 1 Branch 86 Tags 417 MiB
ad9280aed5
Commit Graph

3210 Commits

Author SHA1 Message Date
fit2cloud-chenyw
a516023ea3
Merge pull request #4095 from dataease/pr@dev@feat_map_mark 
feat(视图): 色彩地图增加标记功能
 2022-12-15 14:27:31 +08:00
fit2cloud-chenyw
4fa41d8676 feat(视图): 色彩地图增加标记功能 2022-12-15 14:01:28 +08:00
wangjiahao
1c92558161 refactor(仪表板): 更新仪表板默认主题设置 2022-12-13 17:07:08 +08:00
wangjiahao
68c50614a5 refactor: 调整flyway 2022-12-13 11:42:05 +08:00
taojinlong
513ae189a4
Merge pull request #4072 from dataease/pr@dev@datasource 
feat(数据源): 数据源敏感信息加密
 2022-12-12 17:38:27 +08:00
taojinlong
214c5f1a84 feat(数据源): 数据源敏感信息加密 2022-12-12 17:17:55 +08:00
junjun
5a04c47b4b fix(视图): 修复复制仪表板后视图计算字段表达式为空的问题 #4062 2022-12-12 17:16:30 +08:00
wangjiahao
b85fb8938b feat(应用): 应用模板支持选择存量数据源 2022-12-07 18:21:15 +08:00
wangjiahao
5fc59d7801 Merge remote-tracking branch 'origin/dev' into dev 2022-12-06 17:22:04 +08:00
wangjiahao
1099b00d34 build: 更新版本号至1.18.0 2022-12-06 17:21:22 +08:00
fit2cloud-chenyw
62242d67cc feat(飞书): 工作台免登进入DataEase 2022-12-06 16:36:28 +08:00
fit2cloud-chenyw
4d4807b821 feat(xpack): 钉钉工作台免登进入DataEase 2022-12-05 13:44:59 +08:00
fit2cloud-chenyw
0aabb23165
Merge pull request #3994 from dataease/pr@dev@feat_report_img_down_api 
feat(定时报告): 下载定时报告图片api
 2022-12-02 09:04:18 +08:00
fit2cloud-chenyw
a3a064b486 perf(定时报告): 删除测试代码 2022-12-01 17:20:58 +08:00
fit2cloud-chenyw
904d2c95a2 feat(定时报告): 下载定时报告图片api 2022-12-01 17:13:21 +08:00
王嘉豪
951c0003f7
Merge pull request #3988 from dataease/pr@devrefactor_template-data-change 
refactor: 更新默认模板数据
 2022-12-01 14:58:42 +08:00
wangjiahao
dbad8857ba refactor: 更新默认模板数据 2022-12-01 11:47:29 +08:00
wisonic-s
22323141bc fix(typo): typo 2022-11-30 19:38:57 +08:00
taojinlong
a22eb627c3 fix: 分页条数为0 2022-11-30 19:06:04 +08:00
taojinlong
4e25a992c7 Merge branch 'dev' into pr@dev@fix_dataset 2022-11-30 18:39:17 +08:00
xuwei-fit2cloud
5b5072dfb2
Merge pull request #3962 from dataease/pr@dev@fix_table_field 
fix(视图): 修复doris明细表字段类型转换报错的问题
 2022-11-30 15:50:48 +08:00
junjun
d21b38c443 fix(视图): 修复doris明细表字段类型转换报错的问题 2022-11-30 15:47:55 +08:00
xuwei-fit2cloud
1700a8696a
Merge pull request #3961 from dataease/pr@dev@fix_system_i18n 
fix(系统管理): 国际化缺失
 2022-11-30 15:45:51 +08:00
taojinlong
d1e09c33ca fix: sqlserver 时间格式 2022-11-30 15:42:08 +08:00
fit2cloud-chenyw
29e4296034 fix(系统管理): 国际化缺失 2022-11-30 15:37:10 +08:00
taojinlong
4e3b2a7ae2 fix: 上传excel限制文件大小 2022-11-30 15:18:12 +08:00
Junjun
84952f3c87
Merge pull request #3953 from dataease/pr@dev@fix_app-custom-doris 
fix(应用): 修复应用创建非直连数据集因doris表创建延迟而导致的报错问题
 2022-11-30 13:42:27 +08:00
wangjiahao
c1509be15b fix(应用): 修复应用创建非直连数据集因doris表创建延迟而导致的报错问题 2022-11-30 13:36:23 +08:00
taojinlong
b259e30460 fix(数据集): doris数据集不支持分页 2022-11-30 00:12:07 +08:00
taojinlong
2ea1bbe6f6
Merge pull request #3943 from dataease/pr@dev@fix_dataset 
fix(数据集): 数据集时间格式化问题
 2022-11-30 00:05:19 +08:00
taojinlong
ab923a29c2 fix(数据集): 数据集时间格式化问题 2022-11-29 23:58:51 +08:00
xuwei-fit2cloud
a378126e13
Merge pull request #3938 from dataease/pr@dev@fix_dataset 
fix(数据集): 日期格式化
 2022-11-29 20:43:28 +08:00
taojinlong
73cc64d914 fix(数据集): 日期格式化 2022-11-29 18:14:57 +08:00
xuwei-fit2cloud
a8e9d5d4f3 chore: 添加typos文件 2022-11-29 15:16:20 +08:00
taojinlong
4d06267df2 fix(数据集): API 数据集更新失败 2022-11-29 15:04:33 +08:00
fit2cloud-chenyw
5c3b5add4d
Merge pull request #3915 from dataease/pr@dev@fix_app-clear-cache 
refactor(应用): 删除应用日志勾选删除相关资源时，清理掉浏览器相关资源的缓存
 2022-11-29 10:48:30 +08:00
wangjiahao
822de40487 refactor(应用): 删除应用日志勾选删除相关资源时，清理掉浏览器相关资源的缓存 2022-11-29 10:33:53 +08:00
xuwei-fit2cloud
80093dba16
Merge pull request #3912 from dataease/pr@dev@fix_app-union-dataset 
fix(应用): 修复含有关联数据集的仪表板应用导入后关联数据集报错问题
 2022-11-29 08:58:12 +08:00
taojinlong
72026e9a6a fix(数据集): 数据集脱敏规则 2022-11-28 22:31:26 +08:00
wangjiahao
1d08506f0c fix(应用): 修复含有关联数据集的仪表板应用导入后关联数据集报错问题 2022-11-28 22:23:30 +08:00
Junjun
c7ce770914
Merge pull request #3906 from dataease/pr@dev@fix_login_error_msg 
fix(登录): 登录失败提示信息
 2022-11-28 17:06:31 +08:00
junjun
e12d31be12 fix(视图): 修复明细表分页错误 2022-11-28 16:23:11 +08:00
fit2cloud-chenyw
38c3986ba4 fix(登录): 登录失败提示信息 2022-11-28 16:18:37 +08:00
junjun
a86e93ef4e Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/resources/db/migration/V44__1.17.sql
 2022-11-28 16:04:28 +08:00
Junjun
c2b2bf7036
Merge pull request #3903 from dataease/pr@dev@fix_app-rename 
fix(应用): 修复应用重命名、控制台报错相关问题
 2022-11-28 15:25:46 +08:00
junjun
858203106d refactor(插件): 优化插件显示 2022-11-28 15:19:48 +08:00
wangjiahao
b4a47f6569 fix(应用): 修复应用重命名、控制台报错相关问题 2022-11-28 14:56:30 +08:00
fit2cloud-chenyw
794e017a7c fix(过滤器): 日期范围过滤器参数设置单个结束时间有效 2022-11-28 13:23:35 +08:00
taojinlong
2ec594f1f7 fix(数据集): 自定义脱敏规则 2022-11-28 10:23:46 +08:00
junjun
cc6edeae9e fix(数据集): 修复es数据集导出报错 2022-11-25 17:19:11 +08:00
junjun
a4b2ec8250 feat(视图): 部分数据源不支持直连分页，使用前端分页 2022-11-25 16:50:03 +08:00
junjun
1308aa1d73 feat(视图): 部分数据源不支持直连分页，使用前端分页 2022-11-25 16:31:26 +08:00
fit2cloud-chenyw
27a9cb95e7
Merge pull request #3873 from dataease/pr@dev@refactor_spell 
refactor: 单词拼写优化
 2022-11-25 15:12:51 +08:00
wangjiahao
4a0e4503ba refactor: 单词拼写优化 2022-11-25 13:24:03 +08:00
taojinlong
da4485a300
Merge pull request #3870 from dataease/pr@dev@fix_panel_rename 
fix(仪表板): 重命名报错无权限
 2022-11-25 12:22:10 +08:00
fit2cloud-chenyw
49cdd6b224
Merge pull request #3868 from dataease/pr@dev@fix_background-style 
chore: 变更flyway配置，不检查sql文件中的el变量
 2022-11-25 12:19:26 +08:00
fit2cloud-chenyw
6e6228a7fa fix(仪表板): 重命名报错无权限 2022-11-25 11:30:54 +08:00
wangjiahao
3fe49d2750 chore: 变更flyway配置，不检查sql文件中的el变量 2022-11-25 10:52:04 +08:00
taojinlong
f91566de06 fix: 表格分页 2022-11-24 19:20:08 +08:00
taojinlong
2b5fba0fe8 refactor: 去掉打印 2022-11-24 19:08:19 +08:00
taojinlong
07ed991283 Merge branch 'dev' into pr@dev@dataset 2022-11-24 19:07:14 +08:00
taojinlong
59a8dc4544 feat: 数据集脱敏规则 2022-11-24 19:06:38 +08:00
fit2cloud-chenyw
ce1651fa82 feat(过滤器): 时间范围过滤器支持动态参数 2022-11-24 12:09:56 +08:00
fit2cloud-chenyw
a61e6b684c fix(过滤器): 选择名为count的字段排序会被sql注入拦截 2022-11-23 14:01:34 +08:00
fit2cloud-chenyw
2990887854
Merge branch 'dev' into pr@dev@feat_report_task_editor 2022-11-23 11:34:35 +08:00
fit2cloud-chenyw
164d398ca5 feat(定时报告): 富文本编辑器 2022-11-23 11:32:47 +08:00
xuwei-fit2cloud
9eba57819f
Merge pull request #3830 from dataease/pr@dev@dateformat 
feat: 日期格式的支持
 2022-11-23 09:10:03 +08:00
taojinlong
0764e477bf refactor: 删除注释 2022-11-22 18:56:38 +08:00
taojinlong
8dca4400c1 feat: 日期格式的支持 2022-11-22 18:55:25 +08:00
taojinlong
1cbec36a2d Merge branch 'dev' of github.com:dataease/dataease into dev 2022-11-22 16:05:15 +08:00
taojinlong
4fbf4626cb feat: 单次执行的任务，可以手动触发执行一次同步数据的任务 2022-11-22 16:04:54 +08:00
xuwei-fit2cloud
b1041b7fb3
Merge pull request #3824 from dataease/pr@dev@excel 
feat: Excel空单元格不参与类型判断
 2022-11-22 15:02:00 +08:00
taojinlong
98acbb10d3 feat: Excel空单元格不参与类型判断 2022-11-22 14:00:11 +08:00
taojinlong
d89ebba748 feat: 日期格式的支持 2022-11-22 10:52:17 +08:00
xuwei-fit2cloud
ef1774c730
Merge pull request #3795 from dataease/pr@dev@feat_line_hide_empty_data 
Pr@dev@feat line hide empty data
 2022-11-18 16:10:01 +08:00
wisonic-s
50938eb702 Merge branch 'dev' into pr@dev@feat_line_hide_empty_data 
# Conflicts:
#	frontend/src/lang/en.js
#	frontend/src/lang/tw.js
#	frontend/src/lang/zh.js
 2022-11-18 15:47:37 +08:00
王嘉豪
9e608844a6
Merge branch 'dev' into pr@dev@feat_panel-default 2022-11-18 15:43:37 +08:00
wisonic-s
d32043ef8b feat(视图-AntV折线图): 折线图支持隐藏无数据的点 
AntV折线图支持对空数据进行处理，可选线条断开，置0或者跳过空值
https://www.tapd.cn/55578866/prong/stories/view/1155578866001009888
 2022-11-18 15:43:32 +08:00
wangjiahao
9875240437 feat(仪表板): 进入仪表板菜单默认打开第一个默认仪表板且默认仪表板增加置顶功能 2022-11-18 15:37:08 +08:00
xuwei-fit2cloud
58d0220119
Merge pull request #3785 from dataease/pr@dev@refactor_ui 
Merge remote-tracking branch 'origin/dev' into dev
 2022-11-18 10:58:50 +08:00
xuwei-fit2cloud
0bb3da598b
Merge pull request #3783 from dataease/pr@dev@dateformat2 
feat(数据集): 日期格式支持
 2022-11-18 10:57:33 +08:00
junjun
ab59dfdda1 refactor: 优化数据源类型展示 2022-11-18 10:52:21 +08:00
taojinlong
6cf8943a06 feat(数据集): 日期格式支持 2022-11-18 00:56:44 +08:00
junjun
eee3c25d63 refactor(视图): 优化视图计算字段交互 2022-11-17 19:59:51 +08:00
fit2cloud-chenyw
c6c629fbd9
Merge branch 'dev' into pr@dev@perf_public_link_style 2022-11-17 16:18:51 +08:00
fit2cloud-chenyw
1be57a2f1c perf(公共链接): 交互区域样式 2022-11-17 16:03:00 +08:00
xuwei-fit2cloud
60f6ced036
Merge pull request #3775 from dataease/pr@dev@perf_api_doc 
perf(api文档): 企业用户登录后才可以查看api
 2022-11-17 13:07:03 +08:00
fit2cloud-chenyw
bdc8ff58d0 perf(api文档): 企业用户登录后才可以查看api 2022-11-17 12:45:27 +08:00
junjun
8e5d4572da fix(视图): 修复明细表分页导致的视图异常 2022-11-16 18:05:29 +08:00
Junjun
3ef38df2b6
Merge pull request #3765 from dataease/pr@dev@refactor_panel-watermark-link 
refactor(仪表板): 优化仪表板公共链接水印展示逻辑，用户信息取分享人
 2022-11-16 14:02:50 +08:00
wangjiahao
65b6e88203 refactor(仪表板): 优化仪表板公共链接水印展示逻辑，用户信息取分享人 2022-11-16 13:54:50 +08:00
王嘉豪
1c54cc5af6
Merge pull request #3763 from zxyle/dev 
fix: 修复系统登录后密码被返回
 2022-11-16 10:13:27 +08:00
xuwei-fit2cloud
32ab0b7f76
Merge pull request #3762 from dataease/pr@dev@feat_report_task_fire_now 
feat(定时报告): 立即执行后台
 2022-11-16 09:55:56 +08:00
Xiang Zheng
7c84b6a68b
fix(应用): 修复应用登录后密码被返回 2022-11-15 20:26:33 +08:00
fit2cloud-chenyw
6acf341fe0 feat(定时报告): 立即执行后台 2022-11-15 19:05:03 +08:00
Junjun
99842f957d
Merge pull request #3756 from dataease/pr@dev@TablePagination 
Pr@dev@table pagination
 2022-11-15 16:59:58 +08:00
taojinlong
c27ea60118 feat: 系统的默认超时时间设置为100 2022-11-15 16:44:01 +08:00
taojinlong
fa06823e44 refactor: 冲突 2022-11-15 16:07:12 +08:00
taojinlong
32178e4ce3 feat: 表格支持分页 2022-11-15 16:00:23 +08:00
wangjiahao
57e5ea7aef fix: 修复公共链接水印显示问题 2022-11-15 14:07:42 +08:00
xuwei-fit2cloud
f86d0c729c
Merge pull request #3749 from dataease/pr@dev@perf_user_grid 
perf: 查询用户列表过滤废弃角色
 2022-11-15 13:01:35 +08:00
wangjiahao
aa4e5689b9 feat: 支持水印设置 2022-11-15 11:58:14 +08:00
fit2cloud-chenyw
700b13c3aa perf: 查询用户列表过滤废弃角色 2022-11-15 11:33:32 +08:00
wangjiahao
66c473eaf6 feat: 支持水印设置 2022-11-14 14:54:27 +08:00
wisonic-s
017bb8e252 Merge branch 'dev' into pr@dv@feat_group_line 2022-11-11 15:54:19 +08:00
wisonic-s
28bfd773a8 feat(视图-AntV折线图): AntV 折线图支持分组 
AntV 折线图支持设置子维度快速分组
https://www.tapd.cn/55578866/prong/stories/view/1155578866001010004
 2022-11-11 15:53:34 +08:00
Junjun
76a59c2d5c
Merge pull request #3721 from zhantiao/dev 
perf:数据集功能模块的代码优化
 2022-11-11 11:04:44 +08:00
zhantiao
589cf235cf
Update DataSetTableService.java 
在review中，我发现我遗漏了一行代码
 2022-11-11 10:33:33 +08:00
zhantiao@tiduyun.com
9354dc92ea perf:数据集功能模块的代码优化 2022-11-11 10:11:21 +08:00
zhantiao@tiduyun.com
7c126041ed Revert "perf:优化了一些代码" 
This reverts commit aaca041e
 2022-11-11 10:10:34 +08:00
fit2cloud-chenyw
0a5c9de4c4 perf(消息中心): 消息组件命名规范化 2022-11-11 10:00:42 +08:00
zhantiao@tiduyun.com
aaca041e0a perf:优化了一些代码 2022-11-10 17:32:45 +08:00
zhantiao@tiduyun.com
897782c26e fix:优化了查询授权树模型的代码 2022-11-10 16:14:49 +08:00
fit2cloud-chenyw
17c42f7159 perf(系统): 每天00:00:00定时清理废弃数据 2022-11-10 09:55:54 +08:00
junjun
b41a52080f feat(视图): 支持表格分页 2022-11-09 16:02:11 +08:00
taojinlong
0057ff13dd feat: 表格支持分页 2022-11-09 11:37:49 +08:00
fit2cloud-chenyw
2e7a268d55 perf(数据集): 优化数据集表单路由驼峰命名 2022-11-09 10:50:42 +08:00
junjun
d2f9d59af4 feat(数据集): 数据集导出Excel 2022-11-08 20:19:49 +08:00
taojinlong
b91a14d417 feat: 表格支持分页 2022-11-08 17:05:36 +08:00
taojinlong
aedae12348 feat: 表格支持分页 2022-11-08 16:58:51 +08:00
xuwei-fit2cloud
31d304122b
Merge pull request #3673 from dataease/pr@dev@_link_log 
feat(日志): 公共链接增加日志
 2022-11-08 12:55:45 +08:00
fit2cloud-chenyw
a41cf922d4 feat(日志): 公共链接增加日志 2022-11-08 12:47:31 +08:00
xuwei-fit2cloud
5d3a4a1828
Merge pull request #3669 from dataease/pr@dev@feat_log_ip 
feat(日志管理): 客户端IP地址
 2022-11-08 10:41:28 +08:00
fit2cloud-chenyw
097b4eb45f feat(日志管理): 客户端IP地址 2022-11-07 18:29:50 +08:00
王嘉豪
4f3a17178f
Merge pull request #3662 from dataease/pr@dev@feat_dataset_export 
feat(数据集): 数据集导出Excel
 2022-11-07 16:16:53 +08:00
junjun
432b2f50ec feat(数据集): 数据集导出Excel 2022-11-07 16:03:08 +08:00
fit2cloud-chenyw
398d413e0b feat(登录): 禁止扫码创建用户配置 2022-11-07 15:50:32 +08:00
Junjun
542da44515
Merge pull request #3657 from dataease/pr@dev@feat_log_retention_time_setting 
feat(日志管理): 日志保留期限机制
 2022-11-07 14:26:55 +08:00
fit2cloud-chenyw
5910dd1175 feat(日志管理): 日志保留期限机制 2022-11-07 14:22:49 +08:00
xuwei-fit2cloud
53dacdfdaf
Merge pull request #3654 from dataease/pr@dev@feat_log_retention_time_setting 
feat(基础设置): 日志保留时间
 2022-11-07 13:31:33 +08:00
xuwei-fit2cloud
3ca88cd72f
Merge pull request #3650 from dataease/pr@dev@fix_app-union 
fix(应用): 修复应用新建自定义数据集可能无效的问题
 2022-11-07 13:30:28 +08:00
fit2cloud-chenyw
a2275b5502 feat(基础设置): 日志保留时间 2022-11-07 11:35:38 +08:00
wangjiahao
b783cf42c8 fix(应用): 修复应用新建自定义数据集可能无效的问题 2022-11-07 11:06:00 +08:00
taojinlong
a9cca87c7f Merge branch 'dev' of github.com:dataease/dataease into dev 2022-11-07 10:43:15 +08:00
taojinlong
aa208e4e50 refactor: 升级版本号 2022-11-07 10:43:04 +08:00
wangjiahao
a446ac999b fix(应用): 修复应用新建自定义数据集可能无效的问题 2022-11-07 10:09:26 +08:00
xuwei-fit2cloud
77fac8f684
Merge pull request #3635 from dataease/pr@dev@fix_user_import 
feat(用户管理): 导入用户使用xlsx
 2022-11-03 17:06:07 +08:00
fit2cloud-chenyw
8eff2f492c feat(用户管理): 导入用户使用xlsx 2022-11-03 17:04:07 +08:00
xuwei-fit2cloud
c937bbd9ed
Merge pull request #3633 from dataease/pr@dev@refactor_template-market-sort 
refactor(模板市场): 增加模板市场分类排序
 2022-11-03 16:53:00 +08:00
wangjiahao
df0b4b2a6e refactor(模板市场): 增加模板市场分类排序 2022-11-03 16:50:22 +08:00
王嘉豪
2234a82f0f
Merge pull request #3627 from dataease/pr@dev@refactor_app-replace 
fix(应用): 修复数据集字段未替换问题
 2022-11-03 08:58:32 +08:00
wangjiahao
e471784e4e fix(应用): 修复数据集字段未替换问题 2022-11-03 08:57:13 +08:00
王嘉豪
3b45e35025
Merge pull request #3625 from dataease/pr@dev@refactor_app-sort 
fix(应用): 解决无法创建应用分类问题
 2022-11-03 08:09:29 +08:00
wangjiahao
5b82da6e8b fix(应用): 解决无法创建应用分类问题 2022-11-03 08:07:28 +08:00
fit2cloud-chenyw
9f40cbd30f
Merge pull request #3623 from dataease/pr@dev@refactor_app-update 
refactor(应用): 优化默认应用模板
 2022-11-02 21:50:50 +08:00
wangjiahao
75b6e9d26f refactor(应用): 优化默认应用模板 2022-11-02 21:48:45 +08:00
fit2cloud-chenyw
d75b4de2be
Merge pull request #3618 from dataease/pr@dev@fix_app-new 
refactor(应用): 增加默认JMS应用模板
 2022-11-02 18:55:19 +08:00
wangjiahao
4fdccff8fe refactor(应用): 增加默认JMS应用模板 2022-11-02 18:53:21 +08:00
xuwei-fit2cloud
aa2f13c1fa
Merge pull request #3616 from dataease/pr@dev@dataset 
Pr@dev@dataset
 2022-11-02 17:37:46 +08:00
xuwei-fit2cloud
561168aa21
Merge pull request #3615 from dataease/pr@dev@fix_app-save 
fix(应用): 应用保存增加判断，防止保存为空
 2022-11-02 17:34:29 +08:00
Junjun
bc60514d3a
Merge pull request #3614 from dataease/pr@dev@refactor_flyway 
refactor: 修改Mysql相关字符集排序
 2022-11-02 17:30:46 +08:00
wangjiahao
cbca61f0b5 fix(应用): 应用保存增加判断，防止保存为空 2022-11-02 17:30:03 +08:00
taojinlong
51e8d309ff Merge branch 'dev' of github.com:dataease/dataease into dev 2022-11-02 17:21:14 +08:00
taojinlong
ffba26de67 fix(数据源): 解析API数据源出错 2022-11-02 17:21:05 +08:00
wangjiahao
53c43967e3 refactor: 修改Mysql相关字符集排序 2022-11-02 17:17:33 +08:00
王嘉豪
77de07b9d6
Merge pull request #3612 from dataease/pr@dev@fix_mobile_share_error 
fix(移动端): 没有角色的用户无法查看分享仪表板
 2022-11-02 16:41:02 +08:00
fit2cloud-chenyw
fce9905c23 fix(移动端): 没有角色的用户无法查看分享仪表板 2022-11-02 16:29:02 +08:00
xuwei-fit2cloud
7f4beede72
Merge pull request #3609 from dataease/pr@dev@fix_app-import 
refactor(应用): 优化应用的静态文件存储方式，静态文件直接存放在服务器
 2022-11-02 15:31:24 +08:00
wangjiahao
08b90af58c refactor(应用): 优化应用的静态文件存储方式，静态文件直接存放在服务器 2022-11-02 15:27:22 +08:00
Junjun
481ae86b2d
Merge pull request #3605 from dataease/pr@dev@fix_template-market 
fix(模板市场): 修复历史模板数据应用后视图无法显示问题
 2022-11-02 14:06:57 +08:00
wangjiahao
b8a33d3836 fix(模板市场): 修复历史模板数据应用后视图无法显示问题 2022-11-02 14:02:59 +08:00
taojinlong
9b37a875d8 fix(数据源): 获取 sqlserver 表字段错误 2022-11-01 22:52:14 +08:00
wangjiahao
78957eac22 fix(视图): 修复导出视图xlsx文件在mac上的Excel无法打开问题 2022-11-01 18:44:21 +08:00
taojinlong
c2c1fdf7ca fix(系统参数): 数据集详情-更新信息，查看同步失败的原因 2022-11-01 16:26:45 +08:00
Junjun
38af75c1ef
Merge pull request #3575 from dataease/pr@dev@dataset 
fix(数据集): 行列权限白名单用户列表
 2022-11-01 13:00:59 +08:00
Junjun
8278270119
Merge pull request #3576 from dataease/pr@dev@feat_cleaning_rebot 
feat(清理机器人): 启动时执行清理
 2022-11-01 13:00:33 +08:00
fit2cloud-chenyw
de41484364 feat(清理机器人): 启动时执行清理 2022-11-01 12:56:24 +08:00
taojinlong
024ce68021 fix(数据集): 行列权限白名单用户列表 2022-11-01 12:47:16 +08:00
junjun
0c904bd660 fix(数据集): 修复计算字段中引用函数错误 2022-11-01 11:42:08 +08:00
fit2cloud-chenyw
45929f8d10 fix(分享): 分享目标重复 2022-11-01 09:58:37 +08:00
fit2cloud-chenyw
818d064370 Merge remote-tracking branch 'origin/dev' into dev 2022-11-01 09:30:08 +08:00
fit2cloud-chenyw
8d2d7c2144 fix(api): api简写"详息"替换为"详细信息" 2022-11-01 09:28:46 +08:00
xuwei-fit2cloud
42949a30c1
Merge pull request #3567 from dataease/pr@dev@dataset 
Merge branch 'dev' into pr@dev@dataset
 2022-11-01 09:28:23 +08:00
fit2cloud-chenyw
a9c73c1372 fix(我的分享): 我分享的列表数据重复 2022-10-31 23:33:42 +08:00
taojinlong
79b37c0196 Merge branch 'dev' into pr@dev@dataset 2022-10-31 23:07:55 +08:00
taojinlong
6a2c9ffa48 fix(数据集): 格式化时间 2022-10-31 23:07:18 +08:00
xuwei-fit2cloud
12724a054a
Merge pull request #3564 from dataease/pr@dev@fix_table_wrong_index_number 
Pr@dev@fix table wrong index number
 2022-10-31 22:17:41 +08:00
fit2cloud-chenyw
c6728a263c fix(我的分享): 过滤对已被删除的目标分享 2022-10-31 21:57:52 +08:00
wisonic-s
49c61f6a42 Merge branch 'dev' into pr@dev@fix_table_wrong_index_number 
# Conflicts:
#	frontend/src/views/chart/chart/common/common_table.js
#	frontend/src/views/chart/chart/table/table-info.js
#	frontend/src/views/chart/components/ChartComponentS2.vue
 2022-10-31 19:33:44 +08:00
wisonic-s
78cc8130be fix(视图): 修复表格序号错误 
修复表格序号未按照实际数据排序
https://www.tapd.cn/55578866/bugtrace/bugs/view/1155578866001019105
 2022-10-31 19:12:30 +08:00
fit2cloud-chenyw
dc92b6740b
Merge pull request #3562 from dataease/pr@dev@fix_app-export-i18n 
fix: 修复应用导出后端国际化问题
 2022-10-31 18:54:06 +08:00
wangjiahao
fecc805f93 fix: 修复应用导出后端国际化问题 2022-10-31 18:47:57 +08:00
王嘉豪
25950fc4e7
Merge pull request #3559 from dataease/pr@dev@fix_msg_channel_block 
fix(消息管理): 单一渠道异常阻塞全部消息渠道
 2022-10-31 18:21:21 +08:00
fit2cloud-chenyw
4b2ca88276 fix(消息管理): 单一渠道异常阻塞全部消息渠道 2022-10-31 18:16:57 +08:00
xuwei-fit2cloud
721f3bba63
Merge pull request #3555 from dataease/pr@dev@dataset 
fix(数据集): sql 数据集编辑后，如果选择立即更新，创建一个全量更新任务
 2022-10-31 17:46:58 +08:00
taojinlong
008d79adb2 fix(数据集): sql 数据集编辑后，如果选择立即更新，创建一个全量更新任务 2022-10-31 17:44:01 +08:00
dataeaseShu
04a7806880
Merge pull request #3550 from dataease/pr@dev@refactor_panel-subject 
refactor(仪表板): 仪表板主题默认配色、文案优化
 2022-10-31 16:55:05 +08:00
wangjiahao
64b0b91fe3 refactor(仪表板): 仪表板主题默认配色、文案优化 2022-10-31 16:53:34 +08:00
fit2cloud-chenyw
527ec29bf8 fix(定时报告): 数字区间过滤器报错 2022-10-31 16:40:30 +08:00
fit2cloud-chenyw
d7fd0471ee fix(定时报告): 两个任务选同一个仪表板不同视图数据覆盖 2022-10-31 15:37:03 +08:00
fit2cloud-chenyw
fc8b215ea6 fix(定时报告): resultMode增加非空判断 2022-10-31 15:28:13 +08:00
fit2cloud-chenyw
47bb7d29ce perf(定时报告): 发送完消息删除临时文件 2022-10-31 14:27:07 +08:00
xuwei-fit2cloud
93522fc79e
Merge pull request #3521 from dataease/pr@dev@dataset 
Pr@dev@dataset
 2022-10-31 13:47:10 +08:00
taojinlong
faff7d6d16
Merge pull request #3531 from dataease/pr@dev@perf_report_task_view_file 
perf(定时报告): 视图文件格式改为xlsx
 2022-10-31 13:45:30 +08:00
fit2cloud-chenyw
6b0d48df1a fix(拼写错误): 消息相关sql中拼写错误 2022-10-31 12:13:26 +08:00
fit2cloud-chenyw
539000d8ba perf(定时报告): 视图文件格式改为xlsx 2022-10-31 11:49:31 +08:00
taojinlong
e7d6ae9719 fix(数据集): sql执行记录中，去掉打印；建表语句指定编码格式 2022-10-31 11:04:46 +08:00
taojinlong
1d88ee85e6 fix(数据集): 添加数据库数据集时数据预览出错 2022-10-31 10:50:38 +08:00
wangjiahao
7486653ce0 refactror(应用): 应用编辑权限控制优化 2022-10-30 09:29:22 +08:00
taojinlong
beb946f0d6 Merge branch 'dev' into pr@dev@dataset 
# Conflicts:
#	backend/src/main/resources/db/migration/V42__1.16.sql
 2022-10-28 18:30:34 +08:00
taojinlong
c59585ac5b feat(数据集): 【SQL数据集】增加执行记录 2022-10-28 18:22:01 +08:00
wangjiahao
47543b07f6 fix(应用): 修复导入应用数据集字段异常更新问题 2022-10-28 18:08:47 +08:00
xuwei-fit2cloud
1850d0b59d
Merge pull request #3494 from dataease/pr@dev@fix_report_task_invlid_view 
fix(定时报告): 隐藏已被删除的视图
 2022-10-27 17:33:24 +08:00
fit2cloud-chenyw
a78fb8cf2b fix(定时报告): 隐藏已被删除的视图 2022-10-27 17:08:49 +08:00
wisonic-s
fd60670cc2 Merge branch 'dev' into pr@dev@feat_antv_group_stack_bar 2022-10-27 16:50:07 +08:00
wisonic-s
73700dbe59 feat(视图): 支持分组堆叠柱状图 
视图类型增加分组堆叠柱状图
https://www.tapd.cn/55578866/prong/stories/view/1155578866001008801
 2022-10-27 16:49:01 +08:00
xuwei-fit2cloud
3b5b4a3bb9
Merge pull request #3489 from dataease/pr@dev@fix_cas_logout 
fix(登出): 对接cas后退出系统没有跳转到cas登录页面issues/2909
 2022-10-27 16:19:18 +08:00
fit2cloud-chenyw
d12875eb01
Merge branch 'dev' into pr@dev@fix_oidc_exit_error 2022-10-27 16:15:23 +08:00
fit2cloud-chenyw
b19914ce6b fix(登出): 对接cas后退出系统没有跳转到cas登录页面issues/2909 2022-10-27 16:08:21 +08:00
xuwei-fit2cloud
58995c8dd7
Merge pull request #3478 from dataease/pr@fix_flyway-error 
fix: flyway拼写错误格式化问题修改
 2022-10-27 14:08:14 +08:00
wangjiahao
16401ca5a2 refactor: 统一表和函数的字符集和排序规则 2022-10-27 14:05:37 +08:00
王嘉豪
7cc0fa5823
Merge pull request #3479 from dataease/pr@dev@dataset 
fix(数据源): mysql8 获取表字段为空
 2022-10-27 13:40:08 +08:00
taojinlong
8cc4afe88a fix(数据源): mysql8 获取表字段为空 2022-10-27 12:26:43 +08:00
wangjiahao
b6e71ff203 fix: flyway拼写错误格式化问题修改 2022-10-27 11:52:49 +08:00
xuwei-fit2cloud
9bf6c82289
Merge pull request #3470 from dataease/pr@dev@feat_app-connect 
Pr@dev@feat_app-connect
 2022-10-27 11:29:47 +08:00
wangjiahao
e3529ee9b1 refactor(应用): 应用管理增加权限控制 2022-10-27 11:24:08 +08:00
taojinlong
47d525ec3a fix: 升级依赖版本 2022-10-27 11:02:20 +08:00
taojinlong
9979723d2e Merge branch 'dev' into pr@dev@dataset 2022-10-27 10:48:06 +08:00
taojinlong
e77bcd7669 perf(数据集): 增强解析csv文件时代码稳定性 2022-10-27 10:47:55 +08:00
wangjiahao
9623343d4b Merge branch 'dev' into feat_app-connect 
# Conflicts:
#	backend/src/main/resources/db/migration/V42__1.16.sql
 2022-10-26 19:35:29 +08:00
wangjiahao
3cc6dd041b feat(应用市场): 三方应用对接 2022-10-26 19:34:56 +08:00
fit2cloud-chenyw
ee32305816 fix(登出): oidc宕机后无法退出系统 2022-10-26 19:24:19 +08:00
fit2cloud-chenyw
5daa316966
Merge pull request #3458 from dataease/pr@dev@dataset 
fix(数据源): sqlserver 获取表出错
 2022-10-26 15:41:24 +08:00
taojinlong
408dccb1c7 fix(数据源): sqlserver 获取表出错 2022-10-26 15:32:50 +08:00
xuwei-fit2cloud
af7f359f1a
Merge pull request #3457 from dataease/pr@dev@perf_scan_qr_login 
perf(登录): 用户状态为失效情况下扫码登录错误提示
 2022-10-26 15:30:16 +08:00
fit2cloud-chenyw
c227a1b49f perf(登录): 用户状态为失效情况下扫码登录错误提示 2022-10-26 15:18:26 +08:00
taojinlong
db68e63685 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-10-26 15:09:28 +08:00
taojinlong
1f845b3021 fix(数据集): 校验sql参数，只能在直连时使用 2022-10-26 15:08:20 +08:00
fit2cloud-chenyw
3d6a5562ed fix: 开启cas后公共链接无效 2022-10-26 14:32:54 +08:00
fit2cloud-chenyw
dcc337e986 feat(定时报告): 飞书国际版消息渠道 2022-10-25 17:28:37 +08:00
taojinlong
afa581c1d2 feat(数据源): 支持 Kylin 2022-10-25 14:28:43 +08:00
taojinlong
bf92ddaa4e feat(数据源): 支持 Kylin 2022-10-25 13:49:56 +08:00
fit2cloud-chenyw
93776973d8 perf(平台对接): 优化飞书国际版 2022-10-24 17:31:36 +08:00
fit2cloud-chenyw
c01d44f280 fix: 修改拼写错误，格式化代码 2022-10-24 14:42:37 +08:00
fit2cloud-chenyw
3fdeef0312 feat(平台对接): 飞书国际版 2022-10-24 13:22:58 +08:00
fit2cloud-chenyw
86e2ed96d3
Merge pull request #3412 from dataease/pr@dev@feat_chart_percent 
feat(视图): 快速计算支持占比
 2022-10-22 21:43:59 +08:00
junjun
a08ccdeed2 feat(视图): 快速计算支持占比 2022-10-22 14:03:35 +08:00
fit2cloud-chenyw
0718ad8647 feat: 后台所有拼写错误 2022-10-21 23:23:07 +08:00
fit2cloud-chenyw
1a4312213b fix: 部分后台拼写错误 2022-10-21 17:26:31 +08:00
wisonic-s
00da4e8965 Merge branch 'dev' into pr@dev@feat_liquid_dynamic_max 2022-10-20 18:13:44 +08:00
wisonic-s
e5b59e409a feat(视图-水波图): 水波图目标值支持动态值 
水波图目标值支持动态值 https://www.tapd.cn/55578866/prong/stories/view/1155578866001009735
 2022-10-20 18:12:52 +08:00
Junjun
8ba5fcc849
Merge pull request #3404 from dataease/pr@dev@kylin 
typo: 修复单词拼写错误
 2022-10-20 17:59:41 +08:00
fit2cloud-chenyw
cee4b1940c
fix: 删除无用代码 2022-10-20 17:41:17 +08:00
fit2cloud-chenyw
cf8ba02633 feat(定时报告): 视图数据构造时间过滤器条件 2022-10-20 17:29:25 +08:00
taojinlong
8925c7e0df refactor: 拼写错误 2022-10-20 15:27:51 +08:00
fit2cloud-chenyw
bed3413747 perf(定时报告): 根据视图数据范围导出不同数据 2022-10-19 12:45:46 +08:00
xuwei-fit2cloud
84a22b5dec
Merge pull request #3388 from dataease/pr@dev@feat_report_task_view_data_range 
feat(定时报告): 视图数据选项
 2022-10-19 11:41:11 +08:00
fit2cloud-chenyw
f80e85e2d6 feat(定时报告): 视图数据选项 2022-10-19 11:19:19 +08:00
taojinlong
65ca8a9380 feat(数据集): 数据集字段，字符串转时间，可以指定时间格式 2022-10-18 16:26:51 +08:00
fit2cloud-chenyw
e339d565fa perf(数据同步): 数据同步路由组件使用驼峰命名规范 2022-10-18 15:44:16 +08:00
fit2cloud-chenyw
6bf7c40dac perf(路由): 路由组件使用驼峰命名规范 2022-10-18 15:28:15 +08:00
fit2cloud-chenyw
5800da9e16 fix(定时报告): 任务时间选择周日报错 2022-10-16 12:57:53 +08:00
taojinlong
fc06d14c24 fix(数据源): 添加数据源时，校验参数 2022-10-13 20:39:38 +08:00
fit2cloud-chenyw
52bda7571d fix(定时报告): 时间不能选择周六 2022-10-13 16:33:13 +08:00
lxxawfl
417e2a3a83 update org.apache.shiro:shiro-spring 1.7.1 to 1.9.1 2022-10-12 15:24:46 +08:00
junjun
e72e3fa7c8 perf(视图): g2plot代码完善 2022-10-12 10:23:30 +08:00
taojinlong
07ad5201b1 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-10-11 16:29:31 +08:00
taojinlong
9f56340dc4 refactor: 升级版本号 2022-10-11 16:29:16 +08:00
taojinlong
bf485add69 fix(数据源): Mysql jdbc反序列化漏洞 2022-10-11 16:01:06 +08:00
xuwei-fit2cloud
48f65dba5a
Merge pull request #3311 from dataease/pr@dev@sqlparser 
fix(数据集): sql 解析支持 union
 2022-10-11 13:49:37 +08:00
taojinlong
c467e26e2a fix(数据集): 抽取数据时判断数据类型错误 2022-10-10 16:02:48 +08:00
taojinlong
4721c55dc0 fix(数据集): sql 解析支持 union 2022-10-09 14:19:01 +08:00
wangjiahao
2f8e8c7afb refactor(视图): 导出视图明细变更为xlsx格式 2022-10-08 11:19:31 +08:00
王嘉豪
3990ad28af
Merge pull request #3289 from dataease/pr@dev@refactor-flyway 
refactor: 调整flyway
 2022-10-05 15:49:37 +08:00
wangjiahao
31e8aa626d refactor: 调整flyway 2022-10-05 15:48:10 +08:00
taojinlong
046624a4f1 fix(数据源): 校验时，展示错误信息 2022-09-30 16:31:36 +08:00
fit2cloud-chenyw
d6aeb68ce6 fix(登录): 第三方平台扫码登录在姓名或邮箱重复情况下依然可以成功 2022-09-30 16:03:56 +08:00
xuwei-fit2cloud
f07cd2b0ff
Merge pull request #3278 from dataease/pr@dev@task 
fix(数据更新): mysql YEAR 类型定时同步错误
 2022-09-30 15:45:37 +08:00
taojinlong
564002c164 fix(数据更新): mysql YEAR 类型定时同步错误 2022-09-30 15:43:45 +08:00
xuwei-fit2cloud
acd2ce2d28
Merge pull request #3277 from dataease/pr@dev@refactor_useless-dataset 
refactor: 清理未使用的数据集
 2022-09-30 15:43:18 +08:00
wangjiahao
d3f90ca1d8 refactor: 清理未使用的数据集 2022-09-30 15:34:50 +08:00
xuwei-fit2cloud
054c8520f1
Merge pull request #3276 from dataease/pr@dev@fix_report_down_error 
fix(定时报告): 第三方平台无法下载报告附件
 2022-09-30 15:31:33 +08:00
fit2cloud-chenyw
2c953f3a89 fix(定时报告): 第三方平台无法下载报告附件 2022-09-30 15:21:04 +08:00
wangjiahao
c188ed552a refactor: 默认的系统管理员角色增加系统配置相关菜单权限 2022-09-30 15:18:47 +08:00
xuwei-fit2cloud
78baaac873
Merge pull request #3273 from dataease/pr@dev@refactor-default-panel 
refactor(仪表板): 更新系统默认仪表板
 2022-09-30 15:11:14 +08:00
wangjiahao
fc20351839 refactor(仪表板): 更新系统默认仪表板 2022-09-30 14:40:43 +08:00
xuwei-fit2cloud
f43e08fd61
Merge pull request #3266 from dataease/pr@dev@dataset 
fix: 数据集预览报错
 2022-09-29 18:00:06 +08:00
Junjun
cfbce4f4bc
Merge pull request #3265 from dataease/pr@dev@refactor_dataset-info 
refactor(数据集): 数据集信息界面创建人显示为别名
 2022-09-29 17:40:29 +08:00
王嘉豪
c1c0667bba
Merge pull request #3264 from dataease/pr@dev@fix_symbol_map 
fix(视图): 符号地图添加数字类型提示报错
 2022-09-29 17:37:16 +08:00
wangjiahao
6b885857ad refactor(数据集): 数据集信息界面创建人显示为别名 2022-09-29 17:33:30 +08:00
taojinlong
6a717c94af fix: 数据集预览报错 2022-09-29 17:31:45 +08:00
fit2cloud-chenyw
4814dc53d1 fix(视图): 符号地图添加数字类型提示报错 2022-09-29 17:18:44 +08:00
taojinlong
dda88f9312 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-09-29 16:44:06 +08:00
taojinlong
42e5384fb5 fix: oracel sql 参数报错 2022-09-29 16:43:53 +08:00
xuwei-fit2cloud
53d8a6f099
Merge pull request #3262 from dataease/pr@dev@fix_plugin_view_union_ds 
fix(视图): 插件视图无法使用关联数据集
 2022-09-29 16:04:49 +08:00
fit2cloud-chenyw
6ac864e170 fix(视图): 插件视图无法使用关联数据集 2022-09-29 15:59:07 +08:00
wangjiahao
ead9940bf2 refactor(仪表板): 仪表板信息弹窗修改人显示别名 2022-09-29 15:08:57 +08:00
taojinlong
780fe87ef1 fix: 国际化 2022-09-29 15:06:19 +08:00
fit2cloud-chenyw
f168bcdbd8 fix(定时报告): 部分渠道消息发送失败会中断后面其他渠道消息 2022-09-29 14:07:32 +08:00
wangjiahao
3a1b88db2f refactor: 更新视图复制自动命名函数，兼容富文本视图不需要显示标题的情况 2022-09-29 12:01:00 +08:00
xuwei-fit2cloud
e19e3ccc2f
Merge pull request #3245 from dataease/pr@dev@dataset 
fix: 数据集任务展示下次执行时间
 2022-09-28 18:52:46 +08:00
taojinlong
721d342f00 fix: 数据集任务展示下次执行时间 2022-09-28 18:36:27 +08:00
xuwei-fit2cloud
482b0971bd
Merge pull request #3244 from dataease/pr@dev@fix_lark_qr_login 
fix(登录): 飞书扫码登录
 2022-09-28 18:30:22 +08:00
fit2cloud-chenyw
ff226c6514 fix(登录): 飞书扫码登录 2022-09-28 18:25:35 +08:00
fit2cloud-chenyw
3105660f44 fix(用户管理): 删除用户没有删除对应第三方平台信息 2022-09-28 17:40:40 +08:00
fit2cloud-chenyw
f3dcc26f04 fix(登录): 钉钉扫码绑定DE用户后使用扫码登录失败 2022-09-28 16:45:14 +08:00
taojinlong
83c296b3f0
Merge branch 'dev' into pr@dev@dataset 2022-09-28 16:19:00 +08:00
fit2cloud-chenyw
121c011ec4
Update XLarkServer.java 
fix(个人信息): 扫码绑定飞书
 2022-09-28 15:08:19 +08:00
fit2cloud-chenyw
9cc4e4e5f3
Update XDingtalkServer.java 
fix(个人信息): 扫码绑定钉钉
 2022-09-28 15:07:33 +08:00
fit2cloud-chenyw
94bfe751ad fix(个人信息): 扫码绑定第三方平台错误信息提示 2022-09-28 14:44:31 +08:00
taojinlong
585d737d43 fix: 创建多sheet页的Excel数据集，表中数据格式有问题仍然会创建数据集 2022-09-28 12:04:26 +08:00
xuwei-fit2cloud
efd06148f2
Merge pull request #3228 from dataease/pr@dev@perf_user_bind 
perf(个人信息): 第三方平台绑定DE用户
 2022-09-28 11:53:54 +08:00
fit2cloud-chenyw
0891e0aff0 perf(个人信息): 第三方平台绑定DE用户 2022-09-28 11:50:35 +08:00
xuwei-fit2cloud
a120323073
Merge pull request #3226 from dataease/pr@dev@fix_group_bar 
fix(视图): 修复分组柱状图报错
 2022-09-28 11:38:16 +08:00
junjun
c47db49f3e fix(视图): 修复分组柱状图报错 2022-09-28 11:16:34 +08:00
taojinlong
76098ef5c5 fix: mysql 时间处理错误 2022-09-28 11:04:02 +08:00
taojinlong
0d7b1f1805 fix: sql 参数识别符拼接错误 2022-09-28 11:03:29 +08:00
taojinlong
98055c354b fix: 不同的sql 数据集参数同名 2022-09-28 10:23:14 +08:00
xuwei-fit2cloud
3600b007ea
Merge pull request #3219 from dataease/pr@dev@fix_pop 
fix(视图): 修复SQL Server标准差方差错误
 2022-09-27 18:15:18 +08:00
taojinlong
0f2813e444 fix(数据集): 格式化 oracle sql 出错 2022-09-27 18:10:04 +08:00
junjun
c24d2521e3 fix(视图): 修复SQL Server标准差方差错误 2022-09-27 18:06:47 +08:00
taojinlong
106958327e fix(API数据源): 没有子项的字段置灰 2022-09-27 17:25:31 +08:00
taojinlong
5f09346929 fix(API数据源): 请求 form-data 失败 2022-09-27 17:25:04 +08:00
ren_jq
362c5736df upgrade pagehelper to 5.3.1 2022-09-27 15:39:28 +08:00
xuwei-fit2cloud
a51c426035
Merge pull request #3200 from dataease/pr@dev@mysql-function 
refactor: 修改数据库获取子级和父级函数，防止因垃圾数据出现环路导致循环情况
 2022-09-27 15:01:23 +08:00
wangjiahao
7f24ee745c refactor: 修改数据库获取子级和父级函数，防止因垃圾数据出现环路导致循环情况 2022-09-27 14:21:46 +08:00
王嘉豪
cf0d947e50
Merge pull request #3198 from dataease/pr@dev@fix_login_limit_clear 
fix(登录): 登录成功后登录失败次数未清零
 2022-09-27 14:06:34 +08:00
wangjiahao
92d8fe84e6 refactor: 修改数据库获取子级和父级函数，防止因垃圾数据出现环路导致循环情况 2022-09-27 14:03:40 +08:00
fit2cloud-chenyw
ff5291c5b1 fix(登录): 登录限制提示优化 2022-09-27 13:35:09 +08:00
fit2cloud-chenyw
2ad9c9ca8a fix(登录): 登录成功后登录失败次数未清零 2022-09-27 12:52:08 +08:00
xuwei-fit2cloud
2c42e436b8
Merge pull request #3191 from dataease/pr@dev@excel 
Pr@dev@excel
 2022-09-27 10:20:48 +08:00
taojinlong
a900d71849 refactor: 代码格式调整 2022-09-27 10:17:52 +08:00
xuwei-fit2cloud
9cf27bec99
Merge pull request #3192 from dataease/pr@dev@fix_user_bind 
fix(个人信息): 绑定二维码无法显示
 2022-09-27 09:52:49 +08:00
fit2cloud-chenyw
567bbe1f5a fix(ldap): ldap用户邮箱为空无法登录DE 2022-09-26 21:48:02 +08:00
fit2cloud-chenyw
ad07f3d113 fix(个人信息): 绑定二维码无法显示 2022-09-26 21:28:56 +08:00
xuwei-fit2cloud
553584b6e5
Merge pull request #3190 from dataease/pr@dev@perf_user_bind_auth 
perf(个人信息): 扫码绑定第三方平台
 2022-09-26 17:49:54 +08:00
taojinlong
3b29694684 fix(数据集): TIME 类型，拼接前缀 2022-09-26 17:47:57 +08:00
fit2cloud-chenyw
4ec767ab95 perf(个人信息): 扫码绑定第三方平台 2022-09-26 17:38:01 +08:00
taojinlong
23f607ba22 refactor(数据集): 解决冲突 2022-09-26 10:43:48 +08:00
taojinlong
2f18c6d8a6 fix(数据集): 拼写错误 2022-09-26 10:42:25 +08:00
xuwei-fit2cloud
50b67cda6b
Merge pull request #3173 from dataease/pr@dev@revert_application-market 
revert: 暂时屏蔽应用市场菜单
 2022-09-26 10:03:32 +08:00
xuwei-fit2cloud
5c64231937
Merge pull request #3172 from dataease/pr@dev@refactor-i18n 
refactor: 修改国际化文案
 2022-09-26 10:02:56 +08:00
wangjiahao
73dd7bec01 revert: 暂时屏蔽应用市场菜单 2022-09-23 18:35:44 +08:00
wangjiahao
4356d01c33 refactor: 修改国际化文案 2022-09-23 18:31:49 +08:00
fit2cloudrd
e73deb62b6
fix: 修复系统demo用户没有部分官方数据集权限问题 (#3165) 
* fix(系统配置): 修复外观配置菜单切换导致路由刷新问题

* fix: 修复系统demo用户没有部分官方数据集权限问题

Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-09-23 15:03:07 +08:00
xuwei-fit2cloud
a503fe1937
Merge pull request #3162 from dataease/pr@dev@refactor-system-setting 
refactor(系统配置): 系统配置菜单拆分
 2022-09-23 13:06:23 +08:00
wangjiahao
ea17177c08 refactor(系统配置): 系统配置菜单拆分 2022-09-23 12:46:39 +08:00
junjun
6506ce9d7c refactor(数据集): 数据集接口调整 2022-09-22 17:24:23 +08:00
junjun
4693f78671 refactor(数据集): 数据集接口调整 2022-09-22 17:17:39 +08:00
taojinlong
0f906acbad fix(数据集): 抽取数据精度丢失 2022-09-22 16:33:01 +08:00
xuwei-fit2cloud
161fc5a23d
Merge pull request #3151 from dataease/pr@dev@refactor_app-dock 
refactor: 应用对接定时数据集立即同步
 2022-09-22 12:59:43 +08:00
taojinlong
067e1facb2 feat: 区分数据库类型 2022-09-22 11:50:29 +08:00
wangjiahao
6671856890 refactor: 应用对接定时数据集立即同步 2022-09-22 11:26:31 +08:00
Junjun
1fbd393605
Merge pull request #3135 from dataease/pr@dev@perf_user_assist 
perf(系统管理-用户管理): 用户辅助信息sql
 2022-09-21 14:52:30 +08:00
fit2cloud-chenyw
6360b82430
Merge branch 'dev' into pr@dev@feat_user_assist 2022-09-21 14:28:06 +08:00
fit2cloud-chenyw
6cd176ab66 perf(系统管理-用户管理): 用户辅助信息sql 2022-09-21 14:06:27 +08:00
fit2cloud-chenyw
bf5bf82a30 feat(系统管理-用户管理): 增加辅助信息包含第三方平台账号 2022-09-21 14:01:02 +08:00
junjun
ca92699340 feat(数据源): 数据源详情 2022-09-21 10:47:46 +08:00
taojinlong
d522122fb2 fix: 数据源详情,数据集预览 2022-09-20 17:13:21 +08:00
fit2cloud-chenyw
3f7989894f
fix(登录): 国际化错误 2022-09-20 17:00:35 +08:00
fit2cloud-chenyw
32ad6c7613
Merge branch 'dev' into pr@dev@feat_login_limit 2022-09-20 16:49:07 +08:00
xuwei-fit2cloud
10c2e975b5
Merge pull request #3123 from dataease/pr@dev@feat_templatemarket-auth 
feat: 模板市场支持权限管理和系统参数叠加权限控制，支持为不同用户开放或关闭“模板市场”菜单
 2022-09-20 16:27:12 +08:00
wangjiahao
a29a232aa8 feat: 模板市场支持权限管理和系统参数叠加权限控制，支持为不同用户开放或关闭“模板市场”菜单 2022-09-20 16:19:33 +08:00
fit2cloud-chenyw
dd7c3d12ac
Merge branch 'dev' into pr@dev@feat_login_limit 2022-09-20 14:45:37 +08:00
fit2cloud-chenyw
f2c238798d feat(系统管理-用户管理): 登录限制以及解锁用户 2022-09-20 14:26:15 +08:00
xuwei-fit2cloud
f38b0023ca
Merge pull request #3114 from dataease/refactor@dev@refactor_panel-details 
refactor(仪表板): 仪表板详情弹框显示用户别名
 2022-09-20 13:42:44 +08:00
junjun
44720e4e33 feat(视图): 堆叠项支持自定义排序 2022-09-20 11:31:44 +08:00
wangjiahao
53dbd841a6 refactor(仪表板): 仪表板详情弹框显示用户别名 2022-09-20 11:13:08 +08:00
xuwei-fit2cloud
f4e1a28b40
Merge pull request #3110 from dataease/pr@dev@csv 
feat: 支持 csv 文件
 2022-09-20 10:00:29 +08:00
xuwei-fit2cloud
4906dcceef
Merge pull request #3111 from dataease/pr@dev@feat_app-template 
feat: 支持应用市场，支持应用导入导出
 2022-09-20 09:59:20 +08:00
wangjiahao
2217d46a8d refactor(仪表板): 仪表板详情弹框显示用户别名 2022-09-19 18:47:15 +08:00
wangjiahao
47a290b258 fix(应用市场): 应用市场格式化等问题修复 2022-09-19 18:16:54 +08:00
wangjiahao
9da3990f25 fix(应用市场): 应用市场格式化等问题修复 2022-09-19 18:13:23 +08:00
王嘉豪
5765be7af1
Merge pull request #3108 from dataease/pr@dev@fix_msg_channel 
fix(系统管理-消息中心): 接收管理第三方平台渠道在未配置成功状态也能展示
 2022-09-19 17:23:11 +08:00
taojinlong
b71a3d2498 refactor: 去掉打印 2022-09-19 17:22:47 +08:00
王嘉豪
dec82e3309
Merge pull request #3109 from dataease/pr@dev@fix_third_party_email 
fix(系统管理-系统参数): 第三方登录平台默认邮箱设置为常量导致报错
 2022-09-19 17:22:18 +08:00
xuwei-fit2cloud
f7d328a8ee
Merge pull request #3105 from dataease/pr@dev@fix_report_task_recipients 
fix(系统管理-定时报告): 定时报告收件人逻辑
 2022-09-19 17:14:07 +08:00
wangjiahao
d634950272 feat: 支持应用市场，支持应用导入导出 2022-09-19 17:07:50 +08:00
fit2cloud-chenyw
51539ada88 fix(系统管理-系统参数): 第三方登录平台默认邮箱设置为常量导致报错 2022-09-19 16:30:28 +08:00
fit2cloud-chenyw
98b3bb213b fix(系统管理-消息中心): 接收管理第三方平台渠道在未配置成功状态也能展示 2022-09-19 16:25:22 +08:00
taojinlong
23a4bb200f feat: 支持 csv 文件 2022-09-19 16:11:14 +08:00
fit2cloud-chenyw
459fc98be0 fix(系统管理-定时报告): 定时报告收件人逻辑 2022-09-19 16:04:43 +08:00
junjun
f885bcd4e2 feat(视图): 堆叠项支持自定义排序 2022-09-19 15:08:06 +08:00
fit2cloud-chenyw
9df4f4f2fd fix(登录): 扫码登录失败错误提示 2022-09-16 11:18:34 +08:00
junjun
03dd0fdb64 feat(视图): 辅助线支持动态值 2022-09-16 10:59:34 +08:00
taojinlong
4ca52ab85e Merge branch 'dev' of github.com:dataease/dataease into dev 2022-09-16 09:44:11 +08:00
taojinlong
e6653fcb3f refactor: 删掉不必要的打印 2022-09-16 09:44:03 +08:00
junjun
137b4ba9a6 feat(数据集): 新增数据集交互优化接口 2022-09-15 18:14:41 +08:00
junjun
d50c0a1d8f feat(数据集): 新增数据集交互优化接口 2022-09-15 17:45:47 +08:00
junjun
efac2b381a feat(视图): 辅助线支持动态值 2022-09-15 17:22:02 +08:00
fit2cloud-chenyw
96fec55cf4
Merge pull request #3086 from dataease/pr@dev@perf_report_msg_channel 
perf(系统管理-定时报告): 优化企业微信、钉钉消息渠道
 2022-09-15 15:06:56 +08:00
fit2cloud-chenyw
f28c945131 perf(系统管理-定时报告): 优化企业微信、钉钉消息渠道 2022-09-15 15:04:50 +08:00
taojinlong
e6cee9d845 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-09-15 14:55:07 +08:00
taojinlong
d666482f2e fix: 数据源检测间隔默认为30分钟 2022-09-15 14:48:49 +08:00
fit2cloud-chenyw
3f7a5d3bfd fix(视图): 存量视图却少动态辅助线参数报错 2022-09-15 10:20:08 +08:00
fit2cloud-chenyw
fe4b706d0e perf(系统管理-定时报告): 消息渠道sql 2022-09-14 17:15:23 +08:00
fit2cloud-chenyw
c93dd1c59d
Merge pull request #3078 from dataease/pr@dev@perf_email_task_channel 
perf(系统管理-定时报告): 增加消息渠道
 2022-09-14 17:13:06 +08:00
fit2cloud-chenyw
3ac50f7d39 perf(系统管理-定时报告): 增加消息渠道 2022-09-14 17:12:23 +08:00
taojinlong
6132e129e3 feat: 自定义数据源检测间隔 2022-09-14 16:37:32 +08:00
taojinlong
674abcb203 feat: 自定义数据源检测时间 2022-09-14 16:33:47 +08:00
junjun
2b2385602d fix(数据集): 修复计算字段表达式标点符中英错误 2022-09-14 13:58:38 +08:00
wangjiahao
d2e0057424 Merge remote-tracking branch 'origin/dev' into dev 2022-09-13 18:20:05 +08:00
wangjiahao
64755229e9 fix(数据集): 修复用户在新建的数据集分组下面新建数据集报权限错误的问题 2022-09-13 18:19:53 +08:00
fit2cloud-chenyw
10cdd507a3 perf(系统管理-消息中心): 第三方消息平台sql 2022-09-09 13:00:56 +08:00
fit2cloud-chenyw
3c74bf97c0 feat(系统管理-消息中心): 增加第三方消息平台 2022-09-09 12:32:51 +08:00
wangjiahao
b0720c1c6f Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/resources/db/migration/V40__1.15.sql
 2022-09-08 18:30:14 +08:00
wangjiahao
522d33b2db feat: 仪表板支持应用导出 2022-09-08 18:29:34 +08:00
fit2cloud-chenyw
faef8ffda5 feat(数据集): 增加数据集表单路由页面 2022-09-08 18:02:12 +08:00
taojinlong
9cb834ecab fix: SQL 数据集时间类型变量报错 2022-09-08 17:15:09 +08:00
junjun
ccfa02cd8f feat(视图): 辅助线支持动态值 2022-09-08 15:02:44 +08:00