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

974 Commits

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