Commit Graph

2133 Commits

Author SHA1 Message Date
fit2cloud-chenyw
b1096a6151 fix: 打包后样式错误 2021-08-03 14:14:35 +08:00
fit2cloud-chenyw
721c5858e8
Merge pull request #492 from dataease/pr@dev@fix_国际化冲突
fix: 解决国际化冲突
2021-08-03 14:05:19 +08:00
fit2cloud-chenyw
94d716d1bc fix: 解决国际化冲突 2021-08-03 14:03:34 +08:00
XiaJunjie2020
b4b6b8b6b3
Merge pull request #491 from dataease/pr@dev@refactor_编辑字段样式调整
refactor: 编辑字段样式调整
2021-08-03 13:49:07 +08:00
junjie
bb58d690dc refactor: 编辑字段样式调整 2021-08-03 13:48:14 +08:00
王嘉豪
6d207829c5
Merge pull request #489 from dataease/pr@dev@fix_panel-style-change-save-dev
fix:仪表板样式修改保存按钮还是灰的问题
2021-08-03 13:27:03 +08:00
XiaJunjie2020
152368f2ff
Merge pull request #488 from dataease/pr@dev@feat_函数库flyway
feat: 函数库flyway
2021-08-03 13:25:32 +08:00
wangjiahao
b0905f98d2 fix:仪表板样式修改保存按钮还是灰的问题 2021-08-03 13:25:27 +08:00
junjie
ddcfd700ff feat: 函数库flyway 2021-08-03 13:24:35 +08:00
taojinlong
38e05c2dc6
Merge pull request #485 from dataease/pr@dev@edit-datasource
feat: 允许修改数据源
2021-08-03 12:22:08 +08:00
taojinlong
d22c809421 feat: 允许修改数据源 2021-08-03 12:21:10 +08:00
王嘉豪
355b780579
Merge pull request #484 from dataease/pr@dev@feat_panel-view-set-bar
refactor:明细弹出样式修改
2021-08-03 12:06:25 +08:00
wangjiahao
d61795898c refactor:明细弹出样式修改 2021-08-03 12:05:29 +08:00
XiaJunjie2020
a2ac6e5ad0
Merge pull request #483 from dataease/pr@dev@fix_雷达图数据结构
fix: 雷达图数据结构
2021-08-03 11:51:56 +08:00
junjie
e8fa584d47 fix: 雷达图数据结构 2021-08-03 11:50:15 +08:00
junjie
aa5340bcf3 Merge remote-tracking branch 'origin/dev' into dev 2021-08-03 11:35:19 +08:00
王嘉豪
1ebb5690a8
Merge pull request #480 from dataease/pr@dev@feat_panel-view-set-bar
feat:预览界面点击组件显示设置入口,点击空白也取消设置入口;去掉原有鼠标移入显示的样式
2021-08-03 11:33:37 +08:00
wangjiahao
7960180858 feat:预览界面点击组件显示设置入口,点击空白也取消设置入口;去掉原有鼠标移入显示的样式 2021-08-03 11:31:17 +08:00
wangjiahao
2bbca0e525 feat:组件预览入口修改为悬浮蓝色悬浮框展示 2021-08-03 11:29:32 +08:00
fit2cloud-chenyw
b09bf1ca54 refactor: 优化token过期提示框 2021-08-03 11:28:45 +08:00
wangjiahao
e4e0eef948 feat:增加组件的悬浮工具入口 2021-08-03 11:28:12 +08:00
junjie
cedc441bca Merge remote-tracking branch 'origin/dev' into dev 2021-08-03 11:20:36 +08:00
taojinlong
cbf8c94fc7 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-03 11:11:04 +08:00
taojinlong
ed71f845de feat: 登录过期弹框->重新登录;优化任务日志查询 2021-08-03 11:10:53 +08:00
junjie
f9b2bfd942 Merge remote-tracking branch 'origin/dev' into dev 2021-08-03 11:02:55 +08:00
XiaJunjie2020
0d6bb1484a
Merge pull request #476 from dataease/pr@dev@fix_雷达图tooltip
fix: 雷达图tooltip
2021-08-03 11:02:36 +08:00
junjie
c13a5afc13 Merge remote-tracking branch 'origin/dev' into dev 2021-08-03 11:01:17 +08:00
junjie
2b0ee551c9 fix: 雷达图tooltip 2021-08-03 11:00:10 +08:00
fit2cloud-chenyw
65dcbdadd0
Merge pull request #474 from dataease/pr@dev@fix_maven_package_error
fix: maven打包错误,指定maven-resources-plugin版本解决
2021-08-03 10:47:45 +08:00
fit2cloud-chenyw
70ee578133 fix: maven打包错误,指定maven-resources-plugin版本解决 2021-08-03 10:46:01 +08:00
fit2cloud-chenyw
6fa6cc83a1 fix: 资源权限逻辑错误 2021-08-03 09:52:49 +08:00
taojinlong
532cdf67b4 fix: 执行问任务后删除文件 2021-08-02 21:18:33 +08:00
XiaJunjie2020
6c7f72f862
Merge pull request #471 from dataease/pr@dev@feat_搜索优化
feat: 搜索优化
2021-08-02 19:27:23 +08:00
junjie
ab891386ce feat: 搜索优化 2021-08-02 19:26:28 +08:00
taojinlong
ac8f71577b Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-02 18:33:10 +08:00
taojinlong
e5c4606334 feat: 可配置kettle 相关的文件是否保留 2021-08-02 18:32:44 +08:00
fit2cloud-chenyw
ee234898cd
Merge pull request #470 from dataease/pr@dev@fix_token过期
fix: token过期点击确定没有跳转到登录
2021-08-02 18:28:22 +08:00
XiaJunjie2020
3724d423f5
Merge pull request #469 from dataease/pr@dev@fix_数据关联数据集及时刷新
fix: 关联字段数据集及时刷新
2021-08-02 18:28:03 +08:00
junjie
2772d78e78 fix: 关联字段数据集及时刷新 2021-08-02 18:27:10 +08:00
fit2cloud-chenyw
f9493fe2d7 fix: token过期点击确定没有跳转到登录 2021-08-02 18:27:03 +08:00
taojinlong
fbb884bcbf Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-02 18:13:33 +08:00
taojinlong
6261dff6cc fix: 校验增量更新sql 2021-08-02 18:13:24 +08:00
fit2cloud-chenyw
82265a1526
Merge pull request #467 from dataease/pr@dev@feat_完善api全局token
feat: 完善全局token
2021-08-02 17:53:56 +08:00
fit2cloud-chenyw
e459225f3b feat: 完善全局token 2021-08-02 17:52:43 +08:00
XiaJunjie2020
c2674f738d
Merge pull request #463 from dataease/pr@dev@feat_支持公式编辑
feat: 支持字段编辑
2021-08-02 16:37:16 +08:00
taojinlong
4b5d272f63 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-08-02 16:36:39 +08:00
taojinlong
285c48143f fix: 更新任务状态 2021-08-02 16:36:23 +08:00
junjie
28d93227f4 feat: 支持字段编辑 2021-08-02 16:34:11 +08:00
fit2cloud-chenyw
91b2b29108
Merge pull request #461 from dataease/pr@dev@feat_去除openApi
feat: 去除openApi
2021-08-02 16:09:28 +08:00
fit2cloud-chenyw
17585b4239 feat: 去除openApi 2021-08-02 16:07:59 +08:00