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

2965 Commits

Author SHA1 Message Date
taojinlong
2089f9fb46 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-27 18:19:06 +08:00
taojinlong
31f68d95b6 fix(数据集): 检测数据集同步状态 2022-07-27 18:18:50 +08:00
王嘉豪
eec9180e94
Merge pull request #2716 from dataease/fix_panel-jump 
refactor(xpack): 权限管理交互优化
 2022-07-27 18:08:37 +08:00
wangjiahao
ce5f95d791 refactor(xpack): 权限管理交互优化 2022-07-27 18:07:28 +08:00
fit2cloud-chenyw
08795f851d
Merge pull request #2715 from dataease/pr@dev@fix_user_permission 
fix(系统管理-用户管理): 修改用户角色后其他客户端不能实时同步信息
 2022-07-27 14:58:00 +08:00
fit2cloud-chenyw
5c279293be fix(系统管理-用户管理): 修改用户角色后其他客户端不能实时同步信息 2022-07-27 14:57:05 +08:00
taojinlong
cd2703c503 fix(数据源): 校验 API 数据源字段重复 2022-07-27 11:43:06 +08:00
taojinlong
ae41f94a57 fix(数据源): 校验 API 数据源字段重复 2022-07-27 10:12:32 +08:00
taojinlong
798b1ba778 fix(数据源): API 数据源超时设置 2022-07-26 17:26:50 +08:00
taojinlong
d0906e6f6c Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-26 16:37:56 +08:00
taojinlong
b55ba54f36 feat(数据源): 2022-07-26 16:37:47 +08:00
fit2cloud-chenyw
6b0ce1eaec perf(系统管理): 新增用户时自动过滤账号开头结尾空字符串 2022-07-26 15:57:44 +08:00
junjun
57b8b87f38 feat(X-Pack): 行权限 2022-07-26 12:39:02 +08:00
王嘉豪
2c32b5ef27
Merge branch 'dev' into pr@dev@refactor_menu 2022-07-25 18:14:51 +08:00
wangjiahao
45b81c87ec refactor: 菜单增加复合权限校验，防止用户访问无权限页面 2022-07-25 18:12:43 +08:00
taojinlong
6245da641a refactor: 解决冲突 2022-07-25 17:28:21 +08:00
taojinlong
d39358ecec feat(数据集): 数据集列权限支持白名单 2022-07-25 17:23:28 +08:00
fit2cloud-chenyw
b4c67fee50 fix(系统管理): 定时报告发送邮件附件名称过长导致展示错误 2022-07-25 13:07:15 +08:00
fit2cloud-chenyw
f3d8eb3d74 fix(系统管理): 定时报告发增加视图Id集合注释错误 2022-07-25 10:36:25 +08:00
fit2cloud-chenyw
32aad19c60 feat(仪表板): 仪表板新增查询按钮 2022-07-24 23:00:36 +08:00
fit2cloud-chenyw
bd55c18eae perf(系统管理): 定时报告发送仪表板截图带视图 2022-07-22 16:07:39 +08:00
王嘉豪
0282e84b1c
Merge pull request #2667 from dataease/pr@dev@refactor_panel-tips 
refactor(仪表板): 仪表板预览界面增加仪表板信息弹出提示
 2022-07-22 13:21:02 +08:00
wangjiahao
b8727f9b5a refactor(仪表板): 仪表板预览界面增加仪表板信息弹出提示 2022-07-22 13:20:13 +08:00
fit2cloud-chenyw
1bd2cf390f fix(仪表板): 从模版市场新建仪表板地图找不到坐标文件 2022-07-22 12:03:10 +08:00
fit2cloud-chenyw
bfacd16d08
Merge pull request #2659 from dataease/pr@dev@perf_move_map_file 
perf(仪表板): 复制地图坐标文件判断是否已存在
 2022-07-21 18:34:17 +08:00
fit2cloud-chenyw
dba661c914 perf(仪表板): 复制地图坐标文件判断是否已存在 2022-07-21 18:33:12 +08:00
taojinlong
e64d401025 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-21 17:34:57 +08:00
taojinlong
43cb0b854e feat(数据源): API 数据源支持选择及组合多层级中的字段 2022-07-21 17:34:42 +08:00
fit2cloud-chenyw
01250ad621 perf(仪表板): 自定义地图文件与系统地图文件解耦 2022-07-21 17:22:30 +08:00
fit2cloud-chenyw
0d44ec8b74
Merge branch 'dev' into pr@dev@feat_global_map_setting 2022-07-21 13:43:01 +08:00
fit2cloud-chenyw
7f7cdeb0dd feat(仪表板): 增加世界地图及相关配置 2022-07-21 13:41:03 +08:00
wangjiahao
1112dcb763 refactor: 更新模板市场菜单 2022-07-21 11:33:41 +08:00
王嘉豪
daebb5c79f
Merge pull request #2650 from dataease/pr@dev@feat_panel-market 
feat: 模板市场增加预览功能并可以直接应用模板
 2022-07-21 11:17:25 +08:00
wangjiahao
07d3ca07af feat: 模板市场增加预览功能并可以直接应用模板 2022-07-21 11:16:34 +08:00
taojinlong
7426106c7c fix(数据源): API 数据源支持选择及组合多层级中的字段 2022-07-20 18:05:31 +08:00
taojinlong
fc9ca1e392 Merge branch 'dev' into pre@dev@api 2022-07-20 17:26:47 +08:00
taojinlong
fba93cfd16 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-20 17:25:47 +08:00
taojinlong
dafb95c887 feat(数据源): API 数据源支持选择及组合多层级中的字段 2022-07-20 17:25:33 +08:00
junjun
d7dc867310 feat(X-Pack): 行权限 2022-07-20 16:34:17 +08:00
junjun
dc0f3b0c3c feat(X-Pack): 行权限 2022-07-20 15:30:38 +08:00
junjun
bf8151201c feat(X-Pack): 行权限 2022-07-20 14:44:38 +08:00
junjun
c299ec76e5 feat(X-Pack): 行权限 2022-07-19 21:17:14 +08:00
junjun
382a01e73d feat(X-Pack): 行权限 2022-07-19 20:50:03 +08:00
junjun
61d22387f2 feat(X-Pack): 行权限 2022-07-19 20:49:32 +08:00
junjun
0fd5be758e feat(视图): 增加小数精度 2022-07-19 17:03:41 +08:00
wangjiahao
772af522a4 Merge remote-tracking branch 'origin/dev' into dev 2022-07-19 15:59:13 +08:00
wangjiahao
4f71820484 revert: 删除多余代码 2022-07-19 15:59:01 +08:00
junjun
eb085a489d feat(视图): 增加小数精度 2022-07-19 15:45:58 +08:00
wangjiahao
e925dc2364 feat(仪表板) :支持在DataEase中查看模板市场模板并且直接应用模板创建仪表板 2022-07-19 11:57:21 +08:00
fit2cloud-chenyw
67c55c23ef perf(系统管理): 组织角色管理api适配新版UI 2022-07-16 10:05:48 +08:00
fit2cloud-chenyw
adf6326732 perf(仪表板): 优化echarts地图 增加世界地图 2022-07-15 00:24:15 -04:00
taojinlong
1c5ae1ca05 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-14 17:43:59 +08:00
taojinlong
7ae1ce6c02 fix(数据源): 同步 oracle 数据出错 2022-07-14 17:43:47 +08:00
junjun
6b10b217db feat(X-Pack): 行权限 2022-07-14 11:07:55 +08:00
junjun
fc0757613b feat(X-Pack): 行权限 2022-07-13 13:22:46 +08:00
taojinlong
429e27e12a Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-13 12:31:30 +08:00
taojinlong
37936e7b37 fix(数据源): 增加sql拼接前缀设置 2022-07-13 12:31:18 +08:00
fit2cloud-chenyw
00e6e18137
Merge pull request #2629 from dataease/pr@dev@perf_dept_manager 
perf(系统管理): 优化组织管理适配新版ui
 2022-07-13 11:13:14 +08:00
fit2cloud-chenyw
6b9ad96023 perf(系统管理): 优化组织管理适配新版ui 2022-07-13 11:11:48 +08:00
taojinlong
7759fd0383 feat(数据源): 基于mongo-bi-connector 新增对mongo数据源的支持 2022-07-12 17:25:20 +08:00
fit2cloud-chenyw
d95c89cfce perf(系统管理): 优化角色管理适配新版ui 2022-07-12 15:36:17 +08:00
fit2cloud-chenyw
b09eaa2ebd perf(系统管理): 优化用户管理增加手机号前缀字段 2022-07-12 12:17:13 +08:00
fit2cloud-chenyw
a6e9c558b8 fix(系统管理): 定时报告选择附件页面过滤掉非视图组件 2022-07-12 11:38:57 +08:00
junjun
b1df267c55 Merge remote-tracking branch 'origin/dev' into dev 2022-07-11 16:43:06 +08:00
junjun
00cf97e035 feat(X-Pack): 重构行权限 2022-07-11 16:42:43 +08:00
fit2cloud-chenyw
a7da54227b perf: 优化定时报告发送视图附件 2022-07-11 16:39:36 +08:00
junjun
d6ef0859b4 feat(X-Pack): 重构行权限 2022-07-09 13:50:39 +08:00
fit2cloud-chenyw
a49b0ed107
Merge pull request #2609 from dataease/pr@dev@feat_email_task_view 
feat(系统管理): 定时报告增加发送视图数据
 2022-07-08 16:55:09 +08:00
fit2cloud-chenyw
01b3ad05d8 feat(系统管理): 定时报告增加发送视图数据 2022-07-08 04:52:26 -04:00
junjun
40357d5382 refactor(视图): 下钻后延续第一层排序规则（仅对升降序有效） 2022-07-08 15:59:28 +08:00
taojinlong
0b586c71cc Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-06 23:41:35 +08:00
taojinlong
50cd6367c3 fix(数据集): 处理 sql 参数错误 2022-07-06 23:41:15 +08:00
fit2cloud-chenyw
975d9264ba
Merge pull request #2599 from dataease/pr@dev@fix_panel_share_cancel_error 
fix(仪表板): 删除分享仪表板报错
 2022-07-06 15:45:50 +08:00
fit2cloud-chenyw
f69332267f fix(仪表板): 删除分享仪表板报错 2022-07-06 03:42:10 -04:00
wangjiahao
c73e3e13a6 perf: 优化flyway，提升初次启动速度 2022-07-06 15:33:35 +08:00
fit2cloud-chenyw
bf33bdabfd fix(数据集): 带参数的数据集设置仪表板过滤器报错空指针 2022-07-05 22:22:54 +08:00
taojinlong
538ac13db6 fix(数据集): 过滤组件选择参数传递后，不再额外拼接过滤条件 2022-07-05 13:42:09 +08:00
王嘉豪
87907beff3
Merge pull request #2570 from dataease/pr@dev@fix_panel-mobile 
fix: 修复导入有移动端布局的仪表板时，列表中没有及时显示移动端标识
 2022-07-04 17:05:26 +08:00
wangjiahao
bf5084f236 fix: 修复导入有移动端布局的仪表板时，列表中没有及时显示移动端标识 2022-07-04 17:04:41 +08:00
taojinlong
6599619aa2 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-07-04 15:30:41 +08:00
taojinlong
e74c3883f0 fix(数据源): 校验数据源配置的有效性 2022-07-04 15:29:40 +08:00
王嘉豪
663b323124
Merge pull request #2568 from dataease/pr@dev@fix_view-select-icon 
fix(仪表板): Tab组件选择视图时插件视图组件没有显示图标问题
 2022-07-04 15:02:35 +08:00
