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

2093 Commits

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