Commit Graph

2534 Commits

Author SHA1 Message Date
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
fit2cloud-chenyw
0aa2a69ff1 feat: 仪表板集成插件视图 2022-02-14 10:08:28 +08:00
wangjiahao
ecf1be4486 Merge remote-tracking branch 'origin/dev' into dev 2022-02-11 17:12:54 +08:00
junjun
8f39fbe3f5 feat: S2 pivot 2022-02-11 16:53:57 +08:00
wangjiahao
9eee9ed0f2 refactor: 文案修改 2022-02-11 16:47:01 +08:00
junjun
2c1f0533f2 feat: S2 pivot 2022-02-11 15:23:32 +08:00
fit2cloud-chenyw
756b056d99 refactor: 格式化代码 2022-02-11 14:22:17 +08:00
fit2cloud-chenyw
302fc5db74 refactor: 升级版本号1.8.0 2022-02-10 18:58:41 +08:00
fit2cloud-chenyw
60fa4e1cd4
Merge branch 'dev' into pr@dev@feat_view_plugin 2022-02-10 18:29:04 +08:00
fit2cloud-chenyw
417d869d46 feat: 新增气泡地图插件兼容 2022-02-10 18:17:41 +08:00
junjun
107635933e refactor: 数据集预览优化 2022-02-10 18:04:38 +08:00
wangjiahao
0d73961d86 Merge remote-tracking branch 'origin/dev' into dev 2022-02-10 17:11:16 +08:00
wangjiahao
330bd29232 fix: 修复新tab页预览无法打开的问题 2022-02-10 17:10:58 +08:00
junjun
05bd33b246 feat: S2 pivot 2022-02-10 14:19:59 +08:00
junjun
51412b6641 feat: S2 pivot 2022-02-10 10:22:45 +08:00
wangjiahao
757f9a5c21 Merge remote-tracking branch 'origin/dev' into dev 2022-02-09 18:02:10 +08:00
wangjiahao
064ca3b8c3 feat: 权限管理支持按照资源进行授权 2022-02-09 18:01:48 +08:00
junjie
69b1882085 fix: 修复地图范围不受权限控制的问题 2022-02-09 16:35:29 +08:00
junjie
ec45a82244 feat: S2 pivot 2022-02-08 14:27:40 +08:00
junjie
590fe30c16 feat: S2 pivot 2022-02-08 13:56:48 +08:00
junjie
95641feef7 feat: S2 pivot 2022-02-08 13:50:43 +08:00
fit2cloud-chenyw
a846a8fe74 fix: 日期过滤默认值兼容老版本 2022-02-08 10:58:40 +08:00
junjie
9fc6cedca3 feat: S2 Event 2022-02-07 13:13:50 +08:00
fit2cloud-chenyw
c370079b02 fix: 条件组件兼容老版本 2022-02-05 22:59:34 +08:00
fit2cloud-chenyw
2499f1c354 fix: 数字范围默认值导致仪表板空白 2022-02-05 22:32:59 +08:00
junjie
f4fb642c17 feat: S2 Event 2022-02-05 13:02:30 +08:00
junjie
4be52b9908 feat: S2 Event 2022-02-05 12:47:34 +08:00
junjie
85a6f1ae10 feat: S2 2022-02-02 13:29:46 +08:00
junjie
52a976c8a0 feat: S2 2022-02-01 15:30:09 +08:00
junjie
6c7d65fc77 feat: S2 2022-01-31 14:34:31 +08:00
junjie
66b75928b3 feat: S2明细表 2022-01-31 12:07:10 +08:00
wangjiahao
ea1649510f refactor: 首页文案修改 2022-01-30 12:48:28 +08:00
wangjiahao
473055f5f3 refactor: 当前过滤组件有默认值时无效触发保存 2022-01-30 10:02:16 +08:00
wangjiahao
e55c06e51b fix: 修复移动端一直加载问题 2022-01-30 09:44:17 +08:00
taojinlong
501d455e05 Merge branch 'v1.7' into dev 2022-01-28 20:01:36 +08:00
taojinlong
6f7345e859 Merge branch 'v1.7' of github.com:dataease/dataease into v1.7 2022-01-28 19:58:14 +08:00
taojinlong
62525b0bb3 feat: 增量更新,优先显示设置的 2022-01-28 18:58:01 +08:00
wangjiahao
bc884e8718 fix: 仪表板背景由颜色切换为图片,未加图片时背景颜色依然存在问题 2022-01-28 14:10:09 +08:00
wangjiahao
44eb82eaf9 fix: 新tab页预览仪表板跳转时模式为当前页面打开目标仪表板时,页面未刷新问题 2022-01-28 13:41:41 +08:00
wangjiahao
6c9e34a1ee fix: 仪表板背景由颜色切换为图片,未加图片时背景颜色依然存在问题 2022-01-28 13:40:00 +08:00
wangjiahao
3274877f42 refactor: 更新首页教学视频链接 2022-01-28 13:36:28 +08:00
wangjiahao
de581d2214 fix: 新tab页预览仪表板跳转时模式为当前页面打开目标仪表板时,页面未刷新问题 2022-01-28 13:34:32 +08:00
wangjiahao
8d4519445c refactor: 更新首页教学视频链接 2022-01-28 13:14:43 +08:00
wangjiahao
83e1386cb0 Merge remote-tracking branch 'origin/v1.7' into v1.7 2022-01-28 13:10:02 +08:00
wangjiahao
496962a68e fix: 仪表板背景由颜色切换为图片,未加图片时背景颜色依然存在问题 2022-01-28 13:08:44 +08:00
fit2cloud-chenyw
ccbd5eccc6 fix: 文本过滤组件空默认值异常 2022-01-28 11:42:59 +08:00
fit2cloud-chenyw
6f5fec6928 fix: 文本过滤组件空默认值异常 2022-01-28 11:40:42 +08:00
fit2cloud-chenyw
ac3fa4eca6 fix: 日期范围动态时间季度错误 2022-01-28 11:03:32 +08:00
fit2cloud-chenyw
c8e15a2162 fix: 日期范围动态时间季度错误 2022-01-28 11:01:34 +08:00
fit2cloud-chenyw
d0c55751c7 fix: 数字区间组件不能正常显示 2022-01-27 18:00:43 +08:00
fit2cloud-chenyw
31f9735ab2 fix: 数字区间组件不能正常显示 2022-01-27 17:57:23 +08:00
fit2cloud-chenyw
8207b12e1b fix: 仪表板编辑显示空白 2022-01-27 16:23:57 +08:00
fit2cloud-chenyw
eb6fbc7b5c fix: 仪表板编辑显示空白 2022-01-27 16:20:34 +08:00
junjie
34f51e1487 refactor: 优化地图标签选项 2022-01-27 14:43:55 +08:00
junjie
44c6ec4f8c refactor: 优化地图标签选项 2022-01-27 14:42:37 +08:00
junjie
0236972b90 fix: 统一授权后,分组tree参数修正 2022-01-27 14:30:20 +08:00
junjie
116e2038eb fix: 统一授权后,分组tree参数修正 2022-01-27 14:27:21 +08:00
taojinlong
9b98736627 refactor: 冲突 2022-01-27 13:57:43 +08:00
taojinlong
095a66f225 refactor: 显示所有的重复数据源 2022-01-27 13:52:53 +08:00
taojinlong
f99e1488f5 Merge branch 'v1.7' of github.com:dataease/dataease into v1.7 2022-01-27 13:47:15 +08:00
taojinlong
5fb8aba187 fix: 任务名称长度限制 2022-01-27 13:31:10 +08:00
fit2cloud-chenyw
0c8bdb20d2 fix: 仪表板过滤组件首次加载失效 2022-01-27 11:09:38 +08:00
fit2cloud-chenyw
d8f211b34e
Merge pull request #1704 from dataease/pr@v1.7@fix_view_mult_request
fix: 仪表板过滤组件首次加载失效
2022-01-27 11:07:38 +08:00
fit2cloud-chenyw
ddfd392858 fix: 仪表板过滤组件首次加载失效 2022-01-27 11:06:29 +08:00
junjie
d1980bb2a6 fix: 指标拖拽问题 2022-01-26 17:59:45 +08:00
junjie
0eb0407e4f fix: 指标拖拽问题 2022-01-26 17:57:20 +08:00
wangjiahao
227e82969c fix: 组件属性框直接输入值无法保存问题 2022-01-26 17:15:26 +08:00
wangjiahao
e47443adef fix: 组件属性框直接输入值无法保存问题 2022-01-26 17:05:56 +08:00
wangjiahao
e20e236391 refactor: 首页优化 2022-01-26 16:18:16 +08:00
wangjiahao
17c9b3eac9 refactor: 首页优化 2022-01-26 15:30:01 +08:00
wangjiahao
58a76eca08 refactor: 组件在矩阵模式下增加最小宽高的限制 2022-01-26 14:17:21 +08:00
wangjiahao
0b4581fd98 Merge remote-tracking branch 'origin/v1.7' into v1.7 2022-01-26 14:15:53 +08:00
wangjiahao
6f7a8c56da refactor: 组件在矩阵模式下增加最小宽高的限制 2022-01-26 14:15:34 +08:00
fit2cloud-chenyw
565d288b1d fix: 下拉列表组件逻辑错误 2022-01-26 13:27:58 +08:00
fit2cloud-chenyw
7b290dc643 fix: 下拉列表组件逻辑错误 2022-01-26 13:26:04 +08:00
fit2cloud-chenyw
5d9e2b246b fix: 列表新增按钮迷之消失 2022-01-26 11:51:09 +08:00
fit2cloud-chenyw
12491b730d fix: 列表新增按钮迷之消失 2022-01-26 11:49:28 +08:00
junjie
3fd3099d51 fix: AntV线宽 2022-01-26 10:52:12 +08:00
junjie
92900f09b4 fix: AntV线宽 2022-01-26 10:50:18 +08:00
taojinlong
7fa3ec1ca9 fix: 校验重复数据源 2022-01-26 10:40:20 +08:00
taojinlong
3d75e9920c fix: 校验重复数据源 2022-01-26 10:37:14 +08:00
junjie
5800befa50 fix(table): 明细表默认分页数适配旧版本创建的视图 2022-01-25 16:49:20 +08:00
junjie
24c5bd0c80 fix(table): 明细表默认分页数适配旧版本创建的视图 2022-01-25 16:47:45 +08:00
wangjiahao
564116704a Merge remote-tracking branch 'origin/dev' into dev 2022-01-25 16:39:03 +08:00
wangjiahao
9885b9cc4a feat: 仪表板预览界面支持刷新,仪表板加载代码优化 2022-01-25 16:38:19 +08:00
taojinlong
ece60e75fa build: 升级版本号 2022-01-25 16:13:09 +08:00
taojinlong
a73139e2b4 build: 升级版本号 2022-01-25 16:12:51 +08:00
taojinlong
a912baa7d7 build: 升级版本号 2022-01-25 16:08:00 +08:00
taojinlong
d9604a2744 build: 升级版本号 2022-01-25 16:06:23 +08:00
taojinlong
07e600b727 fix: 行权限枚举值校验 2022-01-25 14:48:40 +08:00
taojinlong
03ba9e43f4 fix: 行权限枚举值校验 2022-01-25 14:40:20 +08:00
taojinlong
a639ba1374 refactor: 冲突 2022-01-25 13:58:51 +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
fit2cloudrd
6dcf172546
refactor: 移动端样式修改 (#1685)
Co-authored-by: wangjiahao <1522128093@qq.com>
2022-01-25 12:11:47 +08:00
fit2cloudrd
8f2539cbdc
refactor: 移动端样式修改
Co-authored-by: wangjiahao <1522128093@qq.com>
2022-01-25 12:02:51 +08:00
wangjiahao
178c91e692 refactor: 移动端过滤组件标题大小跟随pc端 2022-01-25 11:35:44 +08:00
wangjiahao
3f232a36a6 refactor: 移动端过滤组件标题大小跟随pc端 2022-01-25 11:34:12 +08:00
wangjiahao
65139d788a fix: 文件组件大小设置在移动端无效问题 2022-01-25 10:50:29 +08:00
wangjiahao
5c511339c8 fix: 文件组件大小设置在移动端无效问题 2022-01-25 10:48:53 +08:00
junjie
3c11c3084a feat: 增加s2依赖 2022-01-24 16:00:47 +08:00
junjie
a854d0c9d2 refactor: 视图过滤字段值优化 2022-01-24 13:21:59 +08:00