wangjiahao
d72f5432f2 fix(仪表板): Tab组件选择视图时插件视图组件没有显示图标问题 2022-07-04 15:01:53 +08:00
junjun
3bcdc56e50 fix(视图): SQLServer明细表类型转换错误 2022-07-04 12:50:48 +08:00
fit2cloud-chenyw
b73a8d477f fix(系统管理): 授权插件菜单的操作在记录日志时无法获取到菜单名称 2022-07-03 23:07:48 -04:00
taojinlong
ad233b2881 Merge branch 'v1.12' into dev 2022-07-04 00:46:11 +08:00
taojinlong
f5c8c5422e fix(数据集): 数据集参数传递支持 IN 2022-07-04 00:45:03 +08:00
taojinlong
4474970b2d fix(数据源): 超时时间无法修改 2022-07-03 22:02:01 +08:00
taojinlong
969b3d2fcf feat(数据集): 参数值只在编辑 sql 时生效 2022-07-01 18:11:06 +08:00
taojinlong
8d13c10d97 fix(API): 去掉默认 http client 请求头 2022-07-01 17:43:29 +08:00
taojinlong
94871bdbc3 fix(抽取数据): 调整 doris 建表语句 2022-07-01 17:34:11 +08:00
taojinlong
3a8fb1de26 fix(抽取数据): 调整 doris 建表语句 2022-07-01 17:09:16 +08:00
王嘉豪
da03efd1ec
Merge pull request #2545 from dataease/pr@dev@refactor_template-static 
refactor: 优化模板使用，上传模板时模板预览图片使用静态文件存储
 2022-07-01 12:24:37 +08:00
wangjiahao
59e771d605 refactor: 优化模板使用，上传模板时模板预览图片使用静态文件存储 2022-07-01 12:23:39 +08:00
王嘉豪
459b0d49c2
Merge pull request #2541 from dataease/pr@dev@refactor_slow-sql 
refactor: 优惠插件菜单同步慢sql
 2022-07-01 10:38:39 +08:00
wangjiahao
d1d116e86d refactor: 优惠插件菜单同步慢sql 2022-07-01 10:34:27 +08:00
taojinlong
75a51d9eaa Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-30 22:17:41 +08:00
wangjiahao
929e99ac01 refactor: 代码结构优化，去掉无用的引用 2022-06-30 17:38:25 +08:00
fit2cloud-chenyw
e3fcb702c9 feat: 优化修改初始密码提示 2022-06-30 04:06:16 -04:00
wangjiahao
013d5d5de9 refactor: 样式控制面板视图结果在编辑界面也可生效 2022-06-29 18:19:30 +08:00
taojinlong
1e7bc31c52 fix: db2 V10版本sql 拼接 2022-06-29 11:28:58 +08:00
taojinlong
00aeffc8dc fix: db2 时间格式化 2022-06-28 17:42:05 +08:00
taojinlong
dfbca77cee fix: mysql json 字段长度 2022-06-28 12:45:19 +08:00
taojinlong
c89dc628fd fix: MySql数据库表名称含有小数点 2022-06-27 18:23:52 +08:00
taojinlong
3f88b27d50 fix: 枚举值过滤 2022-06-27 17:52:35 +08:00
taojinlong
313942b26e Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-27 17:16:53 +08:00
taojinlong
5366fd1a3b feat: 支持查询超时 2022-06-27 17:16:43 +08:00
junjun
cbf0391780 fix: 图表联动参数构建 2022-06-27 16:34:31 +08:00
taojinlong
fb5f713d62 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-27 12:42:30 +08:00
taojinlong
0f5b69aebe fix: 显示并提示 sql 变量只能在where中使用 2022-06-27 12:42:08 +08:00
wangjiahao
a9228bc420 refactor:更新官方示例，新安装系统屏蔽自定义数据集 2022-06-27 12:09:17 +08:00
taojinlong
2421b5c80c fix: 抽取数据 2022-06-26 15:37:33 +08:00
taojinlong
96a7a62062 fix: 抽取数据 2022-06-26 00:04:21 +08:00
taojinlong
72cdab3c06 fix: 尝试修复支持数据库字符集 2022-06-25 23:35:07 +08:00
taojinlong
a5d31401e4 fix: 尝试修复支持数据库字符集 2022-06-25 23:31:20 +08:00
taojinlong
91491eb1ab fix: 尝试修复支持数据库字符集 2022-06-25 17:24:23 +08:00
taojinlong
be11424539 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-25 15:33:56 +08:00
taojinlong
dc7b06bca5 fix: 参数默认值的時間格式化 2022-06-25 15:33:39 +08:00
wangjiahao
1bc5afa52b refactor: 更新flyway 重置默认主题 2022-06-24 18:05:29 +08:00
fit2cloud-chenyw
9945b90fd5 fix: 过滤组件排序doris无效 2022-06-24 11:37:10 +08:00
fit2cloud-chenyw
4484cd3e6d fix: 过滤器排序功能代码冲突后被覆盖 2022-06-23 22:10:05 +08:00
wangjiahao
f823b35171 refactor: 权限管理授权用户同时显示id和名称 2022-06-23 18:54:23 +08:00
fit2cloud-chenyw
3c0c39ff46 perf: 格式化代码 2022-06-23 10:55:05 +08:00
junjun
2ffea5e26c feat: 视图支持计算字段 2022-06-22 20:34:49 +08:00
junjun
88f060d9ba feat: 视图支持计算字段 2022-06-22 20:18:31 +08:00
junjun
b5e4aea1dc feat: 视图支持计算字段 2022-06-22 19:59:38 +08:00
junjun
30435e00cf test: doris test 2022-06-22 18:19:03 +08:00
taojinlong
f612d21ee5 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-22 16:04:20 +08:00
taojinlong
1349431c63 feat: excel 替换数据显示'同步中' 2022-06-22 16:04:07 +08:00
fit2cloud-chenyw
948e7b61f3 fix: 符号地图选择数字提示后报错 2022-06-22 14:33:35 +08:00
fit2cloud-chenyw
559bcb1ebb
Merge pull request #2469 from dataease/pr@dev@fix_log_export 
fix: 日志导出文件使用excel无法打开
 2022-06-22 12:17:54 +08:00
fit2cloud-chenyw
67c4c8d55c fix: 日志导出文件使用excel无法打开 2022-06-22 12:16:30 +08:00
taojinlong
de35ff89ca feat: 增加达梦插件 2022-06-22 11:35:00 +08:00
fit2cloud-chenyw
5c73127124
Merge pull request #2467 from dataease/pr@dev@fix_logout_error 
fix: 退出登录错误
 2022-06-22 10:48:31 +08:00
fit2cloud-chenyw
1de0d83284 fix: 退出登录错误 2022-06-22 10:46:01 +08:00
taojinlong
2efeec87b9 fix: 参数过滤空指针 2022-06-21 18:25:55 +08:00
taojinlong
152b4fdeee Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-21 18:14:51 +08:00
taojinlong
e83cc02448 refactor: 移动代码到sdk 2022-06-21 18:14:44 +08:00
fit2cloud-chenyw
a40fb8a8bf fix: 插件视图不能使用sql数据集 2022-06-21 15:37:54 +08:00
fit2cloud-chenyw
3d2e4f5edd
Merge pull request #2461 from dataease/pr@dev@fix_api_auth_error_i18n 
fix: api权限错误提示国际化
 2022-06-21 14:40:45 +08:00
fit2cloud-chenyw
32e76cdf82 fix: api权限错误提示国际化 2022-06-21 14:39:40 +08:00
junjun
2620ddd16d feat: 视图支持计算字段 2022-06-21 11:31:44 +08:00
fit2cloud-chenyw
92f037658d fix: 前端超时时间非空判断 2022-06-21 11:18:35 +08:00
junjun
1d0e0e92ad feat: 视图支持计算字段 2022-06-20 18:35:00 +08:00
taojinlong
e5538941ce Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-20 17:40:49 +08:00
junjun
78022a8244 fix: 视图计算字段权限问题 2022-06-20 17:40:13 +08:00
taojinlong
7e5a78334b fix: 获取数据源类型 2022-06-20 17:39:44 +08:00
fit2cloud-chenyw
e39ee7844f fix: 插件上传错误提示 2022-06-20 17:18:07 +08:00
taojinlong
f29aa2ca95 fix: 解析 sql 空指针异常 2022-06-20 14:59:02 +08:00
taojinlong
2cfc3b457e fix: 依赖冲突 2022-06-17 13:26:40 +08:00
taojinlong
1e12eb5b64 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-06-17 11:36:55 +08:00
taojinlong
20bb6f4ea5 fix: 同步字段时，顺序错误 2022-06-17 11:36:45 +08:00
fit2cloud-chenyw
c65e461fa8
Merge pull request #2441 from dataease/pr@dev@perf_cas_reset 
perf: 重置cas登录方式api增加管理员校验
 2022-06-17 10:35:46 +08:00
fit2cloud-chenyw
3642805e67 perf: 重置cas登录方式api增加管理员校验 2022-06-17 10:34:41 +08:00
taojinlong
6c9191e9bd refactor: 解决冲突 2022-06-16 23:03:07 +08:00
taojinlong
3293f3a870 feat: 参数管理 2022-06-16 22:41:09 +08:00
fit2cloud-chenyw
a18964f0b7
Merge pull request #2439 from dataease/pr@dev@feat_fit_xpack_cas 
feat: 适配xpack-cas单点登录
 2022-06-16 18:42:06 +08:00
fit2cloud-chenyw
ccd4f7f1a3 fix: 删除不用的包引入 2022-06-16 18:38:20 +08:00
wangjiahao
3b64979625 refactor: 优化代码结构去掉无用的注释 2022-06-16 18:29:30 +08:00
fit2cloud-chenyw
7218b2105e fix: 删除注释 2022-06-16 18:29:08 +08:00
fit2cloud-chenyw
0baa789fa9 feat: 适配xpack-cas单点登录 2022-06-16 16:58:46 +08:00
wangjiahao
7673e58088 fix: 数据集预览和更新增加数据源权限校验，防止使用无权限数据源执行sql 2022-06-16 16:20:49 +08:00
wangjiahao
d61c5a5ae7 refactor: 更新flyway版本 2022-06-16 15:13:15 +08:00
wangjiahao
2ce2f94113 fix: 插件操作加入权限控制，解决普通用户或者API能越权上传卸载插件问题 2022-06-16 15:09:52 +08:00
taojinlong
4b5788b63c feat: 参数管理 2022-06-16 14:16:47 +08:00
taojinlong
2284cad01c fix: 校验驱动ID 2022-06-16 14:10:08 +08:00
wangjiahao
a6744f7b9f fix: 修复模板管理中导入模板未存储静态文件的问题 2022-06-16 11:41:02 +08:00
junjun
338cb44f5e feat: 视图支持计算字段 2022-06-13 14:30:43 +08:00
junjun
78caab8f61 fix: 修复文本转数值后做维度的排序问题 2022-06-10 13:27:22 +08:00
fit2cloud-chenyw
59e7b9172b fix: sql注入给出提示 2022-06-08 12:52:41 +08:00
taojinlong
10d7bfa0db feat: sql 数据集参数传递 2022-06-08 10:46:12 +08:00
fit2cloud-chenyw
bb1810b1bc fix: 过滤器枚举字段去除分组查询 2022-06-07 19:39:31 +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
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
taojinlong
13aff751f8 feat: 驱动管理的日志记录 2022-05-22 11:39:10 +08:00
taojinlong
df17468447 refactor: 冲突 2022-05-22 10:16:23 +08:00
wangjiahao
fec7a67787 refactor: 批量修改样式优化 2022-05-20 13:08:26 +08:00
taojinlong
ad01a695b4 feat: 支持数据源驱动管理 2022-05-20 00:31:17 +08:00
王嘉豪
cb9f427782
Merge pull request #2282 from dataease/pr@dev@refactor_panel-unpublished 
refactor: 优化仪表板下架逻辑，下架禁止查看
 2022-05-19 17:59:12 +08:00
