Commit Graph

2396 Commits

Author SHA1 Message Date
taojinlong
b6d1516928 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-02-23 17:19:21 +08:00
taojinlong
f66dbde8f7 refactor: API 数据源样式调整 2022-02-23 17:13:34 +08:00
junjun
902c480186 fix: 修复视图中数据集字段、数据,未受数据集权限控制的问题 2022-02-23 16:53:23 +08:00
wangjiahao
6f9deb1530 refactor: 新建或拖入的组件加上背景设置基本元素 2022-02-23 15:57:26 +08:00
wangjiahao
0a9edccc4d Merge remote-tracking branch 'origin/dev' into dev 2022-02-23 15:46:41 +08:00
wangjiahao
2dc8325dbb refactor: 文案修改 2022-02-23 15:46:23 +08:00
fit2cloud-chenyw
fdb9bd67f5
Merge pull request #1811 from dataease/pr@dev@refactor_async_component
refactor: 插件组件dom层级调整
2022-02-23 15:37:29 +08:00
fit2cloud-chenyw
9753b1d6ef refactor: 插件组件dom层级调整 2022-02-23 15:36:08 +08:00
wangjiahao
a4e55c3fb6 feat: 仪表板组件背景支持上传图片 2022-02-23 15:15:56 +08:00
taojinlong
340dd613a4 fix: API 数据源校验 2022-02-23 15:02:01 +08:00
junjun
69006a221e Merge remote-tracking branch 'origin/dev' into dev 2022-02-23 12:11:12 +08:00
王嘉豪
ef6d790035
revert: 视图组件支持设置背景图片
* feat: 视图组件支持设置背景图片

* feat: 视图组件支持设置背景图片

* refactor: 增加白名单

* Revert "feat: 视图组件支持设置背景图片"

This reverts commit fe63b85f09.

# Conflicts:
#	frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue
2022-02-23 12:10:40 +08:00
junjun
fabb431b7d fix: 修复视图中数据集字段、数据,未受数据集权限控制的问题 2022-02-23 12:10:28 +08:00
taojinlong
ac5703b44a feat: 数据源默认不展开 2022-02-23 10:45:57 +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
81e5916a1c fix: API数据源, jsonPath路径不能为空 2022-02-22 17:23:02 +08:00
wangjiahao
cd5fb46d0d refactor: 去掉视图权限校验 2022-02-22 11:04:05 +08:00
wangjiahao
63acd92705 Merge remote-tracking branch 'origin/dev' into dev 2022-02-21 17:58:49 +08:00
wangjiahao
fe63b85f09 feat: 视图组件支持设置背景图片 2022-02-21 17:58:33 +08:00
junjun
1348f53222 feat: S2 pivot 2022-02-21 17:24:42 +08:00
junjun
dfefade933 fix: 同环比支持多时间 2022-02-21 17:24:05 +08:00
fit2cloud-chenyw
a7dc9cdea8 fix: 气泡地图图标 2022-02-21 17:02:42 +08:00
fit2cloud-chenyw
a1f5deaf82 feat: 过滤条件穿透到tab组件内部视图 2022-02-21 16:23:08 +08:00
fit2cloud-chenyw
819a083bae feat: 气泡地图国际化 2022-02-21 12:42:02 +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
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
7f2cc0e0da
Merge pull request #1789 from dataease/pr@dev@refactor_plugin_view
refactor: 完善视图插件
2022-02-18 17:45:15 +08:00
fit2cloud-chenyw
c1ec061127 refactor: 完善视图插件 2022-02-18 17:44:16 +08:00
junjun
cfc01bf46c feat: 视图权限跟随仪表板 2022-02-18 16:49:49 +08:00
junjun
4e19debe21 refactor: 视图结果展示 2022-02-18 10:45:02 +08:00
fit2cloud-chenyw
4671ea996e feat: 兼容插件视图样式设置 2022-02-17 18:39:44 +08:00
fit2cloud-chenyw
173d808371
Merge pull request #1783 from dataease/pr@dev@refactor_plugins_view_compatible
refactor: 仪表板兼容插件视图
2022-02-17 14:25:34 +08:00
fit2cloud-chenyw
e1ed447063 refactor: 仪表板兼容插件视图 2022-02-17 14:22:30 +08:00
junjun
bddb3bc605 feat: S2 pivot align 2022-02-16 16:55:00 +08:00
fit2cloud-chenyw
995fe08298 fix: nginx前后分离部署 2022-02-16 16:10:39 +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
aa76e3be46
Merge pull request #1775 from dataease/pr@dev@refactor_short_public_link
refactor: 重构公共链接短链接
2022-02-15 16:56:01 +08:00
fit2cloud-chenyw
c02de72a7e refactor: 重构公共链接短链接 2022-02-15 16:54:59 +08:00
junjun
f2978cb1e7 feat: S2 pivot 2022-02-15 15:56:51 +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
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
junjun
64fce59957 feat: S2 pivot 2022-02-14 12:41:17 +08:00
junjun
24d9762b87 refactor: 视图字段增加校验提示 2022-02-14 12:27:33 +08:00