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

1735 Commits

Author SHA1 Message Date
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
302fc5db74 refactor: 升级版本号1.8.0 2022-02-10 18:58:41 +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
84d8b16b4f refactor: 修改移动端打包路径 2022-01-27 16:59:02 +08:00
fit2cloud-chenyw
02eb894b28 refactor: 修改移动端打包路径 2022-01-27 16:55:17 +08:00
fit2cloud-chenyw
3224c9de52 fix: favicon迷之消失 2022-01-27 16:03:26 +08:00
fit2cloud-chenyw
945d10d20d fix: favicon迷之消失 2022-01-27 16:01:20 +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
taojinlong
a3a30a74db refactor: 升级依赖包 2022-01-26 15:14:21 +08:00
taojinlong
584b8a1f43 Merge branch 'v1.7' of github.com:dataease/dataease into v1.7 2022-01-26 15:05:33 +08:00
taojinlong
173cf0f10f refactor: 升级依赖包 2022-01-26 15:05:22 +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
taojinlong
a912baa7d7 build: 升级版本号 2022-01-25 16:08:00 +08:00
taojinlong
d9604a2744 build: 升级版本号 2022-01-25 16:06:23 +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