wangjiahao
f0b9d02603 refactor: 优化仪表板下架逻辑，下架禁止查看 2022-05-19 17:58:19 +08:00
fit2cloud-chenyw
c80eea153b feat: 日志通过操作类型搜索 2022-05-18 19:06:27 +08:00
fit2cloud-chenyw
cc8ab2d623 feat: 操作日志数据结构 2022-05-18 18:23:12 +08:00
fit2cloud-chenyw
6ca15ce455
Merge pull request #2271 from dataease/pr@dev@feat_log 
feat: 操作日志
 2022-05-18 18:17:31 +08:00
fit2cloud-chenyw
f0f5813071 feat: 操作日志 2022-05-18 18:12:10 +08:00
wangjiahao
aee2fd9bcf refactor: 模版管理优化,系统模板的管理需要授权 2022-05-17 14:42:03 +08:00
王嘉豪
3932264403
Merge pull request #2253 from dataease/pr@dev@feat_panel-publish 
feat: 仪表板支持发布功能
 2022-05-16 13:35:33 +08:00
wangjiahao
bd5409b8d4 feat: 仪表板支持发布功能 2022-05-16 13:34:38 +08:00
junjun
620ff4af58 feat: 维度自定义排序 2022-05-16 13:25:56 +08:00
fit2cloudrd
866a840dc5
feat: 仪表板编辑视图支持批量设置样式 (#2238) 
* feat: 仪表板编辑视图支持多选

* feat: 仪表板编辑视图支持批量设置样式

Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-05-15 22:22:54 +08:00
fit2cloud-chenyw
70e0fc9bd3
Merge pull request #2246 from dataease/pr@dev@fix_code_style 
fix: 代码语法错误
 2022-05-12 15:05:32 +08:00
fit2cloud-chenyw
499c9cc649 fix: 代码语法错误 2022-05-12 15:04:17 +08:00
junjun
757f7774a2 feat: 自定义排序 2022-05-11 21:48:50 +08:00
junjun
90df43b68e refactor: sql拼接优化 2022-05-11 15:04:19 +08:00
junjun
6b12ba6a20 revert: rollback 2022-05-11 13:11:59 +08:00
wangjiahao
9118b0433c refactor: 国际化 2022-05-10 10:49:18 +08:00
satan
5d674fcca9 修复[issue 1298](https://github.com/dataease/dataease/issues/1298) :"个人信息建议可以修改某些字段" 2022-05-10 10:48:58 +08:00
wangjiahao
700a19b86a refactor: 国际化 2022-05-10 10:43:39 +08:00
satan
84f4cbd071 修复[issue 1298](https://github.com/dataease/dataease/issues/1298) :"个人信息建议可以修改某些字段" 2022-05-10 00:52:06 +08:00
junjun
6c0132c23c test: 临时提交测试 2022-05-09 14:27:49 +08:00
taojinlong
1925498e99 fix: 插件卸载 2022-05-08 13:57:58 +08:00
taojinlong
586f4b0307 fix: 集群模式下，更新数据源信息 2022-05-06 18:45:09 +08:00
taojinlong
e23fff0dcd Merge branch 'dev' of github.com:dataease/dataease into dev 2022-05-06 17:08:01 +08:00
fit2cloud-chenyw
41d8b5c92a feat: 默认登录方式设置 2022-05-05 16:26:51 +08:00
taojinlong
2ae68c2c8f fix: 关联数据集 2022-05-04 20:39:31 +08:00
taojinlong
94b31d6c25 fix: 精简模式下抽取 excel(.xls) 数据集 2022-05-04 17:07:42 +08:00
taojinlong
40a0e196e4 fix: excel 数据集记录日志 2022-05-04 12:24:10 +08:00
taojinlong
4ad1344872 fix: 抽取 API 数据集 2022-05-03 15:12:52 +08:00
taojinlong
f1759e45bf fix: 抽取 API 数据集 2022-05-03 13:45:01 +08:00
taojinlong
796c2444db fix: 定时任务创建全量任务，执行完成后修改为增量，发现增量不生效 2022-05-01 17:53:31 +08:00
taojinlong
861b576722 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-04-29 17:52:08 +08:00
taojinlong
bcb4084e69 fix: 數據源插件卸载 2022-04-29 17:51:17 +08:00
junjun
95a40e3d08 fix: 修复删除数据源后创建数据集报错 2022-04-28 18:44:33 +08:00
junjun
6336c1bdfe fix: 修复关联数据集缺失schema 2022-04-28 18:28:50 +08:00
taojinlong
24ae00582f fix: 时间格式化 2022-04-28 18:16:08 +08:00
fit2cloud-chenyw
1540c1c9ee fix: 公共链接中视图无法导出excel 2022-04-28 18:12:15 +08:00
fit2cloud-chenyw
582f52a535
Merge pull request #2214 from dataease/pr@dev@fix_api_auth_folder 
fix: 权限继承模式api权限逻辑调整
 2022-04-28 17:50:34 +08:00
fit2cloud-chenyw
a2d301b6fa fix: 权限继承模式api权限逻辑调整 2022-04-28 17:49:21 +08:00
taojinlong
1860704263 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-04-28 16:18:42 +08:00
taojinlong
e5e370b9f3 fix: 数据源错误信息 2022-04-28 16:17:37 +08:00
王嘉豪
24bbeb2939
Merge pull request #2211 from dataease/pr@dev@refactor-template-export 
refactor: 仪表板模板导出支持同时导出服务器静态图片
 2022-04-28 14:04:47 +08:00
wangjiahao
1e12ba05c7 refactor: 仪表板模板导出支持同时导出服务器静态图片 2022-04-28 14:03:14 +08:00
fit2cloud-chenyw
c5df08e485 fix: 取消分享消息失效 2022-04-28 11:11:53 +08:00
taojinlong
ab5b1be514 fix: 精简模式Excel数据集在单元格中包含特殊符号或空值时会报错 2022-04-27 11:31:59 +08:00
王嘉豪
34783e5762
Merge pull request #2195 from dataease/pr@dev@refactor_subject 
refactor: 更新系统主题
 2022-04-26 20:09:31 +08:00
wangjiahao
b99c090414 refactor: 更新系统主题 2022-04-26 20:07:42 +08:00
taojinlong
f9523a6620 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-04-26 18:58:19 +08:00
taojinlong
e5f5ab909b fix: 同时创建多个定时同步的数据集，会出现部分数据集更新信息显示成功但是预览数据为空 2022-04-26 18:57:42 +08:00
王嘉豪
e34f45dffa
Merge pull request #2190 from dataease/pr@dev@refactor_panel 
fix: 直接复制tab组件内部视图依然是软连接问题
 2022-04-26 18:04:59 +08:00
王嘉豪
c60b869d7a
Merge pull request #2188 from dataease/pr@dev@refactor_sequence 
refactor: 删除定时任务相关表重复的索引
 2022-04-26 18:04:47 +08:00
wangjiahao
d033387c60 fix: 直接复制tab组件内部视图依然是软连接问题 2022-04-26 18:03:37 +08:00
taojinlong
a63157950d fix: 校验impala数据源重复 2022-04-26 15:35:19 +08:00
wangjiahao
abe2349947 refactor: 删除定时任务相关表重复的索引 2022-04-26 15:03:09 +08:00
wangjiahao
402fddac99 fix: 修复使用mariadb数据库部分函数不兼容问题 2022-04-25 19:48:39 +08:00
fit2cloud-chenyw
477e6abc2b fix: 消息列表切换消息类型无效 2022-04-25 15:32:14 +08:00
taojinlong
8d4ff99917 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-04-25 13:16:43 +08:00
taojinlong
14cb6a9af4 revert: 回滚误提交 2022-04-25 13:16:23 +08:00
fit2cloud-chenyw
3ed388d7b0
Merge pull request #2166 from dataease/pr@dev@feat_marker_map 
feat: dataease适配符号地图插件
 2022-04-25 13:01:37 +08:00
fit2cloud-chenyw
f4130f61a2 feat: dataease适配符号地图插件 2022-04-25 13:00:18 +08:00
王嘉豪
f55749417d
refactor: 背景图片直接存储在服务器 
refactor: 背景图片直接存储在服务器
 2022-04-25 12:13:05 +08:00
taojinlong
dbb8a7a76d fix: 优化插件存放路径 2022-04-24 16:59:54 +08:00
taojinlong
e07200cb81 fix: 优化插件存放路径 2022-04-24 16:59:50 +08:00
taojinlong
d5f6845a00 feat: 添加 Maxcompute 插件 2022-04-24 16:11:00 +08:00
taojinlong
6e44567d6f feat: API 数据源支持获取非数组类型的值 2022-04-24 16:05:14 +08:00
taojinlong
08afbe5e2d feat: Oracle 数据源指定字符集 2022-04-24 14:10:18 +08:00
taojinlong
a5d8d6cbbb feat: Simple 模式下，DataEase 在启动时读取数据库配置文件自动添加引擎设置参数 2022-04-21 21:19:18 +08:00
taojinlong
64e9354dbe fix: 精简模式添加 Excel数据集 2022-04-21 13:41:58 +08:00
fit2cloudrd
c124cc7c7d
refactor: 优化视图标题校验 (#2148) 
* refactor: 优化视图标题校验

* refactor: 优化视图标题校验

Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-04-20 19:05:09 +08:00
wangjiahao
08d1d80e51 refactor: 仪表板编辑缓存优化 2022-04-20 17:25:04 +08:00
taojinlong
7a4f203ed5 fix: bean name（sqlServerQueryProvider） 2022-04-18 14:36:09 +08:00
fit2cloud-chenyw
f0af0354af fix: websocket优化 2022-04-18 11:18:38 +08:00
taojinlong
7241e26013 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-04-18 11:01:52 +08:00
taojinlong
2069701cb9 fix: mysql 驱动 2022-04-18 11:01:31 +08:00
fit2cloud-chenyw
413481685a fix: redis缓存存取方案一致 2022-04-18 10:48:20 +08:00
taojinlong
575010708b fix: 引擎缓存 2022-04-17 21:27:04 +08:00
taojinlong
7f00646285 fix: 数据源插件 2022-04-17 18:19:54 +08:00
taojinlong
74613decc7 fix: bean 名称冲突 2022-04-17 16:52:53 +08:00
taojinlong
16e5641135 conflict 2022-04-17 16:08:22 +08:00
taojinlong
ea43644f07 feat: 支持数据源插件 2022-04-17 15:05:01 +08:00
taojinlong
c15dbf5f14 fix: CacheUtils 设置缓存 2022-04-15 22:47:19 +08:00
taojinlong
c613c9278b fix: 缓存引擎信息 2022-04-15 21:25:41 +08:00
taojinlong
8f9b355b89 feat: 支持 Maxcompute 2022-04-15 16:08:33 +08:00
wangjiahao
7b2a63d291 refactor: 修改视图导出明细后置 2022-04-14 15:56:52 +08:00
fit2cloud-chenyw
61901be4f7 feat: 创建用户页面提示默认密码 2022-04-14 13:02:42 +08:00
fit2cloud-chenyw
d341a1ac68 feat: 帮助文档及首页支持链接自定义 2022-04-14 11:42:43 +08:00
fit2cloud-chenyw
0c16ca38e4 feat: 集群环境websocket消息 2022-04-13 18:30:31 +08:00
fit2cloud-chenyw
d7521f8861
Merge pull request #2105 from dataease/pr@dev@feat_websocket_msg 
feat: 单机模式使用websocket消息通知
 2022-04-13 13:41:26 +08:00
fit2cloud-chenyw
ce7868a4c0 feat: 单机模式使用websocket消息通知 2022-04-13 13:39:29 +08:00
junjun
02b05220d2 feat: 支持计数和去重计数 2022-04-12 19:45:12 +08:00
wangjiahao
d421b81b83 refactor: 增加系统默认模板 2022-04-12 17:42:21 +08:00
fit2cloudrd
bb98e0c4e7
refactor: 视图明细导出优化 (#2093) 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-04-11 10:58:52 +08:00
junjun
fddc019fd3 refactor: 切换数据集优化 2022-04-11 09:31:41 +08:00
wangjiahao
b7437f0413 feat: 视图明细导出支持附带明细截图 2022-04-10 16:48:50 +08:00
fit2cloud-chenyw
f78e7ce972 fix: 定时报告权限设置 2022-04-08 15:01:57 +08:00
wangjiahao
5876c5f0bc refactor: 代码回退 2022-04-08 13:50:39 +08:00
wangjiahao
12f5a015f9 refactor: 优化官方示例 2022-04-07 20:39:25 +08:00
fit2cloud-chenyw
694011cbd3 fix: 首页显示隐藏控制无效 2022-04-07 19:07:31 +08:00
taojinlong
905c731335 fix: 校验增量更新sql字段 2022-04-07 17:20:34 +08:00
taojinlong
8a9f3d38bd Merge branch 'dev' of github.com:dataease/dataease into dev 2022-04-07 17:20:11 +08:00
taojinlong
57d299e6ca fix: 校验增量更新sql字段 2022-04-07 17:19:36 +08:00
wangjiahao
11e2473561 fix: 修复复制仪表板，视图可能被勿删的问题 2022-04-07 15:46:20 +08:00
wangjiahao
d74fd5d0ed fix: 修复复制仪表板，视图可能被勿删的问题 2022-04-07 15:38:03 +08:00
fit2cloud-chenyw
e9f779ad85 fix: 插件卸载逻辑 2022-04-06 19:00:16 +08:00
fit2cloud-chenyw
2c3e88ca9a
Merge pull request #2061 from dataease/pr@dev@fix_plugin_uninstall_logic 
fix: 插件卸载逻辑
 2022-04-06 18:59:23 +08:00
fit2cloud-chenyw
67d5f20848 fix: 插件卸载逻辑 2022-04-06 18:58:15 +08:00
taojinlong
528014ed71 fix: impala 数据源 2022-04-06 17:56:46 +08:00
taojinlong
b0b04cb97f fix: impala 数据源 2022-04-06 17:06:55 +08:00
taojinlong
f0f1edf156 perf: 增大链接池 2022-04-06 16:15:18 +08:00
taojinlong
54804d9ef5 fix: 校验 db2 2022-04-06 10:57:18 +08:00
wangjiahao
7d783ed0d0 fix: 编辑更换视图数据集信息联动备选字段没有立即更新 2022-04-06 10:09:08 +08:00
taojinlong
8d1812f8fa fix: hive sql 数据集 2022-04-05 22:36:04 +08:00
taojinlong
fbb2651832 fix: es 数据源添加表 2022-04-05 21:57:43 +08:00
taojinlong
3ae10f4592 fix: 集群模式抽取数据 2022-04-05 21:50:16 +08:00
taojinlong
8c0d7ae0ad fix: 集群设置 2022-04-05 17:54:47 +08:00
taojinlong
9a9a1a1c0f fix: 检测并更新失败任务状态 2022-04-05 17:30:49 +08:00
taojinlong
0a9d2a8810 fix: StarRocks、tidb 同步数据 2022-04-05 11:58:23 +08:00
junjun
9f3ef8e1f9 fix: 自定义数据集报错提示 2022-04-04 22:20:23 +08:00
fit2cloud-chenyw
05cbd335ce fix: 插件上传增加版本验证 2022-04-04 21:36:56 +08:00
taojinlong
ed325a863a fix: 替换excel后，切换tab 刷新字段 2022-04-03 19:34:48 +08:00
taojinlong
9b48e7a2a4 fix: 默认授权 2022-04-02 23:03:39 +08:00
taojinlong
7efd82b6e5 fix: 默认授权 2022-04-02 22:23:28 +08:00
taojinlong
9d386d4324 fix: 支持 es8 2022-04-02 22:04:45 +08:00
wangjiahao
71b3422ead refactor: 视图编辑时检验title是否重复 2022-04-02 20:09:45 +08:00
taojinlong
77a5ba4baf Merge branch 'v1.9' of github.com:dataease/dataease into v1.9 2022-04-02 16:43:25 +08:00
taojinlong
8a6a9eeaf1 fix: doris日期格式化 2022-04-02 16:42:19 +08:00
fit2cloudrd
f631fc98d7
fix: 新建仪表板卡顿问题 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-04-02 15:04:35 +08:00
taojinlong
3da82ddd20 fix: 数据源指定schame 2022-04-02 14:09:00 +08:00
taojinlong
4b42e73871 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-04-02 14:06:58 +08:00
taojinlong
11800316ae fix: 数据源指定schame 2022-04-02 14:06:42 +08:00
wangjiahao
e259ac0d88 fix: 仪表板编辑是页面偶尔出现SQL报错 2022-04-02 11:12:03 +08:00
王嘉豪
cea18cdc03
Merge pull request #2025 from dataease/pr@dev@refactor_panel-auto-http 
refactor: 复制视图的时间保持为当前时间
 2022-04-01 18:50:19 +08:00
wangjiahao
f2135c175d refactor: 复制视图的时间保持为当前时间 2022-04-01 18:48:34 +08:00
fit2cloud-chenyw
90f520bd27 fix: 插件管理菜单icons 2022-04-01 17:01:12 +08:00
fit2cloud-chenyw
b6ac2dec6a fix: 插件管理菜单icons 2022-04-01 16:59:14 +08:00
fit2cloud-chenyw
9567d5b380 fix: 删除仪表板后公共链接映射还存在 2022-04-01 16:03:18 +08:00
fit2cloud-chenyw
e36df37a59 fix: 删除仪表板后公共链接映射还存在 2022-04-01 15:54:18 +08:00
taojinlong
178a411131 fix: 行权限系统变量 2022-03-31 22:51:54 +08:00
fit2cloud-chenyw
fd8e98f44c refactor: 视图插件自定义icon 2022-03-31 17:58:06 +08:00
王嘉豪
0be2a080af
Merge branch 'dev' into pr@dev@feat_new-template-import 2022-03-31 10:31:50 +08:00
wangjiahao
e21f59b8cb refactor: 更新flyway 2022-03-31 10:29:45 +08:00
taojinlong
fa8d459804 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-30 23:52:51 +08:00
taojinlong
9e5fde11b5 fix: 行权限系统变量 2022-03-30 23:51:55 +08:00
fit2cloud-chenyw
46e38cb697 fix: 调整插件名称 2022-03-30 21:20:10 +08:00
wangjiahao
dc026ae9b1 refactor: 更新flyway 2022-03-30 20:29:30 +08:00
wangjiahao
c0682bcdc8 refactor: 复制视图名称不重复 2022-03-30 20:15:02 +08:00
taojinlong
59d07862fc fix: 同步API数据集的字段 2022-03-30 15:37:31 +08:00
taojinlong
883861bee1 fix: 登陆校验不存在的用户信息 2022-03-30 14:52:42 +08:00
wangjiahao
da7fdcabea fix: 模板视图复制出错问题 2022-03-30 12:35:04 +08:00
fit2cloud-chenyw
038ba17b05
Merge pull request #1994 from dataease/pr@dev@feat_plugin_manage 
feat: 新增插件管理功能
 2022-03-29 16:11:30 +08:00
fit2cloud-chenyw
997ce40b98 feat: 新增插件管理功能 2022-03-29 16:10:16 +08:00
taojinlong
7e54842eab feat: 支持 TiDB、StarRocks 2022-03-29 16:07:21 +08:00
taojinlong
38905dcec8 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-29 16:00:07 +08:00
taojinlong
e67e6d0441 feat: 支持系統變量 2022-03-29 15:59:19 +08:00
fit2cloud-chenyw
6fa87d8258 fix: api权限验证逻辑修复 2022-03-29 14:49:36 +08:00
王嘉豪
cf03e5aed2
Merge pull request #1990 from dataease/pr@dev@fix_panel-style 
fix: 修复第三方参数未启用依然有效的问题
 2022-03-29 12:39:20 +08:00
wangjiahao
0b786a0721 fix: 修复第三方参数未启用依然有效的问题 2022-03-29 12:26:05 +08:00
fit2cloud-chenyw
2cfaa55440 fix: 公共链接不能显示气泡地图 2022-03-29 12:02:21 +08:00
王嘉豪
802d7162de
Merge pull request #1987 from dataease/pr@dev@fix_panel-style 
refactor: 优化公共链接第三方参数
 2022-03-29 11:33:35 +08:00
wangjiahao
ef1affe9f1 refactor: 优化公共链接第三方参数 2022-03-29 11:32:59 +08:00
taojinlong
08d1659b73 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-28 22:01:31 +08:00
taojinlong
183090cee6 fix: excel 数据集新增字段后，追加失败 2022-03-28 22:01:21 +08:00
fit2cloud-chenyw
b0fc9ac436
Merge pull request #1982 from dataease/pr@dev@fix_doris_plugin_view_error 
fix: doris模式视图插件无效
 2022-03-28 18:29:51 +08:00
fit2cloud-chenyw
ab69823e8a fix: doris模式视图插件无效 2022-03-28 18:28:46 +08:00
taojinlong
a87737ab6d Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-28 17:05:27 +08:00
taojinlong
879890fe54 feat: 加密公共链接中的用户ID 2022-03-28 17:01:03 +08:00
fit2cloud-chenyw
cce82f628d
Merge pull request #1981 from dataease/pr@dev@fix_aop_stack_info 
fix: aop中不能捕获原方法异常堆栈
 2022-03-28 16:40:15 +08:00
fit2cloud-chenyw
fbed25f91e fix: aop中不能捕获原方法异常堆栈 2022-03-28 16:38:33 +08:00
junjun
9cc43d1095 fix: 增加接口校验 2022-03-28 15:51:18 +08:00
taojinlong
2213a565f8 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-28 15:42:51 +08:00
taojinlong
53112a7dd4 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-28 15:42:11 +08:00
fit2cloud-chenyw
4aeaf0659d
Merge pull request #1979 from dataease/pr@dev@fix_login_type_error 
fix: 登录验证用户来源
 2022-03-28 15:38:55 +08:00
fit2cloud-chenyw
b57577d316 fix: 登录验证用户来源 2022-03-28 15:37:33 +08:00
taojinlong
845e3d32bd Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-28 15:23:34 +08:00
taojinlong
fc1a92d04e fix: 增加接口校验 2022-03-28 15:23:22 +08:00
fit2cloud-chenyw
e03af70ee2
Merge pull request #1977 from dataease/pr@dev@fix_doris_view_plugins 
fix: 抽取模式插件视图不可用
 2022-03-28 15:18:52 +08:00
fit2cloud-chenyw
8137acfd50 fix: 抽取模式插件视图不可用 2022-03-28 15:17:41 +08:00
junjun
ff679cbb44 fix: 修复明细表数值排序会出现按文本顺序的问题 2022-03-28 15:13:07 +08:00
taojinlong
252f88bbba Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-28 11:40:42 +08:00
taojinlong
42ec51f02d fix: 字符串转时间格式错误 2022-03-28 11:40:25 +08:00
王嘉豪
c34a9b127c
Merge pull request #1973 from dataease/pr@dev@feat_panel-jump 
feat: 仪表板点击视图跳转外部链接是可以加上点击参数
 2022-03-28 09:20:11 +08:00
wangjiahao
59b5b0a0cf feat: 仪表板点击视图跳转外部链接是可以加上点击参数 2022-03-28 09:19:18 +08:00
taojinlong
1be1faf4d4 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-28 09:11:55 +08:00
taojinlong
c493849d1a fix: 精简模式下创建关联数据集失败 2022-03-28 09:11:46 +08:00
wangjiahao
44e7cd5dfb feat: 仪表板增加Web组件 2022-03-27 19:06:37 +08:00
王嘉豪
dbc215f2f8
Merge branch 'dev' into pr@dev@refactor_outer-params 2022-03-27 13:11:42 +08:00
wangjiahao
92b9b4335d feat: 新增资源默认权限继承 2022-03-27 13:09:56 +08:00
王嘉豪
c71de1a521
Merge pull request #1969 from dataease/pr@dev@refactor_outer-params 
feat: 仪表板支持接收外部参数
 2022-03-26 21:18:55 +08:00
wangjiahao
ab886fe1b4 feat: 仪表板支持接收外部参数 2022-03-26 21:17:22 +08:00
taojinlong
8857c99564 fix: 精简模式下 sql 拼接问题 2022-03-25 23:20:27 +08:00
taojinlong
2043788071 fix: impala 时间格式化 2022-03-25 22:20:25 +08:00
taojinlong
71557bfe8f Merge branch 'dev' into pr@dev@cluster 2022-03-25 17:00:52 +08:00
taojinlong
e2d088a51f feat: 支持集群（kettle） 2022-03-25 16:59:22 +08:00
fit2cloud-chenyw
9bcf1980cd
Merge pull request #1964 from dataease/pr@dev@feat_de_tabs_plugin 
faet: 集成新的tabs插件
 2022-03-25 14:29:12 +08:00
fit2cloud-chenyw
70dbd65a1a faet: 集成新的tabs插件 2022-03-25 14:27:47 +08:00
junjun
d5ca2168c4 refactor: 支持ES布尔类型 2022-03-24 17:01:19 +08:00
fit2cloud-chenyw
8c52ea1e70 fix: 插件视图复制错误 2022-03-23 16:55:36 +08:00
fit2cloud-chenyw
c588367076 fix: 完善oidc登录逻辑 2022-03-23 13:09:35 +08:00
taojinlong
a045f51515 feat: 支持集群（doris） 2022-03-22 19:33:19 +08:00
taojinlong
6a883eb6b2 Merge branch 'dev' into pr@dev@cluster 2022-03-22 17:49:09 +08:00
taojinlong
1fa8fae237 feat: 支持集群（doris） 2022-03-22 17:46:54 +08:00
fit2cloud-chenyw
3749e9c0d4 fix: 移动端查看分享仪表板报错 2022-03-22 15:20:26 +08:00
fit2cloud-chenyw
c4448bfd7d
Merge branch 'dev' into pr@dev@refactor_display_info 2022-03-22 12:58:46 +08:00
fit2cloud-chenyw
ccba5bdce5 refactor: 重构系统参数-显示设置布局 2022-03-22 12:56:42 +08:00
junjun
23c423efb3 fix: demo数据地名错误 2022-03-22 10:47:43 +08:00
fit2cloud-chenyw
2f59c3aa75 fix: api权限aop隐藏真实堆栈信息 2022-03-22 10:26:23 +08:00
fit2cloud-chenyw
6b8877ca0e feat: 增加移动端背景替换 2022-03-21 18:40:16 +08:00
fit2cloud-chenyw
c8c8153808 fix: 视图插件过滤条件无效 2022-03-21 15:32:54 +08:00
fit2cloud-chenyw
7d5452b64b fix: 视图插件切换别的视图报错 2022-03-21 14:06:46 +08:00
wangjiahao
bed5a0bf02 refactor: 优化外部参数设置界面 2022-03-18 20:35:52 +08:00
fit2cloud-chenyw
7ef64ba22d feat: 插件反射回调数据源 2022-03-18 16:53:01 +08:00
fit2cloud-chenyw
6a6b31be6f
Merge pull request #1929 from dataease/pr@dev@feat_plugin 
refactor: 解决视图插件冲突
 2022-03-18 10:21:26 +08:00
wangjiahao
05003e5fa3 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-17 21:42:15 +08:00
fit2cloud-chenyw
4975340c43 refactor: 解决视图插件冲突 2022-03-17 21:35:49 +08:00
wangjiahao
89652ad890 feat: 仪表板支持接收外部参数 2022-03-17 21:14:19 +08:00
fit2cloud-chenyw
c21154da39 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/java/io/dataease/provider/query/hive/HiveConstants.java
 2022-03-17 21:04:52 +08:00
fit2cloud-chenyw
2ee7ef58ae refactor: 重构视图插件 2022-03-17 17:22:57 +08:00
taojinlong
f4ee879cbb Merge branch 'dev' into pr@dev@impala 2022-03-17 00:13:55 +08:00
taojinlong
a3b31a21cb feat: 支持 impala 2022-03-17 00:12:50 +08:00
wangjiahao
3f48d8ad24 feat: 拥有移动端布局的仪表板在列表中增加标志 2022-03-16 20:44:54 +08:00
wangjiahao
343a386955 feat: 模板新建仪表板可以更换数据集，未更换显示模板视图数据，并提示 2022-03-16 18:09:16 +08:00
taojinlong
98dc2436a2 refactor: 整理代码 2022-03-16 15:44:59 +08:00
wangjiahao
2feb5138b3 feat: 从模板新建的仪表板支持查看模板缓存数据 2022-03-15 21:41:28 +08:00
wangjiahao
558dfa7d62 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/java/io/dataease/service/chart/ChartViewService.java
 2022-03-15 18:02:19 +08:00
wangjiahao
945f7008a1 feat: 从模板新建的仪表板支持查看模板缓存数据 2022-03-15 18:00:19 +08:00
junjun
63c4f5f2ac feat: 文本卡 2022-03-15 11:11:40 +08:00
taojinlong
39865e1766 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-14 21:20:52 +08:00
taojinlong
5eb54eab52 fix: 修复精简模式下同步数据 2022-03-14 21:20:23 +08:00
wangjiahao
5b363b985b Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/resources/db/migration/V33__1.9.sql
#	backend/src/main/resources/generatorConfig.xml
 2022-03-14 21:16:14 +08:00
wangjiahao
9a8cc0c14a feat: 仪表板模板保存支持保存临时数据 2022-03-14 21:15:33 +08:00
taojinlong
2d1f41df19 feat: 支持精简模式 2022-03-14 12:35:04 +08:00
taojinlong
eae0095db4 refactor: resolve Conflicts 2022-03-14 12:30:20 +08:00
taojinlong
e81138ec5c feat: 支持精简模式 2022-03-14 12:26:24 +08:00
wangjiahao
5ce21e9471 refactor: 仪表板视图操作优化 2022-03-10 21:09:47 +08:00
wangjiahao
cfe1ed3fdc refactor: 仪表板视图操作优化 2022-03-10 20:26:31 +08:00
wangjiahao
59aa355ed9 refactor: 仪表板保存，防止清理多余视图 2022-03-10 12:08:21 +08:00
wangjiahao
0c0f6d2f8b refactor: 优化新建视图操作 2022-03-10 11:53:18 +08:00
wangjiahao
02df8cb956 feat: 视图所有操作移到仪表板 2022-03-10 11:06:49 +08:00
wangjiahao
fea735fb5d Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/resources/generatorConfig.xml
#	frontend/src/lang/en.js
#	frontend/src/lang/tw.js
#	frontend/src/lang/zh.js
#	frontend/src/views/chart/view/ChartEdit.vue
 2022-03-10 10:48:18 +08:00
wangjiahao
cf55778229 feat: 视图所有操作移到仪表板 2022-03-10 10:38:33 +08:00
taojinlong
8b6dc5c0fa Update ExtractDataService.java 
fix: "kettle job 脚本"
 2022-03-09 20:07:49 +08:00
taojinlong
0609d24555 feat: 支持精简模式 2022-03-09 20:03:50 +08:00
fit2cloud-chenyw
b388a8f49e refactor: 缓存兼容redis哨兵和分片集群模式 2022-03-09 17:49:23 +08:00
fit2cloud-chenyw
cb0e2b6a65 refactor: 缓存兼容redis单机模式 2022-03-08 18:26:38 +08:00
junjun
f347578cc1 refactor: 关联数据集权限校验 2022-03-08 12:22:50 +08:00
taojinlong
2a7ce9aec7 Merge branch 'v1.8' into dev 2022-03-04 18:21:08 +08:00
taojinlong
f36060de0e Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-03-04 18:20:20 +08:00
taojinlong
7675f9c119 fix: API 数据集增量同步 2022-03-04 15:45:43 +08:00
junjun
58fd0a56bf feat: 视图高级设置 2022-03-03 18:30:50 +08:00
fit2cloud-chenyw
4e308602a7 fix: 第三方用户登录后总是提示修改密码 2022-03-03 15:00:32 +08:00
fit2cloud-chenyw
3986328304 fix: 第三方用户登录后总是提示修改密码 2022-03-03 14:58:55 +08:00
taojinlong
03d220869a Merge branch 'v1.8' into dev 2022-03-02 22:42:46 +08:00
taojinlong
2b05361788 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-02 22:42:16 +08:00
taojinlong
2f0bbe7c8d perf: 优化启动时，数据集初始化 2022-03-02 22:41:29 +08:00
wangjiahao
0a6e55247a Merge remote-tracking branch 'origin/dev' into dev 2022-03-02 22:34:21 +08:00
wangjiahao
a0a1b1f96e refactor: 修改初始化listener执行顺序 2022-03-02 22:34:05 +08:00
taojinlong
3f889ab62d fix: 自助数据集 api 权限校验 2022-03-02 22:15:48 +08:00
taojinlong
d7a52c28e6 fix: mysql 支持视图 2022-03-02 20:47:33 +08:00
taojinlong
48897c2d1e fix: mysql 支持视图 2022-03-02 20:46:18 +08:00
taojinlong
76e759e605 fix: 异常处理 2022-03-02 18:52:05 +08:00
taojinlong
81e90f2ac6 fix: mysql 支持视图 2022-03-02 18:41:58 +08:00
junjun
9f5820cccc fix: 数据源权限 2022-03-02 18:30:34 +08:00
junjun
a0321b9139 fix: 数据源权限 2022-03-02 18:29:03 +08:00
wangjiahao
479081bcee Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-03-02 18:02:26 +08:00
wangjiahao
fa12e77d5a fix: 无法复制空仪表板问题 2022-03-02 18:02:11 +08:00
taojinlong
3d4e33c8ca fix: 创建关联数据集时，去掉空目录 2022-03-02 17:49:14 +08:00
taojinlong
a89fe306c9 Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-03-02 17:39:28 +08:00
taojinlong
3851f2d4ca fix: 行列权限的API 2022-03-02 17:21:40 +08:00
wangjiahao
0df2cbf432 refactor: 清理官方仪表板未使用的视图 2022-03-02 17:07:16 +08:00
taojinlong
b4a42d7545 Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-03-02 16:09:25 +08:00
taojinlong
a40cd1e08a fix: 创建关联数据集可选择[API]数据集 2022-03-02 16:09:09 +08:00
wangjiahao
2239a2031c refactor: 清理官方仪表板未使用的视图 2022-03-02 16:04:31 +08:00
fit2cloud-chenyw
dfd22d3d7c fix: 组织授权级联缓存 2022-03-02 12:53:11 +08:00
fit2cloud-chenyw
ba00ce3250 refactor: 分享代理方法返回值 2022-03-02 12:36:09 +08:00
taojinlong
ed8b17f8e6 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-02 11:28:37 +08:00
taojinlong
3bcbbfc0f8 refactor: 重复提交 2022-03-02 11:27:48 +08:00
fit2cloud-chenyw
5c008256db fix: 公共链接视图api缺少参数 2022-03-02 11:25:37 +08:00
fit2cloud-chenyw
930a0288d0 fix: 公共链接视图api缺少参数 2022-03-02 11:23:25 +08:00
taojinlong
51bda15879 Merge branch 'v1.8' into dev 2022-03-02 11:11:04 +08:00
taojinlong
ace390c2c9 Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-03-02 11:07:16 +08:00
taojinlong
502806161c fix: 获取oracle数据库的表 2022-03-02 11:00:32 +08:00
王嘉豪
45767f75e4
Merge pull request #1863 from dataease/v1.8 
V1.8
 2022-03-02 10:53:53 +08:00
wangjiahao
73dac7f0b0 Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-03-02 10:47:16 +08:00
wangjiahao
16ea97339e fix: 默认仪表板管理权限未生效问题 2022-03-02 10:46:58 +08:00
fit2cloud-chenyw
1ef29da15f fix: 代理权限视图报错 2022-03-02 10:14:55 +08:00
fit2cloud-chenyw
f507da46c9 fix: 代理权限视图报错 2022-03-02 10:11:20 +08:00
fit2cloud-chenyw
c380781c3b refactor: 分享列表仪表板使用代理权限查看 2022-03-01 21:02:40 +08:00
fit2cloud-chenyw
9b28cf628a
Merge pull request #1861 from dataease/pr@v1.8@refactor_panel_share 
refactor: 分享列表仪表板使用代理权限查看
 2022-03-01 21:01:01 +08:00
fit2cloud-chenyw
79934b3bcf refactor: 分享列表仪表板使用代理权限查看 2022-03-01 20:59:52 +08:00
junjun
4ebb72ca5d refactor: 数据集视图权限 2022-03-01 17:28:48 +08:00
junjun
26139713f2 Merge remote-tracking branch 'origin/dev' into dev 2022-03-01 17:27:13 +08:00
junjun
a88e9d6cce refactor: 数据集视图权限 2022-03-01 17:27:01 +08:00
taojinlong
ef37aeebe1 fxi: 资源接口上，去掉菜单权限 2022-03-01 17:24:57 +08:00
taojinlong
9dc0dcdccd Merge branch 'dev' of github.com:dataease/dataease into dev 2022-03-01 17:22:22 +08:00
taojinlong
f8467db485 fxi: 资源接口上，去掉菜单权限 2022-03-01 17:22:11 +08:00
junjun
24bdcddc6c refactor: 数据集视图权限 2022-03-01 17:21:36 +08:00
junjun
6b2d3e1222 refactor: 数据集视图权限 2022-03-01 17:21:00 +08:00
taojinlong
84070f355a fxi: api 权限错误 2022-03-01 16:47:56 +08:00
taojinlong
8e528ebbaf feat: 仪表板分享以分享人查看数据 2022-03-01 16:06:40 +08:00
fit2cloud-chenyw
9e625e21bd refactor: 用户列表与仪表板分享用户接口分离 2022-03-01 15:09:47 +08:00
fit2cloud-chenyw
0ba4fe7dd7 fix: 定时报告队列中的任务过期依然执行 2022-03-01 14:07:19 +08:00
taojinlong
a72f262226 fix: 行列权限并行生效 2022-03-01 12:42:47 +08:00
taojinlong
66ffc20172 refactor: 拼写错误 2022-03-01 12:05:38 +08:00
taojinlong
665cd7eefb Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-03-01 12:02:39 +08:00
taojinlong
4c7f6ed329 fix: 全局异常处理 2022-03-01 12:02:29 +08:00
wangjiahao
a1e0bf9152 Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-03-01 11:14:25 +08:00
wangjiahao
e188e4a7b3 fix: 仪表板复制重名直接进入编辑页面问题 2022-03-01 11:14:09 +08:00
taojinlong
69ee34bf48 fix: mongo 校验错误 2022-02-28 23:31:22 +08:00
taojinlong
af7b9dab09 fix: 识别 pg 类型 2022-02-28 23:01:29 +08:00
taojinlong
4d0319d44c Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-02-28 21:57:45 +08:00
taojinlong
caf65cb4df fix: 识别 pg 类型 2022-02-28 18:51:24 +08:00
taojinlong
59e5aadee6 fix: mongo 拉取不到最新的collection 2022-02-28 18:45:59 +08:00
wangjiahao
357e3ec285 Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-02-28 18:01:29 +08:00
wangjiahao
190dc5b2a6 feat: 存量视图支持在仪表板编辑列表删除 2022-02-28 18:01:14 +08:00
taojinlong
7ddaaca36c fix: Elasticsearch 支持 nested 类型 2022-02-28 16:25:44 +08:00
taojinlong
d6f0c07ad4 fix: Elasticsearch sql, field_multi_value_leniency -> true; the API returns the first value from the array with no guarantee of consistent results. 2022-02-28 15:02:59 +08:00
taojinlong
84e65cb659 Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-02-28 15:02:45 +08:00
fit2cloud-chenyw
df29dcb467
Merge pull request #1846 from dataease/pr@v1.8@fix_public_link_jump 
fix: 公共链接跳转无法打开目标仪表板
 2022-02-28 13:28:20 +08:00
fit2cloud-chenyw
434fbd5b11 fix: 公共链接跳转无法打开目标仪表板 2022-02-28 13:27:22 +08:00
junjun
d7a1f5197c refactor: 权限 2022-02-28 12:16:31 +08:00
junjun
82f4d11b62 refactor: 数据集视图权限 2022-02-28 11:58:04 +08:00
taojinlong
11088931ea Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-02-28 11:39:14 +08:00
taojinlong
7add22f6d8 refactor: 优化数据源删除提示信息 2022-02-28 11:38:51 +08:00
wangjiahao
5e794da1f5 Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-02-28 11:36:02 +08:00
wangjiahao
7aaad18dd9 fix: 自己创建的仪表板右上角没有编辑按钮 2022-02-28 11:35:32 +08:00
junjun
64d9471c33 refactor: 删除无用接口 2022-02-28 11:22:30 +08:00
junjun
5141f52abb refactor: 视图权限 2022-02-28 11:19:32 +08:00
taojinlong
c9b355c69e fix: 数据集 api 权限 2022-02-28 10:43:20 +08:00
junjun
9642862e57 refactor: 数据集视图权限 2022-02-27 14:49:59 +08:00
taojinlong
cdaa7c42e3 fix: 数据源、数据集 api 权限 2022-02-26 17:10:02 +08:00
taojinlong
9ac2f35992 Merge branch 'v1.8' of github.com:dataease/dataease into v1.8 2022-02-26 17:08:45 +08:00
taojinlong
afa4b4ed32 fix: 数据源、数据集 api 权限 2022-02-26 17:08:37 +08:00
wangjiahao
68b29be9e7 Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-02-25 18:37:01 +08:00
wangjiahao
0ef9e7a001 fix: 仪表板复制后打开的是旧仪表板问题 2022-02-25 18:36:32 +08:00
fit2cloud-chenyw
04730cb4ac refactor: flyway修改拓展插件名称 2022-02-25 17:47:44 +08:00
wangjiahao
74bd25a641 Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-02-25 17:44:33 +08:00
wangjiahao
9c7ad6f04a fix: 仪表板保存视图被删的问题 2022-02-25 17:44:15 +08:00
taojinlong
03a2e92254 fix: api 数据集补全字段 2022-02-25 17:32:17 +08:00
wangjiahao
ecba9659f5 Merge remote-tracking branch 'origin/v1.8' into v1.8 2022-02-25 12:00:45 +08:00
wangjiahao
5166facf16 refactor: 初始化时仪表板视图删的时候,不在复制对应的视图 2022-02-25 12:00:28 +08:00
junjun
bd62492d49 fix: 获取API数据源下表接口报错 2022-02-25 10:34:30 +08:00
wangjiahao
7c97035f71 refactor: 更新可选边框 2022-02-24 22:19:49 +08:00
wangjiahao
b29c00627d feat: 将所有仪表板板视图都归属仪表板 2022-02-24 21:54:03 +08:00
wangjiahao
734aa62a31 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/resources/db/migration/V32__1.8.sql
 2022-02-24 17:41:27 +08:00
wangjiahao
c4dfd975f1 refactor: 仪表板复制支持视图、跳转信息、联动信息同步复制 2022-02-24 17:40:51 +08:00
fit2cloud-chenyw
527f5daac2
Merge pull request #1818 from dataease/pr@dev@feat_xpack_api 
feat: 增加xpack包内部分api
 2022-02-24 17:27:15 +08:00
fit2cloud-chenyw
8484b44ffb feat: 增加xpack包内部分api 2022-02-24 17:25:59 +08:00
taojinlong
64c1ebd11a Merge branch 'dev' of github.com:dataease/dataease into dev 2022-02-24 16:44:10 +08:00
taojinlong
52fcd983ae feat: 显示api数据表的状态 2022-02-24 16:43:54 +08:00
junjun
c1e9d3570d fix: 修复视图中数据集字段、数据，未受数据集权限控制的问题 2022-02-24 14:36:29 +08:00
junjun
d5c0a625fa fix: 修复视图中数据集字段、数据，未受数据集权限控制的问题 2022-02-24 14:33:11 +08:00
taojinlong
3c5c98dd89 fix: 公共链接获取用户信息报错 2022-02-24 14:29:20 +08:00
taojinlong
1b8e7b7dc4 fix: 公共链接获取用户信息报错 2022-02-24 11:13:46 +08:00
taojinlong
582bf1e913 fix: 公共链接获取用户信息报错 2022-02-24 10:34:30 +08:00
taojinlong
2bd1c83e79 fix: db2 sql 数据集抽取错误 2022-02-23 21:33:50 +08:00
taojinlong
fa807521b9 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-02-23 18:30:08 +08:00
taojinlong
eb4dcab708 fix: 国际化 2022-02-23 18:29:55 +08:00
wangjiahao
6e9cee5af2 Merge remote-tracking branch 'origin/dev' into dev 2022-02-23 18:22:11 +08:00
wangjiahao
2ca712521a refactor: tab组件加入视图直接进行复制 2022-02-23 18:21:52 +08:00
taojinlong
85012cb42e fix: API 数据集同步错误 2022-02-23 17:43:28 +08:00
taojinlong
b1100a01e4 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-02-23 17:21:20 +08:00
taojinlong
b6d1516928 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-02-23 17:19:21 +08:00
fit2cloud-chenyw
c9ff4ac5f2 feat: 仪表板api权限 2022-02-23 17:18:21 +08:00
fit2cloud-chenyw
eb67c439d5 feat: 数据集api权限 2022-02-23 16:56:19 +08:00
junjun
60680080ca fix: 修复视图中数据集字段、数据，未受数据集权限控制的问题 2022-02-23 15:34:03 +08:00
taojinlong
340dd613a4 fix: API 数据源校验 2022-02-23 15:02:01 +08:00
junjun
fabb431b7d fix: 修复视图中数据集字段、数据，未受数据集权限控制的问题 2022-02-23 12:10:28 +08:00
王嘉豪
6e7c9d4bdf
refactor: 增加白名单 
* feat: 视图组件支持设置背景图片

* feat: 视图组件支持设置背景图片

* refactor: 增加白名单
 2022-02-23 10:43:29 +08:00
fit2cloudrd
95fde40cbc
feat: 仪表板可以对组件设置边框 
* feat: 视图组件支持设置背景图片

* feat: 视图组件支持设置背景图片

Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-02-22 22:32:05 +08:00
王嘉豪
353a94dac2
Merge pull request #1806 from dataease/pr@dev@refactor_panel-view-edit 
feat: 仪表板可以对组件设置边框
 2022-02-22 21:57:51 +08:00
wangjiahao
0760bd7db1 feat: 仪表板可以对组件设置边框 2022-02-22 21:55:47 +08:00
taojinlong
9333ea6e9a fix: API 数据源 2022-02-22 15:11:02 +08:00
taojinlong
a753e4e66c Merge branch 'dev' of github.com:dataease/dataease into dev 2022-02-22 11:51:53 +08:00
taojinlong
ea1b00ad9c fix: API 数据源 2022-02-22 11:51:43 +08:00
王嘉豪
f4e229a6f7
Merge pull request #1802 from dataease/pr@dev@refactor_panel-view-edit 
fix: 修复只修改仪表板名称后，移动端列表不显示仪表板问题
 2022-02-22 11:24:19 +08:00
wangjiahao
7c67717b3c fix: 修复只修改仪表板名称后，移动端列表不显示仪表板问题 2022-02-22 11:22:02 +08:00
王嘉豪
4782c74ae1
Merge pull request #1801 from dataease/pr@dev@refactor_panel-view-edit 
refactor: 去掉视图权限校验
 2022-02-22 11:04:43 +08:00
wangjiahao
cd5fb46d0d refactor: 去掉视图权限校验 2022-02-22 11:04:05 +08:00
王嘉豪
56dc4105e4
Merge pull request #1800 from dataease/pr@dev@refactor_panel-view-edit 
refactor: 视图去掉重名校验
 2022-02-22 09:50:52 +08:00
wangjiahao
8823a6e035 refactor: 视图去掉重名校验 2022-02-22 09:49:59 +08:00
junjun
e7ccb7c685 fix: 仪表板复制透视图报错 2022-02-21 18:17:09 +08:00
taojinlong
cada5707d6 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-02-21 17:40:54 +08:00
taojinlong
b636179f0c fix: 漏洞修复 2022-02-21 17:40:45 +08:00
fit2cloud-chenyw
b41cef4eb2 refactor: 新增视图插件flyway 2022-02-21 16:34:09 +08:00
taojinlong
fe01f43d8c fix: API 数据源 2022-02-20 15:54:50 +08:00
taojinlong
287948c426 fix: API 数据源 2022-02-20 14:23:04 +08:00
littleSaltZz
d05ff66a68 Mongo常量里用的oracle的别名后缀 2022-02-18 18:05:42 +08:00
taojinlong
7fdbe4082a refactor: 解决冲突 2022-02-18 18:03:21 +08:00
taojinlong
1bc642dd27 feat: 支持API數據機 2022-02-18 17:59:19 +08:00
fit2cloud-chenyw
e1ed447063 refactor: 仪表板兼容插件视图 2022-02-17 14:22:30 +08:00
fit2cloud-chenyw
09188e9dfe
Merge pull request #1779 from dataease/pr@dev@fix_nginx_stage_deploy 
fix: nginx前后分离部署
 2022-02-16 16:13:10 +08:00
fit2cloud-chenyw
995fe08298 fix: nginx前后分离部署 2022-02-16 16:10:39 +08:00
fit2cloudrd
c8bf150e9c
fix: 修复v32__1.8.sql文件中拼写错误及格式 2022-02-16 13:39:03 +08:00
fit2cloud-chenyw
abe6f072c9
Merge pull request #1776 from dataease/pr@dev@fix_refresh_link 
fix: 重新开启链接后，老的链接无效
 2022-02-15 17:08:29 +08:00
wangjiahao
b0d2f33613 Merge remote-tracking branch 'origin/dev' into dev 2022-02-15 17:07:59 +08:00
wangjiahao
57c0f2d745 refactor: 更新视图列表图标，更正仪表板存量视图列表重复问题 2022-02-15 17:07:40 +08:00
fit2cloud-chenyw
a47eb8209e fix: 重新开启链接后，老的链接无效 2022-02-15 17:07:34 +08:00
fit2cloud-chenyw
c02de72a7e refactor: 重构公共链接短链接 2022-02-15 16:54:59 +08:00
wangjiahao
806c4b8694 Merge remote-tracking branch 'origin/dev' into dev 2022-02-15 15:28:46 +08:00
wangjiahao
6da93cdcda refactor: 更新flyway 2022-02-15 14:46:25 +08:00
fit2cloud-chenyw
d7519a9328
Merge pull request #1769 from dataease/pr@dev@feat_share_name 
feat: 分享显示名优化
 2022-02-15 12:36:16 +08:00
fit2cloud-chenyw
dada0b9f8d feat: 分享显示名优化 2022-02-15 12:35:17 +08:00
wangjiahao
1874aa4ea7 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/resources/db/migration/V32__1.8.sql
 2022-02-15 11:59:38 +08:00
wangjiahao
b449734df5 refactor: 优化视图归属于仪表板功能，更新flyway和文案 2022-02-15 11:56:38 +08:00
fit2cloud-chenyw
3f20e23bb9 feat: 公共链接使用8位随机字符后缀,兼容老版本数字后缀 2022-02-15 11:37:13 +08:00
fit2cloud-chenyw
954f68ec91 feat: 公共连接title展示当前仪表板名称 2022-02-15 10:47:01 +08:00
wangjiahao
a58f92ed03 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
 2022-02-14 18:58:33 +08:00
wangjiahao
769b7bc271 feat: 视图归属于仪表板，去掉视图菜单 2022-02-14 18:57:35 +08:00
fit2cloud-chenyw
0445176e7c refactor: 增加数据源、部分数据集api权限 2022-02-14 16:50:26 +08:00
fit2cloud-chenyw
f6bfccdb24 fix: 新建资源缓存一致性问题 2022-02-14 11:56:58 +08:00
wangjiahao
fcb74448d1 Merge remote-tracking branch 'origin/dev' into dev 2022-02-11 10:14:18 +08:00
wangjiahao
7a1e79e314 feat: 权限管理按资源授权方式支持行列权限设置 2022-02-11 10:14:01 +08:00
fit2cloud-chenyw
60fa4e1cd4
Merge branch 'dev' into pr@dev@feat_view_plugin 2022-02-10 18:29:04 +08:00
fit2cloud-chenyw
417d869d46 feat: 新增气泡地图插件兼容 2022-02-10 18:17:41 +08:00
junjun
107635933e refactor: 数据集预览优化 2022-02-10 18:04:38 +08:00
wangjiahao
757f9a5c21 Merge remote-tracking branch 'origin/dev' into dev 2022-02-09 18:02:10 +08:00
wangjiahao
064ca3b8c3 feat: 权限管理支持按照资源进行授权 2022-02-09 18:01:48 +08:00
junjie
95641feef7 feat: S2 pivot 2022-02-08 13:50:43 +08:00
fit2cloud-chenyw
81fe530fd9 fix: api权限单独处理admin 2022-02-08 11:36:12 +08:00
junjie
de00628517 feat: S2 Event 2022-02-06 18:21:08 +08:00
fit2cloud-chenyw
ec7c03a9ee fix: 解压zip未判断子目录 2022-02-05 23:49:52 +08:00
taojinlong
6b4200cf09 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-02-05 20:42:15 +08:00
taojinlong
f73e0f19e5 fix: mongo 过滤 2022-02-05 20:41:58 +08:00
Junjie
c5bf27e02b
Merge pull request #1726 from dataease/pr@dev@feat_s2_event 
feat: S2 Event
 2022-02-05 13:03:23 +08:00
junjie
4be52b9908 feat: S2 Event 2022-02-05 12:47:34 +08:00
taojinlong
22e2732d7b Merge branch 'v1.7' into dev 2022-02-04 15:57:41 +08:00
taojinlong
2ebf1f57c4 fix: 列权限多次保存 2022-02-04 15:54:26 +08:00
taojinlong
2a62c35673 fix: es 时间格式 2022-01-30 00:11:30 +08:00
taojinlong
8986e4cc3a fix: 识别 hive 字段类型 2022-01-29 23:46:24 +08:00
taojinlong
63fed2b39a Merge branch 'dev' of github.com:dataease/dataease into dev 2022-01-29 23:45:34 +08:00
taojinlong
809bab3212 fix: 识别 hive 字段类型 2022-01-29 23:45:23 +08:00
fit2cloud-chenyw
1bc7ea15f2 fix: 移动端搜索出不存在的目录 2022-01-29 09:08:22 +08:00
fit2cloud-chenyw
eec895b8c8 fix: 移动端搜索出不存在的目录 2022-01-29 09:06:31 +08:00
taojinlong
501d455e05 Merge branch 'v1.7' into dev 2022-01-28 20:01:36 +08:00
taojinlong
6f7345e859 Merge branch 'v1.7' of github.com:dataease/dataease into v1.7 2022-01-28 19:58:14 +08:00
taojinlong
d8457b90a4 fix: 数据集支持 doris 视图 2022-01-28 18:45:57 +08:00
fit2cloud-chenyw
60b8842c5e fix: 主题名称重复提示国际化 2022-01-27 14:18:37 +08:00
fit2cloud-chenyw
9972fd7734
Merge pull request #1705 from dataease/pr@v1.7@fix_theme_error_tip 
fix: 主题名称重复提示国际化
 2022-01-27 14:17:32 +08:00
fit2cloud-chenyw
9c21fea0ce fix: 主题名称重复提示国际化 2022-01-27 14:14:56 +08:00
taojinlong
9b98736627 refactor: 冲突 2022-01-27 13:57:43 +08:00
taojinlong
f99e1488f5 Merge branch 'v1.7' of github.com:dataease/dataease into v1.7 2022-01-27 13:47:15 +08:00
taojinlong
a92f3c75f8 fix: sqlserver 表名包含特殊字符 2022-01-27 11:02:16 +08:00
wangjiahao
e20e236391 refactor: 首页优化 2022-01-26 16:18:16 +08:00
wangjiahao
17c9b3eac9 refactor: 首页优化 2022-01-26 15:30:01 +08:00
fit2cloud-chenyw
5d9e2b246b fix: 列表新增按钮迷之消失 2022-01-26 11:51:09 +08:00
fit2cloud-chenyw
12491b730d fix: 列表新增按钮迷之消失 2022-01-26 11:49:28 +08:00
fit2cloud-chenyw
feec041a64 fix: 邮箱连接失败错误信息翻译 2022-01-26 11:21:21 +08:00
fit2cloud-chenyw
00fcfe1fcd fix: 邮箱连接失败错误信息翻译 2022-01-26 10:50:53 +08:00
taojinlong
20f0b85dc7 fix: 设置 db2 schema 2022-01-25 18:26:35 +08:00
taojinlong
570ade378e fix: 设置 db2 schema 2022-01-25 18:25:29 +08:00
taojinlong
369e94905d fix: mongo 过滤 2022-01-25 17:38:20 +08:00
taojinlong
c67d213b29 fix: mongo 过滤 2022-01-25 17:36:50 +08:00
fit2cloud-chenyw
010bee619a
Merge pull request #1687 from dataease/pr@dev@refactor_api_auth 
feat: api权限验证基本功能以及仪表板增删改权限demo
 2022-01-25 14:38:42 +08:00
fit2cloud-chenyw
71f3d463c4 feat: api权限验证基本功能以及仪表板增删改权限demo 2022-01-25 14:35:07 +08:00
taojinlong
27027ecf1c Merge branch 'v1.7' of github.com:dataease/dataease into v1.7 2022-01-25 13:53:24 +08:00
taojinlong
f33e4b93c6 fix: 列权限校验 2022-01-25 13:52:57 +08:00
junjie
164f97ff48 fix: 列权限校验，应忽略视图中'记录数*'字段 2022-01-25 10:29:53 +08:00
taojinlong
17e2ec66c0 fix: 列权限校验 2022-01-24 21:19:21 +08:00
taojinlong
10d2cd431f Merge branch 'v1.7' of github.com:dataease/dataease into v1.7 2022-01-24 17:24:21 +08:00
taojinlong
94d86d93c2 fix: 列权限 2022-01-24 17:24:09 +08:00
junjie
bc9ecf570d fix: 创建视图可能deadlock 2022-01-24 16:16:51 +08:00
junjie
316d59c3dd refactor: 数据集报错优化 2022-01-24 13:21:59 +08:00
taojinlong
9ca73fad57 fix: 国际化 2022-01-23 15:19:59 +08:00
taojinlong
10bab20b12 fix: 数据集列权限 2022-01-23 14:29:54 +08:00
wangjiahao
c1600826e4 refactor: 更新flyway 2022-01-21 18:18:44 +08:00
fit2cloud-chenyw
0732305cad
Merge pull request #1675 from dataease/pr@dev@fix_xpack_menus 
fix: xpack菜单重启后偶尔加载不出来
 2022-01-20 17:14:34 +08:00
fit2cloud-chenyw
5ed209d95e fix: xpack菜单重启后偶尔加载不出来 2022-01-20 17:13:36 +08:00
taojinlong
88d122d003 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-01-20 17:07:17 +08:00
taojinlong
9097b18039 fix: 删除 excel 文件 2022-01-20 17:07:02 +08:00
fit2cloud-chenyw
d02d10c48c refactor: 优化设计缺陷,增加展示字段 2022-01-20 16:38:11 +08:00
fit2cloud-chenyw
3989c343b1 fix: 我分享的仪表板展示空tags 2022-01-20 13:59:47 +08:00
avanb
97adaf7526 refactor: 删除无用代码 2022-01-20 12:54:46 +08:00
ziliang-wan
27a23cb956 refactor: 删除无用代码 2022-01-19 22:45:16 +08:00
fit2cloudrd
bb954cc621
Merge pull request #1660 from song-tianyang/dev 
refactor: 删除没有引用到的繁体国际化字段
 2022-01-19 16:30:18 +08:00
song-tianyang
09a4615582
refactor: 删除没有引用到的繁体国际化字段 2022-01-19 16:28:34 +08:00
MatataYou
da1fcd0dd4
refactor: 删除没有引用到的中文国际化字段 2022-01-19 16:24:58 +08:00
tzlaosiji
e3fe583fe4
refactor: 删除没有引用到的英文国际化字段 2022-01-19 16:19:46 +08:00
taojinlong
7b478beae3 feat: 数据集列权限 2022-01-19 11:54:00 +08:00
taojinlong
d5a3276a1c feat: 数据集列权限 2022-01-19 11:49:13 +08:00
junjie
b00132a3fb fix: 函数描述错别字 2022-01-18 18:36:17 +08:00
fit2cloudrd
5e32cd9dde
refactor: 首页修改 (#1651) 
* refactor:首页修改

* refactor: 首页修改

Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-01-18 12:38:33 +08:00
taojinlong
e4f44bd2d4 feat: 列权限 2022-01-18 10:58:19 +08:00
taojinlong
caba975c2f refactor: 恢复 2022-01-17 18:23:26 +08:00
taojinlong
d64f0050a3
Merge pull request #1615 from rc452860/dev 
feat: 添加数据库数据集时显示表注释
 2022-01-17 18:16:45 +08:00
taojinlong
be5b1b07c2 refactor: 修复冲突 2022-01-17 18:05:26 +08:00
taojinlong
7d90a503c9 feat: 数据集列权限 2022-01-17 18:00:53 +08:00
fit2cloud-chenyw
563d7bee95 fix: token超时时间计算错误 2022-01-14 15:19:31 +08:00
fit2cloud-chenyw
624bffd8c0
Merge pull request #1638 from dataease/pr@dev@feat_priority_task_pool 
feat: 定时报告使用优先级线程池
 2022-01-13 17:29:32 +08:00
fit2cloud-chenyw
9cd891556f feat: 定时报告使用优先级线程池 2022-01-13 17:28:25 +08:00
wangjiahao
18b5815fd7 feat: 系统样式设置中增加首页是否显示按钮 2022-01-13 15:10:46 +08:00
fit2cloud-chenyw
a23e2601d7
Merge pull request #1634 from dataease/pr@dev@feat_default_pwd 
feat: 默认密码
 2022-01-12 17:47:26 +08:00
fit2cloud-chenyw
1714b7b017 feat: 默认密码 2022-01-12 17:46:14 +08:00
wangjiahao
c8491b069e refactor: 首页导航样式适配 2022-01-12 16:56:17 +08:00
wangjiahao
95186bd330 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	frontend/src/lang/en.js
#	frontend/src/lang/tw.js
#	frontend/src/lang/zh.js
 2022-01-12 11:17:01 +08:00
wangjiahao
9c1a055b3f feat: 新增首页导航 2022-01-12 11:14:51 +08:00
fit2cloud-chenyw
0a3580ddae refactor: 优化主题切换 2022-01-12 11:07:03 +08:00
rc452860
00650ce9f2 feat: 添加数据库数据集时显示表注释 2022-01-11 11:11:54 +08:00
fit2cloud-chenyw
eaed04f441 fix: 邮件预览日志 2022-01-10 15:34:59 +08:00
fit2cloud-chenyw
d424e15400 fix: 多字段枚举NPE异常 2022-01-10 15:28:33 +08:00
taojinlong
0f678140cf
Merge pull request #1596 from rc452860/dev 
fix: 数据源类型为oracle时候不同步字段注释问题
 2022-01-10 14:23:00 +08:00
junjie
dc1102d67f feat(数据集): 计算字段语法校验 2022-01-10 11:25:08 +08:00
taojinlong
4b33d79b47 fix: 处理原始表字段注释太长的问题 2022-01-06 15:17:28 +08:00
wangjiahao
4f5cf69378 Merge remote-tracking branch 'origin/v1.6' into v1.6 2022-01-06 11:37:14 +08:00
wangjiahao
65d37de5b0 refactor: 更新flyway 2022-01-06 11:36:37 +08:00
taojinlong
9562f5e207 fix: sql 错误 2022-01-06 07:43:02 +08:00
wangjiahao
f896e4efec refactor: 更新flyway 2022-01-06 00:00:19 +08:00
turc
3be575c98e fix: 数据源类型为oracle时候不同步字段注释问题 2022-01-05 13:36:15 +08:00
fit2cloud-chenyw
ad936cd963 fix: 周表达式无效 2022-01-04 17:53:02 +08:00
fit2cloud-chenyw
2747de3aa8
Merge pull request #1594 from dataease/pr@dev@fix_cron 
fix: 周表达式无效
 2022-01-04 17:52:10 +08:00
fit2cloud-chenyw
314b9fae66 fix: 周表达式无效 2022-01-04 17:50:33 +08:00
junjie
5acf996055 fix: 数据集权限树 2022-01-04 17:44:11 +08:00
junjie
a0d4fd1812 fix: 数据集权限树 2022-01-04 17:32:25 +08:00
taojinlong
aba661e1b5 fix: 查询数据时，先校验数据源有效性 2022-01-04 17:13:15 +08:00
taojinlong
ecad805dc4 fix: 查询数据时，先校验数据源有效性 2022-01-04 17:12:30 +08:00
taojinlong
71a78c0595 Merge branch 'v1.6' of github.com:dataease/dataease into v1.6 2022-01-04 16:23:11 +08:00
taojinlong
617da997a8 fix: 公共链接校验 token 2022-01-04 16:22:53 +08:00
taojinlong
7ae8b80bf1 fix: 公共链接校验 token 2022-01-04 16:21:51 +08:00
wangjiahao
071d236d77 refactor: 增加移动端布局示例 2022-01-04 16:01:36 +08:00
taojinlong
8f50764fa2 Merge branch 'v1.6' of github.com:dataease/dataease into v1.6 2022-01-04 12:08:37 +08:00
taojinlong
d35c03d828 fix: 查询数据时，先校验数据源有效性 2022-01-04 12:06:21 +08:00
taojinlong
9f98c73e08 fix: 查询数据时，先校验数据源有效性 2022-01-04 12:04:43 +08:00
fit2cloud-chenyw
a50c94fbd5 fix: 移动端分页api 2022-01-04 11:52:46 +08:00
taojinlong
832c244736 fix: 定时任务过滤数据集 2022-01-04 11:15:51 +08:00
taojinlong
6ce8e851d6 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-01-04 11:15:09 +08:00