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

1897 Commits

Author SHA1 Message Date
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
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
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
9b15f26ccb refactor: 移动端代码合并 2022-01-04 11:53:10 +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
a5216ba596 build: v1.6 2022-01-04 11:15:49 +08:00
taojinlong
6ce8e851d6 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-01-04 11:15:09 +08:00
taojinlong
8ca71983e1 fix: 定时任务过滤数据集 2022-01-04 11:14:19 +08:00
fit2cloud-chenyw
2ba5690ba9 refactor: 移动端代码合并 2022-01-03 21:13:45 +08:00
fit2cloud-chenyw
b246111524 fix: 移动端分页api 2022-01-03 20:34:56 +08:00
taojinlong
f0cad41560 build: v1.6 2021-12-31 17:46:06 +08:00
taojinlong
64e5c34f05 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-31 17:42:29 +08:00
taojinlong
927bdbdebf fix: mongo sql 拼接问题 2021-12-31 16:34:21 +08:00
fit2cloud-chenyw
765ab7587f fix: 公共链接跳转白名单 2021-12-31 11:46:03 +08:00
taojinlong
55459dd8aa Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-31 10:42:52 +08:00
xiajunjie
fcbe38d040 fix: 字段重名 2021-12-31 00:22:07 +08:00
xiajunjie
1eb4dc6e01 fix: 字段重名 2021-12-31 00:21:01 +08:00
xiajunjie
7812d73545 fix: 字段重名 2021-12-30 20:31:01 +08:00
taojinlong
31f7cc0c85 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-30 16:26:52 +08:00
taojinlong
d4e7c888aa fix: 编辑行权限，字段名可以重复 2021-12-30 16:26:41 +08:00
fit2cloud-chenyw
983b166dea fix: 优化打印日志 2021-12-30 15:57:45 +08:00
taojinlong
0aa40304fc fix: 获取用户角色 ID 2021-12-30 15:48:01 +08:00
taojinlong
7ffe5514a9 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-30 14:50:48 +08:00
taojinlong
47f9ca83bc fix: 枚举值接口支持行权限 2021-12-30 14:50:26 +08:00
junjie
f39f56e0fe fix: 数据集文本转日期 2021-12-30 14:44:36 +08:00
fit2cloud-chenyw
d451100a57 fix: 打印邮件堆栈异常 2021-12-30 13:48:28 +08:00
fit2cloud-chenyw
b8cc97fad8 fix: 邮件截图报错 2021-12-30 12:38:00 +08:00
fit2cloud-chenyw
b2e4307ba5 fix: 多字段枚举接口免登录 2021-12-29 18:47:01 +08:00
taojinlong
55a08f61d2 fix: db2 分页问题 2021-12-29 18:32:23 +08:00
taojinlong
d5a0f9a9c6 fix: sql 数据集不允许有重复字段 2021-12-29 17:52:54 +08:00
junjie
37e98ea808 fix: 下钻字段容错 2021-12-29 16:13:28 +08:00
junjie
da1d0b8282 fix: 下钻字段容错 2021-12-29 16:11:55 +08:00
taojinlong
fac31a30b5 fix: Db2 增量更新 2021-12-29 15:16:47 +08:00
taojinlong
e7da047b21 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-29 14:51:04 +08:00
taojinlong
4642df5bbb fix: 每个字段，同一类型的行權限，限制只有一条记录 2021-12-29 14:50:52 +08:00
junjie
94c8d0467a fix: sql过滤 2021-12-29 11:56:48 +08:00
junjie
6a30bd496a fix: sql过滤 2021-12-29 11:55:28 +08:00
taojinlong
d5f8ce4abd fix: 每个字段，同一类型的行權限，限制只有一条记录 2021-12-29 11:42:57 +08:00
taojinlong
69e9931d5c Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-28 18:44:33 +08:00
taojinlong
6bb37f0d4e fix: 公共链接行权限 2021-12-28 18:44:11 +08:00
wangjiahao
892a967d24 refactor: 仪表板命名，相同目录下的仪表板和目录允许重名 2021-12-28 17:52:31 +08:00
taojinlong
16270dd457 fix: 普通用户个人信息、修改密码、关于 页面跳转后404 2021-12-28 13:12:33 +08:00
taojinlong
29dd75617e Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-27 21:33:56 +08:00
taojinlong
a42539ffdf fix: sqlserver 数据库名称有特殊字符 2021-12-27 21:33:47 +08:00
taojinlong
0f691b9f35 perf: 优化查询时间 2021-12-27 21:31:18 +08:00
xiajunjie
77224697be fix: 关联数据集字段关键字 2021-12-27 20:54:37 +08:00
王嘉豪
1e7986e585
fix: 数据集查询出多余目录问题 (#1531) 2021-12-27 17:43:51 +08:00
taojinlong
46c45315db Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-27 16:27:27 +08:00
taojinlong
4786d23d2c feat: 数据集页面支持行权限 2021-12-27 16:26:59 +08:00
junjie
f6a82359a7 feat: doris field type 2021-12-24 18:35:53 +08:00
fit2cloud-chenyw
58c9a2d8d5 fix: 下拉列表选项重复 2021-12-24 17:30:43 +08:00
junjie
383f8ef292 feat(视图): 同比环比 2021-12-24 15:27:37 +08:00
junjie
dc0a280366 feat(视图): 同比环比 2021-12-24 14:48:16 +08:00
taojinlong
1ff6f13525 fxi: 公共链接行权限 2021-12-24 12:13:33 +08:00
fit2cloud-chenyw
7cbd82ecf9 fix: 任务管理国际化 2021-12-23 16:10:20 +08:00
fit2cloud-chenyw
5abf7b5278 fix: 翻译优化 2021-12-23 16:04:31 +08:00
taojinlong
1fce629624 fix: mongo 支持JDBC连接字符串 2021-12-22 18:35:23 +08:00
taojinlong
40598b8454 fix: 拋出数据源链接异常 2021-12-22 18:14:09 +08:00
taojinlong
9507058a19 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-22 17:05:31 +08:00
taojinlong
e8bcb156cb fix: 降低 hive 驱动版本 2021-12-22 17:02:03 +08:00
xuwei-fit2cloud
4f05002a23 fix: 修改kettle仓库下载链接 2021-12-22 15:27:58 +08:00
junjie
e33d6e3e5b feat: 数据集入口适配 2021-12-22 12:28:09 +08:00
Gin
91e5f56e52
Merge pull request #1494 from dataease/pr@dev@feat_union_custom 
feat: 数据集入口适配
 2021-12-22 12:01:52 +08:00
fit2cloud-chenyw
126dcdcb49 fix: 全屏截图 2021-12-22 11:57:52 +08:00
junjie
b3352c07c9 feat: 数据集入口适配 2021-12-22 11:42:44 +08:00
fit2cloud-chenyw
3a7166d4b1
Merge pull request #1491 from dataease/pr@dev@fix_chrome_shot 
fix: 截屏只有半屏
 2021-12-21 18:52:40 +08:00
fit2cloud-chenyw
21a2309512 fix: 截屏只有半屏 2021-12-21 18:51:37 +08:00
王嘉豪
c3c7e20319
Merge pull request #1490 from dataease/pr@dev@refactor_panel-mobile 
refactor: 优化移动端目录查询
 2021-12-21 17:58:38 +08:00
wangjiahao
5399105baf refactor: 优化移动端目录查询 2021-12-21 17:57:45 +08:00
taojinlong
c138342c08 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-21 17:27:44 +08:00
taojinlong
d312a36220 feat: 行权限支持枚举 2021-12-21 17:26:26 +08:00
fit2cloud-chenyw
9dfee5adf8
Merge pull request #1477 from dataease/pr@dev@fix_chrome_driver_pixel 
fix: chrome-driver截图分辨率
 2021-12-20 17:20:35 +08:00
fit2cloud-chenyw
f12aeb4bdd fix: chrome-driver截图分辨率 2021-12-20 17:19:28 +08:00
taojinlong
7052f9b945 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-20 15:24:51 +08:00
taojinlong
5f5f33a8de fix: excel 替换时，不重建表结构，做字段 mapping 2021-12-20 15:24:41 +08:00
taojinlong
6454ebf7ea fix: es tableInfo 视图错误 2021-12-20 15:23:57 +08:00
fit2cloud-chenyw
ba28c43b40 refactor: 切换基础架构镜像 2021-12-20 14:42:19 +08:00
fit2cloud-chenyw
a97aebd543
Merge pull request #1475 from dataease/pr@dev@refactor_mobile_static_resource 
refactor: 移动端静态资源打包
 2021-12-20 14:20:09 +08:00
fit2cloud-chenyw
f4ffac52d1 refactor: 移动端静态资源打包 2021-12-20 14:18:16 +08:00
junjie
76e83b6896 feat(视图): 同比环比 2021-12-20 11:33:23 +08:00
junjie
31297d73e6 feat(视图): 文本类型过滤组件支持枚举 2021-12-20 10:54:45 +08:00
taojinlong
50d3a1c37f refactor: 解决冲突 2021-12-19 14:50:02 +08:00
taojinlong
a79a96f452 feat: 公共链接支持行权限 2021-12-19 14:46:33 +08:00
fit2cloud-chenyw
90bac42dc7
Merge pull request #1468 from dataease/pr@dev@feat_mobile_panel_url 
feat: 新增移动端仪表板api
 2021-12-18 22:37:04 +08:00
fit2cloud-chenyw
2365d3f24e feat: 新增移动端仪表板api 2021-12-18 22:35:59 +08:00
junjie
fe37d09a9e feat(视图): 文本类型过滤组件支持枚举 2021-12-17 18:16:18 +08:00
wangjiahao
9a4469d7a5 refactor: 移动端，web端视图内部属性可以根据屏幕缩放比例自动缩放 2021-12-17 18:11:39 +08:00
fit2cloud-chenyw
21e5624c22
Merge branch 'dev' into pr@dev@refactor_filter_default_value 2021-12-16 18:19:51 +08:00
fit2cloud-chenyw
3a3055280f feat: 新增时间控件动态默认值 2021-12-16 18:16:24 +08:00
junjie
cf1be88225 feat(视图): 支持过滤组件多字段过滤 2021-12-16 16:17:02 +08:00
taojinlong
2b18d64c7c Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-14 16:27:50 +08:00
taojinlong
4a7d8efe7c feat: 行权限支持"与/或" 2021-12-14 16:27:32 +08:00
junjie
81a2b4753e feat(视图): 过滤器支持and、or逻辑 2021-12-14 15:26:33 +08:00
taojinlong
4683181a6b refactor: 回退 2021-12-14 15:20:44 +08:00
taojinlong
fc5bbd3689 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-12-14 15:07:06 +08:00
taojinlong
82a5e142d2 fxi: 定时同步 db2 2021-12-14 15:06:47 +08:00
王嘉豪
791a76ca3c
Merge pull request #1437 from dataease/pr@dev@fix_panel-filter 
feat: 仪表板tab组件内视图，支持放大和编辑
 2021-12-14 11:45:24 +08:00
wangjiahao
beb295f38f feat: 仪表板tab组件内视图，支持放大和编辑 2021-12-14 11:43:41 +08:00
junjie
d11021934b feat(视图): 行权限 2021-12-14 11:35:35 +08:00
junjie
f4d81ef552 feat: 行权限构建 2021-12-14 11:10:04 +08:00
junjie
9505e3101b feat: 行权限构建 2021-12-14 11:09:38 +08:00
junjie
955d72cb75 feat(视图): 过滤器支持and、or逻辑 2021-12-14 10:14:02 +08:00