Commit Graph

2783 Commits

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