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

2880 Commits

Author SHA1 Message Date
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