dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,156 Commits 37 Branches 86 Tags 419 MiB
50938eb702
Commit Graph

1358 Commits

Author SHA1 Message Date
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
67c4c8d55c fix: 日志导出文件使用excel无法打开 2022-06-22 12:16:30 +08:00
taojinlong
2efeec87b9 fix: 参数过滤空指针 2022-06-21 18:25:55 +08:00
fit2cloud-chenyw
a40fb8a8bf fix: 插件视图不能使用sql数据集 2022-06-21 15:37:54 +08:00
junjun
2620ddd16d feat: 视图支持计算字段 2022-06-21 11:31:44 +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
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
20bb6f4ea5 fix: 同步字段时，顺序错误 2022-06-17 11:36:45 +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
0baa789fa9 feat: 适配xpack-cas单点登录 2022-06-16 16:58:46 +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
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
fbd0d39002 feat: 过滤器枚举值排序 2022-06-07 15:04:24 +08:00
wangjiahao
54d8d59c0a fix: 修复不能创建关联数据集问题 2022-06-02 18:25:10 +08:00
fit2cloud-chenyw
ef86c2a885 fix: 插件视图使用带scheme的数据源没有设置scheme导致查询不到数据 2022-06-01 18:56:02 +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
fit2cloud-chenyw
87001c3268 fix: 符号地图导出excel缺少字段 2022-06-01 11:15:49 +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
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
d49f617c91 fix: 自定义驱动 2022-05-30 21:23:03 +08:00
fit2cloud-chenyw
d9e4cdd18f fix: 修改log文件名称 2022-05-30 10:22:23 +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
吕昊泽
00e7b5f349 修复[issue:2339](https://github.com/dataease/dataease/issues/2339)excel创建关联数据集保留原数据类型 2022-05-29 21:38:20 +08:00
fit2cloud-chenyw
792a86667f fix: 修改个人信息报错 2022-05-29 09:46:29 +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
215d262bbf fix: 暂时屏蔽视图操作日志 2022-05-28 21:42:53 +08:00
taojinlong
718585f3a0 fix: excel 替换、追加不生效 2022-05-28 10:51:11 +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
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
fit2cloud-chenyw
8152848c43 perf: 优化审计日志 2022-05-24 17:55:53 +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
fit2cloud-chenyw
c80eea153b feat: 日志通过操作类型搜索 2022-05-18 19:06:27 +08:00
fit2cloud-chenyw
f0f5813071 feat: 操作日志 2022-05-18 18:12:10 +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
junjun
757f7774a2 feat: 自定义排序 2022-05-11 21:48:50 +08:00
satan
5d674fcca9 修复[issue 1298](https://github.com/dataease/dataease/issues/1298) :"个人信息建议可以修改某些字段" 2022-05-10 10:48:58 +08:00
satan
84f4cbd071 修复[issue 1298](https://github.com/dataease/dataease/issues/1298) :"个人信息建议可以修改某些字段" 2022-05-10 00:52:06 +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
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
王嘉豪
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
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
wangjiahao
d033387c60 fix: 直接复制tab组件内部视图依然是软连接问题 2022-04-26 18:03:37 +08:00
taojinlong
a63157950d fix: 校验impala数据源重复 2022-04-26 15:35:19 +08:00
fit2cloud-chenyw
477e6abc2b fix: 消息列表切换消息类型无效 2022-04-25 15:32:14 +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
e07200cb81 fix: 优化插件存放路径 2022-04-24 16:59:50 +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
575010708b fix: 引擎缓存 2022-04-17 21:27:04 +08:00
taojinlong
7f00646285 fix: 数据源插件 2022-04-17 18:19:54 +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
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
d341a1ac68 feat: 帮助文档及首页支持链接自定义 2022-04-14 11:42:43 +08:00
fit2cloud-chenyw
0c16ca38e4 feat: 集群环境websocket消息 2022-04-13 18:30:31 +08:00
fit2cloudrd
bb98e0c4e7
refactor: 视图明细导出优化 (#2093) 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-04-11 10:58:52 +08:00
wangjiahao
b7437f0413 feat: 视图明细导出支持附带明细截图 2022-04-10 16:48:50 +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
d74fd5d0ed fix: 修复复制仪表板，视图可能被勿删的问题 2022-04-07 15:38:03 +08:00
fit2cloud-chenyw
67d5f20848 fix: 插件卸载逻辑 2022-04-06 18:58:15 +08:00
taojinlong
3ae10f4592 fix: 集群模式抽取数据 2022-04-05 21:50:16 +08:00
taojinlong
c48cd46986 fix: 集群模式抽取数据 2022-04-05 21:49:24 +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
9b48e7a2a4 fix: 默认授权 2022-04-02 23:03:39 +08:00
taojinlong
7efd82b6e5 fix: 默认授权 2022-04-02 22:23:28 +08:00
wangjiahao
71b3422ead refactor: 视图编辑时检验title是否重复 2022-04-02 20:09:45 +08:00
fit2cloudrd
f631fc98d7
fix: 新建仪表板卡顿问题 
Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-04-02 15:04:35 +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
fit2cloud-chenyw
e36df37a59 fix: 删除仪表板后公共链接映射还存在 2022-04-01 15:54:18 +08:00
taojinlong
178a411131 fix: 行权限系统变量 2022-03-31 22:51:54 +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
wangjiahao
c0682bcdc8 refactor: 复制视图名称不重复 2022-03-30 20:15:02 +08:00
taojinlong
59d07862fc fix: 同步API数据集的字段 2022-03-30 15:37:31 +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
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
2cfaa55440 fix: 公共链接不能显示气泡地图 2022-03-29 12:02:21 +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
junjun
9cc43d1095 fix: 增加接口校验 2022-03-28 15:51:18 +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
8137acfd50 fix: 抽取模式插件视图不可用 2022-03-28 15:17:41 +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
王嘉豪
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
e2d088a51f feat: 支持集群（kettle） 2022-03-25 16:59:22 +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
ccba5bdce5 refactor: 重构系统参数-显示设置布局 2022-03-22 12:56:42 +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
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
eae0095db4 refactor: resolve Conflicts 2022-03-14 12:30:20 +08:00
taojinlong
e81138ec5c feat: 支持精简模式 2022-03-14 12:26:24 +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
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
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
7675f9c119 fix: API 数据集增量同步 2022-03-04 15:45:43 +08:00
taojinlong
2f0bbe7c8d perf: 优化启动时，数据集初始化 2022-03-02 22:41:29 +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
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
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
taojinlong
8e528ebbaf feat: 仪表板分享以分享人查看数据 2022-03-01 16:06:40 +08:00
taojinlong
a72f262226 fix: 行列权限并行生效 2022-03-01 12:42:47 +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
af7b9dab09 fix: 识别 pg 类型 2022-02-28 23:01:29 +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
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
7aaad18dd9 fix: 自己创建的仪表板右上角没有编辑按钮 2022-02-28 11:35:32 +08:00
wangjiahao
0ef9e7a001 fix: 仪表板复制后打开的是旧仪表板问题 2022-02-25 18:36:32 +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
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
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
b6d1516928 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-02-23 17:19: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
王嘉豪
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
wangjiahao
7c67717b3c fix: 修复只修改仪表板名称后，移动端列表不显示仪表板问题 2022-02-22 11:22:02 +08:00
wangjiahao
8823a6e035 refactor: 视图去掉重名校验 2022-02-22 09:49:59 +08:00
taojinlong
b636179f0c fix: 漏洞修复 2022-02-21 17:40:45 +08:00
taojinlong
fe01f43d8c fix: API 数据源 2022-02-20 15:54:50 +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
995fe08298 fix: nginx前后分离部署 2022-02-16 16:10:39 +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
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
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
f6bfccdb24 fix: 新建资源缓存一致性问题 2022-02-14 11:56:58 +08:00
junjie
95641feef7 feat: S2 pivot 2022-02-08 13:50:43 +08:00
junjie
de00628517 feat: S2 Event 2022-02-06 18:21:08 +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
809bab3212 fix: 识别 hive 字段类型 2022-01-29 23:45:23 +08:00
wangjiahao
e20e236391 refactor: 首页优化 2022-01-26 16:18:16 +08:00
fit2cloud-chenyw
5d9e2b246b fix: 列表新增按钮迷之消失 2022-01-26 11:51:09 +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
10bab20b12 fix: 数据集列权限 2022-01-23 14:29:54 +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
3989c343b1 fix: 我分享的仪表板展示空tags 2022-01-20 13:59:47 +08:00
taojinlong
d5a3276a1c feat: 数据集列权限 2022-01-19 11:49:13 +08:00
fit2cloudrd
5e32cd9dde
refactor: 首页修改 (#1651) 
* refactor:首页修改

* refactor: 首页修改

Co-authored-by: wangjiahao <1522128093@qq.com>
 2022-01-18 12:38:33 +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
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
rc452860
00650ce9f2 feat: 添加数据库数据集时显示表注释 2022-01-11 11:11:54 +08:00
junjie
dc1102d67f feat(数据集): 计算字段语法校验 2022-01-10 11:25:08 +08:00
taojinlong
aba661e1b5 fix: 查询数据时，先校验数据源有效性 2022-01-04 17:13:15 +08:00
taojinlong
9f98c73e08 fix: 查询数据时，先校验数据源有效性 2022-01-04 12:04:43 +08:00
taojinlong
832c244736 fix: 定时任务过滤数据集 2022-01-04 11:15:51 +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
47f9ca83bc fix: 枚举值接口支持行权限 2021-12-30 14:50:26 +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
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
xiajunjie
77224697be fix: 关联数据集字段关键字 2021-12-27 20:54:37 +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
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
taojinlong
40598b8454 fix: 拋出数据源链接异常 2021-12-22 18:14:09 +08:00
taojinlong
d312a36220 feat: 行权限支持枚举 2021-12-21 17:26:26 +08:00