Commit Graph

934 Commits

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